Merge branch '1.20.2-multiloader' into 1.20-multiloader

# Conflicts:
#	common/src/main/java/net/lionarius/skinrestorer/mixin/SkullBlockEntityMixin.java

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

@@ -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())

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

@@ -1,23 +1,10 @@
 package net.lionarius.skinrestorer.compat.skinshuffle;
 
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.resources.ResourceLocation;
-import org.jetbrains.annotations.NotNull;
 
-public record SkinShuffleHandshakePayload() implements CustomPacketPayload {
+public record SkinShuffleHandshakePayload() {
 
     public static final SkinShuffleHandshakePayload INSTANCE = new SkinShuffleHandshakePayload();
 
     public static final ResourceLocation PACKET_ID = SkinShuffleCompatibility.resourceLocation("handshake");
-
-    @Override
-    public void write(@NotNull FriendlyByteBuf buf) {
-        // NO-OP
-    }
-    
-    @Override
-    public @NotNull ResourceLocation id() {
-        return PACKET_ID;
-    }
 }

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

@@ -2,34 +2,22 @@ package net.lionarius.skinrestorer.compat.skinshuffle;
 
 import com.mojang.authlib.properties.Property;
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.resources.ResourceLocation;
-import org.jetbrains.annotations.NotNull;
 
 public record SkinShuffleSkinRefreshV1Payload(
-        Property textureProperty) implements CustomPacketPayload, SkinShuffleSkinRefreshPayload {
+        Property textureProperty) implements SkinShuffleSkinRefreshPayload {
     
     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 void write(@NotNull FriendlyByteBuf buf) {
-        encode(buf, this);
-    }
-    
-    @Override
-    public @NotNull ResourceLocation id() {
-        return PACKET_ID;
-    }
 }

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

@@ -2,12 +2,10 @@ package net.lionarius.skinrestorer.compat.skinshuffle;
 
 import com.mojang.authlib.properties.Property;
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
 import net.minecraft.resources.ResourceLocation;
-import org.jetbrains.annotations.NotNull;
 
 public record SkinShuffleSkinRefreshV2Payload(
-        Property textureProperty) implements CustomPacketPayload, SkinShuffleSkinRefreshPayload {
+        Property textureProperty) implements SkinShuffleSkinRefreshPayload {
     
     public static final ResourceLocation PACKET_ID = SkinShuffleCompatibility.resourceLocation("skin_refresh");
 
@@ -15,12 +13,12 @@ public record SkinShuffleSkinRefreshV2Payload(
         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());
         }
     }
 
@@ -30,14 +28,4 @@ public record SkinShuffleSkinRefreshV2Payload(
         }
         return new SkinShuffleSkinRefreshV2Payload(new Property(buf.readUtf(), buf.readUtf(), null));
     }
-    
-    @Override
-    public void write(@NotNull FriendlyByteBuf buf) {
-        encode(buf, this);
-    }
-    
-    @Override
-    public @NotNull ResourceLocation id() {
-        return PACKET_ID;
-    }
 }

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

