Merge branch '1.20-multiloader' into 1.19.4-multiloader

# Conflicts:
#	fabric/gradle.properties

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

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

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

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

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

@@ -1,23 +0,0 @@
-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 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/SkinShuffleSkinRefreshPayload.java

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

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

@@ -1,35 +0,0 @@
-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 {
-    
-    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);
-    }
-    
-    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

@@ -1,43 +0,0 @@
-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 {
-    
-    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());
-        if (textureProperty.hasSignature()) {
-            assert textureProperty.signature() != null;
-            
-            buf.writeUtf(textureProperty.signature());
-        }
-    }
-
-    public static SkinShuffleSkinRefreshV2Payload decode(FriendlyByteBuf buf) {
-        if (buf.readBoolean()) {
-            return new SkinShuffleSkinRefreshV2Payload(new Property(buf.readUtf(), buf.readUtf(), buf.readUtf()));
-        }
-        return new SkinShuffleSkinRefreshV2Payload(new Property(buf.readUtf(), buf.readUtf(), null));
-    }
-    
-    @Override
-    public 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

@@ -21,20 +21,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,8 +3,6 @@ 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;
@@ -12,13 +10,11 @@ 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 {
@@ -26,41 +22,37 @@ public abstract class SkullBlockEntityMixin {
     @Shadow
     private static GameProfileCache profileCache;
     
-    @Inject(method = "fetchGameProfile", at = @At("HEAD"),
+    @Inject(method = "updateGameprofile", at = @At("HEAD"),
             cancellable = true)
-    private static void fetchProfileByName(String name, CallbackInfoReturnable<CompletableFuture<Optional<GameProfile>>> cir) {
+    private static void fetchProfileByName(GameProfile profile, Consumer<GameProfile> profileConsumer, CallbackInfo ci) {
         if (profileCache == null)
             return;
         
-        if (name == null)
+        if (profile == null || profile.isComplete() || profile.getName() == null)
             return;
         
         var profileOpt = Optional.<GameProfile>empty();
-        var gameProfileInfo = ((GameProfileCacheAccessor) 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()));
+            profileConsumer.accept(profile);
+            ci.cancel();
         }
     }
 }

common/src/main/java/net/lionarius/skinrestorer/platform/services/CompatibilityHelper.java

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

common/src/main/java/net/lionarius/skinrestorer/skin/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

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

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

@@ -13,6 +13,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.*;
 
@@ -39,7 +40,7 @@ public final class PlayerUtils {
     }
     
     public static void refreshPlayer(ServerPlayer player) {
-        ServerLevel serverLevel = player.serverLevel();
+        ServerLevel serverLevel = player.getLevel();
         PlayerList playerList = serverLevel.getServer().getPlayerList();
         ChunkMap chunkMap = serverLevel.getChunkSource().chunkMap;
         
@@ -67,7 +68,19 @@ public final class PlayerUtils {
         }
         
         if (!player.isDeadOrDying()) {
-            player.connection.send(new ClientboundRespawnPacket(player.createCommonSpawnInfo(serverLevel), ClientboundRespawnPacket.KEEP_ALL_DATA));
+            player.connection.send(
+                    new ClientboundRespawnPacket(
+                            player.getLevel().dimensionTypeId(),
+                            player.getLevel().dimension(),
+                            BiomeManager.obfuscateSeed(player.getLevel().getSeed()),
+                            player.gameMode.getGameModeForPlayer(),
+                            player.gameMode.getPreviousGameModeForPlayer(),
+                            player.getLevel().isDebug(),
+                            player.getLevel().isFlat(),
+                            (byte) 3,
+                            player.getLastDeathLocation()
+                    )
+            );
             player.connection.teleport(player.getX(), player.getY(), player.getZ(), player.getYRot(), player.getXRot());
             player.connection.send(new ClientboundSetEntityMotionPacket(player));
             var vehicle = player.getVehicle();
@@ -129,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/build.gradle

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

fabric/gradle.properties

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

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

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

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

@@ -1,46 +0,0 @@
-package net.lionarius.skinrestorer.fabric.compat.skinshuffle;
-
-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.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 {
-    
-    private SkinShuffleCompatibility() {}
-    
-    public static void initialize() {
-        if (!SkinRestorerFabric.FABRIC_API_LOADED) {
-            SkinRestorer.LOGGER.warn("fabric-api is not loaded, SkinShuffle compatibility will not be available");
-            return;
-        }
-        
-        ServerPlayConnectionEvents.JOIN.register((handler, sender, server) -> net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleCompatibility.onPlayerJoin(handler.getPlayer()));
-        
-        ServerPlayNetworking.registerGlobalReceiver(SkinShuffleSkinRefreshV1Payload.PACKET_ID, SkinShuffleCompatibility::handleSkinRefreshV1Packet);
-        
-        ServerPlayNetworking.registerGlobalReceiver(SkinShuffleSkinRefreshV2Payload.PACKET_ID, SkinShuffleCompatibility::handleSkinRefreshV2Packet);
-    }
-    
-    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);
-    }
-}

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

@@ -1,14 +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;
-import net.minecraft.server.level.ServerPlayer;
 
 public final class FabricCompatibilityHelper implements CompatibilityHelper {
-    @Override
-    public void skinShuffle_sendHandshake(ServerPlayer player) {
-        ServerPlayNetworking.send(player, SkinShuffleHandshakePayload.PACKET_ID, PacketByteBufs.empty());
-    }
 }

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

@@ -29,8 +29,5 @@
         "fabricloader": ">=${fabric_loader_version}",
         "minecraft": ">=${minecraft_version}",
         "java": ">=${java_version}"
-    },
-    "suggests": {
-        "fabric-api": "*"
     }
 }

