update CHANGELOG

fixes #60 and #61

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -0,0 +1,90 @@
+name: Bug Report
+description: Report a bug encountered with SkinRestorer
+title: "[Bug]: "
+labels: ["bug"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        🐛 **Before submitting:**
+        - Ensure you're using the latest mod version
+        - Ensure this bug is reproducible consistently
+        - Check existing issues for duplicates
+
+  - type: input
+    id: mod-version
+    attributes:
+      label: SkinRestorer Version
+      description: Exact version of the mod
+      placeholder: e.g., 2.2.1
+    validations:
+      required: true
+
+  - type: input
+    id: minecraft-version
+    attributes:
+      label: Minecraft Version
+      description: Full Minecraft version
+      placeholder: e.g., 1.21.4
+    validations:
+      required: true
+
+  - type: input
+    id: loader-version
+    attributes:
+      label: Mod Loader & Version
+      description: Fabric/Quilt/Forge/NeoForge version
+      placeholder: e.g., Fabric 0.15.7
+    validations:
+      required: true
+
+  - type: input
+    id: java-version
+    attributes:
+      label: Java Version
+      placeholder: e.g. 17, 21
+    validations:
+      required: true
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Bug Description
+      description: What happened vs what you expected to happen
+    validations:
+      required: true
+
+  - type: textarea
+    id: steps
+    attributes:
+      label: Reproduction Steps
+      description: Provide step-by-step instructions or a video showing how to reproduce the issue.
+      placeholder: |
+        1. 
+        2. 
+        3. 
+        Or a video demonstrating the issue.
+    validations:
+      required: true
+
+  - type: textarea
+    id: logs
+    attributes:
+      label: Relevant Logs
+      description: |
+        Please provide any relevant logs, especially error logs from your server console or `latest.log` file.
+        **Important**: Paste the FULL log content. Use a service like [mclo.gs](https://mclo.gs/).
+      render: shell
+    validations:
+      required: true
+
+  - type: checkboxes
+    id: confirmations
+    attributes:
+      label: Confirmations
+      options:
+        - label: I've checked for existing issues
+          required: true
+        - label: This bug is reproducible consistently
+          required: true
+        - label: I've tested without other mods

.github/ISSUE_TEMPLATE/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: true

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -0,0 +1,52 @@
+name: Feature Request
+description: Suggest a new feature for SkinRestorer
+title: "[Feature Request]: "
+labels: ["enhancement"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        💡 **Before submitting:**
+        - Check existing feature requests for duplicates
+        - Be clear and concise
+        - Explain the *why* and the *how*
+
+  - type: textarea
+    id: description
+    attributes:
+      label: Feature Description
+      description: Detailed description of the feature
+    validations:
+      required: true
+
+  - type: textarea
+    id: motivation
+    attributes:
+      label: Motivation
+      description: Why is this feature needed? What problem does it solve?
+    validations:
+      required: true
+
+  - type: textarea
+    id: use-cases
+    attributes:
+      label: Use Cases
+      description: How would this feature be used and who would benefit?
+    validations:
+      required: true
+
+  - type: textarea
+    id: implementation-ideas
+    attributes:
+      label: Implementation Ideas (Optional)
+      description: Any thoughts on how it could be implemented?
+    validations:
+      required: false
+
+  - type: checkboxes
+    id: confirmations
+    attributes:
+      label: Confirmations
+      options:
+        - label: I've checked for existing feature requests
+          required: true

.gitignore

@@ -30,3 +30,4 @@ bin/
 
 .architectury-transformer/
 run/
+scripts/

CHANGELOG.md

@@ -4,7 +4,57 @@ 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.4.2] - 2025-07-13
+### Fixed
+- Fix crash when head profile name is null (fixes [#60](https://github.com/Suiranoil/SkinRestorer/issues/60) and [#61](https://github.com/Suiranoil/SkinRestorer/issues/61))
+
+## [2.4.1] - 2025-07-09
+### Changed
+- Log full exception and argument when unable to fetch/set skin
+### Fixed
+- Fixed mojang provider using offline uuids when unable to fetch actual uuid resulting in `no profile with uuid` error
+
+## [2.4.0] - 2025-07-05
+### Fixed
+- Added support for player heads
+
+## [2.3.5] - 2025-06-21
+### Fixed
+- Fix mod not loading on client
+
+## [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))
+### Removed
+- Removed minecraft 1.19 support
+
+## [2.3.2] - 2025-05-24
+### Fixed
+- Fixed mixin incompatibility with ModernFix (closes [#42](https://github.com/Suiranoil/SkinRestorer/issues/52))
+
+## [2.3.1] - 2025-05-03
+### Added
+- Added support for minecraft 1.19-1.19.4
+### Changed
+- Use services and session server urls from environment
+
+## [2.3.0] - 2025-03-27
+### Added
+- Added `skinApplyDelayOnJoin` config option (see [wiki](https://github.com/Suiranoil/SkinRestorer/wiki/Configuration#skinapplydelayonjoin))
+### Changed
+- Updated to 1.21.5
+### Removed
+- [NeoForge] Dropped support for NeoForge on Minecraft 1.20.5-1.20.6
+
+## [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)
   (closes [#34](https://github.com/Suiranoil/SkinRestorer/issues/34))

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
+- Fix crash when head profile name is null (fixes [#60](https://github.com/Suiranoil/SkinRestorer/issues/60) and [#61](https://github.com/Suiranoil/SkinRestorer/issues/61))
-### Removed
-- Dropped support for NeoForge on Minecraft 1.20.2-1.20.4

README.md

@@ -1,7 +1,7 @@
 # SkinRestorer
 
-<a href="https://modrinth.com/mod/skinrestorer"><img src="https://raw.githubusercontent.com/Suiranoil/badges/main/assets/minecraft/platform/modrinth/mini/badge.svg" alt="Modrinth" height="32"></a>
+<a href="https://modrinth.com/mod/skinrestorer"><img src="https://raw.githubusercontent.com/Suiranoil/badges/main/assets/minecraft/platform/modrinth/mini/badge.svg" alt="Modrinth"></a>
-<a href="https://www.curseforge.com/minecraft/mc-mods/skinrestorer"><img src="https://raw.githubusercontent.com/Suiranoil/badges/main/assets/minecraft/platform/curseforge/mini/badge.svg" alt="CurseForge" height="32"></a>
+<a href="https://www.curseforge.com/minecraft/mc-mods/skinrestorer"><img src="https://raw.githubusercontent.com/Suiranoil/badges/main/assets/minecraft/platform/curseforge/mini/badge.svg" alt="CurseForge"></a>
 
 A server-side mod for managing and restoring player skins.
 
@@ -33,7 +33,9 @@ the [commands wiki page](https://github.com/Suiranoil/SkinRestorer/wiki/Commands
 If you enjoy using **SkinRestorer** and would like to support its development, you can contribute through the following
 platforms:
 
-[![Ko-fi](https://ko-fi.com/img/githubbutton_sm.svg)](https://ko-fi.com/lionarius)
+<a href="https://ko-fi.com/lionarius"><img src="https://raw.githubusercontent.com/Suiranoil/badges/main/assets/donation/kofi/mini/badge.svg" alt="Ko-fi" height="32"></a>
+
+<a href="https://boosty.to/lionarius"><img src="https://raw.githubusercontent.com/Suiranoil/badges/main/assets/donation/boosty/mini/badge.svg" alt="Boosty" height="32"></a>
 
 Bitcoin (BTC): `1Ndbwny8pxdnWXFgadp95fp97y5JqMJKTX`  
 USDT (TRC20): `TGXn8wrqku5KLzwPWQAeH7wgnV4UzwHEae`  

build.gradle

@@ -1,15 +1,15 @@
 plugins {
     // see https://fabricmc.net/develop/ for new versions
-    id 'fabric-loom' version '1.8-SNAPSHOT' apply false
+    id 'fabric-loom' version '1.10-SNAPSHOT' apply false
-    // see https://projects.neoforged.net/neoforged/neogradle for new versions
+    // see https://projects.neoforged.net/neoforged/moddevgradle for new versions
-    id 'net.neoforged.gradle.userdev' version '7.0.153' apply false
+    id 'net.neoforged.moddev' version '2.0.+' apply false
     // see https://files.minecraftforge.net/net/minecraftforge/gradle/ForgeGradle/ for new versions
-    id 'net.minecraftforge.gradle' version '6.0.29' apply false
+    id 'net.minecraftforge.gradle' version '6.0.+' apply false
     id 'org.parchmentmc.librarian.forgegradle' version '1.+' apply false
 
     id 'org.spongepowered.mixin' version '0.7-SNAPSHOT' apply false
 
-    id 'me.modmuss50.mod-publish-plugin' version '0.8.1' apply false
+    id 'me.modmuss50.mod-publish-plugin' version '0.8.+' apply false
 }
 
 allprojects {

buildSrc/src/main/groovy/multiloader-common.gradle

@@ -83,7 +83,6 @@ processResources {
             'group'                        : project.group, //Else we target the task's group.
             'minecraft_version'            : minecraft_version,
             'minecraft_version_range'      : minecraft_version_range,
-            'fabric_loader_version'        : fabric_loader_version,
             'mod_name'                     : mod_name,
             'mod_author'                   : mod_author,
             'mod_id'                       : mod_id,
@@ -92,16 +91,20 @@ processResources {
             'mod_issues'                   : mod_issues,
             'license'                      : license,
             'description'                  : project.description,
-            'forge_version'                : forge_version,
-            'forge_loader_version_range'   : forge_loader_version_range,
-            'neoforge_version'             : neoforge_version,
-            'neoforge_loader_version_range': neoforge_loader_version_range,
             'credits'                      : credits,
-            'java_version'                 : java_version
+            'java_version'                 : java_version,
+            
+            // Loader specific properties
+            'fabric_loader_version'        : project.hasProperty('fabric_loader_version') ? fabric_loader_version : '',
+            'forge_version'                : project.hasProperty('forge_version') ? forge_version : '',
+            'forge_loader_version_range'   : project.hasProperty('forge_loader_version_range') ? forge_loader_version_range : '',
+            'neoforge_version'             : project.hasProperty('neoforge_version') ? neoforge_version : '',
+            'neoforge_loader_version_range': project.hasProperty('neoforge_loader_version_range') ? neoforge_loader_version_range : ''
     ]
 
     filesMatching(['pack.mcmeta', 'fabric.mod.json', 'META-INF/mods.toml', 'META-INF/neoforge.mods.toml', '*.mixins.json']) {
         expand expandProps
     }
+
     inputs.properties(expandProps)
 }

buildSrc/src/main/groovy/multiloader-publish.gradle

@@ -3,10 +3,7 @@ plugins {
 }
 
 publishMods {
-    if (project.name == 'fabric')
+    file = project.layout.buildDirectory.file("libs/${project.archivesBaseName}-${project.version}.jar").map { it.asFile }.getOrNull()
-        file = remapJar.archiveFile
-    else
-        file = tasks.named('jarJar').get().archiveFile
 
     modLoaders.add(project.name)
     type = STABLE
@@ -23,8 +20,8 @@ publishMods {
         minecraftVersions.addAll(minecraft_version_list.split(','))
         serverRequired = true
 
-        if (project.name == 'fabric')
+        if (project.hasProperty('optional_dependencies') && !optional_dependencies.isEmpty())
-            optional(fabric_optional_dependencies.split(','))
+            optional(optional_dependencies.split(','))
     }
 
     modrinth {
@@ -35,7 +32,7 @@ publishMods {
 
         minecraftVersions.addAll(minecraft_version_list.split(','))
 
-        if (project.name == 'fabric')
+        if (project.hasProperty('optional_dependencies') && !optional_dependencies.isEmpty())
-            optional(fabric_optional_dependencies.split(','))
+            optional(optional_dependencies.split(','))
     }
 }

common/src/main/java/net/lionarius/skinrestorer/SkinRestorer.java

@@ -1,20 +1,19 @@
 package net.lionarius.skinrestorer;
 
+import com.google.common.base.Throwables;
 import com.mojang.authlib.GameProfile;
 import com.mojang.brigadier.CommandDispatcher;
 import net.lionarius.skinrestorer.command.SkinCommand;
 import net.lionarius.skinrestorer.config.Config;
 import net.lionarius.skinrestorer.config.provider.BuiltInProviderConfig;
+import net.lionarius.skinrestorer.exception.TransparentException;
 import net.lionarius.skinrestorer.platform.Services;
 import net.lionarius.skinrestorer.skin.SkinIO;
 import net.lionarius.skinrestorer.skin.SkinStorage;
 import net.lionarius.skinrestorer.skin.SkinValue;
 import net.lionarius.skinrestorer.skin.provider.*;
 import net.lionarius.skinrestorer.translation.Translation;
-import net.lionarius.skinrestorer.util.FileUtils;
+import net.lionarius.skinrestorer.util.*;
-import net.lionarius.skinrestorer.util.PlayerUtils;
-import net.lionarius.skinrestorer.util.Result;
-import net.lionarius.skinrestorer.util.WebUtils;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.MinecraftServer;
@@ -37,6 +36,7 @@ public final class SkinRestorer {
     private static SkinStorage skinStorage;
     private static Path configDir;
     private static Config config;
+    private static TickedScheduler tickedScheduler;
     
     private SkinRestorer() {}
     
@@ -56,6 +56,10 @@ public final class SkinRestorer {
         return SkinRestorer.providersRegistry;
     }
     
+    public static TickedScheduler getTickedScheduler() {
+        return SkinRestorer.tickedScheduler;
+    }
+    
     public static Optional<SkinProvider> getProvider(String name) {
         return Optional.ofNullable(SkinRestorer.providersRegistry.get(name));
     }
@@ -119,6 +123,8 @@ public final class SkinRestorer {
             
             PlayerUtils.refreshPlayer(player);
             acceptedPlayers.add(player);
+            
+            SkinRestorer.getTickedScheduler().cancel(player.getUUID());
         }
         
         return acceptedPlayers;
@@ -143,7 +149,7 @@ public final class SkinRestorer {
                     
                     var skinResult = result.get();
                     if (skinResult.isError())
-                        return Result.<Collection<ServerPlayer>, String>error(skinResult.getErrorValue().getMessage());
+                        throw new TransparentException(Throwables.getRootCause(skinResult.getErrorValue()));
                     
                     var skinValue = SkinValue.fromProviderContextWithValue(context, skinResult.getSuccessValue().orElse(null));
                     
@@ -152,7 +158,7 @@ public final class SkinRestorer {
                     return Result.<Collection<ServerPlayer>, String>success(acceptedPlayers);
                 }, server)
                 .exceptionally(e -> {
-                    SkinRestorer.LOGGER.error(e.toString());
+                    SkinRestorer.LOGGER.error("Failed to set skin '{}:{}'", context.name(), context.argument(), e);
                     return Result.error(e.getMessage());
                 });
     }
@@ -165,6 +171,8 @@ public final class SkinRestorer {
             FileUtils.tryMigrateOldSkinDirectory(SkinRestorer.getConfigDir(), worldSkinDirectory);
             
             SkinRestorer.skinStorage = new SkinStorage(new SkinIO(worldSkinDirectory));
+            SkinRestorer.tickedScheduler = new TickedScheduler(server);
+            server.addTickable(SkinRestorer.tickedScheduler);
         }
         
         public static void onCommandRegister(CommandDispatcher<CommandSourceStack> dispatcher) {

common/src/main/java/net/lionarius/skinrestorer/command/SkinCommand.java

@@ -34,7 +34,7 @@ public final class SkinCommand {
     private SkinCommand() {}
     
     public static void register(CommandDispatcher<CommandSourceStack> dispatcher) {
-        LiteralArgumentBuilder<CommandSourceStack> base =
+        var base =
                 literal("skin")
                         .then(buildSetSubcommand("clear", SkinValue.EMPTY::toProviderContext))
                         .then(literal("reset")
@@ -44,7 +44,7 @@ public final class SkinCommand {
                                 )))
                         .then(literal("refresh").executes(context -> refreshSubcommand(context.getSource())));
         
-        LiteralArgumentBuilder<CommandSourceStack> set = literal("set");
+        var set = literal("set");
         
         var providers = SkinRestorer.getProvidersRegistry().getPublicProviders();
         for (var entry : providers)
@@ -92,7 +92,7 @@ public final class SkinCommand {
             Collection<GameProfile> targets,
             boolean setByOperator
     ) {
-        Collection<ServerPlayer> updatedPlayers = new HashSet<>();
+        var updatedPlayers = new HashSet<ServerPlayer>();
         for (var profile : targets) {
             SkinValue skin = null;
             if (SkinRestorer.getSkinStorage().hasSavedSkin(profile.getId()))
@@ -199,7 +199,7 @@ public final class SkinCommand {
     }
     
     private static LiteralArgumentBuilder<CommandSourceStack> buildSetSubcommand(String name, SkinProvider provider) {
-        LiteralArgumentBuilder<CommandSourceStack> action = literal(name);
+        var action = literal(name);
         
         if (provider.hasVariantSupport()) {
             for (SkinVariant variant : SkinVariant.values()) {

common/src/main/java/net/lionarius/skinrestorer/compat/skinshuffle/SkinShuffleSkinRefreshV1Payload.java

@@ -22,7 +22,7 @@ public record SkinShuffleSkinRefreshV1Payload(
         buf.writeUtf(textureProperty.value());
         buf.writeNullable(textureProperty.signature(), FriendlyByteBuf::writeUtf);
     }
-
+    
     public static SkinShuffleSkinRefreshV1Payload decode(FriendlyByteBuf buf) {
         return new SkinShuffleSkinRefreshV1Payload(new Property(buf.readUtf(), buf.readUtf(), buf.readNullable(FriendlyByteBuf::readUtf)));
     }

common/src/main/java/net/lionarius/skinrestorer/compat/skinshuffle/SkinShuffleSkinRefreshV2Payload.java

@@ -14,7 +14,7 @@ public record SkinShuffleSkinRefreshV2Payload(
             SkinShuffleSkinRefreshV2Payload::encode,
             SkinShuffleSkinRefreshV2Payload::decode
     );
-
+    
     public static void encode(FriendlyByteBuf buf, SkinShuffleSkinRefreshV2Payload value) {
         var textureProperty = value.textureProperty();
         
@@ -27,7 +27,7 @@ public record SkinShuffleSkinRefreshV2Payload(
             buf.writeUtf(textureProperty.signature());
         }
     }
-
+    
     public static SkinShuffleSkinRefreshV2Payload decode(FriendlyByteBuf buf) {
         if (buf.readBoolean()) {
             return new SkinShuffleSkinRefreshV2Payload(new Property(buf.readUtf(), buf.readUtf(), buf.readUtf()));

common/src/main/java/net/lionarius/skinrestorer/config/Config.java

@@ -18,6 +18,8 @@ public final class Config implements GsonPostProcessable {
     
     private boolean refreshSkinOnJoin = true;
     
+    private int skinApplyDelayOnJoin = 0;
+    
     private boolean fetchSkinOnFirstJoin = true;
     
     private FirstJoinSkinProvider firstJoinSkinProvider = FirstJoinSkinProvider.MOJANG;
@@ -37,6 +39,10 @@ public final class Config implements GsonPostProcessable {
         return this.refreshSkinOnJoin;
     }
     
+    public int skinApplyDelayOnJoin() {
+        return this.skinApplyDelayOnJoin;
+    }
+    
     public boolean fetchSkinOnFirstJoin() {
         return this.fetchSkinOnFirstJoin;
     }
@@ -82,6 +88,11 @@ public final class Config implements GsonPostProcessable {
             this.language = "en_us";
         }
         
+        if (this.skinApplyDelayOnJoin < 0) {
+            SkinRestorer.LOGGER.warn("SkinApplyDelayOnJoin config is less than 0, defaulting to 0");
+            this.skinApplyDelayOnJoin = 0;
+        }
+        
         if (this.firstJoinSkinProvider == null) {
             SkinRestorer.LOGGER.warn("FirstJoinSkinProvider config is null, defaulting to MOJANG");
             this.firstJoinSkinProvider = FirstJoinSkinProvider.MOJANG;

common/src/main/java/net/lionarius/skinrestorer/config/provider/BuiltInProviderConfig.java

@@ -1,10 +1,42 @@
 package net.lionarius.skinrestorer.config.provider;
 
-public interface BuiltInProviderConfig {
+import net.lionarius.skinrestorer.SkinRestorer;
+import net.lionarius.skinrestorer.util.gson.GsonPostProcessable;
 
-    boolean enabled();
+public abstract class BuiltInProviderConfig implements GsonPostProcessable {
-
+    protected boolean enabled;
-    String name();
+    protected String name;
-
+    protected CacheConfig cache;
-    CacheConfig cache();
+    
+    public BuiltInProviderConfig(String name, CacheConfig cache) {
+        this.enabled = true;
+        this.name = name;
+        this.cache = cache;
+    }
+    
+    public boolean enabled() {
+        return enabled;
+    }
+    
+    public String name() {
+        return name;
+    }
+    
+    public CacheConfig cache() {
+        return cache;
+    }
+    
+    protected void validate(String defaultName, CacheConfig defaultCache) {
+        if (this.name == null || this.name.isEmpty()) {
+            SkinRestorer.LOGGER.warn("Provider name is null or empty, defaulting to '{}'", defaultName);
+            this.name = defaultName;
+        }
+        
+        if (this.cache == null) {
+            SkinRestorer.LOGGER.warn("Provider cache is null, using default");
+            this.cache = defaultCache;
+        } else {
+            this.cache.validate(defaultCache);
+        }
+    }
 }

common/src/main/java/net/lionarius/skinrestorer/config/provider/CacheConfig.java

@@ -5,20 +5,20 @@ import net.lionarius.skinrestorer.SkinRestorer;
 public final class CacheConfig {
     private boolean enabled;
     private long duration;
-
+    
     public CacheConfig(boolean enabled, long duration) {
         this.enabled = enabled;
         this.duration = duration;
     }
-
+    
     public boolean enabled() {
         return enabled;
     }
-
+    
     public long duration() {
         return duration;
     }
-
+    
     void validate(CacheConfig defaultValue) {
         if (this.duration <= 0) {
             SkinRestorer.LOGGER.warn("Cache duration is less than or equal to zero, defaulting to {}", defaultValue.duration());

common/src/main/java/net/lionarius/skinrestorer/config/provider/ElyByProviderConfig.java

@@ -1,46 +1,16 @@
 package net.lionarius.skinrestorer.config.provider;
 
-import net.lionarius.skinrestorer.SkinRestorer;
 import net.lionarius.skinrestorer.skin.provider.ElyBySkinProvider;
-import net.lionarius.skinrestorer.util.gson.GsonPostProcessable;
 
-public class ElyByProviderConfig implements BuiltInProviderConfig, GsonPostProcessable {
+public final class ElyByProviderConfig extends BuiltInProviderConfig {
     private static final CacheConfig DEFAULT_CACHE_VALUE = new CacheConfig(true, 60);
     
-    private boolean enabled;
-    private String name;
-    private CacheConfig cache;
-    
     public ElyByProviderConfig() {
-        this.enabled = true;
+        super(ElyBySkinProvider.PROVIDER_NAME, DEFAULT_CACHE_VALUE);
-        this.name = ElyBySkinProvider.PROVIDER_NAME;
-        this.cache = DEFAULT_CACHE_VALUE;
-    }
-    
-    public boolean enabled() {
-        return enabled;
-    }
-    
-    public String name() {
-        return name;
-    }
-    
-    public CacheConfig cache() {
-        return cache;
     }
     
     @Override
     public void gsonPostProcess() {
-        if (this.name == null || this.name.isEmpty()) {
+        super.validate(ElyBySkinProvider.PROVIDER_NAME, DEFAULT_CACHE_VALUE);
-            SkinRestorer.LOGGER.warn("Ely.By provider name is null or empty, defaulting to '{}'", ElyBySkinProvider.PROVIDER_NAME);
-            this.name = ElyBySkinProvider.PROVIDER_NAME;
-        }
-        
-        if (this.cache == null) {
-            SkinRestorer.LOGGER.warn("Ely.By provider cache is null, using default");
-            this.cache = DEFAULT_CACHE_VALUE;
-        } else {
-            this.cache.validate(DEFAULT_CACHE_VALUE);
-        }
     }
 }

common/src/main/java/net/lionarius/skinrestorer/config/provider/MineskinProviderConfig.java

@@ -2,52 +2,25 @@ package net.lionarius.skinrestorer.config.provider;
 
 import net.lionarius.skinrestorer.SkinRestorer;
 import net.lionarius.skinrestorer.skin.provider.MineskinSkinProvider;
-import net.lionarius.skinrestorer.util.gson.GsonPostProcessable;
 
-public class MineskinProviderConfig implements BuiltInProviderConfig, GsonPostProcessable {
+public final class MineskinProviderConfig extends BuiltInProviderConfig {
     private static final CacheConfig DEFAULT_CACHE_VALUE = new CacheConfig(true, 300);
     
-    private boolean enabled;
-    private String name;
-    private CacheConfig cache;
     private String apiKey;
     
     public MineskinProviderConfig() {
-        this.enabled = true;
+        super(MineskinSkinProvider.PROVIDER_NAME, DEFAULT_CACHE_VALUE);
-        this.name = MineskinSkinProvider.PROVIDER_NAME;
+        
-        this.cache = DEFAULT_CACHE_VALUE;
         this.apiKey = "";
     }
     
-    public boolean enabled() {
-        return enabled;
-    }
-    
-    public String name() {
-        return name;
-    }
-    
-    public CacheConfig cache() {
-        return cache;
-    }
-    
     public String apiKey() {
         return apiKey;
     }
     
     @Override
     public void gsonPostProcess() {
-        if (this.name == null || this.name.isEmpty()) {
+        super.validate(MineskinSkinProvider.PROVIDER_NAME, DEFAULT_CACHE_VALUE);
-            SkinRestorer.LOGGER.warn("Mineskin provider name is null or empty, defaulting to '{}'", MineskinSkinProvider.PROVIDER_NAME);
-            this.name = MineskinSkinProvider.PROVIDER_NAME;
-        }
-        
-        if (this.cache == null) {
-            SkinRestorer.LOGGER.warn("Mineskin cache is null, using default");
-            this.cache = DEFAULT_CACHE_VALUE;
-        } else {
-            this.cache.validate(DEFAULT_CACHE_VALUE);
-        }
         
         if (this.apiKey == null) {
             SkinRestorer.LOGGER.warn("Mineskin API key is null, defaulting to an empty string");

common/src/main/java/net/lionarius/skinrestorer/config/provider/MojangProviderConfig.java

@@ -1,46 +1,16 @@
 package net.lionarius.skinrestorer.config.provider;
 
-import net.lionarius.skinrestorer.SkinRestorer;
 import net.lionarius.skinrestorer.skin.provider.MojangSkinProvider;
-import net.lionarius.skinrestorer.util.gson.GsonPostProcessable;
 
-public class MojangProviderConfig implements BuiltInProviderConfig, GsonPostProcessable {
+public final class MojangProviderConfig extends BuiltInProviderConfig {
     private static final CacheConfig DEFAULT_CACHE_VALUE = new CacheConfig(true, 60);
     
-    private boolean enabled;
-    private String name;
-    private CacheConfig cache;
-    
     public MojangProviderConfig() {
-        this.enabled = true;
+        super(MojangSkinProvider.PROVIDER_NAME, DEFAULT_CACHE_VALUE);
-        this.name = MojangSkinProvider.PROVIDER_NAME;
-        this.cache = DEFAULT_CACHE_VALUE;
-    }
-    
-    public boolean enabled() {
-        return enabled;
-    }
-    
-    public String name() {
-        return name;
-    }
-    
-    public CacheConfig cache() {
-        return cache;
     }
     
     @Override
     public void gsonPostProcess() {
-        if (this.name == null || this.name.isEmpty()) {
+        super.validate(MojangSkinProvider.PROVIDER_NAME, DEFAULT_CACHE_VALUE);
-            SkinRestorer.LOGGER.warn("Mojang provider name is null or empty, defaulting to '{}'", MojangSkinProvider.PROVIDER_NAME);
-            this.name = MojangSkinProvider.PROVIDER_NAME;
-        }
-        
-        if (this.cache == null) {
-            SkinRestorer.LOGGER.warn("Mojang provider cache is null, using default");
-            this.cache = DEFAULT_CACHE_VALUE;
-        } else {
-            this.cache.validate(DEFAULT_CACHE_VALUE);
-        }
     }
 }

common/src/main/java/net/lionarius/skinrestorer/config/provider/ProvidersConfig.java

@@ -9,41 +9,41 @@ public final class ProvidersConfig implements GsonPostProcessable {
             new ElyByProviderConfig(),
             new MineskinProviderConfig()
     );
-
+    
     private MojangProviderConfig mojang;
     private ElyByProviderConfig ely_by;
     private MineskinProviderConfig mineskin;
-
+    
     public ProvidersConfig(MojangProviderConfig mojang, ElyByProviderConfig ely_by, MineskinProviderConfig mineskin) {
         this.mojang = mojang;
         this.ely_by = ely_by;
         this.mineskin = mineskin;
     }
-
+    
     public MojangProviderConfig mojang() {
         return this.mojang;
     }
-
+    
     public ElyByProviderConfig ely_by() {
         return this.ely_by;
     }
-
+    
     public MineskinProviderConfig mineskin() {
         return this.mineskin;
     }
-
+    
     @Override
     public void gsonPostProcess() {
         if (this.mojang == null) {
             SkinRestorer.LOGGER.warn("Mojang provider config is null, using default");
             this.mojang = ProvidersConfig.DEFAULT.mojang();
         }
-
+        
         if (this.ely_by == null) {
             SkinRestorer.LOGGER.warn("Ely.By provider config is null, using default");
             this.ely_by = ProvidersConfig.DEFAULT.ely_by();
         }
-
+        
         if (this.mineskin == null) {
             SkinRestorer.LOGGER.warn("Mineskin provider config is null, using default");
             this.mineskin = ProvidersConfig.DEFAULT.mineskin();

common/src/main/java/net/lionarius/skinrestorer/exception/TransparentException.java

@@ -0,0 +1,19 @@
+package net.lionarius.skinrestorer.exception;
+
+import org.jetbrains.annotations.NotNull;
+
+public class TransparentException extends RuntimeException {
+    public TransparentException(@NotNull Throwable cause) {
+        super(cause);
+    }
+    
+    @Override
+    public String getMessage() {
+        return this.getCause().getMessage();
+    }
+    
+    @Override
+    public String toString() {
+        return this.getLocalizedMessage();
+    }
+}

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/mixin/PlayerListMixin.java

@@ -9,6 +9,7 @@ import net.minecraft.server.players.PlayerList;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -39,6 +40,22 @@ public abstract class PlayerListMixin {
     
     @Inject(method = "placeNewPlayer", at = @At("HEAD"))
     private void placeNewPlayer(Connection connection, ServerPlayer player, CommonListenerCookie cookie, CallbackInfo ci) {
+        var delay = SkinRestorer.getConfig().skinApplyDelayOnJoin();
+        
+        if (delay <= 0) {
+            skinrestorer$tryApplySkin(server, player);
+        } else {
+            var uuid = player.getUUID();
+            SkinRestorer.getTickedScheduler().schedule(() -> {
+                var actualPlayer = server.getPlayerList().getPlayer(uuid);
+                if (actualPlayer != null)
+                    skinrestorer$tryApplySkin(server, actualPlayer);
+            }, delay, uuid);
+        }
+    }
+    
+    @Unique
+    private static void skinrestorer$tryApplySkin(MinecraftServer server, ServerPlayer player) {
         if (SkinRestorer.getSkinStorage().hasSavedSkin(player.getUUID()))
             SkinRestorer.applySkin(server, Collections.singleton(player.getGameProfile()), SkinRestorer.getSkinStorage().getSkin(player.getUUID()));
     }

common/src/main/java/net/lionarius/skinrestorer/mixin/ServerLoginPacketListenerImplMixin.java

@@ -82,7 +82,7 @@ public abstract class ServerLoginPacketListenerImplMixin {
             var value = SkinValue.fromProviderContextWithValue(context, result.getSuccessValue().orElse(null));
             SkinRestorer.getSkinStorage().setSkin(profile.getId(), value);
         } else {
-            SkinRestorer.LOGGER.warn("Failed to fetch skin: {}", result.getErrorValue().getMessage());
+            SkinRestorer.LOGGER.warn("Failed to fetch skin '{}:{}'", context.name(), context.argument(), result.getErrorValue());
         }
     }
 }

common/src/main/java/net/lionarius/skinrestorer/mixin/SkullBlockEntityMixin.java

@@ -0,0 +1,60 @@
+package net.lionarius.skinrestorer.mixin;
+
+import com.mojang.authlib.GameProfile;
+import net.lionarius.skinrestorer.SkinRestorer;
+import net.lionarius.skinrestorer.util.PlayerUtils;
+import net.minecraft.server.Services;
+import net.minecraft.world.level.block.entity.SkullBlockEntity;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.CompletableFuture;
+import java.util.function.BooleanSupplier;
+
+@Mixin(SkullBlockEntity.class)
+public abstract class SkullBlockEntityMixin {
+    
+    @Inject(method = "fetchProfileByName", at = @At("HEAD"),
+            cancellable = true)
+    private static void fetchProfileByName(String name, Services services, CallbackInfoReturnable<CompletableFuture<Optional<GameProfile>>> cir) {
+        if (name == null)
+            return;
+        
+        var profileOpt = services.profileCache().get(name);
+        
+        skinrestorer$replaceSkin(profileOpt, cir);
+    }
+    
+    @Inject(method = "fetchProfileById", at = @At("HEAD"),
+            cancellable = true)
+    private static void fetchProfileById(UUID id, Services services, BooleanSupplier cacheUninitialized, CallbackInfoReturnable<CompletableFuture<Optional<GameProfile>>> cir) {
+        if (id == null)
+            return;
+        
+        var profileOpt = services.profileCache().get(id);
+        
+        skinrestorer$replaceSkin(profileOpt, cir);
+    }
+    
+    @Unique
+    private static void skinrestorer$replaceSkin(Optional<GameProfile> profileOpt, CallbackInfoReturnable<CompletableFuture<Optional<GameProfile>>> cir) {
+        if (profileOpt.isEmpty())
+            return;
+        
+        var profile = PlayerUtils.cloneGameProfile(profileOpt.get());
+        
+        if (SkinRestorer.getSkinStorage().hasSavedSkin(profile.getId())) {
+            cir.setReturnValue(CompletableFuture.supplyAsync(() -> {
+                var skin = SkinRestorer.getSkinStorage().getSkin(profile.getId(), false);
+                PlayerUtils.applyRestoredSkin(profile, skin.value());
+                
+                return Optional.of(profile);
+            }));
+        }
+    }
+}

common/src/main/java/net/lionarius/skinrestorer/platform/Services.java

@@ -8,11 +8,11 @@ import java.util.ServiceLoader;
 
 public final class Services {
     
-    private Services() {}
-    
     public final static PlatformHelper PLATFORM = load(PlatformHelper.class);
     public final static CompatibilityHelper COMPATIBILITY = load(CompatibilityHelper.class);
     
+    private Services() {}
+    
     private static <T> T load(Class<T> clazz) {
         final T loadedService = ServiceLoader.load(clazz)
                 .findFirst()

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)));
+            return SkinIO.loadSkin(savePath.resolve(SkinIO.uuidToFilename(uuid)));
-            Objects.requireNonNull(value.provider());
-            return value;
         } catch (Exception e) {
             return SkinValue.EMPTY;
         }

common/src/main/java/net/lionarius/skinrestorer/skin/SkinStorage.java

@@ -17,15 +17,22 @@ public class SkinStorage {
         return this.skinMap.containsKey(uuid) || this.skinIO.skinExists(uuid);
     }
     
-    public SkinValue getSkin(UUID uuid) {
+    public SkinValue getSkin(UUID uuid, boolean cache) {
         if (!skinMap.containsKey(uuid)) {
             var skin = skinIO.loadSkin(uuid);
+            if (!cache)
+                return skin;
+            
             setSkin(uuid, skin);
         }
         
         return skinMap.get(uuid);
     }
     
+    public SkinValue getSkin(UUID uuid) {
+        return this.getSkin(uuid, true);
+    }
+    
     public void removeSkin(UUID uuid, boolean save) {
         var skin = skinMap.remove(uuid);
         if (skin != null && save)

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);
+    }
 }

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<Pair<URI, SkinVariant>, Optional<Property>> 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();
@@ -53,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,

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

@@ -4,11 +4,13 @@ import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.CacheLoader;
 import com.google.common.cache.LoadingCache;
 import com.google.common.util.concurrent.UncheckedExecutionException;
-import com.mojang.authlib.GameProfile;
+import com.mojang.authlib.*;
 import com.mojang.authlib.properties.Property;
+import com.mojang.authlib.yggdrasil.YggdrasilEnvironment;
 import com.mojang.authlib.yggdrasil.response.MinecraftProfilePropertiesResponse;
 import com.mojang.util.UndashedUuid;
 import net.lionarius.skinrestorer.SkinRestorer;
+import net.lionarius.skinrestorer.exception.TransparentException;
 import net.lionarius.skinrestorer.skin.SkinVariant;
 import net.lionarius.skinrestorer.util.JsonUtils;
 import net.lionarius.skinrestorer.util.PlayerUtils;
@@ -30,7 +32,8 @@ public final class MojangSkinProvider implements SkinProvider {
     
     public static final String PROVIDER_NAME = "mojang";
     
-    private static final URI API_URI;
+    private static final Environment ENVIRONMENT;
+    private static final URI SERVICES_SERVER_URI;
     private static final URI SESSION_SERVER_URI;
     
     public static final String PROFILE_CACHE_FILENAME = "mojang_profile_cache.json";
@@ -40,19 +43,34 @@ public final class MojangSkinProvider implements SkinProvider {
     
     static {
         try {
-            API_URI = new URI("https://api.mojang.com");
+            ENVIRONMENT = EnvironmentParser.getEnvironmentFromProperties().orElse(YggdrasilEnvironment.PROD.getEnvironment());
-            SESSION_SERVER_URI = new URI("https://sessionserver.mojang.com");
+            
+            SERVICES_SERVER_URI = new URI(ENVIRONMENT.servicesHost());
+            SESSION_SERVER_URI = new URI(ENVIRONMENT.sessionHost());
         } catch (URISyntaxException e) {
             throw new IllegalArgumentException(e);
         }
         
-        PROFILE_CACHE = new GameProfileCache((names, callback) -> {
+        PROFILE_CACHE = new GameProfileCache(new GameProfileRepository() {
-            for (var name : names) {
+            @Override
+            public void findProfilesByNames(String[] names, ProfileLookupCallback callback) {
+                for (var name : names) {
+                    try {
+                        var profile = MojangSkinProvider.getProfile(name);
+                        callback.onProfileLookupSucceeded(profile);
+                    } catch (IOException e) {
+                        throw new TransparentException(e);
+                    }
+                }
+            }
+            
+            @Override
+            public Optional<GameProfile> findProfileByName(String name) {
                 try {
                     var profile = MojangSkinProvider.getProfile(name);
-                    callback.onProfileLookupSucceeded(profile);
+                    return Optional.of(profile);
                 } catch (IOException e) {
-                    callback.onProfileLookupFailed(name, e);
+                    throw new TransparentException(e);
                 }
             }
         }, SkinRestorer.getConfigDir().resolve(PROFILE_CACHE_FILENAME).toFile());
@@ -117,8 +135,8 @@ public final class MojangSkinProvider implements SkinProvider {
     
     private static GameProfile getProfile(final String name) throws IOException {
         var request = HttpRequest.newBuilder()
-                .uri(MojangSkinProvider.API_URI
+                .uri(MojangSkinProvider.SERVICES_SERVER_URI
-                        .resolve("/users/profiles/minecraft/")
+                        .resolve("/minecraft/profile/lookup/name/")
                         .resolve(name)
                 )
                 .GET()

common/src/main/java/net/lionarius/skinrestorer/util/PlayerUtils.java

@@ -39,7 +39,7 @@ public final class PlayerUtils {
     }
     
     public static void refreshPlayer(ServerPlayer player) {
-        ServerLevel serverLevel = player.serverLevel();
+        ServerLevel serverLevel = player.level();
         PlayerList playerList = serverLevel.getServer().getPlayerList();
         ChunkMap chunkMap = serverLevel.getChunkSource().chunkMap;
         
@@ -96,6 +96,13 @@ public final class PlayerUtils {
         }
     }
     
+    public static GameProfile cloneGameProfile(GameProfile profile) {
+        var newProfile = new GameProfile(profile.getId(), profile.getName());
+        newProfile.getProperties().putAll(profile.getProperties());
+        
+        return newProfile;
+    }
+    
     public static Property getPlayerSkin(GameProfile profile) {
         return Iterables.getFirst(profile.getProperties().get(TEXTURES_KEY), null);
     }

common/src/main/java/net/lionarius/skinrestorer/util/Result.java

@@ -19,6 +19,18 @@ public class Result<S, E> {
         this.errorValue = errorValue;
     }
     
+    public static <S, E> Result<S, E> success(@NotNull S successValue) {
+        return new Result<>(successValue, null);
+    }
+    
+    public static <S, E> Result<S, E> error(@NotNull E errorValue) {
+        return new Result<>(null, errorValue);
+    }
+    
+    public static <S, E> Result<Optional<S>, E> ofNullable(S successValue) {
+        return Result.success(Optional.ofNullable(successValue));
+    }
+    
     public S getSuccessValue() {
         return successValue;
     }
@@ -69,16 +81,4 @@ public class Result<S, E> {
     public int hashCode() {
         return Objects.hash(successValue, errorValue);
     }
-    
-    public static <S, E> Result<S, E> success(@NotNull S successValue) {
-        return new Result<>(successValue, null);
-    }
-    
-    public static <S, E> Result<S, E> error(@NotNull E errorValue) {
-        return new Result<>(null, errorValue);
-    }
-    
-    public static <S, E> Result<Optional<S>, E> ofNullable(S successValue) {
-        return Result.success(Optional.ofNullable(successValue));
-    }
 }

common/src/main/java/net/lionarius/skinrestorer/util/TickedScheduler.java

@@ -0,0 +1,60 @@
+package net.lionarius.skinrestorer.util;
+
+import net.minecraft.server.MinecraftServer;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Map;
+import java.util.Queue;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.PriorityBlockingQueue;
+
+public class TickedScheduler implements Runnable {
+    private final MinecraftServer server;
+    private final Queue<TickTask> queue = new PriorityBlockingQueue<>();
+    private final Map<Integer, Integer> idMap = new ConcurrentHashMap<>();
+    
+    public TickedScheduler(MinecraftServer server) {
+        this.server = server;
+    }
+    
+    public void schedule(Runnable task, int delay) {
+        this.schedule(task, delay, task);
+    }
+    
+    public void schedule(Runnable task, int delay, Object id) {
+        var taskId = id.hashCode();
+        var serverTick = this.server.getTickCount();
+        this.idMap.merge(taskId, serverTick, Integer::max);
+        this.queue.add(new TickTask(serverTick, serverTick + delay, taskId, task));
+    }
+    
+    public void cancel(Object id) {
+        var taskId = id.hashCode();
+        this.idMap.remove(taskId);
+    }
+    
+    @Override
+    public void run() {
+        TickTask nextTask;
+        while ((nextTask = this.queue.peek()) != null) {
+            if (nextTask.runOnTick() > this.server.getTickCount())
+                break;
+            
+            var tickTask = this.queue.remove();
+            var lastTaskScheduledOnTick = this.idMap.get(tickTask.id());
+            
+            if (lastTaskScheduledOnTick != null && lastTaskScheduledOnTick <= tickTask.scheduledOnTick()) {
+                this.idMap.remove(tickTask.id());
+                if (tickTask.task() != null)
+                    tickTask.task().run();
+            }
+        }
+    }
+    
+    private record TickTask(int scheduledOnTick, int runOnTick, int id, Runnable task) implements Comparable<TickTask> {
+        @Override
+        public int compareTo(@NotNull TickedScheduler.TickTask other) {
+            return Integer.compare(this.runOnTick, other.runOnTick);
+        }
+    }
+}

common/src/main/java/net/lionarius/skinrestorer/util/WebUtils.java

@@ -13,8 +13,6 @@ import java.time.temporal.ChronoUnit;
 
 public final class WebUtils {
     
-    private WebUtils() {}
-    
     public static final String USER_AGENT;
     
     private static HttpClient HTTP_CLIENT = null;
@@ -23,6 +21,8 @@ public final class WebUtils {
         USER_AGENT = String.format("SkinRestorer/%d", System.currentTimeMillis() % 65535);
     }
     
+    private WebUtils() {}
+    
     public static void recreateHttpClient() {
         HTTP_CLIENT = WebUtils.buildClient();
     }

common/src/main/resources/skinrestorer.mixins.json

@@ -2,13 +2,15 @@
     "required": true,
     "minVersion": "0.8",
     "package": "net.lionarius.skinrestorer.mixin",
-    "compatibilityLevel": "JAVA_8",
+    "compatibilityLevel": "JAVA_17",
+    "priority": 1100,
     "refmap": "${mod_id}.refmap.json",
     "mixins": [
         "ChunkMapAccessor",
         "PlayerListMixin",
         "ServerLoginPacketListenerImplMixin",
-        "TrackedEntityAccessorInvoker"
+        "TrackedEntityAccessorInvoker",
+        "SkullBlockEntityMixin"
     ],
     "injectors": {
         "defaultRequire": 1

fabric/gradle.properties

@@ -0,0 +1,5 @@
+# Fabric, see https://fabricmc.net/develop/ for new versions
+fabric_loader_version=0.15.0
+fabric_api_version=0.127.0+1.21.6
+
+optional_dependencies=fabric-api

fabric/src/main/resources/skinrestorer.fabric.mixins.json

@@ -2,7 +2,7 @@
     "required": true,
     "minVersion": "0.8",
     "package": "net.lionarius.skinrestorer.fabric.mixin",
-    "compatibilityLevel": "JAVA_8",
+    "compatibilityLevel": "JAVA_17",
     "refmap": "${mod_id}.refmap.json",
     "mixins": [
         "CommandsMixin",

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
 
@@ -40,9 +40,10 @@ minecraft {
 
     runs {
         client {
-            workingDirectory file('../run/client')
+            workingDirectory rootProject.file('run/client')
             ideaModule "${rootProject.name}.${project.name}.main"
             taskName 'Client'
+            property 'eventbus.api.strictRuntimeChecks', 'true'
             mods {
                 modClientRun {
                     source sourceSets.main
@@ -51,9 +52,10 @@ minecraft {
         }
 
         server {
-            workingDirectory file('../run/server')
+            workingDirectory rootProject.file('run/server')
             ideaModule "${rootProject.name}.${project.name}.main"
             taskName 'Server'
+            property 'eventbus.api.strictRuntimeChecks', 'true'
             mods {
                 modServerRun {
                     source sourceSets.main
@@ -66,6 +68,8 @@ minecraft {
 dependencies {
     minecraft "net.minecraftforge:forge:${forge_minecraft_version}-${forge_version}"
 
+    annotationProcessor('net.minecraftforge:eventbus-validator:7.0-beta.7')
+    
     annotationProcessor('org.spongepowered:mixin:0.8.5-SNAPSHOT:processor')
     implementation('net.sf.jopt-simple:jopt-simple:5.0.4') { version { strictly '5.0.4' } }
 

forge/gradle.properties

@@ -0,0 +1,5 @@
+# Forge, see https://files.minecraftforge.net/net/minecraftforge/forge/ for new versions
+forge_version=56.0.0
+forge_loader_version_range=[56,)
+# Forge sometimes skips minor minecraft versions (like 1.20.5)
+forge_minecraft_version=1.21.6

forge/src/main/java/net/lionarius/skinrestorer/forge/SkinRestorerForge.java

@@ -4,7 +4,7 @@ import net.lionarius.skinrestorer.SkinRestorer;
 import net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleCompatibility;
 import net.minecraftforge.event.RegisterCommandsEvent;
 import net.minecraftforge.event.server.ServerStartedEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.eventbus.api.listener.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 
 @Mod(SkinRestorer.MOD_ID)

forge/src/main/java/net/lionarius/skinrestorer/forge/compat/skinshuffle/SkinShuffleCompatibility.java

@@ -1,13 +1,13 @@
 package net.lionarius.skinrestorer.forge.compat.skinshuffle;
 
-import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.entity.player.PlayerEvent;
 
 public final class SkinShuffleCompatibility {
     
     private SkinShuffleCompatibility() {}
     
     public static void initialize() {
-        MinecraftForge.EVENT_BUS.register(SkinShuffleGameEventHandler.class);
+        PlayerEvent.PlayerLoggedInEvent.BUS.addListener(SkinShuffleGameEventHandler::onPlayerLoggedIn);
         
         SkinShufflePacketHandler.initialize();
     }

forge/src/main/java/net/lionarius/skinrestorer/forge/compat/skinshuffle/SkinShuffleGameEventHandler.java

@@ -3,13 +3,11 @@ package net.lionarius.skinrestorer.forge.compat.skinshuffle;
 import net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleCompatibility;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraftforge.event.entity.player.PlayerEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
 
 public final class SkinShuffleGameEventHandler {
     
     private SkinShuffleGameEventHandler() {}
     
-    @SubscribeEvent
     public static void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) {
         SkinShuffleCompatibility.onPlayerJoin((ServerPlayer) event.getEntity());
     }

forge/src/main/java/net/lionarius/skinrestorer/forge/compat/skinshuffle/SkinShufflePacketHandler.java

@@ -1,8 +1,8 @@
 package net.lionarius.skinrestorer.forge.compat.skinshuffle;
 
 import net.lionarius.skinrestorer.SkinRestorer;
-import net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleCompatibility;
 import net.lionarius.skinrestorer.compat.skinshuffle.*;
+import net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleCompatibility;
 import net.minecraft.network.Connection;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraftforge.event.network.CustomPayloadEvent;
@@ -10,9 +10,6 @@ import net.minecraftforge.network.Channel;
 import net.minecraftforge.network.ChannelBuilder;
 
 public class SkinShufflePacketHandler {
-    private SkinShufflePacketHandler() {
-    }
-    
     private static final Channel<CustomPacketPayload> INSTANCE = ChannelBuilder
             .named(SkinRestorer.resourceLocation("skin_shuffle_compat"))
             .optional()
@@ -26,6 +23,9 @@ public class SkinShufflePacketHandler {
             .add(SkinShuffleSkinRefreshV2Payload.PACKET_ID, SkinShuffleSkinRefreshV2Payload.PACKET_CODEC, SkinShufflePacketHandler::handleSkinRefreshPacket)
             .build();
     
+    private SkinShufflePacketHandler() {
+    }
+    
     protected static void initialize() {
         // NO-OP
     }

gradle.properties

@@ -3,12 +3,12 @@ group=net.lionarius
 java_version=21
 
 # Common
-minecraft_version=1.21
+minecraft_version=1.21.6
-minecraft_version_list=1.21,1.21.1,1.21.2,1.21.3
+minecraft_version_list=1.21.6,1.21.7
-minecraft_version_range=[1.21, 1.22)
+minecraft_version_range=[1.21.6, 1.22)
 mod_id=skinrestorer
 mod_name=SkinRestorer
-mod_version=2.2.0
+mod_version=2.4.2
 mod_author=Lionarius
 mod_homepage=https://modrinth.com/mod/skinrestorer
 mod_sources=https://github.com/Suiranoil/SkinRestorer
@@ -17,26 +17,12 @@ license=MIT
 credits=
 description=A server-side mod for managing skins.
 
-mineskin_client_version=3.0.1-SNAPSHOT
+# Dependencies
+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
+parchment_minecraft=1.21.5
-parchment_version=2024.11.10
+parchment_version=2025.06.15
-
-# Fabric, see https://fabricmc.net/develop/ for new versions
-fabric_loader_version=0.15.0
-fabric_api_version=0.100.1+1.21
-fabric_optional_dependencies=fabric-api
-
-# Forge, see https://files.minecraftforge.net/net/minecraftforge/forge/ for new versions
-forge_version=51.0.0
-forge_loader_version_range=[51,)
-# Forge sometimes skips minor minecraft versions (like 1.20.5)
-forge_minecraft_version=1.21
-
-# NeoForge, see https://projects.neoforged.net/neoforged/neoforge for new versions
-neoforge_version=21.0.0-beta
-neoforge_loader_version_range=[4,)
 
 # Publishing
 curseforge_id=443823
@@ -45,3 +31,5 @@ modrinth_id=ghrZDhGW
 # Gradle
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
+org.gradle.parallel=true
+org.gradle.caching=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
-' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -115,7 +114,7 @@ case "$( uname )" in                #(
   NONSTOP* )        nonstop=true ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+CLASSPATH="\\\"\\\""
 
 
 # Determine the Java command to use to start the JVM.
@@ -206,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.
@@ -214,7 +213,7 @@ DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
         "$@"
 
 # Stop when "xargs" is not available.

gradlew.bat

@@ -70,11 +70,11 @@ goto fail
 :execute
 @rem Setup the command line
 
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+set CLASSPATH=
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
 
 :end
 @rem End local scope for the variables with windows NT shell

neoforge/build.gradle

@@ -3,56 +3,58 @@ plugins {
     id 'idea'
     id 'eclipse'
 
-    id 'net.neoforged.gradle.userdev'
+    id 'net.neoforged.moddev'
 
     id 'multiloader-publish'
 }
 
-// Automatically enable neoforge AccessTransformers if the file exists
+neoForge {
-def at = project(':common').file('src/main/resources/META-INF/accesstransformer.cfg')
+    version = neoforge_version
-if (at.exists()) {
+    
-    minecraft.accessTransformers.file(at)
+    // Automatically enable neoforge AccessTransformers if the file exists
-}
+    def at = project(':common').file('src/main/resources/META-INF/accesstransformer.cfg')
-
+    if (at.exists()) {
-jarJar.enable()
+        minecraft.accessTransformers.file(at)
-
-tasks.named('jar') {
-    archiveClassifier = 'thin'
-}
-
-tasks.named('jarJar') {
-    archiveClassifier = ''
-}
-
-jar.finalizedBy('jarJar')
-
-dependencies {
-    implementation "net.neoforged:neoforge:${neoforge_version}"
-
-    implementation(jarJar(group: 'org.mineskin', name: 'java-client', version: mineskin_client_version)) {
-        jarJar.ranged(it, "[${mineskin_client_version},)")
     }
-}
 
-subsystems {
     parchment {
         minecraftVersion = parchment_minecraft
         mappingsVersion = parchment_version
     }
-}
 
-runs {
+    runs {
-    configureEach {
+        configureEach {
-        modSource project.sourceSets.main
+            ideName = "NeoForge ${it.name.capitalize()} (${project.path})" // Unify the run config names with fabric
-        systemProperty 'neoforge.enabledGameTestNamespaces', project.mod_id
+        }
+
+        client {
+            client()
+            gameDirectory = rootProject.file('run/client')
+        }
+
+        server {
+            server()
+            programArgument '--nogui'
+            gameDirectory = rootProject.file('run/server')
+        }
     }
 
-    client {
+    mods {
-        workingDirectory = file('../run/client')
+        "${mod_id}" {
-    }
+            sourceSet sourceSets.main
-
+        }
-    server {
-        programArgument '--nogui'
-        workingDirectory = file('../run/server')
     }
 }
+
+dependencies {
+    implementation "net.neoforged:neoforge:${neoforge_version}"
+
+    jarJar(implementation('org.mineskin:java-client')) {
+        version {
+            strictly "[${mineskin_client_version},)"
+            prefer mineskin_client_version
+        }
+    }
+
+    additionalRuntimeClasspath "org.mineskin:java-client:${mineskin_client_version}"
+}

neoforge/gradle.properties

@@ -0,0 +1,3 @@
+# NeoForge, see https://projects.neoforged.net/neoforged/neoforge for new versions
+neoforge_version=21.6.0-beta
+neoforge_loader_version_range=[4,)

neoforge/src/main/java/net/lionarius/skinrestorer/neoforge/compat/skinshuffle/SkinShuffleModEventHandler.java

@@ -1,7 +1,7 @@
 package net.lionarius.skinrestorer.neoforge.compat.skinshuffle;
 
-import net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleCompatibility;
 import net.lionarius.skinrestorer.compat.skinshuffle.*;
+import net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleCompatibility;
 import net.minecraft.server.level.ServerPlayer;
 import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.neoforge.network.event.RegisterPayloadHandlersEvent;