Merge branch '1.21-multiloader' into 1.20.5-multiloader

# Conflicts:
#	gradle.properties

CHANGELOG.md

@@ -4,6 +4,10 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [2.3.4] - 2025-06-19
+### Added
+- Added support for minecraft 1.21.6
+
 ## [2.3.3] - 2025-06-01
 ### Fixed
 - Fixed forge mixin crash (closes [#54](https://github.com/Suiranoil/SkinRestorer/issues/53))

CHANGELOG_LATEST.md

@@ -1,4 +1,2 @@
-### Fixed
+### Added
-- Fixed forge mixin crash (closes [#54](https://github.com/Suiranoil/SkinRestorer/issues/53))
+- Added support for minecraft 1.21.6
-### Removed
-- Removed minecraft 1.19 support

common/src/main/java/net/lionarius/skinrestorer/mineskin/Java11RequestHandler.java

@@ -32,8 +32,8 @@ public class Java11RequestHandler extends RequestHandler {
     private final Gson gson;
     private final HttpClient httpClient;
     
-    public Java11RequestHandler(String userAgent, String apiKey, int timeout, Gson gson, InetSocketAddress proxy) {
+    public Java11RequestHandler(String baseUrl, String userAgent, String apiKey, int timeout, Gson gson, InetSocketAddress proxy) {
-        super(userAgent, apiKey, timeout, gson);
+        super(baseUrl, userAgent, apiKey, timeout, gson);
         this.gson = gson;
         
         HttpClient.Builder clientBuilder = HttpClient.newBuilder()
@@ -85,6 +85,7 @@ public class Java11RequestHandler extends RequestHandler {
     
     public <T, R extends MineSkinResponse<T>> R getJson(String url, Class<T> clazz, ResponseConstructor<T, R> constructor)
             throws IOException {
+        url = this.baseUrl + url;
         MineSkinClientImpl.LOGGER.fine("GET " + url);
         
         HttpRequest.Builder requestBuilder = HttpRequest.newBuilder()
@@ -110,6 +111,7 @@ public class Java11RequestHandler extends RequestHandler {
     
     public <T, R extends MineSkinResponse<T>> R postJson(String url, JsonObject data, Class<T> clazz, ResponseConstructor<T, R> constructor)
             throws IOException {
+        url = this.baseUrl + url;
         MineSkinClientImpl.LOGGER.fine("POST " + url);
         
         HttpRequest.Builder requestBuilder = HttpRequest.newBuilder()
@@ -137,6 +139,7 @@ public class Java11RequestHandler extends RequestHandler {
     
     public <T, R extends MineSkinResponse<T>> R postFormDataFile(String url, String key, String filename, InputStream in, Map<String, String> data, Class<T> clazz, ResponseConstructor<T, R> constructor)
             throws IOException {
+        url = this.baseUrl + url;
         MineSkinClientImpl.LOGGER.fine("POST " + url);
         
         String boundary = "mineskin-" + System.currentTimeMillis();

common/src/main/java/net/lionarius/skinrestorer/skin/provider/MineskinSkinProvider.java

@@ -43,7 +43,8 @@ public final class MineskinSkinProvider implements SkinProvider {
                 .userAgent(WebUtils.USER_AGENT)
                 .gson(JsonUtils.GSON)
                 .timeout((int) Duration.ofSeconds(config.requestTimeout()).toMillis())
-                .requestHandler((userAgent, apiKey, timeout, gson) -> new Java11RequestHandler(
+                .requestHandler((baseUrl, userAgent, apiKey, timeout, gson) -> new Java11RequestHandler(
+                        baseUrl,
                         userAgent,
                         apiKey,
                         timeout,

fabric/src/main/resources/fabric.mod.json

@@ -14,7 +14,7 @@
     },
     "icon": "assets/${mod_id}/icon.png",
     "license": "${license}",
-    "environment": "*",
+    "environment": "server",
     "entrypoints": {
         "main": [
             "net.lionarius.skinrestorer.fabric.SkinRestorerFabric"

forge/build.gradle

@@ -24,7 +24,7 @@ tasks.named('jarJar') {
 jar.finalizedBy('jarJar')
 
 minecraft {
-    mappings channel: 'parchment', version: "${parchment_version}-${parchment_minecraft}"
+    mappings channel: 'parchment', version: "${parchment_minecraft}-${parchment_version}-${minecraft_version}"
 
     copyIdeResources = true //Calls processResources when in dev
 

forge/src/main/resources/META-INF/mods.toml

@@ -17,11 +17,11 @@ modId = "forge"
 mandatory = true
 versionRange = "[${forge_version},)"
 ordering = "NONE"
-side = "BOTH"
+side = "SERVER"
 
 [[dependencies.${mod_id}]]
 modId = "minecraft"
 mandatory = true
 versionRange = "${minecraft_version_range}"
 ordering = "NONE"
-side = "BOTH"
+side = "SERVER"

gradle.properties

@@ -8,7 +8,7 @@ minecraft_version_list=1.20.5,1.20.6
 minecraft_version_range=[1.20.5,1.20.6]
 mod_id=skinrestorer
 mod_name=SkinRestorer
-mod_version=2.3.3
+mod_version=2.3.4
 mod_author=Lionarius
 mod_homepage=https://modrinth.com/mod/skinrestorer
 mod_sources=https://github.com/Suiranoil/SkinRestorer
@@ -18,7 +18,7 @@ credits=
 description=A server-side mod for managing skins.
 
 # Dependencies
-mineskin_client_version=3.0.1-SNAPSHOT
+mineskin_client_version=3.0.6-SNAPSHOT
 
 # ParchmentMC mappings, see https://parchmentmc.org/docs/getting-started#choose-a-version for new versions
 parchment_minecraft=1.20.6

neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -20,11 +20,11 @@ modId = "neoforge"
 type = "required"
 versionRange = "[${neoforge_version},)"
 ordering = "NONE"
-side = "BOTH"
+side = "SERVER"
 
 [[dependencies.${mod_id}]]
 modId = "minecraft"
 type = "required"
 versionRange = "${minecraft_version_range}"
 ordering = "NONE"
-side = "BOTH"
+side = "SERVER"