@@ -4,7 +4,6 @@ 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;
@@ -39,7 +38,7 @@ public abstract class PlayerListMixin {
     }
     
     @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 delay = SkinRestorer.getConfig().skinApplyDelayOnJoin();
         
         if (delay <= 0) {

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

@@ -22,20 +22,24 @@ import java.util.concurrent.CompletableFuture;
 public abstract class ServerLoginPacketListenerImplMixin {
     
     @Shadow @Nullable
-    private GameProfile authenticatedProfile;
+    private GameProfile gameProfile;
+    
+    @Shadow
+    protected abstract GameProfile createFakeProfile(GameProfile original);
     
     @Unique
     private CompletableFuture<Void> skinrestorer$pendingSkin;
     
-    @Inject(method = "verifyLoginAndFinishConnectionSetup", at = @At(value = "INVOKE",
-                                                                     target = "Lnet/minecraft/server/players/PlayerList;canPlayerLogin(Ljava/net/SocketAddress;Lcom/mojang/authlib/GameProfile;)Lnet/minecraft/network/chat/Component;"),
-            cancellable = true)
+    @Inject(method = "handleAcceptedLogin", at = @At(value = "HEAD"), cancellable = true)
     public void waitForSkin(CallbackInfo ci) {
         if (skinrestorer$pendingSkin == null) {
             skinrestorer$pendingSkin = CompletableFuture.supplyAsync(() -> {
-                final var profile = authenticatedProfile;
-                
+                var profile = gameProfile;
                 assert profile != null;
+                
+                if (!profile.isComplete())
+                    profile = createFakeProfile(profile);
+                
                 var originalSkin = PlayerUtils.getPlayerSkin(profile);
                 
                 if (SkinRestorer.getSkinStorage().hasSavedSkin(profile.getId())) {

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

@@ -3,56 +3,56 @@ package net.lionarius.skinrestorer.mixin;
 import com.mojang.authlib.GameProfile;
 import net.lionarius.skinrestorer.SkinRestorer;
 import net.lionarius.skinrestorer.util.PlayerUtils;
-import net.minecraft.Util;
-import net.minecraft.server.Services;
+import net.minecraft.server.players.GameProfileCache;
 import net.minecraft.world.level.block.entity.SkullBlockEntity;
 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.CallbackInfoReturnable;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import java.util.Locale;
 import java.util.Optional;
-import java.util.UUID;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.BooleanSupplier;
+import java.util.function.Consumer;
 
 @Mixin(SkullBlockEntity.class)
 public abstract class SkullBlockEntityMixin {
     
-    @Inject(method = "loadProfile", at = @At("HEAD"),
+    @Shadow
+    private static GameProfileCache profileCache;
+    
+    @Inject(method = "updateGameprofile", at = @At("HEAD"),
             cancellable = true)
-    private static void fetchProfileByName(String name, Services services, BooleanSupplier hasCache, CallbackInfoReturnable<CompletableFuture<Optional<GameProfile>>> cir) {
-        if (name == null)
+    private static void fetchProfileByName(GameProfile profile, Consumer<GameProfile> profileConsumer, CallbackInfo ci) {
+        if (profileCache == null)
+            return;
+        
+        if (profile == null || profile.isComplete() || profile.getName() == null)
             return;
         
         var profileOpt = Optional.<GameProfile>empty();
-        var gameProfileInfo = ((GameProfileCacheAccessor) services.profileCache()).getProfilesByName().get(name.toLowerCase(Locale.ROOT));
+        var gameProfileInfo = ((GameProfileCacheAccessor) profileCache).getProfilesByName().get(profile.getName().toLowerCase(Locale.ROOT));
         
         if (gameProfileInfo != null)
             profileOpt = Optional.of(gameProfileInfo.getProfile());
         
-        skinrestorer$replaceSkin(profileOpt, cir);
+        skinrestorer$replaceSkin(profileOpt, profileConsumer, ci);
     }
     
     @Unique
-    private static void skinrestorer$replaceSkin(Optional<GameProfile> profileOpt, CallbackInfoReturnable<CompletableFuture<Optional<GameProfile>>> cir) {
-        if (SkinRestorer.getMinecraftServer() == null)
-            return;
-        
+    private static void skinrestorer$replaceSkin(Optional<GameProfile> profileOpt, Consumer<GameProfile> profileConsumer, CallbackInfo ci) {
         if (profileOpt.isEmpty())
             return;
         
         var profile = PlayerUtils.cloneGameProfile(profileOpt.get());
         
         if (SkinRestorer.getSkinStorage().hasSavedSkin(profile.getId())) {
-            cir.setReturnValue(CompletableFuture.supplyAsync(() -> {
-                var skin = SkinRestorer.getSkinStorage().getSkin(profile.getId(), false);
-                PlayerUtils.applyRestoredSkin(profile, skin.value());
-                
-                return Optional.of(profile);
-            }, Util.backgroundExecutor()));
+            var skin = SkinRestorer.getSkinStorage().getSkin(profile.getId(), false);
+            PlayerUtils.applyRestoredSkin(profile, skin.value());
+            
+            profileConsumer.accept(profile);
+            ci.cancel();
         }
     }
 }

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

@@ -102,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).toProfile();
+        return PlayerUtils.toProfile(JsonUtils.fromJson(response.body(), MinecraftProfilePropertiesResponse.class));
     }
 }

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

@@ -8,7 +8,6 @@ import com.mojang.authlib.*;
 import com.mojang.authlib.properties.Property;
 import com.mojang.authlib.yggdrasil.YggdrasilEnvironment;
 import com.mojang.authlib.yggdrasil.response.MinecraftProfilePropertiesResponse;
-import com.mojang.util.UndashedUuid;
 import net.lionarius.skinrestorer.SkinRestorer;
 import net.lionarius.skinrestorer.exception.TransparentException;
 import net.lionarius.skinrestorer.skin.SkinVariant;
@@ -41,13 +40,13 @@ 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 GameProfileCache((names, callback) -> {
+        PROFILE_CACHE = new GameProfileCache((names, agent, callback) -> {
             for (var name : names) {
                 try {
                     var profile = MojangSkinProvider.getProfile(name);
@@ -138,7 +137,7 @@ public final class MojangSkinProvider implements SkinProvider {
         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();
@@ -149,6 +148,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).toProfile();
+        return PlayerUtils.toProfile(JsonUtils.fromJson(response.body(), MinecraftProfilePropertiesResponse.class));
     }
 }

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

@@ -50,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");
             

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

@@ -12,6 +12,7 @@ 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.*;
 
@@ -66,12 +67,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();
@@ -133,8 +142,8 @@ public final class PlayerUtils {
     }
     
     public static GameProfile toProfile(MinecraftProfilePropertiesResponse response) {
-        final GameProfile profile = new GameProfile(response.id(), response.name());
-        profile.getProperties().putAll(response.properties());
+        final GameProfile profile = new GameProfile(response.getId(), response.getName());
+        profile.getProperties().putAll(response.getProperties());
         return profile;
     }
 }

fabric/gradle.properties

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

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

@@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 public abstract class MinecraftServerMixin {
     
     @Inject(method = "runServer",
-            at = @At(value = "INVOKE", target = "Lnet/minecraft/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);
     }

forge/gradle.properties

@@ -1,5 +1,5 @@
 # Forge, see https://files.minecraftforge.net/net/minecraftforge/forge/ for new versions
-forge_version=49.0.1
-forge_loader_version_range=[49,)
+forge_version=46.0.1
+forge_loader_version_range=[46,)
 # Forge sometimes skips minor minecraft versions (like 1.20.5)
-forge_minecraft_version=1.20.3
+forge_minecraft_version=1.20

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

@@ -1,58 +1,66 @@
 package net.lionarius.skinrestorer.forge.compat.skinshuffle;
 
 import io.netty.buffer.Unpooled;
-import net.lionarius.skinrestorer.compat.skinshuffle.*;
 import net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleCompatibility;
+import net.lionarius.skinrestorer.compat.skinshuffle.*;
 import net.minecraft.network.Connection;
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraftforge.event.network.CustomPayloadEvent;
-import net.minecraftforge.network.ChannelBuilder;
-import net.minecraftforge.network.EventNetworkChannel;
+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 EventNetworkChannel HANDSHAKE_INSTANCE = ChannelBuilder
+    private static final EventNetworkChannel HANDSHAKE_INSTANCE = NetworkRegistry.ChannelBuilder
             .named(SkinShuffleHandshakePayload.PACKET_ID)
-            .optional()
+            .clientAcceptedVersions(NetworkRegistry.acceptMissingOr(""))
+            .serverAcceptedVersions(NetworkRegistry.acceptMissingOr(""))
+            .networkProtocolVersion(() -> "")
             .eventNetworkChannel();
     
-    private static final EventNetworkChannel SKIN_REFRESH_V1_INSTANCE = ChannelBuilder
+    private static final EventNetworkChannel SKIN_REFRESH_V1_INSTANCE = NetworkRegistry.ChannelBuilder
             .named(SkinShuffleSkinRefreshV1Payload.PACKET_ID)
-            .optional()
-            .eventNetworkChannel()
-            .addListener(SkinShufflePacketHandler::skinRefreshV1Listener);
+            .clientAcceptedVersions(NetworkRegistry.acceptMissingOr(""))
+            .serverAcceptedVersions(NetworkRegistry.acceptMissingOr(""))
+            .networkProtocolVersion(() -> "")
+            .eventNetworkChannel();
     
-    private static final EventNetworkChannel SKIN_REFRESH_V2_INSTANCE = ChannelBuilder
+    private static final EventNetworkChannel SKIN_REFRESH_V2_INSTANCE = NetworkRegistry.ChannelBuilder
             .named(SkinShuffleSkinRefreshV2Payload.PACKET_ID)
-            .optional()
-            .eventNetworkChannel()
-            .addListener(SkinShufflePacketHandler::skinRefreshV2Listener);
-
+            .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);
     }
     
     private SkinShufflePacketHandler() {
     }
 
     public static void sendHandshake(Connection connection) {
-        HANDSHAKE_INSTANCE.send(new FriendlyByteBuf(Unpooled.buffer(0, 0)), connection);
+        connection.send(new ClientboundCustomPayloadPacket(SkinShuffleHandshakePayload.PACKET_ID, new FriendlyByteBuf(Unpooled.buffer(0, 0))));
     }
     
-    private static void skinRefreshV1Listener(CustomPayloadEvent event) {
+    private static void skinRefreshV1Listener(NetworkEvent.ClientCustomPayloadEvent event) {
         var payload = SkinShuffleSkinRefreshV1Payload.decode(event.getPayload());
-        handleSkinRefreshPacket(payload, event.getSource());
+        handleSkinRefreshPacket(payload, event.getSource().get());
+        event.getSource().get().setPacketHandled(true);
     }
-
-    private static void skinRefreshV2Listener(CustomPayloadEvent event) {
+    
+    private static void skinRefreshV2Listener(NetworkEvent.ClientCustomPayloadEvent event) {
         var payload = SkinShuffleSkinRefreshV2Payload.decode(event.getPayload());
-        handleSkinRefreshPacket(payload, event.getSource());
+        handleSkinRefreshPacket(payload, event.getSource().get());
+        event.getSource().get().setPacketHandled(true);
     }
-
-    private static void handleSkinRefreshPacket(SkinShuffleSkinRefreshPayload payload, CustomPayloadEvent.Context context) {
+    
+    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(sender.getServer(), sender, payload);

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

gradle.properties

@@ -3,9 +3,9 @@ group=net.lionarius
 java_version=17
 
 # Common
-minecraft_version=1.20.3
-minecraft_version_list=1.20.3,1.20.4
-minecraft_version_range=[1.20.3,1.20.4]
+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
@@ -21,8 +21,8 @@ description=A server-side mod for managing skins.
 mineskin_client_version=3.2.1-SNAPSHOT
 
 # ParchmentMC mappings, see https://parchmentmc.org/docs/getting-started#choose-a-version for new versions
-parchment_minecraft=1.20.3
-parchment_version=2023.12.31
+parchment_minecraft=1.20.1
+parchment_version=2023.09.03
 
 # Publishing
 curseforge_id=443823

neoforge/gradle.properties

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

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')