diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/VersionConstants.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/VersionConstants.java index bac0b9665..8255fd808 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/VersionConstants.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/VersionConstants.java @@ -76,8 +76,8 @@ public class VersionConstants implements IVersionConstants return "1.21.5"; #elif MC_VER == MC_1_21_6 return "1.21.6"; - #elif MC_VER == MC_1_21_7 - return "1.21.7"; + #elif MC_VER == MC_1_21_8 + return "1.21.8"; #else ERROR MC version constant missing #endif diff --git a/gradle.properties b/gradle.properties index 3a2d46452..16cead96f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -51,7 +51,7 @@ versionStr= # This defines what MC version Intellij will use for the preprocessor # and what version is used automatically by build and run commands -mcVer=1.21.7 +mcVer=1.21.8 # Defines the maximum amount of memory Minecraft is allowed when run in a development environment #minecraftMemoryJavaArg="-Xmx4G" diff --git a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeMain.java b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeMain.java index 024f94c61..ce96ada26 100644 --- a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeMain.java +++ b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeMain.java @@ -50,7 +50,7 @@ import java.util.function.Consumer; #if MC_VER < MC_1_20_6 import net.neoforged.neoforge.client.ConfigScreenHandler; -#elif MC_VER < MC_1_21_7 +#elif MC_VER < MC_1_21_8 import net.neoforged.neoforge.client.gui.IConfigScreenFactory; import org.jetbrains.annotations.NotNull; #else @@ -76,7 +76,7 @@ public class NeoforgeMain extends AbstractModInitializer this.onInitializeClient(); eventBus.addListener(this::registerNetworkingClientServer); - #if MC_VER < MC_1_21_7 + #if MC_VER < MC_1_21_8 #else eventBus.addListener(this::registerClientPayloadEvent); #endif @@ -107,7 +107,7 @@ public class NeoforgeMain extends AbstractModInitializer public void registerNetworkingServer(RegisterPayloadHandlersEvent event) { NeoforgePluginPacketSender.setPacketHandler(event, ServerApi.INSTANCE::pluginMessageReceived); } - #if MC_VER < MC_1_21_7 + #if MC_VER < MC_1_21_8 #else public void registerClientPayloadEvent(RegisterClientPayloadHandlersEvent event) { NeoforgePluginPacketSender.registerClientPacketHandler(event); } diff --git a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgePluginPacketSender.java b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgePluginPacketSender.java index 686ca8a8d..391d798c2 100644 --- a/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgePluginPacketSender.java +++ b/neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgePluginPacketSender.java @@ -14,7 +14,7 @@ import java.util.Optional; import java.util.function.BiConsumer; import java.util.function.Consumer; -#if MC_VER < MC_1_21_7 +#if MC_VER < MC_1_21_8 #else import net.neoforged.neoforge.client.network.ClientPacketDistributor; import net.neoforged.neoforge.client.network.event.RegisterClientPayloadHandlersEvent; @@ -48,7 +48,7 @@ public class NeoforgePluginPacketSender extends AbstractPluginPacketSender }); } - #if MC_VER < MC_1_21_7 + #if MC_VER < MC_1_21_8 #else public static void registerClientPacketHandler(RegisterClientPayloadHandlersEvent event) { @@ -67,7 +67,7 @@ public class NeoforgePluginPacketSender extends AbstractPluginPacketSender @Override public void sendToServer(AbstractNetworkMessage message) { - #if MC_VER < MC_1_21_7 + #if MC_VER < MC_1_21_8 PacketDistributor.sendToServer(new CommonPacketPayload(message)); #else ClientPacketDistributor.sendToServer(new CommonPacketPayload(message)); diff --git a/versionProperties/1.21.7.properties b/versionProperties/1.21.8.properties similarity index 91% rename from versionProperties/1.21.7.properties rename to versionProperties/1.21.8.properties index 7fd0207e1..a334e85c1 100644 --- a/versionProperties/1.21.7.properties +++ b/versionProperties/1.21.8.properties @@ -1,8 +1,8 @@ # 1.21.7 version java_version=21 -minecraft_version=1.21.7 +minecraft_version=1.21.8 parchment_version=1.21:2024.07.28 -compatible_minecraft_versions=["1.21.7"] +compatible_minecraft_versions=["1.21.8"] accessWidenerVersion=1_21_4 builds_for=fabric,neoforge # forge is broken due to gradle/build script issues @@ -12,7 +12,7 @@ netty_version=4.1.97.Final # Fabric loader fabric_loader_version=0.16.13 -fabric_api_version=0.128.2+1.21.7 +fabric_api_version=0.129.0+1.21.8 modmenu_version=15.0.0-beta.3 starlight_version_fabric= phosphor_version_fabric= @@ -41,7 +41,7 @@ fabric_api_version=0.128.2+1.21.7 # (Neo)Forge loader forge_version= -neoforge_version=21.7.23-beta +neoforge_version=21.8.2-beta # around 6.19 neo changed how their render API works, failing to meet this causes the game to crash neoforge_version_range=[*,)