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 7b3985d..ec59754 100644 --- a/common/src/main/java/net/lionarius/skinrestorer/util/PlayerUtils.java +++ b/common/src/main/java/net/lionarius/skinrestorer/util/PlayerUtils.java @@ -91,7 +91,7 @@ public final class PlayerUtils { public static void sendActivePlayerEffects(ServerPlayer player) { for (var effect : player.getActiveEffects()) { - player.connection.send(new ClientboundUpdateMobEffectPacket(player.getId(), effect, false)); + player.connection.send(new ClientboundUpdateMobEffectPacket(player.getId(), effect)); } } diff --git a/forge/build.gradle b/forge/build.gradle index 7fb5ceb..2b2e2e7 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -20,8 +20,6 @@ minecraft { copyIdeResources = true //Calls processResources when in dev - reobf = false // Forge 1.20.6+ uses official mappings at runtime, so we shouldn't reobf from official to SRG - // Automatically enable forge AccessTransformers if the file exists // This location is hardcoded in Forge and can not be changed. // https://github.com/MinecraftForge/MinecraftForge/blob/be1698bb1554f9c8fa2f58e32b9ab70bc4385e60/fmlloader/src/main/java/net/minecraftforge/fml/loading/moddiscovery/ModFile.java#L123 diff --git a/gradle.properties b/gradle.properties index 1ab35b3..92fecc9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,12 +3,12 @@ # Project group=net.lionarius.skinrestorer -java_version=21 +java_version=17 # Common -minecraft_version=1.20.5 -minecraft_version_list=1.20.5,1.20.6 -minecraft_version_range=[1.20.5,1.20.6] +minecraft_version=1.20.3 +minecraft_version_list=1.20.3,1.20.4 +minecraft_version_range=[1.20.3,1.20.4] mod_id=skinrestorer mod_name=SkinRestorer mod_version=2.0.2 @@ -21,21 +21,21 @@ credits= description=A server-side mod for managing skins. # ParchmentMC mappings, see https://parchmentmc.org/docs/getting-started#choose-a-version for new versions -parchment_minecraft=1.20.6 -parchment_version=2024.06.16 +parchment_minecraft=1.20.3 +parchment_version=2023.12.31 # Fabric, see https://fabricmc.net/develop/ for new versions fabric_loader_version=0.15.0 # Forge, see https://files.minecraftforge.net/net/minecraftforge/forge/ for new versions -forge_version=50.0.0 -forge_loader_version_range=[50,) +forge_version=49.0.1 +forge_loader_version_range=[49,) # Forge sometimes skips minor minecraft versions (like 1.20.5) -forge_minecraft_version=1.20.6 +forge_minecraft_version=1.20.3 # NeoForge, see https://projects.neoforged.net/neoforged/neoforge for new versions -neoforge_version=20.5.0-beta -neoforge_loader_version_range=[3,) +neoforge_version=20.3.1-beta +neoforge_loader_version_range=[1,) # Publishing curseforge_id=443823 diff --git a/neoforge/src/main/java/net/lionarius/skinrestorer/neoforge/SkinRestorerNeoForge.java b/neoforge/src/main/java/net/lionarius/skinrestorer/neoforge/SkinRestorerNeoForge.java index 320bed9..aae33c0 100644 --- a/neoforge/src/main/java/net/lionarius/skinrestorer/neoforge/SkinRestorerNeoForge.java +++ b/neoforge/src/main/java/net/lionarius/skinrestorer/neoforge/SkinRestorerNeoForge.java @@ -3,7 +3,6 @@ package net.lionarius.skinrestorer.neoforge; import net.lionarius.skinrestorer.SkinRestorer; import net.lionarius.skinrestorer.command.SkinCommand; import net.neoforged.bus.api.SubscribeEvent; -import net.neoforged.fml.common.EventBusSubscriber; import net.neoforged.fml.common.Mod; import net.neoforged.fml.loading.FMLPaths; import net.neoforged.neoforge.common.NeoForge; @@ -11,7 +10,7 @@ import net.neoforged.neoforge.event.RegisterCommandsEvent; import net.neoforged.neoforge.event.server.ServerStartedEvent; @Mod(SkinRestorer.MOD_ID) -@EventBusSubscriber(modid = SkinRestorer.MOD_ID) +@Mod.EventBusSubscriber(modid = SkinRestorer.MOD_ID) public final class SkinRestorerNeoForge { public SkinRestorerNeoForge() { diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/mods.toml similarity index 94% rename from neoforge/src/main/resources/META-INF/neoforge.mods.toml rename to neoforge/src/main/resources/META-INF/mods.toml index 83adf48..d3ab250 100644 --- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/neoforge/src/main/resources/META-INF/mods.toml @@ -17,14 +17,14 @@ config = "${mod_id}.mixins.json" [[dependencies.${mod_id}]] modId = "neoforge" -type = "required" +mandatory = true versionRange = "[${neoforge_version},)" ordering = "NONE" side = "BOTH" [[dependencies.${mod_id}]] modId = "minecraft" -type = "required" +mandatory = true versionRange = "${minecraft_version_range}" ordering = "NONE" side = "BOTH"