From dfe6d7af4265e7f6470e503f02f4899f94711848 Mon Sep 17 00:00:00 2001 From: lionarius Date: Mon, 2 Dec 2024 21:40:16 +0300 Subject: [PATCH 1/5] fix date in changelog --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index e9082d5..ddd0154 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,7 @@ 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.2.0] - 2024-11-28 +## [2.2.0] - 2024-12-02 ### Added - Added support for [SkinShuffle](https://modrinth.com/mod/skinshuffle) clients (requires FabricAPI on Fabric) (closes [#34](https://github.com/Suiranoil/SkinRestorer/issues/34)) From a63b6c3867e3acab261b3616069ed207ab1cff7e Mon Sep 17 00:00:00 2001 From: lionarius Date: Wed, 11 Dec 2024 07:05:53 +0300 Subject: [PATCH 2/5] implement GsonPostProcessable for SkinValue --- .../java/net/lionarius/skinrestorer/skin/SkinIO.java | 4 +--- .../net/lionarius/skinrestorer/skin/SkinValue.java | 10 +++++++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/net/lionarius/skinrestorer/skin/SkinIO.java b/common/src/main/java/net/lionarius/skinrestorer/skin/SkinIO.java index 5081373..ad4f843 100644 --- a/common/src/main/java/net/lionarius/skinrestorer/skin/SkinIO.java +++ b/common/src/main/java/net/lionarius/skinrestorer/skin/SkinIO.java @@ -27,9 +27,7 @@ public class SkinIO { public SkinValue loadSkin(UUID uuid) { try { - var value = SkinIO.loadSkin(savePath.resolve(SkinIO.uuidToFilename(uuid))); - Objects.requireNonNull(value.provider()); - return value; + return SkinIO.loadSkin(savePath.resolve(SkinIO.uuidToFilename(uuid))); } catch (Exception e) { return SkinValue.EMPTY; } diff --git a/common/src/main/java/net/lionarius/skinrestorer/skin/SkinValue.java b/common/src/main/java/net/lionarius/skinrestorer/skin/SkinValue.java index 8b8d34c..dd2ff7d 100644 --- a/common/src/main/java/net/lionarius/skinrestorer/skin/SkinValue.java +++ b/common/src/main/java/net/lionarius/skinrestorer/skin/SkinValue.java @@ -3,11 +3,14 @@ package net.lionarius.skinrestorer.skin; import com.mojang.authlib.properties.Property; import net.lionarius.skinrestorer.skin.provider.EmptySkinProvider; import net.lionarius.skinrestorer.skin.provider.SkinProviderContext; +import net.lionarius.skinrestorer.util.gson.GsonPostProcessable; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.Objects; + public record SkinValue(@NotNull String provider, @Nullable String argument, @Nullable SkinVariant variant, - @Nullable Property value, @Nullable Property originalValue) { + @Nullable Property value, @Nullable Property originalValue) implements GsonPostProcessable { public static final SkinValue EMPTY = new SkinValue(EmptySkinProvider.PROVIDER_NAME, null, null, null); @@ -30,4 +33,9 @@ public record SkinValue(@NotNull String provider, @Nullable String argument, @Nu public SkinValue setOriginalValue(Property originalValue) { return new SkinValue(this.provider, this.argument, this.variant, this.value, originalValue); } + + @Override + public void gsonPostProcess() { + Objects.requireNonNull(this.provider); + } } From 823b2ea3f6cc0cb97fdeb07a409502d0a37eae74 Mon Sep 17 00:00:00 2001 From: lionarius Date: Tue, 17 Dec 2024 09:03:33 +0300 Subject: [PATCH 3/5] remove api url in mineskin provider --- .../skin/provider/MineskinSkinProvider.java | 10 ---------- 1 file changed, 10 deletions(-) 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 5e79fc5..75d9a6a 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 @@ -22,7 +22,6 @@ import org.mineskin.response.QueueResponse; import java.net.InetSocketAddress; import java.net.URI; -import java.net.URISyntaxException; import java.time.Duration; import java.util.Optional; import java.util.concurrent.TimeUnit; @@ -31,19 +30,10 @@ public final class MineskinSkinProvider implements SkinProvider { public static final String PROVIDER_NAME = "web"; - private static final URI API_URI; private static MineSkinClient MINESKIN_CLIENT; private static LoadingCache, Optional> SKIN_CACHE; - static { - try { - API_URI = new URI("https://api.mineskin.org"); - } catch (URISyntaxException e) { - throw new IllegalArgumentException(e); - } - } - public static void reload() { var config = SkinRestorer.getConfig(); var configApiKey = config.providersConfig().mineskin().apiKey(); From 4d6d4faafd0c2a7145a505ea687928e2ea7b04e6 Mon Sep 17 00:00:00 2001 From: lionarius Date: Mon, 23 Dec 2024 11:55:32 +0300 Subject: [PATCH 4/5] update CHANGELOG.md --- CHANGELOG.md | 4 ++++ CHANGELOG_LATEST.md | 10 +--------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ddd0154..61306df 100644 --- a/CHANGELOG.md +++ b/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.2.1] - 2024-12-23 +### Fixed +- Fixed game not closing because of mineskin working threads (closes [#41](https://github.com/Suiranoil/SkinRestorer/issues/41)) + ## [2.2.0] - 2024-12-02 ### Added - Added support for [SkinShuffle](https://modrinth.com/mod/skinshuffle) clients (requires FabricAPI on Fabric) diff --git a/CHANGELOG_LATEST.md b/CHANGELOG_LATEST.md index 36d1c1a..8920438 100644 --- a/CHANGELOG_LATEST.md +++ b/CHANGELOG_LATEST.md @@ -1,10 +1,2 @@ -### Added -- Added support for [SkinShuffle](https://modrinth.com/mod/skinshuffle) clients (requires FabricAPI on Fabric) - (closes [#34](https://github.com/Suiranoil/SkinRestorer/issues/34)) -- Added `providers.mineskin.apiKey` config option (see [wiki](https://github.com/Suiranoil/SkinRestorer/wiki/Configuration#providersmineskin)) -### Changed -- Migrated to MineSkin's new API V2 ### Fixed -- Fixed `providers` config validation -### Removed -- Dropped support for NeoForge on Minecraft 1.20.2-1.20.4 +- Fixed game not closing because of mineskin working threads (closes [#41](https://github.com/Suiranoil/SkinRestorer/issues/41)) From 6a7f5f209622de4eeded3528fa79a5e3c3990f6d Mon Sep 17 00:00:00 2001 From: lionarius Date: Mon, 23 Dec 2024 11:56:02 +0300 Subject: [PATCH 5/5] bump version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index be7ef45..64c4b05 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ minecraft_version_list=1.21,1.21.1,1.21.2,1.21.3 minecraft_version_range=[1.21, 1.22) mod_id=skinrestorer mod_name=SkinRestorer -mod_version=2.2.0 +mod_version=2.2.1 mod_author=Lionarius mod_homepage=https://modrinth.com/mod/skinrestorer mod_sources=https://github.com/Suiranoil/SkinRestorer