From 1b6afd5d6e3caa9379c2d75916d6c2751aa30a5f Mon Sep 17 00:00:00 2001 From: Lionarius Date: Wed, 11 Jun 2025 01:26:34 +0300 Subject: [PATCH] update mineskin client to 3.0.6 --- .../skinrestorer/mineskin/Java11RequestHandler.java | 7 +++++-- .../skinrestorer/skin/provider/MineskinSkinProvider.java | 3 ++- gradle.properties | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/net/lionarius/skinrestorer/mineskin/Java11RequestHandler.java b/common/src/main/java/net/lionarius/skinrestorer/mineskin/Java11RequestHandler.java index b69832a..2c23b08 100644 --- a/common/src/main/java/net/lionarius/skinrestorer/mineskin/Java11RequestHandler.java +++ b/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) { - super(userAgent, apiKey, timeout, gson); + public Java11RequestHandler(String baseUrl, String userAgent, String apiKey, int timeout, Gson gson, InetSocketAddress proxy) { + super(baseUrl, userAgent, apiKey, timeout, gson); this.gson = gson; HttpClient.Builder clientBuilder = HttpClient.newBuilder() @@ -85,6 +85,7 @@ public class Java11RequestHandler extends RequestHandler { public > R getJson(String url, Class clazz, ResponseConstructor 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 > R postJson(String url, JsonObject data, Class clazz, ResponseConstructor 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 > R postFormDataFile(String url, String key, String filename, InputStream in, Map data, Class clazz, ResponseConstructor constructor) throws IOException { + url = this.baseUrl + url; MineSkinClientImpl.LOGGER.fine("POST " + url); String boundary = "mineskin-" + System.currentTimeMillis(); diff --git a/common/src/main/java/net/lionarius/skinrestorer/skin/provider/MineskinSkinProvider.java b/common/src/main/java/net/lionarius/skinrestorer/skin/provider/MineskinSkinProvider.java index 75d9a6a..0386927 100644 --- a/common/src/main/java/net/lionarius/skinrestorer/skin/provider/MineskinSkinProvider.java +++ b/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, diff --git a/gradle.properties b/gradle.properties index 996a99c..a27443d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -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.21.5