From 07b4887f609c35f6d56b10cbe93dccb0bdc1bc4e Mon Sep 17 00:00:00 2001 From: Lionarius Date: Wed, 18 Jun 2025 19:05:09 +0300 Subject: [PATCH] update to minecraft 1.21.6 --- .../java/net/lionarius/skinrestorer/util/PlayerUtils.java | 2 +- fabric/gradle.properties | 2 +- forge/build.gradle | 4 ++++ forge/gradle.properties | 6 +++--- .../net/lionarius/skinrestorer/forge/SkinRestorerForge.java | 2 +- .../forge/compat/skinshuffle/SkinShuffleCompatibility.java | 4 ++-- .../compat/skinshuffle/SkinShuffleGameEventHandler.java | 2 -- gradle.properties | 6 +++--- neoforge/gradle.properties | 2 +- 9 files changed, 16 insertions(+), 14 deletions(-) diff --git a/common/src/main/java/net/lionarius/skinrestorer/util/PlayerUtils.java b/common/src/main/java/net/lionarius/skinrestorer/util/PlayerUtils.java index 8cc2510..d5cbe8f 100644 --- a/common/src/main/java/net/lionarius/skinrestorer/util/PlayerUtils.java +++ b/common/src/main/java/net/lionarius/skinrestorer/util/PlayerUtils.java @@ -39,7 +39,7 @@ public final class PlayerUtils { } public static void refreshPlayer(ServerPlayer player) { - ServerLevel serverLevel = player.serverLevel(); + ServerLevel serverLevel = player.level(); PlayerList playerList = serverLevel.getServer().getPlayerList(); ChunkMap chunkMap = serverLevel.getChunkSource().chunkMap; diff --git a/fabric/gradle.properties b/fabric/gradle.properties index df40a49..9ac3893 100644 --- a/fabric/gradle.properties +++ b/fabric/gradle.properties @@ -1,5 +1,5 @@ # Fabric, see https://fabricmc.net/develop/ for new versions fabric_loader_version=0.15.0 -fabric_api_version=0.119.5+1.21.5 +fabric_api_version=0.127.0+1.21.6 optional_dependencies=fabric-api diff --git a/forge/build.gradle b/forge/build.gradle index 143574b..31ef1cb 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -43,6 +43,7 @@ minecraft { workingDirectory rootProject.file('run/client') ideaModule "${rootProject.name}.${project.name}.main" taskName 'Client' + property 'eventbus.api.strictRuntimeChecks', 'true' mods { modClientRun { source sourceSets.main @@ -54,6 +55,7 @@ minecraft { workingDirectory rootProject.file('run/server') ideaModule "${rootProject.name}.${project.name}.main" taskName 'Server' + property 'eventbus.api.strictRuntimeChecks', 'true' mods { modServerRun { source sourceSets.main @@ -66,6 +68,8 @@ 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' } } diff --git a/forge/gradle.properties b/forge/gradle.properties index e4950ce..1d49e44 100644 --- 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=55.0.0 -forge_loader_version_range=[55,) +forge_version=56.0.0 +forge_loader_version_range=[56,) # Forge sometimes skips minor minecraft versions (like 1.20.5) -forge_minecraft_version=1.21.5 +forge_minecraft_version=1.21.6 diff --git a/forge/src/main/java/net/lionarius/skinrestorer/forge/SkinRestorerForge.java b/forge/src/main/java/net/lionarius/skinrestorer/forge/SkinRestorerForge.java index ef34aa0..da046fb 100644 --- a/forge/src/main/java/net/lionarius/skinrestorer/forge/SkinRestorerForge.java +++ b/forge/src/main/java/net/lionarius/skinrestorer/forge/SkinRestorerForge.java @@ -4,7 +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.eventbus.api.SubscribeEvent; +import net.minecraftforge.eventbus.api.listener.SubscribeEvent; import net.minecraftforge.fml.common.Mod; @Mod(SkinRestorer.MOD_ID) diff --git 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 index a433843..2c467ad 100644 --- 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.common.MinecraftForge; +import net.minecraftforge.event.entity.player.PlayerEvent; public final class SkinShuffleCompatibility { private SkinShuffleCompatibility() {} public static void initialize() { - MinecraftForge.EVENT_BUS.register(SkinShuffleGameEventHandler.class); + PlayerEvent.PlayerLoggedInEvent.BUS.addListener(SkinShuffleGameEventHandler::onPlayerLoggedIn); SkinShufflePacketHandler.initialize(); } diff --git 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 index 70daee9..a58c9a2 100644 --- 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,13 +3,11 @@ 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()); } diff --git a/gradle.properties b/gradle.properties index aa10f69..45e9910 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,9 +3,9 @@ group=net.lionarius java_version=21 # Common -minecraft_version=1.21.5 -minecraft_version_list=1.21.5 -minecraft_version_range=[1.21.5, 1.22) +minecraft_version=1.21.6 +minecraft_version_list=1.21.6 +minecraft_version_range=[1.21.6, 1.22) mod_id=skinrestorer mod_name=SkinRestorer mod_version=2.3.3 diff --git a/neoforge/gradle.properties b/neoforge/gradle.properties index 8e1bf88..4fe7510 100644 --- 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.5.0-beta +neoforge_version=21.6.0-beta neoforge_loader_version_range=[4,)