forge/gradle.properties

@@ -1,5 +1,5 @@
 # Forge, see https://files.minecraftforge.net/net/minecraftforge/forge/ for new versions
-forge_version=48.0.0
-forge_loader_version_range=[48,)
+forge_version=45.0.0
+forge_loader_version_range=[45,)
 # Forge sometimes skips minor minecraft versions (like 1.20.5)
-forge_minecraft_version=1.20.2
+forge_minecraft_version=1.19.4

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

@@ -1,7 +1,6 @@
 package net.lionarius.skinrestorer.forge;
 
 import net.lionarius.skinrestorer.SkinRestorer;
-import net.lionarius.skinrestorer.compat.skinshuffle.SkinShuffleCompatibility;
 import net.minecraftforge.event.RegisterCommandsEvent;
 import net.minecraftforge.event.server.ServerStartedEvent;
 import net.minecraftforge.event.server.ServerStoppedEvent;
@@ -14,9 +13,6 @@ public final class SkinRestorerForge {
     
     public SkinRestorerForge() {
         SkinRestorer.onInitialize();
-        
-        if (SkinShuffleCompatibility.shouldApply())
-            net.lionarius.skinrestorer.forge.compat.skinshuffle.SkinShuffleCompatibility.initialize();
     }
     
     @SubscribeEvent

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

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

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

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

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

@@ -1,60 +0,0 @@
-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.minecraft.network.Connection;
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraftforge.event.network.CustomPayloadEvent;
-import net.minecraftforge.network.ChannelBuilder;
-import net.minecraftforge.network.EventNetworkChannel;
-
-public class SkinShufflePacketHandler {
-
-    private static final EventNetworkChannel HANDSHAKE_INSTANCE = ChannelBuilder
-            .named(SkinShuffleHandshakePayload.PACKET_ID)
-            .optional()
-            .eventNetworkChannel();
-    
-    private static final EventNetworkChannel SKIN_REFRESH_V1_INSTANCE = ChannelBuilder
-            .named(SkinShuffleSkinRefreshV1Payload.PACKET_ID)
-            .optional()
-            .eventNetworkChannel()
-            .addListener(SkinShufflePacketHandler::skinRefreshV1Listener);
-    
-    private static final EventNetworkChannel SKIN_REFRESH_V2_INSTANCE = ChannelBuilder
-            .named(SkinShuffleSkinRefreshV2Payload.PACKET_ID)
-            .optional()
-            .eventNetworkChannel()
-            .addListener(SkinShufflePacketHandler::skinRefreshV2Listener);
-
-    protected static void initialize() {
-        // NO-OP
-    }
-    
-    private SkinShufflePacketHandler() {
-    }
-
-    public static void sendHandshake(Connection connection) {
-        HANDSHAKE_INSTANCE.send(new FriendlyByteBuf(Unpooled.buffer(0, 0)), connection);
-    }
-    
-    private static void skinRefreshV1Listener(CustomPayloadEvent event) {
-        var payload = SkinShuffleSkinRefreshV1Payload.decode(event.getPayload());
-        handleSkinRefreshPacket(payload, event.getSource());
-    }
-
-    private static void skinRefreshV2Listener(CustomPayloadEvent event) {
-        var payload = SkinShuffleSkinRefreshV2Payload.decode(event.getPayload());
-        handleSkinRefreshPacket(payload, event.getSource());
-    }
-
-    private static void handleSkinRefreshPacket(SkinShuffleSkinRefreshPayload payload, CustomPayloadEvent.Context context) {
-        var sender = context.getSender();
-        
-        if (!context.isServerSide() || sender == null)
-            return;
-        
-        SkinShuffleCompatibility.handleSkinRefresh(sender.getServer(), sender, payload);
-    }
-}

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

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

gradle.properties

@@ -3,9 +3,9 @@ group=net.lionarius
 java_version=17
 
 # Common
-minecraft_version=1.20.2
-minecraft_version_list=1.20.2
-minecraft_version_range=1.20.2
+minecraft_version=1.19.4
+minecraft_version_list=1.19.4
+minecraft_version_range=[1.19.4,1.20)
 mod_id=skinrestorer
 mod_name=SkinRestorer
 mod_version=2.4.3
@@ -21,8 +21,8 @@ description=A server-side mod for managing skins.
 mineskin_client_version=3.0.6-SNAPSHOT
 
 # ParchmentMC mappings, see https://parchmentmc.org/docs/getting-started#choose-a-version for new versions
-parchment_minecraft=1.20.2
-parchment_version=2023.12.10
+parchment_minecraft=1.19.4
+parchment_version=2023.06.26
 
 # Publishing
 curseforge_id=443823

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