Merge branch '1.21.5-multiloader' into 1.21-multiloader

# Conflicts:
#	gradle.properties

.gitignore

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

CHANGELOG.md

@@ -4,6 +4,44 @@ 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.5.0] - 2026-01-14
+### Added
+- Added collection skin provider (allows assigning random skins from a predefined set)
+- Added `forceFirstJoinSkinFetch` config option to force skin fetch on first join even if player already has a skin
+
+## [2.4.3] - 2025-07-25
+### Fixed
+- Fixed crash on client when loading player head skin (fixes [#63](https://github.com/Suiranoil/SkinRestorer/issues/63) and [#64](https://github.com/Suiranoil/SkinRestorer/issues/64))
+- Fixed server freeze when loading player head skin
+
+## [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))

CHANGELOG_LATEST.md

@@ -1,2 +1,3 @@
-### Fixed
+### Added
-- Fixed mixin incompatibility with ModernFix (closes [#42](https://github.com/Suiranoil/SkinRestorer/issues/52))
+- Added collection skin provider (allows assigning random skins from a predefined set) (see [wiki](https://github.com/Suiranoil/SkinRestorer/wiki/Configuration#providerscollection))
+- Added `forceFirstJoinSkinFetch` config option to force skin fetch on first join even if player already has a skin (see [wiki](https://github.com/Suiranoil/SkinRestorer/wiki/Configuration#forcefirstjoinskinfetch))

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

@@ -3,14 +3,17 @@ 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 if (project.name == 'neoforge')
-        file = jar.archiveFile
-    else
-        file = tasks.named('jarJar').get().archiveFile
 
     modLoaders.add(project.name)
+
+    if (project.hasProperty('additional_modloaders') && !additional_modloaders.isEmpty())
+    {
+        def loaders = additional_modloaders.split(',')
+        for (loader in loaders)
+            modLoaders.add(loader)
+    }
+    
     type = STABLE
     version = project.version
     displayName = "[${project.name.capitalize()}] ${mod_name} ${mod_version}"

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

@@ -1,10 +1,12 @@
 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;
@@ -17,6 +19,7 @@ import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.level.storage.LevelResource;
+import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -35,6 +38,7 @@ public final class SkinRestorer {
     private static Path configDir;
     private static Config config;
     private static TickedScheduler tickedScheduler;
+    private static MinecraftServer minecraftServer;
     
     private SkinRestorer() {}
     
@@ -58,12 +62,16 @@ public final class SkinRestorer {
         return SkinRestorer.tickedScheduler;
     }
     
+    public static @Nullable MinecraftServer getMinecraftServer() {
+        return SkinRestorer.minecraftServer;
+    }
+    
     public static Optional<SkinProvider> getProvider(String name) {
         return Optional.ofNullable(SkinRestorer.providersRegistry.get(name));
     }
     
     public static ResourceLocation resourceLocation(String name) {
-        return new ResourceLocation(SkinRestorer.MOD_ID, name);
+        return ResourceLocation.fromNamespaceAndPath(SkinRestorer.MOD_ID, name);
     }
     
     public static String assetPath(String name) {
@@ -80,6 +88,7 @@ public final class SkinRestorer {
         SkinRestorer.registerDefaultSkinProvider(MojangSkinProvider.PROVIDER_NAME, SkinProvider.MOJANG, SkinRestorer.getConfig().providersConfig().mojang());
         SkinRestorer.registerDefaultSkinProvider(ElyBySkinProvider.PROVIDER_NAME, SkinProvider.ELY_BY, SkinRestorer.getConfig().providersConfig().ely_by());
         SkinRestorer.registerDefaultSkinProvider(MineskinSkinProvider.PROVIDER_NAME, SkinProvider.MINESKIN, SkinRestorer.getConfig().providersConfig().mineskin());
+        SkinRestorer.registerDefaultSkinProvider(CollectionSkinProvider.PROVIDER_NAME, SkinProvider.COLLECTION, SkinRestorer.getConfig().providersConfig().collection());
     }
     
     private static void registerDefaultSkinProvider(String defaultName, SkinProvider provider, BuiltInProviderConfig config) {
@@ -98,6 +107,7 @@ public final class SkinRestorer {
         MojangSkinProvider.reload();
         ElyBySkinProvider.reload();
         MineskinSkinProvider.reload();
+        CollectionSkinProvider.reload();
     }
     
     public static Collection<ServerPlayer> applySkin(MinecraftServer server, Iterable<GameProfile> targets, SkinValue value, boolean save) {
@@ -147,7 +157,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));
                     
@@ -156,7 +166,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());
                 });
     }
@@ -171,6 +181,14 @@ public final class SkinRestorer {
             SkinRestorer.skinStorage = new SkinStorage(new SkinIO(worldSkinDirectory));
             SkinRestorer.tickedScheduler = new TickedScheduler(server);
             server.addTickable(SkinRestorer.tickedScheduler);
+            
+            SkinRestorer.minecraftServer = server;
+        }
+        
+        public static void onServerStopped(MinecraftServer server) {
+            SkinRestorer.skinStorage = null;
+            SkinRestorer.tickedScheduler = null;
+            SkinRestorer.minecraftServer = null;
         }
         
         public static void onCommandRegister(CommandDispatcher<CommandSourceStack> dispatcher) {

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

@@ -128,7 +128,7 @@ public final class SkinCommand {
             boolean save,
             boolean setByOperator
     ) {
-        src.sendSuccess(Translation.translatableWithFallback(Translation.COMMAND_SKIN_LOADING_KEY), false);
+        src.sendSystemMessage(Translation.translatableWithFallback(Translation.COMMAND_SKIN_LOADING_KEY));
         
         SkinRestorer.setSkinAsync(src.getServer(), targets, context, save).thenAccept(result -> {
             if (result.isError()) {
@@ -169,7 +169,7 @@ public final class SkinCommand {
     private static int configReloadSubcommand(CommandContext<CommandSourceStack> context) {
         SkinRestorer.reloadConfig();
         
-        context.getSource().sendSuccess(Translation.translatableWithFallback(
+        context.getSource().sendSuccess(() -> Translation.translatableWithFallback(
                 Translation.COMMAND_SKIN_CONFIG_RELOADED_KEY
         ), true);
         
@@ -178,7 +178,7 @@ public final class SkinCommand {
     
     private static void sendResponse(CommandSourceStack src, Collection<ServerPlayer> updatedPlayers, boolean setByOperator) {
         if (updatedPlayers.isEmpty()) {
-            src.sendSuccess(Translation.translatableWithFallback(
+            src.sendSuccess(() -> Translation.translatableWithFallback(
                     Translation.COMMAND_SKIN_NO_CHANGES_KEY
             ), true);
             return;
@@ -187,12 +187,12 @@ public final class SkinCommand {
         if (setByOperator) {
             var playersComponent = PlayerUtils.createPlayerListComponent(updatedPlayers);
             
-            src.sendSuccess(Translation.translatableWithFallback(
+            src.sendSuccess(() -> Translation.translatableWithFallback(
                     Translation.COMMAND_SKIN_AFFECTED_PLAYERS_KEY,
                     playersComponent
             ), true);
         } else {
-            src.sendSuccess(Translation.translatableWithFallback(
+            src.sendSuccess(() -> Translation.translatableWithFallback(
                     Translation.COMMAND_SKIN_OK_KEY
             ), true);
         }

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

@@ -0,0 +1,55 @@
+package net.lionarius.skinrestorer.compat.skinshuffle;
+
+import net.lionarius.skinrestorer.SkinRestorer;
+import net.lionarius.skinrestorer.platform.Services;
+import net.lionarius.skinrestorer.skin.SkinValue;
+import net.lionarius.skinrestorer.skin.provider.SkinShuffleSkinProvider;
+import net.lionarius.skinrestorer.util.PlayerUtils;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.ServerPlayer;
+
+import java.util.Collections;
+
+public class SkinShuffleCompatibility {
+    
+    public static final String MOD_ID = "skinshuffle";
+    
+    private static final boolean SHOULD_APPLY = !Services.PLATFORM.isModLoaded(SkinShuffleCompatibility.MOD_ID);
+    
+    private SkinShuffleCompatibility() {}
+    
+    public static boolean shouldApply() {
+        return SkinShuffleCompatibility.SHOULD_APPLY;
+    }
+    
+    public static ResourceLocation resourceLocation(String name) {
+        return ResourceLocation.fromNamespaceAndPath(SkinShuffleCompatibility.MOD_ID, name);
+    }
+    
+    public static void onPlayerJoin(ServerPlayer player) {
+        Services.COMPATIBILITY.skinShuffle_sendHandshake(player);
+    }
+    
+    public static void handleSkinRefresh(MinecraftServer server, ServerPlayer player, SkinShuffleSkinRefreshPayload payload) {
+        var property = payload.textureProperty();
+        
+        if (!property.name().equals(PlayerUtils.TEXTURES_KEY))
+            return;
+        
+        if (!property.hasSignature())
+            return;
+        
+        server.execute(() -> {
+            SkinRestorer.applySkin(
+                    server,
+                    Collections.singleton(player.getGameProfile()),
+                    new SkinValue(SkinShuffleSkinProvider.PROVIDER_NAME, null, null, property),
+                    !server.usesAuthentication()
+            );
+            
+            if (server.usesAuthentication() && SkinRestorer.getSkinStorage().hasSavedSkin(player.getUUID()))
+                SkinRestorer.getSkinStorage().deleteSkin(player.getUUID());
+        });
+    }
+}

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

@@ -0,0 +1,19 @@
+package net.lionarius.skinrestorer.compat.skinshuffle;
+
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.network.codec.StreamCodec;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
+import org.jetbrains.annotations.NotNull;
+
+public record SkinShuffleHandshakePayload() implements CustomPacketPayload {
+    
+    public static final SkinShuffleHandshakePayload INSTANCE = new SkinShuffleHandshakePayload();
+    
+    public static final CustomPacketPayload.Type<SkinShuffleHandshakePayload> PACKET_ID = new CustomPacketPayload.Type<>(SkinShuffleCompatibility.resourceLocation("handshake"));
+    public static final StreamCodec<FriendlyByteBuf, SkinShuffleHandshakePayload> PACKET_CODEC = StreamCodec.unit(INSTANCE);
+    
+    @Override
+    public CustomPacketPayload.@NotNull Type<? extends CustomPacketPayload> type() {
+        return PACKET_ID;
+    }
+}

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

@@ -0,0 +1,7 @@
+package net.lionarius.skinrestorer.compat.skinshuffle;
+
+import com.mojang.authlib.properties.Property;
+
+public interface SkinShuffleSkinRefreshPayload {
+    Property textureProperty();
+}

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

@@ -0,0 +1,34 @@
+package net.lionarius.skinrestorer.compat.skinshuffle;
+
+import com.mojang.authlib.properties.Property;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.network.codec.StreamCodec;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
+import org.jetbrains.annotations.NotNull;
+
+public record SkinShuffleSkinRefreshV1Payload(
+        Property textureProperty) implements CustomPacketPayload, SkinShuffleSkinRefreshPayload {
+    
+    public static final CustomPacketPayload.Type<SkinShuffleSkinRefreshV1Payload> PACKET_ID = new CustomPacketPayload.Type<>(SkinShuffleCompatibility.resourceLocation("refresh"));
+    public static final StreamCodec<FriendlyByteBuf, SkinShuffleSkinRefreshV1Payload> PACKET_CODEC = StreamCodec.of(
+            SkinShuffleSkinRefreshV1Payload::encode,
+            SkinShuffleSkinRefreshV1Payload::decode
+    );
+    
+    public static void encode(FriendlyByteBuf buf, SkinShuffleSkinRefreshV1Payload value) {
+        var textureProperty = value.textureProperty();
+        
+        buf.writeUtf(textureProperty.name());
+        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)));
+    }
+    
+    @Override
+    public @NotNull CustomPacketPayload.Type<? extends CustomPacketPayload> type() {
+        return PACKET_ID;
+    }
+}

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

@@ -0,0 +1,42 @@
+package net.lionarius.skinrestorer.compat.skinshuffle;
+
+import com.mojang.authlib.properties.Property;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.network.codec.StreamCodec;
+import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
+import org.jetbrains.annotations.NotNull;
+
+public record SkinShuffleSkinRefreshV2Payload(
+        Property textureProperty) implements CustomPacketPayload, SkinShuffleSkinRefreshPayload {
+    
+    public static final CustomPacketPayload.Type<SkinShuffleSkinRefreshV2Payload> PACKET_ID = new CustomPacketPayload.Type<>(SkinShuffleCompatibility.resourceLocation("skin_refresh"));
+    public static final StreamCodec<FriendlyByteBuf, SkinShuffleSkinRefreshV2Payload> PACKET_CODEC = StreamCodec.of(
+            SkinShuffleSkinRefreshV2Payload::encode,
+            SkinShuffleSkinRefreshV2Payload::decode
+    );
+    
+    public static void encode(FriendlyByteBuf buf, SkinShuffleSkinRefreshV2Payload value) {
+        var textureProperty = value.textureProperty();
+        
+        buf.writeBoolean(textureProperty.hasSignature());
+        buf.writeUtf(textureProperty.name());
+        buf.writeUtf(textureProperty.value());
+        if (textureProperty.hasSignature()) {
+            assert textureProperty.signature() != null;
+            
+            buf.writeUtf(textureProperty.signature());
+        }
+    }
+    
+    public static SkinShuffleSkinRefreshV2Payload decode(FriendlyByteBuf buf) {
+        if (buf.readBoolean()) {
+            return new SkinShuffleSkinRefreshV2Payload(new Property(buf.readUtf(), buf.readUtf(), buf.readUtf()));
+        }
+        return new SkinShuffleSkinRefreshV2Payload(new Property(buf.readUtf(), buf.readUtf(), null));
+    }
+    
+    @Override
+    public @NotNull CustomPacketPayload.Type<? extends CustomPacketPayload> type() {
+        return PACKET_ID;
+    }
+}

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

@@ -22,6 +22,8 @@ public final class Config implements GsonPostProcessable {
     
     private boolean fetchSkinOnFirstJoin = true;
     
+    private boolean forceFirstJoinSkinFetch = false;
+    
     private FirstJoinSkinProvider firstJoinSkinProvider = FirstJoinSkinProvider.MOJANG;
     
     private String proxy = "";
@@ -47,6 +49,10 @@ public final class Config implements GsonPostProcessable {
         return this.fetchSkinOnFirstJoin;
     }
     
+    public boolean forceFirstJoinSkinFetch() {
+        return this.forceFirstJoinSkinFetch;
+    }
+    
     public FirstJoinSkinProvider firstJoinSkinProvider() {
         return this.firstJoinSkinProvider;
     }

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

@@ -1,6 +1,7 @@
 package net.lionarius.skinrestorer.config;
 
 import com.google.gson.annotations.SerializedName;
+import net.lionarius.skinrestorer.skin.provider.CollectionSkinProvider;
 import net.lionarius.skinrestorer.skin.provider.ElyBySkinProvider;
 import net.lionarius.skinrestorer.skin.provider.MojangSkinProvider;
 
@@ -8,7 +9,9 @@ public enum FirstJoinSkinProvider {
     @SerializedName(value = "MOJANG", alternate = {"mojang"})
     MOJANG(MojangSkinProvider.PROVIDER_NAME),
     @SerializedName(value = "ELY.BY", alternate = {"ely.by", "ELY_BY", "ely_by"})
-    ELY_BY(ElyBySkinProvider.PROVIDER_NAME);
+    ELY_BY(ElyBySkinProvider.PROVIDER_NAME),
+    @SerializedName(value = "COLLECTION", alternate = {"collection"})
+    COLLECTION(CollectionSkinProvider.PROVIDER_NAME);
     
     private final String name;
     

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

@@ -8,8 +8,13 @@ public abstract class BuiltInProviderConfig implements GsonPostProcessable {
     protected String name;
     protected CacheConfig cache;
     
+    
     public BuiltInProviderConfig(String name, CacheConfig cache) {
-        this.enabled = true;
+        this(name, cache, true);
+    }
+    
+    public BuiltInProviderConfig(String name, CacheConfig cache, boolean enabled) {
+        this.enabled = enabled;
         this.name = name;
         this.cache = cache;
     }

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/ProvidersConfig.java

@@ -1,52 +1,65 @@
 package net.lionarius.skinrestorer.config.provider;
 
 import net.lionarius.skinrestorer.SkinRestorer;
+import net.lionarius.skinrestorer.config.provider.collection.CollectionProviderConfig;
 import net.lionarius.skinrestorer.util.gson.GsonPostProcessable;
 
 public final class ProvidersConfig implements GsonPostProcessable {
     public static final ProvidersConfig DEFAULT = new ProvidersConfig(
             new MojangProviderConfig(),
             new ElyByProviderConfig(),
-            new MineskinProviderConfig()
+            new MineskinProviderConfig(),
+            new CollectionProviderConfig()
     );
-
+    
     private MojangProviderConfig mojang;
     private ElyByProviderConfig ely_by;
     private MineskinProviderConfig mineskin;
-
+    private CollectionProviderConfig collection;
-    public ProvidersConfig(MojangProviderConfig mojang, ElyByProviderConfig ely_by, MineskinProviderConfig mineskin) {
+    
+    public ProvidersConfig(MojangProviderConfig mojang, ElyByProviderConfig ely_by, MineskinProviderConfig mineskin, CollectionProviderConfig collection) {
         this.mojang = mojang;
         this.ely_by = ely_by;
         this.mineskin = mineskin;
+        this.collection = collection;
     }
-
+    
     public MojangProviderConfig mojang() {
         return this.mojang;
     }
-
+    
     public ElyByProviderConfig ely_by() {
         return this.ely_by;
     }
-
+    
     public MineskinProviderConfig mineskin() {
         return this.mineskin;
     }
-
+    
+    public CollectionProviderConfig collection() {
+        return this.collection;
+    }
+    
     @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();
         }
+        
+        if (this.collection == null) {
+            SkinRestorer.LOGGER.warn("Collection provider config is null, using default");
+            this.collection = ProvidersConfig.DEFAULT.collection();
+        }
     }
 }

common/src/main/java/net/lionarius/skinrestorer/config/provider/collection/CollectionProviderConfig.java

@@ -0,0 +1,32 @@
+package net.lionarius.skinrestorer.config.provider.collection;
+
+import com.google.gson.annotations.JsonAdapter;
+import net.lionarius.skinrestorer.config.provider.BuiltInProviderConfig;
+import net.lionarius.skinrestorer.config.provider.CacheConfig;
+import net.lionarius.skinrestorer.skin.provider.CollectionSkinProvider;
+import net.lionarius.skinrestorer.util.gson.GsonPostProcessable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public final class CollectionProviderConfig extends BuiltInProviderConfig implements GsonPostProcessable {
+    private static final CacheConfig DEFAULT_CACHE_VALUE = new CacheConfig(true, 604800);
+    
+    @JsonAdapter(CollectionSkinSourceListDeserializer.class)
+    private List<CollectionSkinSource> sources = new ArrayList<>();
+    
+    public CollectionProviderConfig() {
+        super(CollectionSkinProvider.PROVIDER_NAME, DEFAULT_CACHE_VALUE, false);
+    }
+    
+    public List<CollectionSkinSource> sources() {
+        return this.sources;
+    }
+    
+    @Override
+    public void gsonPostProcess() {
+        if (this.sources == null) {
+            this.sources = new ArrayList<>();
+        }
+    }
+}

common/src/main/java/net/lionarius/skinrestorer/config/provider/collection/CollectionSkinFile.java

@@ -0,0 +1,60 @@
+package net.lionarius.skinrestorer.config.provider.collection;
+
+import net.lionarius.skinrestorer.SkinRestorer;
+import net.lionarius.skinrestorer.skin.SkinVariant;
+import net.lionarius.skinrestorer.util.gson.GsonPostProcessable;
+import org.jetbrains.annotations.Nullable;
+
+import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+public final class CollectionSkinFile implements CollectionSkinSource, GsonPostProcessable {
+    private String path = "";
+    private SkinVariant variant = SkinVariant.CLASSIC;
+    
+    @Override
+    public @Nullable URI uri() {
+        if (this.path.isEmpty())
+            return null;
+        
+        try {
+            var filePath = SkinRestorer.getConfigDir().resolve(this.path);
+            
+            if (!Files.exists(filePath)) {
+                SkinRestorer.LOGGER.warn("Skin file does not exist: {}", this.path);
+                return null;
+            }
+            
+            if (!Files.isRegularFile(filePath)) {
+                SkinRestorer.LOGGER.warn("Skin path is not a file: {}", this.path);
+                return null;
+            }
+            
+            if (!this.path.toLowerCase().endsWith(".png")) {
+                SkinRestorer.LOGGER.warn("Skin file is not a PNG file: {}", this.path);
+                return null;
+            }
+            
+            return filePath.toUri();
+        } catch (Exception e) {
+            SkinRestorer.LOGGER.warn("Invalid file path: {}", this.path, e);
+            return null;
+        }
+    }
+    
+    @Override
+    public SkinVariant variant() {
+        return this.variant;
+    }
+    
+    @Override
+    public void gsonPostProcess() {
+        if (this.path == null) {
+            this.path = "";
+        }
+        if (this.variant == null) {
+            this.variant = SkinVariant.CLASSIC;
+        }
+    }
+}

common/src/main/java/net/lionarius/skinrestorer/config/provider/collection/CollectionSkinSource.java

@@ -0,0 +1,12 @@
+package net.lionarius.skinrestorer.config.provider.collection;
+
+import net.lionarius.skinrestorer.skin.SkinVariant;
+import org.jetbrains.annotations.Nullable;
+
+import java.net.URI;
+
+public interface CollectionSkinSource {
+    @Nullable URI uri();
+    
+    SkinVariant variant();
+}

common/src/main/java/net/lionarius/skinrestorer/config/provider/collection/CollectionSkinSourceListDeserializer.java

@@ -0,0 +1,35 @@
+package net.lionarius.skinrestorer.config.provider.collection;
+
+import com.google.gson.*;
+
+import java.lang.reflect.Type;
+import java.util.ArrayList;
+import java.util.List;
+
+public class CollectionSkinSourceListDeserializer implements JsonSerializer<List<CollectionSkinSource>>, JsonDeserializer<List<CollectionSkinSource>> {
+    @Override
+    public JsonElement serialize(List<CollectionSkinSource> src, Type typeOfT, JsonSerializationContext context) {
+        return context.serialize(src, List.class);
+    }
+    
+    @Override
+    public List<CollectionSkinSource> deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context)
+            throws JsonParseException {
+        List<CollectionSkinSource> sources = new ArrayList<>();
+        
+        if (json.isJsonArray()) {
+            for (JsonElement element : json.getAsJsonArray()) {
+                if (element.isJsonObject()) {
+                    JsonObject obj = element.getAsJsonObject();
+                    if (obj.has("url")) {
+                        sources.add(context.deserialize(obj, CollectionSkinUrl.class));
+                    } else if (obj.has("path")) {
+                        sources.add(context.deserialize(obj, CollectionSkinFile.class));
+                    }
+                }
+            }
+        }
+        
+        return sources;
+    }
+}

common/src/main/java/net/lionarius/skinrestorer/config/provider/collection/CollectionSkinUrl.java

@@ -0,0 +1,41 @@
+package net.lionarius.skinrestorer.config.provider.collection;
+
+import net.lionarius.skinrestorer.SkinRestorer;
+import net.lionarius.skinrestorer.skin.SkinVariant;
+import net.lionarius.skinrestorer.util.gson.GsonPostProcessable;
+import org.jetbrains.annotations.Nullable;
+
+import java.net.URI;
+
+public final class CollectionSkinUrl implements CollectionSkinSource, GsonPostProcessable {
+    private String url = "";
+    private SkinVariant variant = SkinVariant.CLASSIC;
+    
+    @Override
+    public @Nullable URI uri() {
+        try {
+            if (this.url.isEmpty())
+                return null;
+            
+            return new URI(this.url);
+        } catch (Exception e) {
+            SkinRestorer.LOGGER.warn("Invalid URI: {}", this.url, e);
+            return null;
+        }
+    }
+    
+    @Override
+    public SkinVariant variant() {
+        return this.variant;
+    }
+    
+    @Override
+    public void gsonPostProcess() {
+        if (this.url == null) {
+            this.url = "";
+        }
+        if (this.variant == null) {
+            this.variant = SkinVariant.CLASSIC;
+        }
+    }
+}

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/ChunkMapAccessor.java

@@ -9,5 +9,5 @@ import org.spongepowered.asm.mixin.gen.Accessor;
 public interface ChunkMapAccessor {
     
     @Accessor
-    Int2ObjectMap<Object> getEntityMap();
+    Int2ObjectMap<TrackedEntityAccessorInvoker> getEntityMap();
 }

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

@@ -0,0 +1,14 @@
+package net.lionarius.skinrestorer.mixin;
+
+import net.minecraft.server.players.GameProfileCache;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+
+import java.util.Map;
+
+@Mixin(GameProfileCache.class)
+public interface GameProfileCacheAccessor {
+    
+    @Accessor
+    Map<String, GameProfileCache.GameProfileInfo> getProfilesByName();
+}

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

@@ -4,6 +4,7 @@ import net.lionarius.skinrestorer.SkinRestorer;
 import net.minecraft.network.Connection;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.server.network.CommonListenerCookie;
 import net.minecraft.server.players.PlayerList;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
@@ -38,7 +39,7 @@ public abstract class PlayerListMixin {
     }
     
     @Inject(method = "placeNewPlayer", at = @At("HEAD"))
-    private void placeNewPlayer(Connection connection, ServerPlayer player, CallbackInfo ci) {
+    private void placeNewPlayer(Connection connection, ServerPlayer player, CommonListenerCookie cookie, CallbackInfo ci) {
         var delay = SkinRestorer.getConfig().skinApplyDelayOnJoin();
         
         if (delay <= 0) {

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

@@ -2,6 +2,7 @@ package net.lionarius.skinrestorer.mixin;
 
 import com.mojang.authlib.GameProfile;
 import net.lionarius.skinrestorer.SkinRestorer;
+import net.lionarius.skinrestorer.config.FirstJoinSkinProvider;
 import net.lionarius.skinrestorer.skin.SkinValue;
 import net.lionarius.skinrestorer.skin.provider.SkinProviderContext;
 import net.lionarius.skinrestorer.util.PlayerUtils;
@@ -21,24 +22,20 @@ import java.util.concurrent.CompletableFuture;
 public abstract class ServerLoginPacketListenerImplMixin {
     
     @Shadow @Nullable
-    private GameProfile gameProfile;
+    private GameProfile authenticatedProfile;
     
     @Unique
     private CompletableFuture<Void> skinrestorer$pendingSkin;
     
-    @Shadow
+    @Inject(method = "verifyLoginAndFinishConnectionSetup", at = @At(value = "INVOKE",
-    protected abstract GameProfile createFakeProfile(GameProfile original);
+                                                                     target = "Lnet/minecraft/server/players/PlayerList;canPlayerLogin(Ljava/net/SocketAddress;Lcom/mojang/authlib/GameProfile;)Lnet/minecraft/network/chat/Component;"),
-    
+            cancellable = true)
-    @Inject(method = "handleAcceptedLogin", at = @At(value = "HEAD"), cancellable = true)
     public void waitForSkin(CallbackInfo ci) {
         if (skinrestorer$pendingSkin == null) {
             skinrestorer$pendingSkin = CompletableFuture.supplyAsync(() -> {
-                var profile = gameProfile;
+                final var profile = authenticatedProfile;
+                
                 assert profile != null;
-                
-                if (!profile.isComplete())
-                    profile = createFakeProfile(profile);
-                
                 var originalSkin = PlayerUtils.getPlayerSkin(profile);
                 
                 if (SkinRestorer.getSkinStorage().hasSavedSkin(profile.getId())) {
@@ -57,9 +54,15 @@ public abstract class ServerLoginPacketListenerImplMixin {
                     return null;
                 }
                 
-                if (originalSkin == null && SkinRestorer.getConfig().fetchSkinOnFirstJoin()) {
+                var config = SkinRestorer.getConfig();
+                var provider = config.firstJoinSkinProvider();
+                
+                var shouldFetch = (originalSkin == null && config.fetchSkinOnFirstJoin()) ||
+                                      (originalSkin != null && config.forceFirstJoinSkinFetch() && provider != FirstJoinSkinProvider.MOJANG);
+                
+                if (shouldFetch) {
                     var context = new SkinProviderContext(
-                            SkinRestorer.getConfig().firstJoinSkinProvider().getName(),
+                            provider.getName(),
                             profile.getName(),
                             null
                     );
@@ -86,7 +89,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,69 @@
+package net.lionarius.skinrestorer.mixin;
+
+import com.mojang.authlib.GameProfile;
+import net.lionarius.skinrestorer.SkinRestorer;
+import net.lionarius.skinrestorer.util.PlayerUtils;
+import net.minecraft.Util;
+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.Locale;
+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 = Optional.<GameProfile>empty();
+        var gameProfileInfo = ((GameProfileCacheAccessor) services.profileCache()).getProfilesByName().get(name.toLowerCase(Locale.ROOT));
+        
+        if (gameProfileInfo != null)
+            profileOpt = Optional.of(gameProfileInfo.getProfile());
+        
+        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 (SkinRestorer.getMinecraftServer() == null)
+            return;
+        
+        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);
+            }, Util.backgroundExecutor()));
+        }
+    }
+}

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/platform/services/CompatibilityHelper.java

@@ -1,4 +1,8 @@
 package net.lionarius.skinrestorer.platform.services;
 
+import net.minecraft.server.level.ServerPlayer;
+
 public interface CompatibilityHelper {
+    
+    void skinShuffle_sendHandshake(ServerPlayer player);
 }

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

@@ -9,25 +9,11 @@ import org.jetbrains.annotations.Nullable;
 
 import java.util.Objects;
 
-public final class SkinValue implements GsonPostProcessable {
+public record SkinValue(@NotNull String provider, @Nullable String argument, @Nullable SkinVariant variant,
+                        @Nullable Property value, @Nullable Property originalValue) implements GsonPostProcessable {
     
     public static final SkinValue EMPTY = new SkinValue(EmptySkinProvider.PROVIDER_NAME, null, null, null);
     
-    private @NotNull String provider;
-    private @Nullable String argument;
-    private @Nullable SkinVariant variant;
-    private @Nullable Property value;
-    private @Nullable Property originalValue;
-    
-    public SkinValue(@NotNull String provider, @Nullable String argument, @Nullable SkinVariant variant,
-            @Nullable Property value, @Nullable Property originalValue) {
-        this.provider = provider;
-        this.argument = argument;
-        this.variant = variant;
-        this.value = value;
-        this.originalValue = originalValue;
-    }
-    
     public SkinValue(String provider, String argument, SkinVariant variant, Property value) {
         this(provider, argument, variant, value, null);
     }
@@ -52,23 +38,4 @@ public final class SkinValue implements GsonPostProcessable {
     public void gsonPostProcess() {
         Objects.requireNonNull(this.provider);
     }
-    
-    public @NotNull String provider() {
-        return provider;
-    }
-    
-    public @Nullable String argument() {
-        return argument;
-    }
-    
-    public @Nullable SkinVariant variant() {
-        return variant;}
-    
-    public @Nullable Property value() {
-        return value;
-    }
-    
-    public @Nullable Property originalValue() {
-        return originalValue;
-    }
 }

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

@@ -1,8 +1,11 @@
 package net.lionarius.skinrestorer.skin;
 
+import com.google.gson.annotations.SerializedName;
+
 public enum SkinVariant {
-    
+    @SerializedName(value = "classic", alternate = {"CLASSIC"})
     CLASSIC("classic"),
+    @SerializedName(value = "slim", alternate = {"SLIM"})
     SLIM("slim");
     
     private final String name;

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

@@ -0,0 +1,91 @@
+package net.lionarius.skinrestorer.skin.provider;
+
+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.properties.Property;
+import it.unimi.dsi.fastutil.Pair;
+import net.lionarius.skinrestorer.SkinRestorer;
+import net.lionarius.skinrestorer.config.provider.collection.CollectionSkinSource;
+import net.lionarius.skinrestorer.skin.SkinVariant;
+import net.lionarius.skinrestorer.util.Result;
+import org.jetbrains.annotations.NotNull;
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Optional;
+import java.util.concurrent.TimeUnit;
+
+public final class CollectionSkinProvider implements SkinProvider {
+    
+    public static final String PROVIDER_NAME = "collection";
+    
+    private static LoadingCache<Integer, Optional<Property>> SKIN_CACHE;
+    
+    private static List<Pair<URI, SkinVariant>> COLLECTION_SKINS;
+    
+    public static void reload() {
+        COLLECTION_SKINS = loadCollectionSkins();
+        
+        createCache();
+    }
+    
+    private static List<Pair<URI, SkinVariant>> loadCollectionSkins() {
+        List<Pair<URI, SkinVariant>> skins = new ArrayList<>();
+        
+        var config = SkinRestorer.getConfig().providersConfig().collection();
+        
+        for (CollectionSkinSource source : config.sources()) {
+            var uri = source.uri();
+            if (uri != null) {
+                skins.add(Pair.of(uri, source.variant()));
+            }
+        }
+        
+        return skins;
+    }
+    
+    private static void createCache() {
+        var config = SkinRestorer.getConfig().providersConfig().collection();
+        var time = config.cache().enabled() ? config.cache().duration() : 0;
+        
+        SKIN_CACHE = CacheBuilder.newBuilder()
+                .expireAfterWrite(time, TimeUnit.SECONDS)
+                .build(new CacheLoader<>() {
+                    @Override
+                    public @NotNull Optional<Property> load(@NotNull Integer key) throws Exception {
+                        var skinEntry = COLLECTION_SKINS.get(key);
+                        return MineskinSkinProvider.loadSkin(skinEntry.first(), skinEntry.second());
+                    }
+                });
+    }
+    
+    @Override
+    public String getArgumentName() {
+        return "seed";
+    }
+    
+    @Override
+    public boolean hasVariantSupport() {
+        return false;
+    }
+    
+    @Override
+    public Result<Optional<Property>, Exception> fetchSkin(String argument, SkinVariant variant) {
+        if (COLLECTION_SKINS.isEmpty()) {
+            return Result.error(new IllegalStateException("No collection skins configured"));
+        }
+        
+        var skinIndex = Math.abs(argument.hashCode()) % COLLECTION_SKINS.size();
+        
+        try {
+            return Result.success(SKIN_CACHE.get(skinIndex));
+        } catch (UncheckedExecutionException e) {
+            return Result.error((Exception) e.getCause());
+        } catch (Exception e) {
+            return Result.error(e);
+        }
+    }
+}

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

@@ -9,7 +9,11 @@ import com.mojang.authlib.properties.Property;
 import com.mojang.authlib.yggdrasil.response.MinecraftProfilePropertiesResponse;
 import net.lionarius.skinrestorer.SkinRestorer;
 import net.lionarius.skinrestorer.skin.SkinVariant;
-import net.lionarius.skinrestorer.util.*;
+import net.lionarius.skinrestorer.util.JsonUtils;
+import net.lionarius.skinrestorer.util.PlayerUtils;
+import net.lionarius.skinrestorer.util.Result;
+import net.lionarius.skinrestorer.util.WebUtils;
+import net.minecraft.util.StringUtil;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
@@ -67,7 +71,7 @@ public final class ElyBySkinProvider implements SkinProvider {
     @Override
     public Result<Optional<Property>, Exception> fetchSkin(String username, SkinVariant variant) {
         try {
-            if (!StringUtils.isValidPlayerName(username))
+            if (!StringUtil.isValidPlayerName(username))
                 throw new IllegalArgumentException("invalid username");
             
             var usernameLowerCase = username.toLowerCase(Locale.ROOT);
@@ -102,6 +106,6 @@ public final class ElyBySkinProvider implements SkinProvider {
         if (response.statusCode() != 200)
             throw new IllegalArgumentException("no profile with name " + username);
         
-        return PlayerUtils.toProfile(JsonUtils.fromJson(response.body(), MinecraftProfilePropertiesResponse.class));
+        return JsonUtils.fromJson(response.body(), MinecraftProfilePropertiesResponse.class).toProfile();
     }
 }

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

@@ -22,6 +22,8 @@ import org.mineskin.response.QueueResponse;
 
 import java.net.InetSocketAddress;
 import java.net.URI;
+import java.nio.file.Files;
+import java.nio.file.Path;
 import java.time.Duration;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
@@ -43,7 +45,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,
@@ -93,13 +96,18 @@ public final class MineskinSkinProvider implements SkinProvider {
         }
     }
     
-    private static Optional<Property> loadSkin(URI uri, SkinVariant variant) throws Exception {
+    static Optional<Property> loadSkin(URI uri, SkinVariant variant) throws Exception {
         var mineskinVariant = switch (variant) {
             case CLASSIC -> Variant.CLASSIC;
             case SLIM -> Variant.SLIM;
         };
         
-        var request = GenerateRequest.url(uri)
+        var request = "file".equals(uri.getScheme())
+                ? GenerateRequest.upload(Files.newInputStream(Path.of(uri)))
+                .variant(mineskinVariant)
+                .name("skinrestorer-skin")
+                .visibility(Visibility.UNLISTED)
+                : GenerateRequest.url(uri)
                 .variant(mineskinVariant)
                 .name("skinrestorer-skin")
                 .visibility(Visibility.UNLISTED);

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

@@ -8,10 +8,16 @@ 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.*;
+import net.lionarius.skinrestorer.util.JsonUtils;
+import net.lionarius.skinrestorer.util.PlayerUtils;
+import net.lionarius.skinrestorer.util.Result;
+import net.lionarius.skinrestorer.util.WebUtils;
 import net.minecraft.server.players.GameProfileCache;
+import net.minecraft.util.StringUtil;
 import org.jetbrains.annotations.NotNull;
 
 import java.io.IOException;
@@ -39,19 +45,19 @@ public final class MojangSkinProvider implements SkinProvider {
         try {
             ENVIRONMENT = EnvironmentParser.getEnvironmentFromProperties().orElse(YggdrasilEnvironment.PROD.getEnvironment());
             
-            SERVICES_SERVER_URI = new URI(ENVIRONMENT.getServicesHost());
+            SERVICES_SERVER_URI = new URI(ENVIRONMENT.servicesHost());
-            SESSION_SERVER_URI = new URI(ENVIRONMENT.getSessionHost());
+            SESSION_SERVER_URI = new URI(ENVIRONMENT.sessionHost());
         } catch (URISyntaxException e) {
             throw new IllegalArgumentException(e);
         }
         
-        PROFILE_CACHE = new GameProfileCache((names, agent, callback) -> {
+        PROFILE_CACHE = new GameProfileCache((names, callback) -> {
             for (var name : names) {
                 try {
                     var profile = MojangSkinProvider.getProfile(name);
                     callback.onProfileLookupSucceeded(profile);
                 } catch (IOException e) {
-                    callback.onProfileLookupFailed(new GameProfile(null, name), e);
+                    throw new TransparentException(e);
                 }
             }
         }, SkinRestorer.getConfigDir().resolve(PROFILE_CACHE_FILENAME).toFile());
@@ -92,7 +98,7 @@ public final class MojangSkinProvider implements SkinProvider {
     @Override
     public Result<Optional<Property>, Exception> fetchSkin(String username, SkinVariant variant) {
         try {
-            if (!StringUtils.isValidPlayerName(username))
+            if (!StringUtil.isValidPlayerName(username))
                 throw new IllegalArgumentException("invalid username");
             
             var cachedProfile = MojangSkinProvider.PROFILE_CACHE.get(username);
@@ -136,7 +142,7 @@ public final class MojangSkinProvider implements SkinProvider {
         var request = HttpRequest.newBuilder()
                 .uri(MojangSkinProvider.SESSION_SERVER_URI
                         .resolve("/session/minecraft/profile/")
-                        .resolve(uuid.toString() + "?unsigned=false")
+                        .resolve(UndashedUuid.toString(uuid) + "?unsigned=false")
                 )
                 .GET()
                 .build();
@@ -147,6 +153,6 @@ public final class MojangSkinProvider implements SkinProvider {
         if (response.statusCode() != 200)
             throw new IllegalArgumentException("no profile with uuid " + uuid);
         
-        return PlayerUtils.toProfile(JsonUtils.fromJson(response.body(), MinecraftProfilePropertiesResponse.class));
+        return JsonUtils.fromJson(response.body(), MinecraftProfilePropertiesResponse.class).toProfile();
     }
 }

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

@@ -13,6 +13,7 @@ public interface SkinProvider {
     MojangSkinProvider MOJANG = new MojangSkinProvider();
     ElyBySkinProvider ELY_BY = new ElyBySkinProvider();
     MineskinSkinProvider MINESKIN = new MineskinSkinProvider();
+    CollectionSkinProvider COLLECTION = new CollectionSkinProvider();
     SkinShuffleSkinProvider SKIN_SHUFFLE = new SkinShuffleSkinProvider();
     
     Set<String> BUILTIN_PROVIDER_NAMES = ImmutableSet.of(
@@ -20,6 +21,7 @@ public interface SkinProvider {
             MojangSkinProvider.PROVIDER_NAME,
             ElyBySkinProvider.PROVIDER_NAME,
             MineskinSkinProvider.PROVIDER_NAME,
+            CollectionSkinProvider.PROVIDER_NAME,
             SkinShuffleSkinProvider.PROVIDER_NAME
     );
     

common/src/main/java/net/lionarius/skinrestorer/translation/Translation.java

@@ -39,11 +39,11 @@ public final class Translation {
     }
     
     public static MutableComponent translatableWithFallback(String key) {
-        return Component.translatable(Translation.get(key));
+        return Component.translatableWithFallback(key, Translation.get(key));
     }
     
     public static MutableComponent translatableWithFallback(String key, Object... args) {
-        return Component.translatable(Translation.get(key), args);
+        return Component.translatableWithFallback(key, Translation.get(key), args);
     }
     
     public static void reloadTranslations() {

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

@@ -1,6 +1,9 @@
 package net.lionarius.skinrestorer.util;
 
-import com.google.gson.*;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.properties.Property;
 import com.mojang.authlib.properties.PropertyMap;
@@ -19,7 +22,7 @@ public final class JsonUtils {
             .registerTypeAdapterFactory(new PostProcessingEnabler())
             .registerTypeAdapter(UUID.class, new UUIDTypeAdapter())
             .registerTypeAdapter(PropertyMap.class, new PropertyMap.Serializer())
-            .registerTypeAdapter(GameProfile.class, new GameProfileSerializer())
+            .registerTypeAdapter(GameProfile.class, new GameProfile.Serializer())
             .setPrettyPrinting()
             .create();
     
@@ -47,7 +50,7 @@ public final class JsonUtils {
     
     public static JsonObject skinPropertyToJson(Property property) {
         try {
-            JsonObject json = GSON.fromJson(new String(Base64.getDecoder().decode(property.getValue()), StandardCharsets.UTF_8), JsonObject.class);
+            JsonObject json = GSON.fromJson(new String(Base64.getDecoder().decode(property.value()), StandardCharsets.UTF_8), JsonObject.class);
             if (json != null)
                 json.remove("timestamp");
             
@@ -57,26 +60,4 @@ public final class JsonUtils {
             return null;
         }
     }
-    
-    private static class GameProfileSerializer implements JsonSerializer<GameProfile>, JsonDeserializer<GameProfile> {
-        @Override
-        public GameProfile deserialize(final JsonElement json, final Type typeOfT, final JsonDeserializationContext context) throws JsonParseException {
-            final JsonObject object = (JsonObject) json;
-            final UUID id = object.has("id") ? context.deserialize(object.get("id"), UUID.class) : null;
-            final String name = object.has("name") ? object.getAsJsonPrimitive("name").getAsString() : null;
-            return new GameProfile(id, name);
-        }
-        
-        @Override
-        public JsonElement serialize(final GameProfile src, final Type typeOfSrc, final JsonSerializationContext context) {
-            final JsonObject result = new JsonObject();
-            if (src.getId() != null) {
-                result.add("id", context.serialize(src.getId()));
-            }
-            if (src.getName() != null) {
-                result.addProperty("name", src.getName());
-            }
-            return result;
-        }
-    }
 }

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

@@ -6,14 +6,12 @@ import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.properties.Property;
 import com.mojang.authlib.yggdrasil.response.MinecraftProfilePropertiesResponse;
 import net.lionarius.skinrestorer.mixin.ChunkMapAccessor;
-import net.lionarius.skinrestorer.mixin.TrackedEntityAccessorInvoker;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.protocol.game.*;
 import net.minecraft.server.level.ChunkMap;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.server.players.PlayerList;
-import net.minecraft.world.level.biome.BiomeManager;
 
 import java.util.*;
 
@@ -40,21 +38,25 @@ public final class PlayerUtils {
     }
     
     public static void refreshPlayer(ServerPlayer player) {
-        ServerLevel serverLevel = player.getLevel();
+        ServerLevel serverLevel = player.serverLevel();
         PlayerList playerList = serverLevel.getServer().getPlayerList();
         ChunkMap chunkMap = serverLevel.getChunkSource().chunkMap;
         
-        playerList.broadcastAll(new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.REMOVE_PLAYER, player));
+        playerList.broadcastAll(new ClientboundBundlePacket(
-        playerList.broadcastAll(new ClientboundPlayerInfoPacket(ClientboundPlayerInfoPacket.Action.ADD_PLAYER, player));
+                List.of(
+                        new ClientboundPlayerInfoRemovePacket(List.of(player.getUUID())),
+                        ClientboundPlayerInfoUpdatePacket.createPlayerInitializing(Collections.singleton(player))
+                )
+        ));
         
-        var trackedEntity = (TrackedEntityAccessorInvoker) ((ChunkMapAccessor) chunkMap).getEntityMap().get(player.getId());
+        var trackedEntity = ((ChunkMapAccessor) chunkMap).getEntityMap().get(player.getId());
         if (trackedEntity != null) {
             var seenBy = Set.copyOf(trackedEntity.getSeenBy());
             for (var observerConnection : seenBy) {
                 var observer = observerConnection.getPlayer();
                 trackedEntity.invokeRemovePlayer(observer);
                 
-                var trackedObserverEntity = (TrackedEntityAccessorInvoker) ((ChunkMapAccessor) chunkMap).getEntityMap().get(observer.getId());
+                var trackedObserverEntity = ((ChunkMapAccessor) chunkMap).getEntityMap().get(observer.getId());
                 if (trackedObserverEntity != null) {
                     trackedObserverEntity.invokeRemovePlayer(player);
                     trackedObserverEntity.invokeUpdatePlayer(player);
@@ -64,19 +66,12 @@ public final class PlayerUtils {
         }
         
         if (!player.isDeadOrDying()) {
-            player.connection.send(
+            player.connection.send(new ClientboundBundlePacket(
-                    new ClientboundRespawnPacket(
+                    List.of(
-                            player.getLevel().dimensionTypeId(),
+                            new ClientboundRespawnPacket(player.createCommonSpawnInfo(serverLevel), ClientboundRespawnPacket.KEEP_ALL_DATA),
-                            player.getLevel().dimension(),
+                            new ClientboundGameEventPacket(ClientboundGameEventPacket.LEVEL_CHUNKS_LOAD_START, 0)
-                            BiomeManager.obfuscateSeed(player.getLevel().getSeed()),
-                            player.gameMode.getGameModeForPlayer(),
-                            player.gameMode.getPreviousGameModeForPlayer(),
-                            player.getLevel().isDebug(),
-                            player.getLevel().isFlat(),
-                            true,
-                            player.getLastDeathLocation()
                     )
-            );
+            ));
             player.connection.teleport(player.getX(), player.getY(), player.getZ(), player.getYRot(), player.getXRot());
             player.connection.send(new ClientboundSetEntityMotionPacket(player));
             var vehicle = player.getVehicle();
@@ -90,16 +85,23 @@ public final class PlayerUtils {
             playerList.sendPlayerPermissionLevel(player);
             playerList.sendLevelInfo(player, serverLevel);
             playerList.sendAllPlayerInfo(player);
-            PlayerUtils.sendActivePlayerEffects(player);
+            playerList.sendActivePlayerEffects(player);
         }
     }
     
     private static void sendActivePlayerEffects(ServerPlayer player) {
         for (var effect : player.getActiveEffects()) {
-            player.connection.send(new ClientboundUpdateMobEffectPacket(player.getId(), effect));
+            player.connection.send(new ClientboundUpdateMobEffectPacket(player.getId(), effect, false));
         }
     }
     
+    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);
     }
@@ -131,8 +133,8 @@ public final class PlayerUtils {
     }
     
     public static GameProfile toProfile(MinecraftProfilePropertiesResponse response) {
-        final GameProfile profile = new GameProfile(response.getId(), response.getName());
+        final GameProfile profile = new GameProfile(response.id(), response.name());
-        profile.getProperties().putAll(response.getProperties());
+        profile.getProperties().putAll(response.properties());
         return profile;
     }
 }

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/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/META-INF/accesstransformer.cfg

@@ -0,0 +1 @@
+public net.minecraft.server.players.GameProfileCache$GameProfileInfo

common/src/main/resources/skinrestorer.accesswidener

@@ -0,0 +1,3 @@
+accessWidener v2 named
+
+accessible class net/minecraft/server/players/GameProfileCache$GameProfileInfo

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

@@ -9,7 +9,9 @@
         "ChunkMapAccessor",
         "PlayerListMixin",
         "ServerLoginPacketListenerImplMixin",
-        "TrackedEntityAccessorInvoker"
+        "TrackedEntityAccessorInvoker",
+        "SkullBlockEntityMixin",
+        "GameProfileCacheAccessor"
     ],
     "injectors": {
         "defaultRequire": 1

fabric/build.gradle

@@ -14,6 +14,8 @@ dependencies {
     }
     modImplementation "net.fabricmc:fabric-loader:${fabric_loader_version}"
 
+    modCompileOnly "net.fabricmc.fabric-api:fabric-api:${fabric_api_version}"
+
     include implementation("org.mineskin:java-client:${mineskin_client_version}")
 }
 

fabric/gradle.properties

@@ -1,2 +1,6 @@
 # Fabric, see https://fabricmc.net/develop/ for new versions
 fabric_loader_version=0.15.0
+fabric_api_version=0.100.1+1.21
+
+optional_dependencies=fabric-api
+additional_modloaders=quilt

fabric/src/main/java/net/lionarius/skinrestorer/fabric/SkinRestorerFabric.java

@@ -2,11 +2,18 @@ package net.lionarius.skinrestorer.fabric;
 
 import net.fabricmc.api.ModInitializer;
 import net.lionarius.skinrestorer.SkinRestorer;
+import net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleCompatibility;
+import net.lionarius.skinrestorer.platform.Services;
 
 public final class SkinRestorerFabric implements ModInitializer {
-
+    
+    public static final boolean FABRIC_API_LOADED = Services.PLATFORM.isModLoaded("fabric-api");
+    
     @Override
     public void onInitialize() {
         SkinRestorer.onInitialize();
+        
+        if (SkinShuffleCompatibility.shouldApply())
+            net.lionarius.skinrestorer.fabric.compat.skinshuffle.SkinShuffleCompatibility.initialize();
     }
 }

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

@@ -0,0 +1,37 @@
+package net.lionarius.skinrestorer.fabric.compat.skinshuffle;
+
+import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
+import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
+import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
+import net.lionarius.skinrestorer.SkinRestorer;
+import net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleHandshakePayload;
+import net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleSkinRefreshPayload;
+import net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleSkinRefreshV1Payload;
+import net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleSkinRefreshV2Payload;
+import net.lionarius.skinrestorer.fabric.SkinRestorerFabric;
+
+public final class SkinShuffleCompatibility {
+    
+    private SkinShuffleCompatibility() {}
+    
+    public static void initialize() {
+        if (!SkinRestorerFabric.FABRIC_API_LOADED) {
+            SkinRestorer.LOGGER.warn("fabric-api is not loaded, SkinShuffle compatibility will not be available");
+            return;
+        }
+        
+        PayloadTypeRegistry.playS2C().register(SkinShuffleHandshakePayload.PACKET_ID, SkinShuffleHandshakePayload.PACKET_CODEC);
+        PayloadTypeRegistry.playC2S().register(SkinShuffleSkinRefreshV1Payload.PACKET_ID, SkinShuffleSkinRefreshV1Payload.PACKET_CODEC);
+        PayloadTypeRegistry.playC2S().register(SkinShuffleSkinRefreshV2Payload.PACKET_ID, SkinShuffleSkinRefreshV2Payload.PACKET_CODEC);
+        
+        ServerPlayConnectionEvents.JOIN.register((handler, sender, server) -> net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleCompatibility.onPlayerJoin(handler.getPlayer()));
+        
+        ServerPlayNetworking.registerGlobalReceiver(SkinShuffleSkinRefreshV1Payload.PACKET_ID, SkinShuffleCompatibility::handleSkinRefreshPacket);
+        
+        ServerPlayNetworking.registerGlobalReceiver(SkinShuffleSkinRefreshV2Payload.PACKET_ID, SkinShuffleCompatibility::handleSkinRefreshPacket);
+    }
+    
+    private static void handleSkinRefreshPacket(SkinShuffleSkinRefreshPayload payload, ServerPlayNetworking.Context context) {
+        net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleCompatibility.handleSkinRefresh(context.player().getServer(), context.player(), payload);
+    }
+}

fabric/src/main/java/net/lionarius/skinrestorer/fabric/mixin/MinecraftServerMixin.java

@@ -11,8 +11,14 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 public abstract class MinecraftServerMixin {
     
     @Inject(method = "runServer",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/Util;getMillis()J", ordinal = 0))
+            at = @At(value = "INVOKE", target = "Lnet/minecraft/Util;getNanos()J", ordinal = 0))
     private void onServerStarted(CallbackInfo ci) {
         SkinRestorer.Events.onServerStarted((MinecraftServer) (Object) this);
     }
+    
+    @Inject(method = "runServer",
+            at = @At(value = "INVOKE", target = "Lnet/minecraft/server/MinecraftServer;onServerExit()V"))
+    private void onServerStopped(CallbackInfo ci) {
+        SkinRestorer.Events.onServerStopped((MinecraftServer) (Object) this);
+    }
 }

fabric/src/main/java/net/lionarius/skinrestorer/fabric/platform/FabricCompatibilityHelper.java

@@ -1,6 +1,13 @@
 package net.lionarius.skinrestorer.fabric.platform;
 
+import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
+import net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleHandshakePayload;
 import net.lionarius.skinrestorer.platform.services.CompatibilityHelper;
+import net.minecraft.server.level.ServerPlayer;
 
 public final class FabricCompatibilityHelper implements CompatibilityHelper {
+    @Override
+    public void skinShuffle_sendHandshake(ServerPlayer player) {
+        ServerPlayNetworking.send(player, SkinShuffleHandshakePayload.INSTANCE);
+    }
 }

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

@@ -24,9 +24,13 @@
         "${mod_id}.mixins.json",
         "${mod_id}.fabric.mixins.json"
     ],
+    "accessWidener": "${mod_id}.accesswidener",
     "depends": {
         "fabricloader": ">=${fabric_loader_version}",
         "minecraft": ">=${minecraft_version}",
         "java": ">=${java_version}"
+    },
+    "suggests": {
+        "fabric-api": "*"
     }
 }

forge/build.gradle

@@ -17,23 +17,23 @@ mixin {
 
 jarJar.enable()
 
-tasks.named('jar') {
-    archiveClassifier = 'thin'
-}
-
 tasks.named('jarJar') {
     archiveClassifier = ''
 }
 
+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
 
+    reobf = false // Forge 1.20.6+ uses official mappings at runtime, so we shouldn't reobf from official to SRG
+
     // Automatically enable forge AccessTransformers if the file exists
     // This location is hardcoded in Forge and can not be changed.
     // https://github.com/MinecraftForge/MinecraftForge/blob/be1698bb1554f9c8fa2f58e32b9ab70bc4385e60/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFile.java#L123
-    def at = project(':common').file('src/main/resources/META-INF/accesstransformer.cfg')
+    def at = project(":common").file('src/main/resources/META-INF/accesstransformer.cfg')
     if (at.exists()) {
         accessTransformer = at
     }
@@ -88,3 +88,7 @@ sourceSets.each {
     it.output.resourcesDir = dir
     it.java.destinationDirectory = dir
 }
+
+tasks.named('processResources') {
+    duplicatesStrategy = DuplicatesStrategy.INCLUDE
+}

forge/gradle.properties

@@ -1,5 +1,5 @@
 # Forge, see https://files.minecraftforge.net/net/minecraftforge/forge/ for new versions
-forge_version=41.0.1
+forge_version=51.0.0
-forge_loader_version_range=[41,)
+forge_loader_version_range=[51,)
 # Forge sometimes skips minor minecraft versions (like 1.20.5)
-forge_minecraft_version=1.19
+forge_minecraft_version=1.21

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

@@ -1,8 +1,10 @@
 package net.lionarius.skinrestorer.forge;
 
 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.event.server.ServerStoppedEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 
@@ -12,6 +14,9 @@ public final class SkinRestorerForge {
     
     public SkinRestorerForge() {
         SkinRestorer.onInitialize();
+        
+        if (SkinShuffleCompatibility.shouldApply())
+            net.lionarius.skinrestorer.forge.compat.skinshuffle.SkinShuffleCompatibility.initialize();
     }
     
     @SubscribeEvent
@@ -23,4 +28,9 @@ public final class SkinRestorerForge {
     public static void onServerStarted(ServerStartedEvent event) {
         SkinRestorer.Events.onServerStarted(event.getServer());
     }
+    
+    @SubscribeEvent
+    public static void onServerStopped(ServerStoppedEvent event) {
+        SkinRestorer.Events.onServerStopped(event.getServer());
+    }
 }

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

@@ -0,0 +1,14 @@
+package net.lionarius.skinrestorer.forge.compat.skinshuffle;
+
+import net.minecraftforge.common.MinecraftForge;
+
+public final class SkinShuffleCompatibility {
+    
+    private SkinShuffleCompatibility() {}
+    
+    public static void initialize() {
+        MinecraftForge.EVENT_BUS.register(SkinShuffleGameEventHandler.class);
+        
+        SkinShufflePacketHandler.initialize();
+    }
+}

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

@@ -0,0 +1,16 @@
+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

@@ -0,0 +1,45 @@
+package net.lionarius.skinrestorer.forge.compat.skinshuffle;
+
+import net.lionarius.skinrestorer.SkinRestorer;
+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;
+import net.minecraftforge.network.Channel;
+import net.minecraftforge.network.ChannelBuilder;
+
+public class SkinShufflePacketHandler {
+    private static final Channel<CustomPacketPayload> INSTANCE = ChannelBuilder
+            .named(SkinRestorer.resourceLocation("skin_shuffle_compat"))
+            .optional()
+            .payloadChannel()
+            .any()
+            .clientbound()
+            .add(SkinShuffleHandshakePayload.PACKET_ID, SkinShuffleHandshakePayload.PACKET_CODEC, (payload, context) -> {
+            })
+            .serverbound()
+            .add(SkinShuffleSkinRefreshV1Payload.PACKET_ID, SkinShuffleSkinRefreshV1Payload.PACKET_CODEC, SkinShufflePacketHandler::handleSkinRefreshPacket)
+            .add(SkinShuffleSkinRefreshV2Payload.PACKET_ID, SkinShuffleSkinRefreshV2Payload.PACKET_CODEC, SkinShufflePacketHandler::handleSkinRefreshPacket)
+            .build();
+    
+    private SkinShufflePacketHandler() {
+    }
+    
+    protected static void initialize() {
+        // NO-OP
+    }
+    
+    public static void sendHandshake(Connection connection) {
+        INSTANCE.send(SkinShuffleHandshakePayload.INSTANCE, connection);
+    }
+    
+    private static void handleSkinRefreshPacket(SkinShuffleSkinRefreshPayload payload, CustomPayloadEvent.Context context) {
+        var sender = context.getSender();
+        
+        if (!context.isServerSide() || sender == null)
+            return;
+        
+        SkinShuffleCompatibility.handleSkinRefresh(sender.getServer(), sender, payload);
+    }
+}

forge/src/main/java/net/lionarius/skinrestorer/forge/platform/ForgeCompatibilityHelper.java

@@ -1,6 +1,13 @@
 package net.lionarius.skinrestorer.forge.platform;
 
+import net.lionarius.skinrestorer.forge.compat.skinshuffle.SkinShufflePacketHandler;
 import net.lionarius.skinrestorer.platform.services.CompatibilityHelper;
+import net.minecraft.server.level.ServerPlayer;
 
 public final class ForgeCompatibilityHelper implements CompatibilityHelper {
+    
+    @Override
+    public void skinShuffle_sendHandshake(ServerPlayer player) {
+        SkinShufflePacketHandler.sendHandshake(player.connection.getConnection());
+    }
 }

gradle.properties

@@ -1,14 +1,14 @@
 # Project
 group=net.lionarius
-java_version=17
+java_version=21
 
 # Common
-minecraft_version=1.19
+minecraft_version=1.21
-minecraft_version_list=1.19
+minecraft_version_list=1.21,1.21.1,1.21.2,1.21.3,1.21.4
-minecraft_version_range=[1.19,1.19.1)
+minecraft_version_range=[1.21, 1.21.4]
 mod_id=skinrestorer
 mod_name=SkinRestorer
-mod_version=2.3.2
+mod_version=2.5.0
 mod_author=Lionarius
 mod_homepage=https://modrinth.com/mod/skinrestorer
 mod_sources=https://github.com/Suiranoil/SkinRestorer
@@ -18,11 +18,11 @@ credits=
 description=A server-side mod for managing skins.
 
 # Dependencies
-mineskin_client_version=3.0.1-SNAPSHOT
+mineskin_client_version=3.2.1-SNAPSHOT
 
 # ParchmentMC mappings, see https://parchmentmc.org/docs/getting-started#choose-a-version for new versions
-parchment_minecraft=1.19.2
+parchment_minecraft=1.21.1
-parchment_version=2022.11.27
+parchment_version=2024.11.17
 
 # Publishing
 curseforge_id=443823

neoforge/build.gradle

@@ -12,9 +12,9 @@ neoForge {
     version = neoforge_version
     
     // Automatically enable neoforge AccessTransformers if the file exists
-    def at = project(':common').file('src/main/resources/META-INF/accesstransformer.cfg')
+    def at = project(":common").file('src/main/resources/META-INF/accesstransformer.cfg')
     if (at.exists()) {
-        minecraft.accessTransformers.file(at)
+        accessTransformers.from(at.absolutePath)
     }
 
     parchment {

neoforge/gradle.properties

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

neoforge/src/main/java/net/lionarius/skinrestorer/neoforge/SkinRestorerNeoForge.java

@@ -3,12 +3,14 @@ package net.lionarius.skinrestorer.neoforge;
 import net.lionarius.skinrestorer.SkinRestorer;
 import net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleCompatibility;
 import net.neoforged.bus.api.SubscribeEvent;
+import net.neoforged.fml.common.EventBusSubscriber;
 import net.neoforged.fml.common.Mod;
 import net.neoforged.neoforge.event.RegisterCommandsEvent;
 import net.neoforged.neoforge.event.server.ServerStartedEvent;
+import net.neoforged.neoforge.event.server.ServerStoppedEvent;
 
 @Mod(SkinRestorer.MOD_ID)
-@Mod.EventBusSubscriber(modid = SkinRestorer.MOD_ID)
+@EventBusSubscriber(modid = SkinRestorer.MOD_ID)
 public final class SkinRestorerNeoForge {
     
     public SkinRestorerNeoForge() {
@@ -27,4 +29,9 @@ public final class SkinRestorerNeoForge {
     public static void onServerStarted(ServerStartedEvent event) {
         SkinRestorer.Events.onServerStarted(event.getServer());
     }
+    
+    @SubscribeEvent
+    public static void onServerStopped(ServerStoppedEvent event) {
+        SkinRestorer.Events.onServerStopped(event.getServer());
+    }
 }

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

@@ -1,5 +1,7 @@
 package net.lionarius.skinrestorer.neoforge.compat.skinshuffle;
 
+import net.lionarius.skinrestorer.SkinRestorer;
+import net.neoforged.fml.ModList;
 import net.neoforged.neoforge.common.NeoForge;
 
 public final class SkinShuffleCompatibility {
@@ -9,6 +11,7 @@ public final class SkinShuffleCompatibility {
     public static void initialize() {
         NeoForge.EVENT_BUS.register(SkinShuffleGameEventHandler.class);
         
-        SkinShufflePacketHandler.initialize();
+        final var mod = ModList.get().getModContainerById(SkinRestorer.MOD_ID).get();
+        mod.getEventBus().register(SkinShuffleModEventHandler.class);
     }
 }

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

@@ -0,0 +1,31 @@
+package net.lionarius.skinrestorer.neoforge.compat.skinshuffle;
+
+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;
+import net.neoforged.neoforge.network.handling.IPayloadContext;
+import net.neoforged.neoforge.network.registration.HandlerThread;
+
+public final class SkinShuffleModEventHandler {
+    private SkinShuffleModEventHandler() {}
+    
+    @SubscribeEvent
+    public static void onRegisterPayloadHandlers(RegisterPayloadHandlersEvent event) {
+        final var registrar = event.registrar("1").optional().executesOn(HandlerThread.NETWORK);
+        
+        registrar
+                .playToClient(SkinShuffleHandshakePayload.PACKET_ID, SkinShuffleHandshakePayload.PACKET_CODEC,
+                        (payload, context) -> {})
+                .playToServer(SkinShuffleSkinRefreshV1Payload.PACKET_ID, SkinShuffleSkinRefreshV1Payload.PACKET_CODEC,
+                        SkinShuffleModEventHandler::handleSkinRefreshPacket)
+                .playToServer(SkinShuffleSkinRefreshV2Payload.PACKET_ID, SkinShuffleSkinRefreshV2Payload.PACKET_CODEC,
+                        SkinShuffleModEventHandler::handleSkinRefreshPacket);
+    }
+    
+    private static void handleSkinRefreshPacket(SkinShuffleSkinRefreshPayload payload, IPayloadContext context) {
+        var player = (ServerPlayer) context.player();
+        SkinShuffleCompatibility.handleSkinRefresh(player.getServer(), player, payload);
+    }
+}

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

@@ -1,55 +0,0 @@
-package net.lionarius.skinrestorer.neoforge.compat.skinshuffle;
-
-import net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleCompatibility;
-import net.lionarius.skinrestorer.compat.skinshuffle.*;
-import net.neoforged.neoforge.network.NetworkConstants;
-import net.neoforged.neoforge.network.NetworkEvent;
-import net.neoforged.neoforge.network.NetworkRegistry;
-import net.neoforged.neoforge.network.event.EventNetworkChannel;
-
-public final class SkinShufflePacketHandler {
-    private SkinShufflePacketHandler() {
-    }
-    
-    // there is no need for handshake channel but register it to not allow other mods to use it
-    private static final EventNetworkChannel HANDSHAKE_INSTANCE = NetworkRegistry.ChannelBuilder
-            .named(SkinShuffleHandshakePayload.PACKET_ID)
-            .serverAcceptedVersions(NetworkRegistry.acceptMissingOr("1"))
-            .clientAcceptedVersions(NetworkRegistry.acceptMissingOr("1"))
-            .networkProtocolVersion(() -> NetworkConstants.NETVERSION)
-            .eventNetworkChannel();
-    
-    private static final EventNetworkChannel SKIN_REFRESH_V1_INSTANCE = NetworkRegistry.ChannelBuilder
-            .named(SkinShuffleSkinRefreshV1Payload.PACKET_ID)
-            .serverAcceptedVersions(NetworkRegistry.acceptMissingOr("1"))
-            .clientAcceptedVersions(NetworkRegistry.acceptMissingOr("1"))
-            .networkProtocolVersion(() -> NetworkConstants.NETVERSION)
-            .eventNetworkChannel();
-    
-    private static final EventNetworkChannel SKIN_REFRESH_V2_INSTANCE = NetworkRegistry.ChannelBuilder
-            .named(SkinShuffleSkinRefreshV2Payload.PACKET_ID)
-            .serverAcceptedVersions(NetworkRegistry.acceptMissingOr("1"))
-            .clientAcceptedVersions(NetworkRegistry.acceptMissingOr("1"))
-            .networkProtocolVersion(() -> NetworkConstants.NETVERSION)
-            .eventNetworkChannel();
-    
-    static void initialize() {
-        SKIN_REFRESH_V1_INSTANCE.addListener(SkinShufflePacketHandler::skinRefreshV1Listener);
-        SKIN_REFRESH_V2_INSTANCE.addListener(SkinShufflePacketHandler::skinRefreshV2Listener);
-    }
-    
-    private static void skinRefreshV1Listener(NetworkEvent.ServerCustomPayloadEvent event) {
-        var payload = SkinShuffleSkinRefreshV1Payload.decode(event.getPayload());
-        handleSkinRefreshPacket(payload, event.getSource());
-    }
-    
-    private static void skinRefreshV2Listener(NetworkEvent.ServerCustomPayloadEvent event) {
-        var payload = SkinShuffleSkinRefreshV2Payload.decode(event.getPayload());
-        handleSkinRefreshPacket(payload, event.getSource());
-    }
-    
-    private static void handleSkinRefreshPacket(SkinShuffleSkinRefreshPayload payload, NetworkEvent.Context context) {
-        var player = context.getSender();
-        SkinShuffleCompatibility.handleSkinRefresh(player.getServer(), player, payload);
-    }
-}

neoforge/src/main/java/net/lionarius/skinrestorer/neoforge/platform/NeoForgeCompatibilityHelper.java

@@ -10,6 +10,6 @@ public final class NeoForgeCompatibilityHelper implements CompatibilityHelper {
     @Override
     public void skinShuffle_sendHandshake(ServerPlayer player) {
         // we can't use the packet distributor here because neoforge doesn't support sending packets to non-neoforge players
-        player.connection.connection.send(new ClientboundCustomPayloadPacket(SkinShuffleHandshakePayload.INSTANCE));
+        player.connection.getConnection().send(new ClientboundCustomPayloadPacket(SkinShuffleHandshakePayload.INSTANCE));
     }
 }

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

@@ -17,14 +17,14 @@ config = "${mod_id}.mixins.json"
 
 [[dependencies.${mod_id}]]
 modId = "neoforge"
-mandatory = true
+type = "required"
 versionRange = "[${neoforge_version},)"
 ordering = "NONE"
 side = "BOTH"
 
 [[dependencies.${mod_id}]]
 modId = "minecraft"
-mandatory = true
+type = "required"
 versionRange = "${minecraft_version_range}"
 ordering = "NONE"
 side = "BOTH"

settings.gradle

@@ -71,5 +71,4 @@ rootProject.name = 'skin-restorer'
 include('common')
 include('fabric')
 include('forge')
-// There is no NeoForge for versions <1.20.2
+include('neoforge')
-// include('neoforge')