From 1c51796409f23441cf1ca4d9a523fe23069813c4 Mon Sep 17 00:00:00 2001 From: Lionarius Date: Wed, 18 Jun 2025 19:03:33 +0300 Subject: [PATCH 1/8] add mojmap layer version to parchment on forge --- forge/build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge/build.gradle b/forge/build.gradle index 3d033c9..143574b 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -24,7 +24,7 @@ tasks.named('jarJar') { jar.finalizedBy('jarJar') minecraft { - mappings channel: 'parchment', version: "${parchment_version}-${parchment_minecraft}" + mappings channel: 'parchment', version: "${parchment_minecraft}-${parchment_version}-${minecraft_version}" copyIdeResources = true //Calls processResources when in dev From 30d21c9424af3209f6f831a8498d20d0321b0b61 Mon Sep 17 00:00:00 2001 From: Lionarius Date: Wed, 18 Jun 2025 19:04:28 +0300 Subject: [PATCH 2/8] update parchment --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index a27443d..aa10f69 100644 --- a/gradle.properties +++ b/gradle.properties @@ -22,7 +22,7 @@ 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.21.5 -parchment_version=2025.04.19 +parchment_version=2025.06.15 # Publishing curseforge_id=443823 From 07b4887f609c35f6d56b10cbe93dccb0bdc1bc4e Mon Sep 17 00:00:00 2001 From: Lionarius Date: Wed, 18 Jun 2025 19:05:09 +0300 Subject: [PATCH 3/8] 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,) From ad6d64e8d40dd59f62d123a75c2e6b43b9f5a891 Mon Sep 17 00:00:00 2001 From: Lionarius Date: Thu, 19 Jun 2025 05:54:56 +0300 Subject: [PATCH 4/8] use server side --- fabric/src/main/resources/fabric.mod.json | 2 +- forge/src/main/resources/META-INF/mods.toml | 4 ++-- neoforge/src/main/resources/META-INF/neoforge.mods.toml | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 85c219d..44706e4 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -14,7 +14,7 @@ }, "icon": "assets/${mod_id}/icon.png", "license": "${license}", - "environment": "*", + "environment": "server", "entrypoints": { "main": [ "net.lionarius.skinrestorer.fabric.SkinRestorerFabric" diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index fce198f..d12fa37 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -17,11 +17,11 @@ modId = "forge" mandatory = true versionRange = "[${forge_version},)" ordering = "NONE" -side = "BOTH" +side = "SERVER" [[dependencies.${mod_id}]] modId = "minecraft" mandatory = true versionRange = "${minecraft_version_range}" ordering = "NONE" -side = "BOTH" +side = "SERVER" diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml index 83adf48..a1f92ca 100644 --- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -20,11 +20,11 @@ modId = "neoforge" type = "required" versionRange = "[${neoforge_version},)" ordering = "NONE" -side = "BOTH" +side = "SERVER" [[dependencies.${mod_id}]] modId = "minecraft" type = "required" versionRange = "${minecraft_version_range}" ordering = "NONE" -side = "BOTH" +side = "SERVER" From 2325b3b35c2cf423340489ff40a112a63de699c7 Mon Sep 17 00:00:00 2001 From: Lionarius Date: Thu, 19 Jun 2025 06:00:49 +0300 Subject: [PATCH 5/8] bump version --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 45e9910..cf56c69 100644 --- a/gradle.properties +++ b/gradle.properties @@ -8,7 +8,7 @@ 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 +mod_version=2.3.4 mod_author=Lionarius mod_homepage=https://modrinth.com/mod/skinrestorer mod_sources=https://github.com/Suiranoil/SkinRestorer From df58fe8c89e98f267c0326260d30300e1de80ec9 Mon Sep 17 00:00:00 2001 From: Lionarius Date: Thu, 19 Jun 2025 06:01:20 +0300 Subject: [PATCH 6/8] update CHANGELOG --- CHANGELOG.md | 4 ++++ CHANGELOG_LATEST.md | 6 ++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5a6a5a7..5021b05 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ 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.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)) diff --git a/CHANGELOG_LATEST.md b/CHANGELOG_LATEST.md index 349167c..3dcb1fc 100644 --- a/CHANGELOG_LATEST.md +++ b/CHANGELOG_LATEST.md @@ -1,4 +1,2 @@ -### Fixed -- Fixed forge mixin crash (closes [#54](https://github.com/Suiranoil/SkinRestorer/issues/53)) -### Removed -- Removed minecraft 1.19 support +### Added +- Added support for minecraft 1.21.6 From 6f5b291008eaf9c2f6d7d89fff4a733b29ccf072 Mon Sep 17 00:00:00 2001 From: Lionarius Date: Thu, 19 Jun 2025 06:04:24 +0300 Subject: [PATCH 7/8] backport to 1.21.5 --- .../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, 14 insertions(+), 16 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 d5cbe8f..8cc2510 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.level(); + ServerLevel serverLevel = player.serverLevel(); PlayerList playerList = serverLevel.getServer().getPlayerList(); ChunkMap chunkMap = serverLevel.getChunkSource().chunkMap; diff --git a/fabric/gradle.properties b/fabric/gradle.properties index 9ac3893..df40a49 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.127.0+1.21.6 +fabric_api_version=0.119.5+1.21.5 optional_dependencies=fabric-api diff --git a/forge/build.gradle b/forge/build.gradle index 31ef1cb..143574b 100644 --- a/forge/build.gradle +++ b/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' } } diff --git a/forge/gradle.properties b/forge/gradle.properties index 1d49e44..e4950ce 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=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 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 da046fb..ef34aa0 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.listener.SubscribeEvent; +import net.minecraftforge.eventbus.api.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 2c467ad..a433843 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.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(); } 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 a58c9a2..70daee9 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,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()); } diff --git a/gradle.properties b/gradle.properties index cf56c69..8a5a98a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,9 +3,9 @@ group=net.lionarius java_version=21 # Common -minecraft_version=1.21.6 -minecraft_version_list=1.21.6 -minecraft_version_range=[1.21.6, 1.22) +minecraft_version=1.21.5 +minecraft_version_list=1.21.5 +minecraft_version_range=[1.21.5, 1.22) mod_id=skinrestorer mod_name=SkinRestorer mod_version=2.3.4 diff --git a/neoforge/gradle.properties b/neoforge/gradle.properties index 4fe7510..8e1bf88 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.6.0-beta +neoforge_version=21.5.0-beta neoforge_loader_version_range=[4,) From 21f00231af30737b729ad3d3b54d1782d5a9ad7d Mon Sep 17 00:00:00 2001 From: Lionarius Date: Thu, 19 Jun 2025 06:05:56 +0300 Subject: [PATCH 8/8] fix minecraft version range --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 8a5a98a..20cb638 100644 --- a/gradle.properties +++ b/gradle.properties @@ -5,7 +5,7 @@ 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_range=[1.21.5, 1.21.6) mod_id=skinrestorer mod_name=SkinRestorer mod_version=2.3.4