Merge branch '1.21.6-multiloader' into 1.21.5-multiloader

# Conflicts:
#	gradle.properties

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

@@ -38,7 +38,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;
         

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.127.0+1.21.6
+fabric_api_version=0.119.5+1.21.5
 
 optional_dependencies=fabric-api
 additional_modloaders=quilt

forge/build.gradle

@@ -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' } }
 

forge/gradle.properties

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

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

@@ -5,7 +5,7 @@ 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)

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

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

gradle.properties

@@ -3,9 +3,9 @@ group=net.lionarius
 java_version=21
 
 # Common
-minecraft_version=1.21.6
-minecraft_version_list=1.21.6,1.21.7,1.21.8
-minecraft_version_range=[1.21.6, 1.21.8]
+minecraft_version=1.21.5
+minecraft_version_list=1.21.5
+minecraft_version_range=[1.21.5, 1.21.6)
 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.21.6
-parchment_version=2025.06.29
+parchment_minecraft=1.21.5
+parchment_version=2025.06.15
 
 # Publishing
 curseforge_id=443823

neoforge/gradle.properties

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