backport to 1.20

Merge branch '1.20.2-multiloader' into 1.20-multiloader
# Conflicts: # common/src/main/java/net/lionarius/skinrestorer/mixin/ServerLoginPacketListenerImplMixin.java
2026-01-16 04:42:12 +00:00 · 2025-05-30 22:39:37 +03:00 · 2025-05-30 22:38:16 +03:00 · 2025-05-30 22:37:22 +03:00 · 2025-05-30 22:37:11 +03:00 · 2025-05-30 22:36:56 +03:00
65 changed files with 360 additions and 819 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -30,4 +30,3 @@ bin/

 .architectury-transformer/
 run/
-scripts/
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,44 +4,6 @@ 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))
--- a/CHANGELOG_LATEST.md
+++ b/CHANGELOG_LATEST.md
@@ -1,3 +1,2 @@
-### Added
- 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))
+### Fixed
+- Fixed mixin incompatibility with ModernFix (closes [#42](https://github.com/Suiranoil/SkinRestorer/issues/52))
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
 plugins {
    // see https://fabricmc.net/develop/ for new versions
-    id 'fabric-loom' version '1.13-SNAPSHOT' apply false
+    id 'fabric-loom' version '1.10-SNAPSHOT' apply false
    // see https://projects.neoforged.net/neoforged/moddevgradle for new versions
    id 'net.neoforged.moddev' version '2.0.+' apply false
    // see https://files.minecraftforge.net/net/minecraftforge/gradle/ForgeGradle/ for new versions
--- a/buildSrc/src/main/groovy/multiloader-publish.gradle
+++ b/buildSrc/src/main/groovy/multiloader-publish.gradle
@@ -3,17 +3,14 @@ plugins {
 }

 publishMods {
-    file = project.layout.buildDirectory.file("libs/${project.archivesBaseName}-${project.version}.jar").map { it.asFile }.getOrNull()
+    if (project.name == 'fabric')
+        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}"
--- a/common/src/main/java/net/lionarius/skinrestorer/SkinRestorer.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/SkinRestorer.java
@@ -1,12 +1,10 @@
 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.mixin.PlayerAccessor;
 import net.lionarius.skinrestorer.platform.Services;
 import net.lionarius.skinrestorer.skin.SkinIO;
 import net.lionarius.skinrestorer.skin.SkinStorage;
@@ -15,11 +13,10 @@ import net.lionarius.skinrestorer.skin.provider.*;
 import net.lionarius.skinrestorer.translation.Translation;
 import net.lionarius.skinrestorer.util.*;
 import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.resources.Identifier;
+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;

@@ -38,7 +35,6 @@ public final class SkinRestorer {
    private static Path configDir;
    private static Config config;
    private static TickedScheduler tickedScheduler;
-    private static MinecraftServer minecraftServer;
    
    private SkinRestorer() {}
    
@@ -62,16 +58,12 @@ 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 Identifier resourceLocation(String name) {
-        return Identifier.fromNamespaceAndPath(SkinRestorer.MOD_ID, name);
+    public static ResourceLocation resourceLocation(String name) {
+        return new ResourceLocation(SkinRestorer.MOD_ID, name);
    }
    
    public static String assetPath(String name) {
@@ -88,7 +80,6 @@ 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) {
@@ -107,29 +98,25 @@ public final class SkinRestorer {
        MojangSkinProvider.reload();
        ElyBySkinProvider.reload();
        MineskinSkinProvider.reload();
-        CollectionSkinProvider.reload();
    }
    
-    public static Collection<ServerPlayer> applySkin(MinecraftServer server, Iterable<ServerPlayer> targets, SkinValue value, boolean save) {
+    public static Collection<ServerPlayer> applySkin(MinecraftServer server, Iterable<GameProfile> targets, SkinValue value, boolean save) {
        var acceptedPlayers = new HashSet<ServerPlayer>();
        
-        for (var player : targets) {
-            var profile = player.getGameProfile();
-            var skin = PlayerUtils.getPlayerSkin(profile);
+        for (var profile : targets) {
+            if (!SkinRestorer.getSkinStorage().hasSavedSkin(profile.getId()))
+                value = value.setOriginalValue(PlayerUtils.getPlayerSkin(profile));
            
-            if (!SkinRestorer.getSkinStorage().hasSavedSkin(profile.id()))
-                value = value.setOriginalValue(skin);
-            
-            if (PlayerUtils.areSkinPropertiesEquals(value.value(), skin))
+            if (PlayerUtils.areSkinPropertiesEquals(value.value(), PlayerUtils.getPlayerSkin(profile)))
                continue;
            
            if (save)
-                SkinRestorer.getSkinStorage().setSkin(profile.id(), value);
+                SkinRestorer.getSkinStorage().setSkin(profile.getId(), value);
            
-            var newProfile = PlayerUtils.applyRestoredSkin(profile, value.value());
-            ((PlayerAccessor) player).setGameProfile(newProfile);
+            PlayerUtils.applyRestoredSkin(profile, value.value());
            
-            if (player.connection == null)
+            var player = server.getPlayerList().getPlayer(profile.getId());
+            if (player == null)
                continue;
            
            PlayerUtils.refreshPlayer(player);
@@ -141,13 +128,13 @@ public final class SkinRestorer {
        return acceptedPlayers;
    }
    
-    public static Collection<ServerPlayer> applySkin(MinecraftServer server, Iterable<ServerPlayer> targets, SkinValue value) {
+    public static Collection<ServerPlayer> applySkin(MinecraftServer server, Iterable<GameProfile> targets, SkinValue value) {
        return SkinRestorer.applySkin(server, targets, value, true);
    }
    
    public static CompletableFuture<Result<Collection<ServerPlayer>, String>> setSkinAsync(
            MinecraftServer server,
-            Collection<ServerPlayer> targets,
+            Collection<GameProfile> targets,
            SkinProviderContext context,
            boolean save
    ) {
@@ -160,7 +147,7 @@ public final class SkinRestorer {
                    
                    var skinResult = result.get();
                    if (skinResult.isError())
-                        throw new TransparentException(Throwables.getRootCause(skinResult.getErrorValue()));
+                        return Result.<Collection<ServerPlayer>, String>error(skinResult.getErrorValue().getMessage());
                    
                    var skinValue = SkinValue.fromProviderContextWithValue(context, skinResult.getSuccessValue().orElse(null));
                    
@@ -169,7 +156,7 @@ public final class SkinRestorer {
                    return Result.<Collection<ServerPlayer>, String>success(acceptedPlayers);
                }, server)
                .exceptionally(e -> {
-                    SkinRestorer.LOGGER.error("Failed to set skin '{}:{}'", context.name(), context.argument(), e);
+                    SkinRestorer.LOGGER.error(e.toString());
                    return Result.error(e.getMessage());
                });
    }
@@ -184,14 +171,6 @@ 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) {
--- a/common/src/main/java/net/lionarius/skinrestorer/command/SkinCommand.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/command/SkinCommand.java
@@ -1,5 +1,6 @@
 package net.lionarius.skinrestorer.command;

+import com.mojang.authlib.GameProfile;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.arguments.StringArgumentType;
 import com.mojang.brigadier.builder.ArgumentBuilder;
@@ -15,15 +16,12 @@ import net.lionarius.skinrestorer.skin.provider.SkinProviderContext;
 import net.lionarius.skinrestorer.translation.Translation;
 import net.lionarius.skinrestorer.util.PlayerUtils;
 import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.commands.Commands;
 import net.minecraft.commands.arguments.GameProfileArgument;
 import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.server.players.NameAndId;

 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
-import java.util.Objects;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Supplier;
@@ -56,7 +54,7 @@ public final class SkinCommand {
        
        base.then(
                literal("config")
-                        .requires(commandSourceStack -> Commands.LEVEL_OWNERS.check(commandSourceStack.permissions()))
+                        .requires(commandSourceStack -> commandSourceStack.hasPermission(4))
                        .then(literal("reload").executes(SkinCommand::configReloadSubcommand))
        );
        
@@ -74,41 +72,37 @@ public final class SkinCommand {
        
        SkinProviderContext context = null;
        var save = true;
-        if (!SkinRestorer.getSkinStorage().hasSavedSkin(profile.id())) {
-            if (profile.properties().containsKey(PlayerUtils.TEXTURES_KEY)) {
+        if (!SkinRestorer.getSkinStorage().hasSavedSkin(profile.getId())) {
+            if (profile.getProperties().containsKey(PlayerUtils.TEXTURES_KEY)) {
                save = false;
                context = MojangSkinProvider.skinProviderContextFromProfile(profile);
            }
        } else {
-            context = SkinRestorer.getSkinStorage().getSkin(profile.id()).toProviderContext();
+            context = SkinRestorer.getSkinStorage().getSkin(profile.getId()).toProviderContext();
        }
        
        if (context == null)
            return 0;
        
-        return SkinCommand.setSubcommand(src, Collections.singleton(new NameAndId(profile)), context, save, false);
+        return SkinCommand.setSubcommand(src, Collections.singleton(profile), context, save, false);
    }
    
    private static int resetSubcommand(
            CommandSourceStack src,
-            Collection<NameAndId> targets,
+            Collection<GameProfile> targets,
            boolean setByOperator
    ) {
        var updatedPlayers = new HashSet<ServerPlayer>();
-        for (var nameAndId : targets) {
+        for (var profile : targets) {
            SkinValue skin = null;
-            if (SkinRestorer.getSkinStorage().hasSavedSkin(nameAndId.id()))
-                skin = SkinRestorer.getSkinStorage().getSkin(nameAndId.id()).replaceValueWithOriginal();
+            if (SkinRestorer.getSkinStorage().hasSavedSkin(profile.getId()))
+                skin = SkinRestorer.getSkinStorage().getSkin(profile.getId()).replaceValueWithOriginal();
            
            if (skin == null)
                continue;
            
-            var player = src.getServer().getPlayerList().getPlayer(nameAndId.id());
-            if (player == null)
-                continue;
-            
-            var updatedPlayer = SkinRestorer.applySkin(src.getServer(), Collections.singleton(player), skin, false);
-            SkinRestorer.getSkinStorage().deleteSkin(nameAndId.id());
+            var updatedPlayer = SkinRestorer.applySkin(src.getServer(), Collections.singleton(profile), skin, false);
+            SkinRestorer.getSkinStorage().deleteSkin(profile.getId());
            
            updatedPlayers.addAll(updatedPlayer);
        }
@@ -124,24 +118,19 @@ public final class SkinCommand {
        if (src.getPlayer() == null)
            return 0;
        
-        return resetSubcommand(src, Collections.singleton(src.getPlayer().nameAndId()), false);
+        return resetSubcommand(src, Collections.singleton(src.getPlayer().getGameProfile()), false);
    }
    
    private static int setSubcommand(
            CommandSourceStack src,
-            Collection<NameAndId> targets,
+            Collection<GameProfile> targets,
            SkinProviderContext context,
            boolean save,
            boolean setByOperator
    ) {
        src.sendSystemMessage(Translation.translatableWithFallback(Translation.COMMAND_SKIN_LOADING_KEY));
        
-        var profileTargets = targets.stream()
-                .map(nameAndId -> src.getServer().getPlayerList().getPlayer(nameAndId.id()))
-                .filter(Objects::nonNull)
-                .toList();
-        
-        SkinRestorer.setSkinAsync(src.getServer(), profileTargets, context, save).thenAccept(result -> {
+        SkinRestorer.setSkinAsync(src.getServer(), targets, context, save).thenAccept(result -> {
            if (result.isError()) {
                src.sendFailure(Translation.translatableWithFallback(
                        Translation.COMMAND_SKIN_FAILED_KEY,
@@ -160,7 +149,7 @@ public final class SkinCommand {
    
    private static int setSubcommand(
            CommandSourceStack src,
-            Collection<NameAndId> targets,
+            Collection<GameProfile> targets,
            SkinProviderContext context,
            boolean setByOperator
    ) {
@@ -174,7 +163,7 @@ public final class SkinCommand {
        if (src.getPlayer() == null)
            return 0;
        
-        return setSubcommand(src, Collections.singleton(src.getPlayer().nameAndId()), context, false);
+        return setSubcommand(src, Collections.singleton(src.getPlayer().getGameProfile()), context, false);
    }
    
    private static int configReloadSubcommand(CommandContext<CommandSourceStack> context) {
@@ -267,10 +256,10 @@ public final class SkinCommand {
    }
    
    private static RequiredArgumentBuilder<CommandSourceStack, GameProfileArgument.Result> makeTargetsArgument(
-            BiFunction<CommandContext<CommandSourceStack>, Collection<NameAndId>, Integer> consumer
+            BiFunction<CommandContext<CommandSourceStack>, Collection<GameProfile>, Integer> consumer
    ) {
        return argument("targets", GameProfileArgument.gameProfile())
-                .requires(source -> Commands.LEVEL_GAMEMASTERS.check(source.permissions()))
+                .requires(source -> source.hasPermission(2))
                .executes(context -> consumer.apply(context, GameProfileArgument.getGameProfiles(context, "targets")));
    }
 }
--- a/common/src/main/java/net/lionarius/skinrestorer/compat/skinshuffle/SkinShuffleCompatibility.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/compat/skinshuffle/SkinShuffleCompatibility.java
@@ -5,7 +5,7 @@ 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.Identifier;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerPlayer;

@@ -23,8 +23,8 @@ public class SkinShuffleCompatibility {
        return SkinShuffleCompatibility.SHOULD_APPLY;
    }
    
-    public static Identifier resourceLocation(String name) {
-        return Identifier.fromNamespaceAndPath(SkinShuffleCompatibility.MOD_ID, name);
+    public static ResourceLocation resourceLocation(String name) {
+        return new ResourceLocation(SkinShuffleCompatibility.MOD_ID, name);
    }
    
    public static void onPlayerJoin(ServerPlayer player) {
@@ -34,7 +34,7 @@ public class SkinShuffleCompatibility {
    public static void handleSkinRefresh(MinecraftServer server, ServerPlayer player, SkinShuffleSkinRefreshPayload payload) {
        var property = payload.textureProperty();
        
-        if (!property.name().equals(PlayerUtils.TEXTURES_KEY))
+        if (!property.getName().equals(PlayerUtils.TEXTURES_KEY))
            return;
        
        if (!property.hasSignature())
@@ -43,7 +43,7 @@ public class SkinShuffleCompatibility {
        server.execute(() -> {
            SkinRestorer.applySkin(
                    server,
-                    Collections.singleton(player),
+                    Collections.singleton(player.getGameProfile()),
                    new SkinValue(SkinShuffleSkinProvider.PROVIDER_NAME, null, null, property),
                    !server.usesAuthentication()
            );
--- a/common/src/main/java/net/lionarius/skinrestorer/compat/skinshuffle/SkinShuffleHandshakePayload.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/compat/skinshuffle/SkinShuffleHandshakePayload.java
@@ -1,19 +1,10 @@
 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;
+import net.minecraft.resources.ResourceLocation;
+
+public record SkinShuffleHandshakePayload() {

-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;
-    }
+
+    public static final ResourceLocation PACKET_ID = SkinShuffleCompatibility.resourceLocation("handshake");
 }
--- a/common/src/main/java/net/lionarius/skinrestorer/compat/skinshuffle/SkinShuffleSkinRefreshV1Payload.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/compat/skinshuffle/SkinShuffleSkinRefreshV1Payload.java
@@ -2,33 +2,22 @@ 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;
+import net.minecraft.resources.ResourceLocation;

 public record SkinShuffleSkinRefreshV1Payload(
-        Property textureProperty) implements CustomPacketPayload, SkinShuffleSkinRefreshPayload {
+        Property textureProperty) implements 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 final ResourceLocation PACKET_ID = SkinShuffleCompatibility.resourceLocation("refresh");
    
    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);
+        buf.writeUtf(textureProperty.getName());
+        buf.writeUtf(textureProperty.getValue());
+        buf.writeNullable(textureProperty.getSignature(), 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;
-    }
 }
--- a/common/src/main/java/net/lionarius/skinrestorer/compat/skinshuffle/SkinShuffleSkinRefreshV2Payload.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/compat/skinshuffle/SkinShuffleSkinRefreshV2Payload.java
@@ -2,41 +2,30 @@ 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;
+import net.minecraft.resources.ResourceLocation;

 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
-    );
+        Property textureProperty) implements SkinShuffleSkinRefreshPayload {
    
+    public static final ResourceLocation PACKET_ID = SkinShuffleCompatibility.resourceLocation("skin_refresh");
+
    public static void encode(FriendlyByteBuf buf, SkinShuffleSkinRefreshV2Payload value) {
        var textureProperty = value.textureProperty();
        
        buf.writeBoolean(textureProperty.hasSignature());
-        buf.writeUtf(textureProperty.name());
-        buf.writeUtf(textureProperty.value());
+        buf.writeUtf(textureProperty.getName());
+        buf.writeUtf(textureProperty.getValue());
        if (textureProperty.hasSignature()) {
-            assert textureProperty.signature() != null;
+            assert textureProperty.getSignature() != null;
            
-            buf.writeUtf(textureProperty.signature());
+            buf.writeUtf(textureProperty.getSignature());
        }
    }
-    
+
    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;
-    }
 }
--- a/common/src/main/java/net/lionarius/skinrestorer/config/Config.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/config/Config.java
@@ -22,8 +22,6 @@ public final class Config implements GsonPostProcessable {
    
    private boolean fetchSkinOnFirstJoin = true;
    
-    private boolean forceFirstJoinSkinFetch = false;
-    
    private FirstJoinSkinProvider firstJoinSkinProvider = FirstJoinSkinProvider.MOJANG;
    
    private String proxy = "";
@@ -49,10 +47,6 @@ public final class Config implements GsonPostProcessable {
        return this.fetchSkinOnFirstJoin;
    }
    
-    public boolean forceFirstJoinSkinFetch() {
-        return this.forceFirstJoinSkinFetch;
-    }
-    
    public FirstJoinSkinProvider firstJoinSkinProvider() {
        return this.firstJoinSkinProvider;
    }
--- a/common/src/main/java/net/lionarius/skinrestorer/config/FirstJoinSkinProvider.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/config/FirstJoinSkinProvider.java
@@ -1,7 +1,6 @@
 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;

@@ -9,9 +8,7 @@ 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),
-    @SerializedName(value = "COLLECTION", alternate = {"collection"})
-    COLLECTION(CollectionSkinProvider.PROVIDER_NAME);
+    ELY_BY(ElyBySkinProvider.PROVIDER_NAME);
    
    private final String name;
    
--- a/common/src/main/java/net/lionarius/skinrestorer/config/provider/BuiltInProviderConfig.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/config/provider/BuiltInProviderConfig.java
@@ -8,13 +8,8 @@ public abstract class BuiltInProviderConfig implements GsonPostProcessable {
    protected String name;
    protected CacheConfig cache;
    
-    
    public BuiltInProviderConfig(String name, CacheConfig cache) {
-        this(name, cache, true);
-    }
-    
-    public BuiltInProviderConfig(String name, CacheConfig cache, boolean enabled) {
-        this.enabled = enabled;
+        this.enabled = true;
        this.name = name;
        this.cache = cache;
    }
--- a/common/src/main/java/net/lionarius/skinrestorer/config/provider/CacheConfig.java
+++ b/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());
--- a/common/src/main/java/net/lionarius/skinrestorer/config/provider/ProvidersConfig.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/config/provider/ProvidersConfig.java
@@ -1,65 +1,52 @@
 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 CollectionProviderConfig()
+            new MineskinProviderConfig()
    );
-    
+
    private MojangProviderConfig mojang;
    private ElyByProviderConfig ely_by;
    private MineskinProviderConfig mineskin;
-    private CollectionProviderConfig collection;
-    
-    public ProvidersConfig(MojangProviderConfig mojang, ElyByProviderConfig ely_by, MineskinProviderConfig mineskin, CollectionProviderConfig collection) {
+
+    public ProvidersConfig(MojangProviderConfig mojang, ElyByProviderConfig ely_by, MineskinProviderConfig mineskin) {
        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();
-        }
    }
 }
--- a/common/src/main/java/net/lionarius/skinrestorer/config/provider/collection/CollectionProviderConfig.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/config/provider/collection/CollectionProviderConfig.java
@@ -1,32 +0,0 @@
-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<>();
-        }
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/config/provider/collection/CollectionSkinFile.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/config/provider/collection/CollectionSkinFile.java
@@ -1,60 +0,0 @@
-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;
-        }
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/config/provider/collection/CollectionSkinSource.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/config/provider/collection/CollectionSkinSource.java
@@ -1,12 +0,0 @@
-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();
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/config/provider/collection/CollectionSkinSourceListDeserializer.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/config/provider/collection/CollectionSkinSourceListDeserializer.java
@@ -1,35 +0,0 @@
-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;
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/config/provider/collection/CollectionSkinUrl.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/config/provider/collection/CollectionSkinUrl.java
@@ -1,41 +0,0 @@
-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;
-        }
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/exception/TransparentException.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/exception/TransparentException.java
@@ -1,19 +0,0 @@
-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();
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/mineskin/Java11RequestHandler.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/mineskin/Java11RequestHandler.java
@@ -32,8 +32,8 @@ public class Java11RequestHandler extends RequestHandler {
    private final Gson gson;
    private final HttpClient httpClient;
    
-    public Java11RequestHandler(String baseUrl, String userAgent, String apiKey, int timeout, Gson gson, InetSocketAddress proxy) {
-        super(baseUrl, userAgent, apiKey, timeout, gson);
+    public Java11RequestHandler(String userAgent, String apiKey, int timeout, Gson gson, InetSocketAddress proxy) {
+        super(userAgent, apiKey, timeout, gson);
        this.gson = gson;
        
        HttpClient.Builder clientBuilder = HttpClient.newBuilder()
@@ -85,7 +85,6 @@ 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()
@@ -111,7 +110,6 @@ 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()
@@ -139,7 +137,6 @@ 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();
--- a/common/src/main/java/net/lionarius/skinrestorer/mixin/ChunkMapAccessor.java
+++ b/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<TrackedEntityAccessorInvoker> getEntityMap();
+    Int2ObjectMap<Object> getEntityMap();
 }
--- a/common/src/main/java/net/lionarius/skinrestorer/mixin/PlayerAccessor.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/mixin/PlayerAccessor.java
@@ -1,15 +0,0 @@
-package net.lionarius.skinrestorer.mixin;
-
-import com.mojang.authlib.GameProfile;
-import net.minecraft.world.entity.player.Player;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Mutable;
-import org.spongepowered.asm.mixin.gen.Accessor;
-
-
-@Mixin(Player.class)
-public interface PlayerAccessor {
-    @Accessor("gameProfile")
-    @Mutable
-    void setGameProfile(GameProfile properties);
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/mixin/PlayerListMixin.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/mixin/PlayerListMixin.java
@@ -4,28 +4,18 @@ 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;
-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;

 import java.util.Collections;
-import java.util.List;

@Mixin(PlayerList.class)
 public abstract class PlayerListMixin {
    
-    @Shadow
-    public abstract List<ServerPlayer> getPlayers();
-    
-    @Shadow @Final
-    private MinecraftServer server;
-    
    @Inject(method = "remove", at = @At("TAIL"))
    private void remove(ServerPlayer player, CallbackInfo ci) {
        SkinRestorer.Events.onPlayerDisconnect(player);
@@ -33,13 +23,14 @@ public abstract class PlayerListMixin {
    
    @Inject(method = "removeAll", at = @At("HEAD"))
    private void removeAll(CallbackInfo ci) {
-        for (var player : getPlayers()) {
+        for (var player : ((PlayerList) (Object) this).getPlayers()) {
            SkinRestorer.Events.onPlayerDisconnect(player);
        }
    }
    
    @Inject(method = "placeNewPlayer", at = @At("HEAD"))
-    private void placeNewPlayer(Connection connection, ServerPlayer player, CommonListenerCookie cookie, CallbackInfo ci) {
+    private void placeNewPlayer(Connection connection, ServerPlayer player, CallbackInfo ci) {
+        var server = ((PlayerList) (Object) this).getServer();
        var delay = SkinRestorer.getConfig().skinApplyDelayOnJoin();
        
        if (delay <= 0) {
@@ -57,6 +48,6 @@ public abstract class PlayerListMixin {
    @Unique
    private static void skinrestorer$tryApplySkin(MinecraftServer server, ServerPlayer player) {
        if (SkinRestorer.getSkinStorage().hasSavedSkin(player.getUUID()))
-            SkinRestorer.applySkin(server, Collections.singleton(player), SkinRestorer.getSkinStorage().getSkin(player.getUUID()));
+            SkinRestorer.applySkin(server, Collections.singleton(player.getGameProfile()), SkinRestorer.getSkinStorage().getSkin(player.getUUID()));
    }
 }
--- a/common/src/main/java/net/lionarius/skinrestorer/mixin/ServerLoginPacketListenerImplAccessorInvoker.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/mixin/ServerLoginPacketListenerImplAccessorInvoker.java
@@ -0,0 +1,17 @@
+package net.lionarius.skinrestorer.mixin;
+
+import com.mojang.authlib.GameProfile;
+import net.minecraft.server.network.ServerLoginPacketListenerImpl;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.gen.Accessor;
+import org.spongepowered.asm.mixin.gen.Invoker;
+
+@Mixin(ServerLoginPacketListenerImpl.class)
+public interface ServerLoginPacketListenerImplAccessorInvoker {
+    
+    @Accessor
+    GameProfile getGameProfile();
+    
+    @Invoker
+    GameProfile invokeCreateFakeProfile(GameProfile original);
+}
--- a/common/src/main/java/net/lionarius/skinrestorer/mixin/ServerLoginPacketListenerImplMixin.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/mixin/ServerLoginPacketListenerImplMixin.java
@@ -2,7 +2,6 @@ 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,31 +20,29 @@ import java.util.concurrent.CompletableFuture;
@Mixin(ServerLoginPacketListenerImpl.class)
 public abstract class ServerLoginPacketListenerImplMixin {
    
-    @Shadow @Nullable
-    private GameProfile authenticatedProfile;
-    
    @Unique
    private CompletableFuture<Void> skinrestorer$pendingSkin;
    
-    @Inject(method = "verifyLoginAndFinishConnectionSetup", at = @At(value = "INVOKE",
-                                                                     target = "Lnet/minecraft/server/players/PlayerList;canPlayerLogin(Ljava/net/SocketAddress;Lnet/minecraft/server/players/NameAndId;)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(() -> {
-                final var profile = authenticatedProfile;
-                
+                var profile = ((ServerLoginPacketListenerImplAccessorInvoker) this).getGameProfile();
                assert profile != null;
+                
+                if (!profile.isComplete())
+                    profile = ((ServerLoginPacketListenerImplAccessorInvoker) this).invokeCreateFakeProfile(profile);
+                
                var originalSkin = PlayerUtils.getPlayerSkin(profile);
                
-                if (SkinRestorer.getSkinStorage().hasSavedSkin(profile.id())) {
+                if (SkinRestorer.getSkinStorage().hasSavedSkin(profile.getId())) {
                    if (originalSkin != null) { // update to the latest official skin
-                        var value = SkinRestorer.getSkinStorage().getSkin(profile.id());
-                        SkinRestorer.getSkinStorage().setSkin(profile.id(), value.setOriginalValue(originalSkin));
+                        var value = SkinRestorer.getSkinStorage().getSkin(profile.getId());
+                        SkinRestorer.getSkinStorage().setSkin(profile.getId(), value.setOriginalValue(originalSkin));
                    }
                    
                    if (SkinRestorer.getConfig().refreshSkinOnJoin()) {
-                        var currentSkin = SkinRestorer.getSkinStorage().getSkin(profile.id());
+                        var currentSkin = SkinRestorer.getSkinStorage().getSkin(profile.getId());
                        var context = currentSkin.toProviderContext();
                        
                        skinrestorer$fetchSkin(profile, context);
@@ -54,16 +51,10 @@ public abstract class ServerLoginPacketListenerImplMixin {
                    return null;
                }
                
-                var config = SkinRestorer.getConfig();
-                var provider = config.firstJoinSkinProvider();
-                
-                var shouldFetch = (originalSkin == null && config.fetchSkinOnFirstJoin()) ||
-                                      (originalSkin != null && config.forceFirstJoinSkinFetch() && provider != FirstJoinSkinProvider.MOJANG);
-                
-                if (shouldFetch) {
+                if (originalSkin == null && SkinRestorer.getConfig().fetchSkinOnFirstJoin()) {
                    var context = new SkinProviderContext(
-                            provider.getName(),
-                            profile.name(),
+                            SkinRestorer.getConfig().firstJoinSkinProvider().getName(),
+                            profile.getName(),
                            null
                    );
                    skinrestorer$fetchSkin(profile, context);
@@ -79,7 +70,7 @@ public abstract class ServerLoginPacketListenerImplMixin {
    
    @Unique
    private static void skinrestorer$fetchSkin(GameProfile profile, SkinProviderContext context) {
-        SkinRestorer.LOGGER.debug("Fetching {}'s skin", profile.name());
+        SkinRestorer.LOGGER.debug("Fetching {}'s skin", profile.getName());
        
        var result = SkinRestorer.getProvider(context.name()).map(
                provider -> provider.fetchSkin(context.argument(), context.variant())
@@ -87,9 +78,9 @@ public abstract class ServerLoginPacketListenerImplMixin {
        
        if (!result.isError()) {
            var value = SkinValue.fromProviderContextWithValue(context, result.getSuccessValue().orElse(null));
-            SkinRestorer.getSkinStorage().setSkin(profile.id(), value);
+            SkinRestorer.getSkinStorage().setSkin(profile.getId(), value);
        } else {
-            SkinRestorer.LOGGER.warn("Failed to fetch skin '{}:{}'", context.name(), context.argument(), result.getErrorValue());
+            SkinRestorer.LOGGER.warn("Failed to fetch skin: {}", result.getErrorValue().getMessage());
        }
    }
 }
--- a/common/src/main/java/net/lionarius/skinrestorer/platform/Services.java
+++ b/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()
--- a/common/src/main/java/net/lionarius/skinrestorer/skin/SkinStorage.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/skin/SkinStorage.java
@@ -17,22 +17,15 @@ public class SkinStorage {
        return this.skinMap.containsKey(uuid) || this.skinIO.skinExists(uuid);
    }
    
-    public SkinValue getSkin(UUID uuid, boolean cache) {
+    public SkinValue getSkin(UUID uuid) {
        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)
--- a/common/src/main/java/net/lionarius/skinrestorer/skin/SkinVariant.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/skin/SkinVariant.java
@@ -1,11 +1,8 @@
 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;
--- a/common/src/main/java/net/lionarius/skinrestorer/skin/provider/CollectionSkinProvider.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/skin/provider/CollectionSkinProvider.java
@@ -1,91 +0,0 @@
-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);
-        }
-    }
-}
--- a/common/src/main/java/net/lionarius/skinrestorer/skin/provider/ElyBySkinProvider.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/skin/provider/ElyBySkinProvider.java
@@ -9,11 +9,7 @@ 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.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 net.lionarius.skinrestorer.util.*;
 import org.jetbrains.annotations.NotNull;

 import java.io.IOException;
@@ -71,7 +67,7 @@ public final class ElyBySkinProvider implements SkinProvider {
    @Override
    public Result<Optional<Property>, Exception> fetchSkin(String username, SkinVariant variant) {
        try {
-            if (!StringUtil.isValidPlayerName(username))
+            if (!StringUtils.isValidPlayerName(username))
                throw new IllegalArgumentException("invalid username");
            
            var usernameLowerCase = username.toLowerCase(Locale.ROOT);
@@ -106,6 +102,6 @@ public final class ElyBySkinProvider implements SkinProvider {
        if (response.statusCode() != 200)
            throw new IllegalArgumentException("no profile with name " + username);
        
-        return JsonUtils.fromJson(response.body(), MinecraftProfilePropertiesResponse.class).profile();
+        return PlayerUtils.toProfile(JsonUtils.fromJson(response.body(), MinecraftProfilePropertiesResponse.class));
    }
 }
--- a/common/src/main/java/net/lionarius/skinrestorer/skin/provider/MineskinSkinProvider.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/skin/provider/MineskinSkinProvider.java
@@ -22,8 +22,6 @@ 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;
@@ -45,8 +43,7 @@ public final class MineskinSkinProvider implements SkinProvider {
                .userAgent(WebUtils.USER_AGENT)
                .gson(JsonUtils.GSON)
                .timeout((int) Duration.ofSeconds(config.requestTimeout()).toMillis())
-                .requestHandler((baseUrl, userAgent, apiKey, timeout, gson) -> new Java11RequestHandler(
-                        baseUrl,
+                .requestHandler((userAgent, apiKey, timeout, gson) -> new Java11RequestHandler(
                        userAgent,
                        apiKey,
                        timeout,
@@ -96,18 +93,13 @@ public final class MineskinSkinProvider implements SkinProvider {
        }
    }
    
-    static Optional<Property> loadSkin(URI uri, SkinVariant variant) throws Exception {
+    private static Optional<Property> loadSkin(URI uri, SkinVariant variant) throws Exception {
        var mineskinVariant = switch (variant) {
            case CLASSIC -> Variant.CLASSIC;
            case SLIM -> Variant.SLIM;
        };
        
-        var request = "file".equals(uri.getScheme())
-                ? GenerateRequest.upload(Files.newInputStream(Path.of(uri)))
-                .variant(mineskinVariant)
-                .name("skinrestorer-skin")
-                .visibility(Visibility.UNLISTED)
-                : GenerateRequest.url(uri)
+        var request = GenerateRequest.url(uri)
                .variant(mineskinVariant)
                .name("skinrestorer-skin")
                .visibility(Visibility.UNLISTED);
--- a/common/src/main/java/net/lionarius/skinrestorer/skin/provider/MojangSkinProvider.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/skin/provider/MojangSkinProvider.java
@@ -8,17 +8,10 @@ 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.authlib.yggdrasil.response.NameAndId;
-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;
-import net.lionarius.skinrestorer.util.Result;
-import net.lionarius.skinrestorer.util.WebUtils;
-import net.minecraft.server.players.CachedUserNameToIdResolver;
-import net.minecraft.util.StringUtil;
+import net.lionarius.skinrestorer.util.*;
+import net.minecraft.server.players.GameProfileCache;
 import org.jetbrains.annotations.NotNull;

 import java.io.IOException;
@@ -32,11 +25,13 @@ import java.util.concurrent.TimeUnit;
 public final class MojangSkinProvider implements SkinProvider {
    
    public static final String PROVIDER_NAME = "mojang";
-    public static final String PROFILE_CACHE_FILENAME = "mojang_profile_cache.json";
+    
    private static final Environment ENVIRONMENT;
    private static final URI SERVICES_SERVER_URI;
    private static final URI SESSION_SERVER_URI;
-    private static final CachedUserNameToIdResolver PROFILE_CACHE;
+    
+    public static final String PROFILE_CACHE_FILENAME = "mojang_profile_cache.json";
+    private static final GameProfileCache PROFILE_CACHE;
    
    private static LoadingCache<UUID, Optional<Property>> SKIN_CACHE;
    
@@ -44,32 +39,19 @@ public final class MojangSkinProvider implements SkinProvider {
        try {
            ENVIRONMENT = EnvironmentParser.getEnvironmentFromProperties().orElse(YggdrasilEnvironment.PROD.getEnvironment());
            
-            SERVICES_SERVER_URI = new URI(ENVIRONMENT.servicesHost());
-            SESSION_SERVER_URI = new URI(ENVIRONMENT.sessionHost());
+            SERVICES_SERVER_URI = new URI(ENVIRONMENT.getServicesHost());
+            SESSION_SERVER_URI = new URI(ENVIRONMENT.getSessionHost());
        } catch (URISyntaxException e) {
            throw new IllegalArgumentException(e);
        }
        
-        PROFILE_CACHE = new CachedUserNameToIdResolver(new GameProfileRepository() {
-            @Override
-            public void findProfilesByNames(String[] names, ProfileLookupCallback callback) {
-                for (var name : names) {
-                    try {
-                        var profile = MojangSkinProvider.getProfile(name);
-                        callback.onProfileLookupSucceeded(profile.name(), profile.id());
-                    } catch (IOException e) {
-                        throw new TransparentException(e);
-                    }
-                }
-            }
-            
-            @Override
-            public Optional<NameAndId> findProfileByName(String name) {
+        PROFILE_CACHE = new GameProfileCache((names, agent, callback) -> {
+            for (var name : names) {
                try {
                    var profile = MojangSkinProvider.getProfile(name);
-                    return Optional.of(new NameAndId(profile.id(), profile.name()));
+                    callback.onProfileLookupSucceeded(profile);
                } catch (IOException e) {
-                    throw new TransparentException(e);
+                    callback.onProfileLookupFailed(new GameProfile(null, name), e);
                }
            }
        }, SkinRestorer.getConfigDir().resolve(PROFILE_CACHE_FILENAME).toFile());
@@ -94,7 +76,7 @@ public final class MojangSkinProvider implements SkinProvider {
    }
    
    public static SkinProviderContext skinProviderContextFromProfile(GameProfile gameProfile) {
-        return new SkinProviderContext(MojangSkinProvider.PROVIDER_NAME, gameProfile.name(), null);
+        return new SkinProviderContext(MojangSkinProvider.PROVIDER_NAME, gameProfile.getName(), null);
    }
    
    @Override
@@ -110,14 +92,14 @@ public final class MojangSkinProvider implements SkinProvider {
    @Override
    public Result<Optional<Property>, Exception> fetchSkin(String username, SkinVariant variant) {
        try {
-            if (!StringUtil.isValidPlayerName(username))
+            if (!StringUtils.isValidPlayerName(username))
                throw new IllegalArgumentException("invalid username");
            
            var cachedProfile = MojangSkinProvider.PROFILE_CACHE.get(username);
            if (cachedProfile.isEmpty())
                throw new IllegalArgumentException("no profile found for " + username);
            
-            return Result.success(SKIN_CACHE.get(cachedProfile.get().id()));
+            return Result.success(SKIN_CACHE.get(cachedProfile.get().getId()));
        } catch (UncheckedExecutionException e) {
            return Result.error((Exception) e.getCause());
        } catch (Exception e) {
@@ -132,7 +114,7 @@ public final class MojangSkinProvider implements SkinProvider {
        return Optional.ofNullable(textures);
    }
    
-    private static NameAndId getProfile(final String name) throws IOException {
+    private static GameProfile getProfile(final String name) throws IOException {
        var request = HttpRequest.newBuilder()
                .uri(MojangSkinProvider.SERVICES_SERVER_URI
                        .resolve("/minecraft/profile/lookup/name/")
@@ -147,14 +129,14 @@ public final class MojangSkinProvider implements SkinProvider {
        if (response.statusCode() != 200)
            throw new IllegalArgumentException("no profile with name " + name);
        
-        return JsonUtils.fromJson(response.body(), NameAndId.class);
+        return JsonUtils.fromJson(response.body(), GameProfile.class);
    }
    
    private static GameProfile getProfileWithProperties(UUID uuid) throws IOException {
        var request = HttpRequest.newBuilder()
                .uri(MojangSkinProvider.SESSION_SERVER_URI
                        .resolve("/session/minecraft/profile/")
-                        .resolve(UndashedUuid.toString(uuid) + "?unsigned=false")
+                        .resolve(uuid.toString() + "?unsigned=false")
                )
                .GET()
                .build();
@@ -165,6 +147,6 @@ public final class MojangSkinProvider implements SkinProvider {
        if (response.statusCode() != 200)
            throw new IllegalArgumentException("no profile with uuid " + uuid);
        
-        return JsonUtils.fromJson(response.body(), MinecraftProfilePropertiesResponse.class).profile();
+        return PlayerUtils.toProfile(JsonUtils.fromJson(response.body(), MinecraftProfilePropertiesResponse.class));
    }
 }
--- a/common/src/main/java/net/lionarius/skinrestorer/skin/provider/SkinProvider.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/skin/provider/SkinProvider.java
@@ -13,7 +13,6 @@ 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(
@@ -21,7 +20,6 @@ public interface SkinProvider {
            MojangSkinProvider.PROVIDER_NAME,
            ElyBySkinProvider.PROVIDER_NAME,
            MineskinSkinProvider.PROVIDER_NAME,
-            CollectionSkinProvider.PROVIDER_NAME,
            SkinShuffleSkinProvider.PROVIDER_NAME
    );
    
--- a/common/src/main/java/net/lionarius/skinrestorer/util/JsonUtils.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/util/JsonUtils.java
@@ -4,6 +4,7 @@ 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;
 import com.mojang.util.UUIDTypeAdapter;
@@ -21,6 +22,7 @@ public final class JsonUtils {
            .registerTypeAdapterFactory(new PostProcessingEnabler())
            .registerTypeAdapter(UUID.class, new UUIDTypeAdapter())
            .registerTypeAdapter(PropertyMap.class, new PropertyMap.Serializer())
+            .registerTypeAdapter(GameProfile.class, new GameProfile.Serializer())
            .setPrettyPrinting()
            .create();
    
@@ -48,7 +50,7 @@ public final class JsonUtils {
    
    public static JsonObject skinPropertyToJson(Property property) {
        try {
-            JsonObject json = GSON.fromJson(new String(Base64.getDecoder().decode(property.value()), StandardCharsets.UTF_8), JsonObject.class);
+            JsonObject json = GSON.fromJson(new String(Base64.getDecoder().decode(property.getValue()), StandardCharsets.UTF_8), JsonObject.class);
            if (json != null)
                json.remove("timestamp");
            
--- a/common/src/main/java/net/lionarius/skinrestorer/util/PlayerUtils.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/util/PlayerUtils.java
@@ -1,19 +1,19 @@
 package net.lionarius.skinrestorer.util;

 import com.google.common.collect.Iterables;
-import com.google.common.collect.LinkedHashMultimap;
 import com.google.gson.JsonObject;
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.properties.Property;
-import com.mojang.authlib.properties.PropertyMap;
 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,7 +40,7 @@ public final class PlayerUtils {
    }
    
    public static void refreshPlayer(ServerPlayer player) {
-        ServerLevel serverLevel = player.level();
+        ServerLevel serverLevel = player.serverLevel();
        PlayerList playerList = serverLevel.getServer().getPlayerList();
        ChunkMap chunkMap = serverLevel.getChunkSource().chunkMap;
        
@@ -51,14 +51,14 @@ public final class PlayerUtils {
                )
        ));
        
-        var trackedEntity = ((ChunkMapAccessor) chunkMap).getEntityMap().get(player.getId());
+        var trackedEntity = (TrackedEntityAccessorInvoker) ((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 = ((ChunkMapAccessor) chunkMap).getEntityMap().get(observer.getId());
+                var trackedObserverEntity = (TrackedEntityAccessorInvoker) ((ChunkMapAccessor) chunkMap).getEntityMap().get(observer.getId());
                if (trackedObserverEntity != null) {
                    trackedObserverEntity.invokeRemovePlayer(player);
                    trackedObserverEntity.invokeUpdatePlayer(player);
@@ -68,12 +68,20 @@ public final class PlayerUtils {
        }
        
        if (!player.isDeadOrDying()) {
-            player.connection.send(new ClientboundBundlePacket(
-                    List.of(
-                            new ClientboundRespawnPacket(player.createCommonSpawnInfo(serverLevel), ClientboundRespawnPacket.KEEP_ALL_DATA),
-                            new ClientboundGameEventPacket(ClientboundGameEventPacket.LEVEL_CHUNKS_LOAD_START, 0)
+            player.connection.send(
+                    new ClientboundRespawnPacket(
+                            player.level().dimensionTypeId(),
+                            player.level().dimension(),
+                            BiomeManager.obfuscateSeed(player.serverLevel().getSeed()),
+                            player.gameMode.getGameModeForPlayer(),
+                            player.gameMode.getPreviousGameModeForPlayer(),
+                            player.level().isDebug(),
+                            player.serverLevel().isFlat(),
+                            (byte) 3,
+                            player.getLastDeathLocation(),
+                            player.getPortalCooldown()
                    )
-            ));
+            );
            player.connection.teleport(player.getX(), player.getY(), player.getZ(), player.getYRot(), player.getXRot());
            player.connection.send(new ClientboundSetEntityMotionPacket(player));
            var vehicle = player.getVehicle();
@@ -87,37 +95,25 @@ public final class PlayerUtils {
            playerList.sendPlayerPermissionLevel(player);
            playerList.sendLevelInfo(player, serverLevel);
            playerList.sendAllPlayerInfo(player);
-            playerList.sendActivePlayerEffects(player);
+            PlayerUtils.sendActivePlayerEffects(player);
        }
    }
    
    private static void sendActivePlayerEffects(ServerPlayer player) {
        for (var effect : player.getActiveEffects()) {
-            player.connection.send(new ClientboundUpdateMobEffectPacket(player.getId(), effect, false));
+            player.connection.send(new ClientboundUpdateMobEffectPacket(player.getId(), effect));
        }
    }
    
-    public static GameProfile cloneGameProfile(GameProfile profile) {
-        var newProfile = new GameProfile(profile.id(), profile.name());
-        newProfile.properties().putAll(profile.properties());
-        
-        return newProfile;
-    }
-    
    public static Property getPlayerSkin(GameProfile profile) {
-        return Iterables.getFirst(profile.properties().get(TEXTURES_KEY), null);
+        return Iterables.getFirst(profile.getProperties().get(TEXTURES_KEY), null);
    }
    
-    public static GameProfile applyRestoredSkin(GameProfile profile, Property skin) {
-        var propertiesMap = profile.properties();
+    public static void applyRestoredSkin(GameProfile profile, Property skin) {
+        profile.getProperties().removeAll(TEXTURES_KEY);
        
-        var newProperties = LinkedHashMultimap.create(propertiesMap);
-        newProperties.removeAll(TEXTURES_KEY);
-        if (skin != null) {
-            newProperties.put(TEXTURES_KEY, skin);
-        }
-        
-        return new GameProfile(profile.id(), profile.name(), new PropertyMap(newProperties));
+        if (skin != null)
+            profile.getProperties().put(TEXTURES_KEY, skin);
    }
    
    public static boolean areSkinPropertiesEquals(Property x, Property y) {
@@ -140,8 +136,8 @@ public final class PlayerUtils {
    }
    
    public static GameProfile toProfile(MinecraftProfilePropertiesResponse response) {
-        final GameProfile profile = new GameProfile(response.id(), response.name());
-        profile.properties().putAll(response.properties());
+        final GameProfile profile = new GameProfile(response.getId(), response.getName());
+        profile.getProperties().putAll(response.getProperties());
        return profile;
    }
 }
--- a/common/src/main/java/net/lionarius/skinrestorer/util/Result.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/util/Result.java
@@ -19,18 +19,6 @@ 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;
    }
@@ -81,4 +69,16 @@ 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));
+    }
 }
--- a/common/src/main/java/net/lionarius/skinrestorer/util/WebUtils.java
+++ b/common/src/main/java/net/lionarius/skinrestorer/util/WebUtils.java
@@ -13,6 +13,8 @@ import java.time.temporal.ChronoUnit;

 public final class WebUtils {
    
+    private WebUtils() {}
+    
    public static final String USER_AGENT;
    
    private static HttpClient HTTP_CLIENT = null;
@@ -21,8 +23,6 @@ public final class WebUtils {
        USER_AGENT = String.format("SkinRestorer/%d", System.currentTimeMillis() % 65535);
    }
    
-    private WebUtils() {}
-    
    public static void recreateHttpClient() {
        HTTP_CLIENT = WebUtils.buildClient();
    }
--- a/common/src/main/resources/META-INF/accesstransformer.cfg
+++ b/common/src/main/resources/META-INF/accesstransformer.cfg
--- a/common/src/main/resources/skinrestorer.accesswidener
+++ b/common/src/main/resources/skinrestorer.accesswidener
@@ -1 +0,0 @@
-accessWidener v2 named
--- a/common/src/main/resources/skinrestorer.mixins.json
+++ b/common/src/main/resources/skinrestorer.mixins.json
@@ -7,8 +7,8 @@
    "refmap": "${mod_id}.refmap.json",
    "mixins": [
        "ChunkMapAccessor",
-        "PlayerAccessor",
        "PlayerListMixin",
+        "ServerLoginPacketListenerImplAccessorInvoker",
        "ServerLoginPacketListenerImplMixin",
        "TrackedEntityAccessorInvoker"
    ],
--- a/fabric/gradle.properties
+++ b/fabric/gradle.properties
@@ -1,6 +1,5 @@
 # Fabric, see https://fabricmc.net/develop/ for new versions
 fabric_loader_version=0.15.0
-fabric_api_version=0.139.4+1.21.11
+fabric_api_version=0.83.0+1.20

 optional_dependencies=fabric-api
-additional_modloaders=quilt
--- a/fabric/src/main/java/net/lionarius/skinrestorer/fabric/compat/skinshuffle/SkinShuffleCompatibility.java
+++ b/fabric/src/main/java/net/lionarius/skinrestorer/fabric/compat/skinshuffle/SkinShuffleCompatibility.java
@@ -1,14 +1,17 @@
 package net.lionarius.skinrestorer.fabric.compat.skinshuffle;

-import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
+import net.fabricmc.fabric.api.networking.v1.PacketSender;
 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;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.server.network.ServerGamePacketListenerImpl;

 public final class SkinShuffleCompatibility {
    
@@ -20,18 +23,24 @@ public final class SkinShuffleCompatibility {
            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(SkinShuffleSkinRefreshV1Payload.PACKET_ID, SkinShuffleCompatibility::handleSkinRefreshV1Packet);
        
-        ServerPlayNetworking.registerGlobalReceiver(SkinShuffleSkinRefreshV2Payload.PACKET_ID, SkinShuffleCompatibility::handleSkinRefreshPacket);
+        ServerPlayNetworking.registerGlobalReceiver(SkinShuffleSkinRefreshV2Payload.PACKET_ID, SkinShuffleCompatibility::handleSkinRefreshV2Packet);
    }
    
-    private static void handleSkinRefreshPacket(SkinShuffleSkinRefreshPayload payload, ServerPlayNetworking.Context context) {
-        net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleCompatibility.handleSkinRefresh(SkinRestorer.getMinecraftServer(), context.player(), payload);
+    private static void handleSkinRefreshV1Packet(MinecraftServer server, ServerPlayer player, ServerGamePacketListenerImpl listener, FriendlyByteBuf buf, PacketSender sender) {
+        var payload = SkinShuffleSkinRefreshV1Payload.decode(buf);
+        SkinShuffleCompatibility.handleSkinRefreshPacket(payload, server, player);
+    }
+    
+    private static void handleSkinRefreshV2Packet(MinecraftServer server, ServerPlayer player, ServerGamePacketListenerImpl listener, FriendlyByteBuf buf, PacketSender sender) {
+        var payload = SkinShuffleSkinRefreshV2Payload.decode(buf);
+        SkinShuffleCompatibility.handleSkinRefreshPacket(payload, server, player);
+    }
+    
+    private static void handleSkinRefreshPacket(SkinShuffleSkinRefreshPayload payload, MinecraftServer server, ServerPlayer player) {
+        net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleCompatibility.handleSkinRefresh(server, player, payload);
    }
 }
--- a/fabric/src/main/java/net/lionarius/skinrestorer/fabric/mixin/MinecraftServerMixin.java
+++ b/fabric/src/main/java/net/lionarius/skinrestorer/fabric/mixin/MinecraftServerMixin.java
@@ -11,14 +11,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 public abstract class MinecraftServerMixin {
    
    @Inject(method = "runServer",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/util/Util;getNanos()J", ordinal = 0))
+            at = @At(value = "INVOKE", target = "Lnet/minecraft/Util;getMillis()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);
-    }
 }
--- a/fabric/src/main/java/net/lionarius/skinrestorer/fabric/platform/FabricCompatibilityHelper.java
+++ b/fabric/src/main/java/net/lionarius/skinrestorer/fabric/platform/FabricCompatibilityHelper.java
@@ -1,5 +1,6 @@
 package net.lionarius.skinrestorer.fabric.platform;

+import net.fabricmc.fabric.api.networking.v1.PacketByteBufs;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
 import net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleHandshakePayload;
 import net.lionarius.skinrestorer.platform.services.CompatibilityHelper;
@@ -8,6 +9,6 @@ import net.minecraft.server.level.ServerPlayer;
 public final class FabricCompatibilityHelper implements CompatibilityHelper {
    @Override
    public void skinShuffle_sendHandshake(ServerPlayer player) {
-        ServerPlayNetworking.send(player, SkinShuffleHandshakePayload.INSTANCE);
+        ServerPlayNetworking.send(player, SkinShuffleHandshakePayload.PACKET_ID, PacketByteBufs.empty());
    }
 }
--- a/fabric/src/main/resources/fabric.mod.json
+++ b/fabric/src/main/resources/fabric.mod.json
@@ -24,7 +24,6 @@
        "${mod_id}.mixins.json",
        "${mod_id}.fabric.mixins.json"
    ],
-    "accessWidener": "${mod_id}.accesswidener",
    "depends": {
        "fabricloader": ">=${fabric_loader_version}",
        "minecraft": ">=${minecraft_version}",
--- a/forge/build.gradle
+++ b/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_minecraft}-${parchment_version}-${minecraft_version}"
+    mappings channel: 'parchment', version: "${parchment_version}-${parchment_minecraft}"

    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
    }
@@ -43,7 +43,6 @@ minecraft {
            workingDirectory rootProject.file('run/client')
            ideaModule "${rootProject.name}.${project.name}.main"
            taskName 'Client'
-            property 'eventbus.api.strictRuntimeChecks', 'true'
            mods {
                modClientRun {
                    source sourceSets.main
@@ -55,7 +54,6 @@ minecraft {
            workingDirectory rootProject.file('run/server')
            ideaModule "${rootProject.name}.${project.name}.main"
            taskName 'Server'
-            property 'eventbus.api.strictRuntimeChecks', 'true'
            mods {
                modServerRun {
                    source sourceSets.main
@@ -68,8 +66,6 @@ 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' } }

@@ -92,7 +88,3 @@ sourceSets.each {
    it.output.resourcesDir = dir
    it.java.destinationDirectory = dir
 }
-
-tasks.named('processResources') {
-    duplicatesStrategy = DuplicatesStrategy.INCLUDE
-}
--- a/forge/gradle.properties
+++ b/forge/gradle.properties
@@ -1,5 +1,5 @@
 # Forge, see https://files.minecraftforge.net/net/minecraftforge/forge/ for new versions
-forge_version=61.0.0
-forge_loader_version_range=[61,)
+forge_version=46.0.1
+forge_loader_version_range=[46,)
 # Forge sometimes skips minor minecraft versions (like 1.20.5)
-forge_minecraft_version=1.21.11
+forge_minecraft_version=1.20
--- a/forge/src/main/java/net/lionarius/skinrestorer/forge/SkinRestorerForge.java
+++ b/forge/src/main/java/net/lionarius/skinrestorer/forge/SkinRestorerForge.java
@@ -4,8 +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.event.server.ServerStoppedEvent;
-import net.minecraftforge.eventbus.api.listener.SubscribeEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;

@Mod(SkinRestorer.MOD_ID)
@@ -28,9 +27,4 @@ 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());
-    }
 }
--- a/forge/src/main/java/net/lionarius/skinrestorer/forge/compat/skinshuffle/SkinShuffleCompatibility.java
+++ b/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.event.entity.player.PlayerEvent;
+import net.minecraftforge.common.MinecraftForge;

 public final class SkinShuffleCompatibility {
    
    private SkinShuffleCompatibility() {}
    
    public static void initialize() {
-        PlayerEvent.PlayerLoggedInEvent.BUS.addListener(SkinShuffleGameEventHandler::onPlayerLoggedIn);
+        MinecraftForge.EVENT_BUS.register(SkinShuffleGameEventHandler.class);
        
        SkinShufflePacketHandler.initialize();
    }
--- a/forge/src/main/java/net/lionarius/skinrestorer/forge/compat/skinshuffle/SkinShuffleGameEventHandler.java
+++ b/forge/src/main/java/net/lionarius/skinrestorer/forge/compat/skinshuffle/SkinShuffleGameEventHandler.java
@@ -3,11 +3,13 @@ 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());
    }
--- a/forge/src/main/java/net/lionarius/skinrestorer/forge/compat/skinshuffle/SkinShufflePacketHandler.java
+++ b/forge/src/main/java/net/lionarius/skinrestorer/forge/compat/skinshuffle/SkinShufflePacketHandler.java
@@ -1,45 +1,67 @@
 package net.lionarius.skinrestorer.forge.compat.skinshuffle;

-import net.lionarius.skinrestorer.SkinRestorer;
-import net.lionarius.skinrestorer.compat.skinshuffle.*;
+import io.netty.buffer.Unpooled;
 import net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleCompatibility;
+import net.lionarius.skinrestorer.compat.skinshuffle.*;
 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;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket;
+import net.minecraftforge.network.NetworkEvent;
+import net.minecraftforge.network.NetworkRegistry;
+import net.minecraftforge.network.event.EventNetworkChannel;

 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() {
    }
    
+    private static final EventNetworkChannel HANDSHAKE_INSTANCE = NetworkRegistry.ChannelBuilder
+            .named(SkinShuffleHandshakePayload.PACKET_ID)
+            .clientAcceptedVersions(NetworkRegistry.acceptMissingOr(""))
+            .serverAcceptedVersions(NetworkRegistry.acceptMissingOr(""))
+            .networkProtocolVersion(() -> "")
+            .eventNetworkChannel();
+    
+    private static final EventNetworkChannel SKIN_REFRESH_V1_INSTANCE = NetworkRegistry.ChannelBuilder
+            .named(SkinShuffleSkinRefreshV1Payload.PACKET_ID)
+            .clientAcceptedVersions(NetworkRegistry.acceptMissingOr(""))
+            .serverAcceptedVersions(NetworkRegistry.acceptMissingOr(""))
+            .networkProtocolVersion(() -> "")
+            .eventNetworkChannel();
+    
+    private static final EventNetworkChannel SKIN_REFRESH_V2_INSTANCE = NetworkRegistry.ChannelBuilder
+            .named(SkinShuffleSkinRefreshV2Payload.PACKET_ID)
+            .clientAcceptedVersions(NetworkRegistry.acceptMissingOr(""))
+            .serverAcceptedVersions(NetworkRegistry.acceptMissingOr(""))
+            .networkProtocolVersion(() -> "")
+            .eventNetworkChannel();
+    
    protected static void initialize() {
-        // NO-OP
+        SKIN_REFRESH_V1_INSTANCE.addListener(SkinShufflePacketHandler::skinRefreshV1Listener);
+        SKIN_REFRESH_V2_INSTANCE.addListener(SkinShufflePacketHandler::skinRefreshV2Listener);
    }
    
    public static void sendHandshake(Connection connection) {
-        INSTANCE.send(SkinShuffleHandshakePayload.INSTANCE, connection);
+        connection.send(new ClientboundCustomPayloadPacket(SkinShuffleHandshakePayload.PACKET_ID, new FriendlyByteBuf(Unpooled.buffer(0, 0))));
    }
    
-    private static void handleSkinRefreshPacket(SkinShuffleSkinRefreshPayload payload, CustomPayloadEvent.Context context) {
+    private static void skinRefreshV1Listener(NetworkEvent.ClientCustomPayloadEvent event) {
+        var payload = SkinShuffleSkinRefreshV1Payload.decode(event.getPayload());
+        handleSkinRefreshPacket(payload, event.getSource().get());
+        event.getSource().get().setPacketHandled(true);
+    }
+    
+    private static void skinRefreshV2Listener(NetworkEvent.ClientCustomPayloadEvent event) {
+        var payload = SkinShuffleSkinRefreshV2Payload.decode(event.getPayload());
+        handleSkinRefreshPacket(payload, event.getSource().get());
+        event.getSource().get().setPacketHandled(true);
+    }
+    
+    private static void handleSkinRefreshPacket(SkinShuffleSkinRefreshPayload payload, NetworkEvent.Context context) {
        var sender = context.getSender();
        
-        if (!context.isServerSide() || sender == null)
+        if (!context.getDirection().getReceptionSide().isServer() || sender == null)
            return;
        
-        SkinShuffleCompatibility.handleSkinRefresh(SkinRestorer.getMinecraftServer(), sender, payload);
+        SkinShuffleCompatibility.handleSkinRefresh(sender.getServer(), sender, payload);
    }
 }
--- a/forge/src/main/java/net/lionarius/skinrestorer/forge/platform/ForgeCompatibilityHelper.java
+++ b/forge/src/main/java/net/lionarius/skinrestorer/forge/platform/ForgeCompatibilityHelper.java
@@ -8,6 +8,6 @@ public final class ForgeCompatibilityHelper implements CompatibilityHelper {
    
    @Override
    public void skinShuffle_sendHandshake(ServerPlayer player) {
-        SkinShufflePacketHandler.sendHandshake(player.connection.getConnection());
+        SkinShufflePacketHandler.sendHandshake(player.connection.connection);
    }
 }
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,14 +1,14 @@
 # Project
 group=net.lionarius
-java_version=21
+java_version=17

 # Common
-minecraft_version=1.21.11
-minecraft_version_list=1.21.11
-minecraft_version_range=[1.21.11, 1.22)
+minecraft_version=1.20
+minecraft_version_list=1.20,1.20.1
+minecraft_version_range=[1.20, 1.20.1]
 mod_id=skinrestorer
 mod_name=SkinRestorer
-mod_version=2.5.0
+mod_version=2.3.2
 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.2.1-SNAPSHOT
+mineskin_client_version=3.0.1-SNAPSHOT

 # ParchmentMC mappings, see https://parchmentmc.org/docs/getting-started#choose-a-version for new versions
-parchment_minecraft=1.21.11
-parchment_version=2025.12.20
+parchment_minecraft=1.20.1
+parchment_version=2023.09.03

 # Publishing
 curseforge_id=443823
--- a/neoforge/build.gradle
+++ b/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()) {
-        accessTransformers.from(at.absolutePath)
+        minecraft.accessTransformers.file(at)
    }

    parchment {
@@ -55,4 +55,6 @@ dependencies {
            prefer mineskin_client_version
        }
    }
+
+    additionalRuntimeClasspath "org.mineskin:java-client:${mineskin_client_version}"
 }
--- a/neoforge/gradle.properties
+++ b/neoforge/gradle.properties
@@ -1,3 +1,3 @@
 # NeoForge, see https://projects.neoforged.net/neoforged/neoforge for new versions
-neoforge_version=21.11.0-beta
-neoforge_loader_version_range=[4,)
+neoforge_version=20.2.3-beta
+neoforge_loader_version_range=[1,)
--- a/neoforge/src/main/java/net/lionarius/skinrestorer/neoforge/SkinRestorerNeoForge.java
+++ b/neoforge/src/main/java/net/lionarius/skinrestorer/neoforge/SkinRestorerNeoForge.java
@@ -3,14 +3,12 @@ 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)
-@EventBusSubscriber(modid = SkinRestorer.MOD_ID)
+@Mod.EventBusSubscriber(modid = SkinRestorer.MOD_ID)
 public final class SkinRestorerNeoForge {
    
    public SkinRestorerNeoForge() {
@@ -29,9 +27,4 @@ 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());
-    }
 }
--- a/neoforge/src/main/java/net/lionarius/skinrestorer/neoforge/compat/skinshuffle/SkinShuffleCompatibility.java
+++ b/neoforge/src/main/java/net/lionarius/skinrestorer/neoforge/compat/skinshuffle/SkinShuffleCompatibility.java
@@ -1,7 +1,5 @@
 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 {
@@ -11,7 +9,6 @@ public final class SkinShuffleCompatibility {
    public static void initialize() {
        NeoForge.EVENT_BUS.register(SkinShuffleGameEventHandler.class);
        
-        final var mod = ModList.get().getModContainerById(SkinRestorer.MOD_ID).get();
-        mod.getEventBus().register(SkinShuffleModEventHandler.class);
+        SkinShufflePacketHandler.initialize();
    }
 }
--- a/neoforge/src/main/java/net/lionarius/skinrestorer/neoforge/compat/skinshuffle/SkinShuffleModEventHandler.java
+++ b/neoforge/src/main/java/net/lionarius/skinrestorer/neoforge/compat/skinshuffle/SkinShuffleModEventHandler.java
@@ -1,32 +0,0 @@
-package net.lionarius.skinrestorer.neoforge.compat.skinshuffle;
-
-import net.lionarius.skinrestorer.SkinRestorer;
-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(SkinRestorer.getMinecraftServer(), player, payload);
-    }
-}
--- a/neoforge/src/main/java/net/lionarius/skinrestorer/neoforge/compat/skinshuffle/SkinShufflePacketHandler.java
+++ b/neoforge/src/main/java/net/lionarius/skinrestorer/neoforge/compat/skinshuffle/SkinShufflePacketHandler.java
@@ -0,0 +1,55 @@
+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);
+    }
+}
--- a/neoforge/src/main/java/net/lionarius/skinrestorer/neoforge/platform/NeoForgeCompatibilityHelper.java
+++ b/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.getConnection().send(new ClientboundCustomPayloadPacket(SkinShuffleHandshakePayload.INSTANCE));
+        player.connection.connection.send(new ClientboundCustomPayloadPacket(SkinShuffleHandshakePayload.INSTANCE));
    }
 }
--- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml
+++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml
@@ -17,14 +17,14 @@ config = "${mod_id}.mixins.json"

 [[dependencies.${mod_id}]]
 modId = "neoforge"
-type = "required"
+mandatory = true
 versionRange = "[${neoforge_version},)"
 ordering = "NONE"
 side = "BOTH"

 [[dependencies.${mod_id}]]
 modId = "minecraft"
-type = "required"
+mandatory = true
 versionRange = "${minecraft_version_range}"
 ordering = "NONE"
 side = "BOTH"
--- a/settings.gradle
+++ b/settings.gradle
@@ -71,4 +71,5 @@ rootProject.name = 'skin-restorer'
 include('common')
 include('fabric')
 include('forge')
-include('neoforge')
+// There is no NeoForge for versions <1.20.2
+// include('neoforge')
Author	SHA1	Message	Date
Lionarius	56655bca36	backport to 1.20	2025-05-30 22:39:37 +03:00
Lionarius	90ca995907	Merge branch '1.20.2-multiloader' into 1.20-multiloader # Conflicts: # common/src/main/java/net/lionarius/skinrestorer/mixin/ServerLoginPacketListenerImplMixin.java	2025-05-30 22:38:16 +03:00
Lionarius	0823ed6669	Merge branch '1.20.3-multiloader' into 1.20.2-multiloader	2025-05-30 22:37:22 +03:00
Lionarius	3fff2eb920	Merge branch '1.20.5-multiloader' into 1.20.3-multiloader	2025-05-30 22:37:11 +03:00
Lionarius	50a49b33a2	Merge branch '1.21-multiloader' into 1.20.5-multiloader	2025-05-30 22:36:56 +03:00
Lionarius	8de7f3a16f	Merge branch '1.21.5-multiloader' into 1.21-multiloader	2025-05-30 22:36:25 +03:00
Lionarius	7fb647b3ba	Merge branch '1.20.2-multiloader' into 1.20-multiloader # Conflicts: # common/src/main/java/net/lionarius/skinrestorer/mixin/PlayerListMixin.java	2025-05-30 21:50:53 +03:00
Lionarius	907566e12b	Merge branch '1.20.3-multiloader' into 1.20.2-multiloader	2025-05-30 21:48:30 +03:00
Lionarius	8a730c7c61	Merge branch '1.20.5-multiloader' into 1.20.3-multiloader	2025-05-30 21:48:01 +03:00
Lionarius	0feba3f4b2	Merge branch '1.21-multiloader' into 1.20.5-multiloader	2025-05-30 21:47:51 +03:00
Lionarius	fcd76d9a87	Merge branch '1.21.5-multiloader' into 1.21-multiloader	2025-05-30 21:47:45 +03:00
Lionarius	1a5f4ab2b0	Merge branch '1.20.2-multiloader' into 1.20-multiloader	2025-05-24 14:13:19 +03:00
Lionarius	a2c4da3c6e	Merge branch '1.20.3-multiloader' into 1.20.2-multiloader	2025-05-24 14:07:13 +03:00
Lionarius	04e781d36f	Merge branch '1.20.5-multiloader' into 1.20.3-multiloader	2025-05-24 14:05:58 +03:00
Lionarius	4b30b8b53d	Merge branch '1.21-multiloader' into 1.20.5-multiloader	2025-05-24 14:00:30 +03:00
Lionarius	0921cf70bf	Merge branch '1.21.5-multiloader' into 1.21-multiloader	2025-05-24 13:52:11 +03:00
lionarius	a458f3456c	Merge branch '1.20.2-multiloader' into 1.20-multiloader	2025-05-03 11:30:55 +03:00
lionarius	b297c6addb	Merge branch '1.20.3-multiloader' into 1.20.2-multiloader	2025-05-03 11:30:25 +03:00
lionarius	daedf692a1	Merge branch '1.20.5-multiloader' into 1.20.3-multiloader	2025-05-03 11:29:46 +03:00
lionarius	c2afd37fae	Merge branch '1.21-multiloader' into 1.20.5-multiloader	2025-05-03 11:29:07 +03:00
lionarius	e0b1de4ae2	Merge branch '1.21.5-multiloader' into 1.21-multiloader	2025-05-03 11:27:53 +03:00
lionarius	d351f7497c	gradle properties for 1.20	2025-05-03 10:58:41 +03:00
lionarius	a2279bc66e	backport to 1.20	2025-05-03 10:58:25 +03:00
lionarius	33586d02a3	Merge branch '1.20.2-multiloader' into 1.20-multiloader # Conflicts: # gradle.properties	2025-05-03 10:53:13 +03:00
lionarius	5f6d1204fc	gradle properties for 1.20.2	2025-05-03 10:51:54 +03:00
lionarius	4abcb3ba71	Merge branch '1.20.3-multiloader' into 1.20.2-multiloader # Conflicts: # gradle.properties	2025-05-03 10:45:43 +03:00
lionarius	a655e0c2ce	gradle properties for 1.20.3	2025-05-03 10:44:08 +03:00
lionarius	a7298a1909	Merge branch '1.20.5-multiloader' into 1.20.3-multiloader # Conflicts: # gradle.properties	2025-05-03 10:37:23 +03:00
lionarius	e1a58f4246	gradle properties for 1.20.5	2025-05-03 10:35:51 +03:00
lionarius	496c8d8078	Merge branch '1.21-multiloader' into 1.20.5-multiloader # Conflicts: # gradle.properties	2025-05-03 10:34:32 +03:00
lionarius	0070d3ab1c	gradle properties for 1.21	2025-05-03 10:27:09 +03:00
lionarius	7ec929335b	Merge branch '1.21.5-multiloader' into 1.21-multiloader # Conflicts: # common/src/main/java/net/lionarius/skinrestorer/skin/provider/MojangSkinProvider.java # gradle.properties	2025-05-03 10:07:59 +03:00
lionarius	5da06ee325	inject at cancel-safe position	2025-05-03 09:45:53 +03:00
lionarius	4a1ce7885c	Merge branch '1.20.2-multiloader' into 1.20-multiloader	2025-03-27 18:35:34 +03:00
lionarius	d471eb2e5f	Merge branch '1.20.3-multiloader' into 1.20.2-multiloader	2025-03-27 18:34:36 +03:00
lionarius	138350545a	Merge branch '1.20.5-multiloader' into 1.20.3-multiloader	2025-03-27 18:33:47 +03:00
lionarius	7ab9f722e8	Merge branch '1.21-multiloader' into 1.20.5-multiloader	2025-03-27 18:32:56 +03:00
lionarius	5c2a50fd98	Merge branch '1.21.5-multiloader' into 1.21-multiloader	2025-03-27 18:31:05 +03:00
lionarius	d1c0317fa1	Merge branch '1.20.2-multiloader' into 1.20-multiloader	2025-03-27 12:47:06 +03:00
lionarius	2a3c3d0f54	Merge branch '1.20.3-multiloader' into 1.20.2-multiloader	2025-03-27 12:47:00 +03:00
lionarius	040d26cb33	Merge branch '1.20.5-multiloader' into 1.20.3-multiloader	2025-03-27 12:46:54 +03:00
lionarius	ef79818d5c	Merge branch '1.21-multiloader' into 1.20.5-multiloader	2025-03-27 12:46:45 +03:00
lionarius	0d4a0034b8	Merge branch '1.21.5-multiloader' into 1.21-multiloader	2025-03-27 12:46:37 +03:00
lionarius	694e5ebfef	Merge branch '1.20.2-multiloader' into 1.20-multiloader # Conflicts: # common/src/main/java/net/lionarius/skinrestorer/mixin/PlayerListMixin.java	2025-03-26 02:53:09 +03:00
lionarius	c8a4674e0c	Merge branch '1.20.3-multiloader' into 1.20.2-multiloader	2025-03-26 02:47:09 +03:00
lionarius	d374c80659	Merge branch '1.20.5-multiloader' into 1.20.3-multiloader	2025-03-26 02:38:36 +03:00
lionarius	d85942041b	drop neoforge 1.20.5-6 support	2025-03-26 02:38:18 +03:00
lionarius	1cafc91935	Merge branch '1.21-multiloader' into 1.20.5-multiloader # Conflicts: # gradle.properties	2025-03-26 02:32:11 +03:00
lionarius	5d28269b94	pin max 1.21 version	2025-03-26 02:31:16 +03:00
lionarius	2293fc2399	Revert "update gradle.properties" This reverts commit `2e3b2649b3`.	2025-03-26 02:26:26 +03:00
lionarius	3971f2efbf	Revert "fix GameProfileRepository interface impl" This reverts commit `516601a899`.	2025-03-26 02:26:25 +03:00
lionarius	048860182d	Merge branch '1.20.2-multiloader' into 1.20-multiloader	2024-12-23 11:59:48 +03:00
lionarius	143e95d7f2	Merge branch '1.20.3-multiloader' into 1.20.2-multiloader	2024-12-23 11:59:42 +03:00
lionarius	34de47e13e	Merge branch '1.20.5-multiloader' into 1.20.3-multiloader	2024-12-23 11:59:36 +03:00
lionarius	08e7f1792b	Merge branch '1.21-multiloader' into 1.20.5-multiloader	2024-12-23 11:59:26 +03:00
lionarius	2b8de22f70	Merge branch '1.20.2-multiloader' into 1.20-multiloader	2024-12-02 21:06:22 +03:00
lionarius	ebdbee480f	Merge branch '1.20.3-multiloader' into 1.20.2-multiloader	2024-12-02 21:06:14 +03:00
lionarius	49b2a2fc1e	Merge branch '1.20.5-multiloader' into 1.20.3-multiloader	2024-12-02 21:06:08 +03:00
lionarius	592a6ac253	Merge branch '1.21-multiloader' into 1.20.5-multiloader	2024-12-02 21:06:01 +03:00
lionarius	e43ebdd11e	Merge branch '1.20.2-multiloader' into 1.20-multiloader	2024-12-02 17:57:26 +03:00
lionarius	33e5889657	Merge branch '1.20.3-multiloader' into 1.20.2-multiloader	2024-12-02 17:54:39 +03:00
lionarius	348471b30d	actually fix reobf on forge	2024-12-02 17:54:13 +03:00
lionarius	3b88b5f5d5	Merge branch '1.20.2-multiloader' into 1.20-multiloader	2024-12-02 12:21:47 +03:00
lionarius	18ec6e87f8	Merge branch '1.20.3-multiloader' into 1.20.2-multiloader	2024-12-02 12:11:16 +03:00
lionarius	e52baaef4c	Merge branch '1.20.5-multiloader' into 1.20.3-multiloader	2024-12-02 03:39:12 +03:00
lionarius	03dad0f8dc	Merge branch '1.21-multiloader' into 1.20.5-multiloader	2024-12-02 03:35:57 +03:00
lionarius	4a3da6fd6c	backport to 1.20-1.20.1	2024-12-01 23:34:34 +03:00
lionarius	f6523c0d99	Merge branch '1.20.2-multiloader' into 1.20-multiloader # Conflicts: # settings.gradle	2024-11-30 04:01:50 +03:00
lionarius	4c803cb369	Merge branch '1.20.3-multiloader' into 1.20.2-multiloader	2024-11-30 03:53:15 +03:00
lionarius	120a8b7e3d	fix reobf on forge	2024-11-30 03:49:04 +03:00
lionarius	cab2ab3239	fix fabric handshake send	2024-11-30 03:48:43 +03:00
lionarius	95cc551df7	drop neoforge support	2024-11-30 03:48:01 +03:00
lionarius	3b71911ba0	backport to 1.20.3	2024-11-30 03:03:31 +03:00
lionarius	7d1d4966b0	Merge branch '1.20.5-multiloader' into 1.20.3-multiloader # Conflicts: # gradle.properties	2024-11-29 11:54:10 +03:00
lionarius	dda9a9632a	backport to 1.20.5	2024-11-29 11:53:03 +03:00
lionarius	b0d95a4d4f	Merge branch '1.21-multiloader' into 1.20.5-multiloader # Conflicts: # gradle.properties	2024-11-29 10:43:50 +03:00
lionarius	f1ee3b4542	Merge branch 'refs/heads/1.20.2-multiloader' into 1.20-multiloader	2024-09-25 20:49:23 +03:00
lionarius	14f51e9224	Merge branch 'refs/heads/1.20.3-multiloader' into 1.20.2-multiloader	2024-09-25 20:49:17 +03:00
lionarius	026ceb2337	Merge branch 'refs/heads/1.20.5-multiloader' into 1.20.3-multiloader	2024-09-25 20:49:09 +03:00
lionarius	c650aa1386	Merge branch 'refs/heads/1.21-multiloader' into 1.20.5-multiloader	2024-09-25 20:48:47 +03:00
lionarius	bcb8cd930d	backport to 1.20.0	2024-09-24 08:36:12 +03:00
lionarius	8b26d81ae4	Merge branch 'refs/heads/1.20.2-multiloader' into 1.20-multiloader # Conflicts: # common/src/main/java/net/lionarius/skinrestorer/mixin/ServerLoginPacketListenerImplMixin.java	2024-09-24 08:20:23 +03:00
lionarius	1d1aa94644	Merge branch 'refs/heads/1.20.3-multiloader' into 1.20.2-multiloader	2024-09-24 08:16:47 +03:00
lionarius	3203435453	backport to 1.20.3	2024-09-24 08:12:20 +03:00
lionarius	8a9802f763	Merge branch 'refs/heads/1.20.5-multiloader' into 1.20.3-multiloader	2024-09-24 08:10:50 +03:00
lionarius	7add58da44	Merge branch 'refs/heads/1.21-multiloader' into 1.20.5-multiloader # Conflicts: # gradle.properties	2024-09-24 08:08:10 +03:00
lionarius	9c9907d0ba	Merge branch 'refs/heads/1.21-multiloader' into 1.20-multiloader # Conflicts: # common/src/main/java/net/lionarius/skinrestorer/mixin/ServerLoginPacketListenerImplMixin.java	2024-08-20 13:53:39 +03:00
lionarius	5ddde27915	Merge branch 'refs/heads/1.21-multiloader' into 1.20.2-multiloader	2024-08-20 13:51:47 +03:00
lionarius	08b734bb27	Merge branch 'refs/heads/1.21-multiloader' into 1.20.3-multiloader	2024-08-20 13:51:30 +03:00
lionarius	49290171e2	Merge branch 'refs/heads/1.21-multiloader' into 1.20.5-multiloader	2024-08-20 13:50:52 +03:00
lionarius	bfd8843b44	backport to 1.20-1.20.1	2024-08-04 02:36:35 +03:00
lionarius	cfdfee11b3	backport to 1.20.2	2024-08-04 02:36:33 +03:00
lionarius	5c31b5f881	backport to 1.20.3-1.20.4	2024-08-04 02:36:30 +03:00
lionarius	b72d0c1e85	backport to 1.20.5-1.20.6	2024-08-04 02:36:26 +03:00