Bump protocol version

Fixes some Iris shader compile issues

.gitlab-ci.yml

@@ -35,7 +35,7 @@ build:
   stage: build
   parallel:
     matrix:
-      - MC_VER: ["1.16.5", "1.17.1", "1.18.2", "1.19.2", "1.19.4", "1.20.1", "1.20.2", "1.20.4", "1.20.6", "1.21.1", "1.21.3", "1.21.4", "1.21.5", "1.21.6", "1.21.7"]
+      - MC_VER: ["1.16.5", "1.17.1", "1.18.2", "1.19.2", "1.19.4", "1.20.1", "1.20.2", "1.20.4", "1.20.6", "1.21.1", "1.21.3", "1.21.4", "1.21.5", "1.21.6", "1.21.8"]
   script:
     # this both runs the unit tests and assembles the code
     - ./gradlew clean -PmcVer="${MC_VER}" -PinfoGitCommit="${CI_COMMIT_SHA}" -PinfoGitBranch="${CI_COMMIT_BRANCH}" -PinfoBuildSource="GitLab CI (${CI_PIPELINE_ID})" --gradle-user-home cache/;

common/src/main/java/com/seibel/distanthorizons/common/AbstractModInitializer.java

@@ -66,7 +66,7 @@ public abstract class AbstractModInitializer
 	{
 		DependencySetup.createClientBindings();
 		
-		LOGGER.info("Initializing " + ModInfo.READABLE_NAME + " client.");
+		LOGGER.info("Initializing " + ModInfo.READABLE_NAME + " client, firing DhApiBeforeDhInitEvent...");
 		ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeDhInitEvent.class, null);
 		
 		this.startup();
@@ -90,7 +90,7 @@ public abstract class AbstractModInitializer
 	{
 		DependencySetup.createServerBindings();
 		
-		LOGGER.info("Initializing " + ModInfo.READABLE_NAME + " server.");
+		LOGGER.info("Initializing " + ModInfo.READABLE_NAME + " server, firing DhApiBeforeDhInitEvent event...");
 		ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeDhInitEvent.class, null);
 		
 		this.startup();
@@ -181,9 +181,9 @@ public abstract class AbstractModInitializer
 	
 	private void postInit()
 	{
-		LOGGER.info("Post-Initializing Mod");
+		LOGGER.info("Running Delayed setup...");
 		this.runDelayedSetup();
-		LOGGER.info("Mod Post-Initialized");
+		LOGGER.info("Delayed setup complete, firing DhApiAfterDhInitEvent event...");
 		
 		// should be fired after all delayed setup so singletons and config can be accessed
 		ApiEventInjector.INSTANCE.fireAllEvents(DhApiAfterDhInitEvent.class, null);

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
+		#elif MC_VER == MC_1_21_8
-			return "1.21.7";
+			return "1.21.8";
 		#else
 			ERROR MC version constant missing
 		#endif

common/src/main/java/com/seibel/distanthorizons/common/wrappers/level/KeyedClientLevelManager.java

@@ -36,9 +36,9 @@ public class KeyedClientLevelManager implements IKeyedClientLevelManager
 	public IServerKeyedClientLevel getServerKeyedLevel() { return this.serverKeyedLevel; }
 	
 	@Override
-	public IServerKeyedClientLevel setServerKeyedLevel(IClientLevelWrapper clientLevel, String levelKey)
+	public IServerKeyedClientLevel setServerKeyedLevel(IClientLevelWrapper clientLevel, String serverKey, String levelKey)
 	{
-		IServerKeyedClientLevel keyedLevel = new ServerKeyedClientLevel((ClientLevel) clientLevel.getWrappedMcObject(), levelKey);
+		IServerKeyedClientLevel keyedLevel = new ServerKeyedClientLevel((ClientLevel) clientLevel.getWrappedMcObject(), serverKey, levelKey);
 		this.serverKeyedLevel = keyedLevel;
 		this.enabled = true;
 		return keyedLevel;

common/src/main/java/com/seibel/distanthorizons/common/wrappers/level/ServerKeyedClientLevel.java

@@ -2,24 +2,28 @@ package com.seibel.distanthorizons.common.wrappers.level;
 
 import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
 import com.seibel.distanthorizons.core.level.IServerKeyedClientLevel;
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
-import com.seibel.distanthorizons.coreapi.util.StringUtil;
 import net.minecraft.client.multiplayer.ClientLevel;
 
 public class ServerKeyedClientLevel extends ClientLevelWrapper implements IServerKeyedClientLevel
 {
+	/** Returns the folder name the server wants the client to use. */
+	private final String serverKey;
+	
 	/** A unique identifier (generally the level's name) for differentiating multiverse levels */
 	private final String serverLevelKey;
 	
 	
 	
-	public ServerKeyedClientLevel(ClientLevel level, String serverLevelKey)
+	public ServerKeyedClientLevel(ClientLevel level, String serverKey, String serverLevelKey)
 	{
 		super(level);
+		this.serverKey = serverKey;
 		this.serverLevelKey = serverLevelKey;
 	}
 	
 	
+	@Override
+	public String getServerKey() { return this.serverKey; }
 	
 	@Override
 	public String getServerLevelKey() { return this.serverLevelKey; }

fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricMain.java

@@ -127,7 +127,8 @@ public class FabricMain extends AbstractModInitializer implements ClientModIniti
 	}
 	
 	@Override
-	protected void subscribeClientStartedEvent(Runnable eventHandler) { ClientLifecycleEvents.CLIENT_STARTED.register((mc) -> eventHandler.run()); }
+	protected void subscribeClientStartedEvent(Runnable eventHandler) 
+	{ ClientLifecycleEvents.CLIENT_STARTED.register((mc) -> eventHandler.run()); }
 	
 	@Override
 	protected void subscribeServerStartingEvent(Consumer<MinecraftServer> eventHandler)

forge/src/main/java/com/seibel/distanthorizons/forge/ForgeMain.java

@@ -118,14 +118,14 @@ public class ForgeMain extends AbstractModInitializer
 	
 	@Override
 	protected void subscribeRegisterCommandsEvent(Consumer<CommandDispatcher<CommandSourceStack>> eventHandler)
-	{
+	{ MinecraftForge.EVENT_BUS.addListener((RegisterCommandsEvent e) -> { eventHandler.accept(e.getDispatcher()); }); }
-		MinecraftForge.EVENT_BUS.addListener((RegisterCommandsEvent e) -> { eventHandler.accept(e.getDispatcher()); });
-	}
 	
 	@Override
 	protected void subscribeClientStartedEvent(Runnable eventHandler)
 	{
-		// FIXME What event is this?
+		// Just run the event handler, since there are no proper ClientLifecycleEvent for the client 
+		// to signify readiness other than FmlClientSetupEvent
+		eventHandler.run();
 	}
 	
 	@Override

gradle.properties

@@ -5,7 +5,7 @@ org.gradle.caching=true
 
 # Mod Info
 mod_name=DistantHorizons
-mod_version=2.3.3-b
+mod_version=2.3.5-b-dev
 api_version=4.0.0
 maven_group=com.seibel.distanthorizons
 mod_readable_name=Distant Horizons
@@ -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"

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); }
@@ -155,7 +155,9 @@ public class NeoforgeMain extends AbstractModInitializer
 	@Override
 	protected void subscribeClientStartedEvent(Runnable eventHandler)
 	{
-		// FIXME What event is this?
+		// Just run the event handler, since there are no proper ClientLifecycleEvent for the client 
+		// to signify readiness other than FmlClientSetupEvent
+		eventHandler.run(); 
 	}
 	
 	@Override

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

versionProperties/1.16.5.properties

@@ -25,8 +25,7 @@ fabric_api_version=0.42.0+1.16
     canvas_version=
 
     # iris - needs 1.7.4+ to support the DH API
-    # chunky - isn't recommended since it can cause holes in the LODs
+    fabric_incompatibility_list={ "iris": "*" }
-    fabric_incompatibility_list={ "iris": "*", "chunky": "*" }
     fabric_recommend_list={}
 
     # Fabric mod run

versionProperties/1.17.1.properties

@@ -25,8 +25,7 @@ fabric_api_version=0.46.1+1.17
     canvas_version=
 
     # iris - needs 1.7.4+ to support the DH API
-    # chunky - isn't recommended since it can cause holes in the LODs
+    fabric_incompatibility_list={ "iris": "*" }
-    fabric_incompatibility_list={ "iris": "*", "chunky": "*" }
     fabric_recommend_list={}
 
     # Fabric mod run

versionProperties/1.18.2.properties

@@ -26,8 +26,7 @@ fabric_api_version=0.76.0+1.18.2
     canvas_version=mc118:1.0.2616
 
     # iris - needs 1.7.4+ to support the DH API
-    # chunky - isn't recommended since it can cause holes in the LODs
+    fabric_incompatibility_list={ "iris": "*" }
-    fabric_incompatibility_list={ "iris": "*", "chunky": "*" }
     fabric_recommend_list={}
 
     # Fabric mod run

versionProperties/1.19.2.properties

@@ -25,8 +25,7 @@ fabric_api_version=0.76.1+1.19.2
     canvas_version=mc119-1.0.2480
 
     # iris - needs 1.7.4+ to support the DH API
-    # chunky - isn't recommended since it can cause holes in the LODs
+    fabric_incompatibility_list={ "iris": "*" }
-    fabric_incompatibility_list={ "iris": "*", "chunky": "*" }
     fabric_recommend_list={}
 
     # Fabric mod run

versionProperties/1.19.4.properties

@@ -24,8 +24,7 @@ fabric_api_version=0.87.1+1.19.4
     canvas_version=
 
     # iris - needs 1.7.4+ to support the DH API
-    # chunky - isn't recommended since it can cause holes in the LODs
+    fabric_incompatibility_list={ "iris": "*" }
-    fabric_incompatibility_list={ "iris": "*", "chunky": "*" }
     fabric_recommend_list={}
 
     # Fabric mod run

versionProperties/1.20.1.properties

@@ -24,8 +24,7 @@ fabric_api_version=0.90.4+1.20.1
     canvas_version=
 
     # iris - needs 1.7.4+ to support the DH API
-    # chunky - isn't recommended since it can cause holes in the LODs
+    fabric_incompatibility_list={ "iris": "<=1.7.4" }
-    fabric_incompatibility_list={ "iris": "<=1.7.4", "chunky": "*" }
     fabric_recommend_list={}
     
     # Fabric mod run

versionProperties/1.20.2.properties

@@ -24,8 +24,7 @@ fabric_api_version=0.90.4+1.20.2
     canvas_version=
 
     # iris - needs 1.7.4+ to support the DH API
-    # chunky - isn't recommended since it can cause holes in the LODs
+    fabric_incompatibility_list={ "iris": "<=1.7.4" }
-    fabric_incompatibility_list={ "iris": "<=1.7.4", "chunky": "*" }
     fabric_recommend_list={}
     
     # Fabric mod run

versionProperties/1.20.4.properties

@@ -25,8 +25,7 @@ fabric_api_version=0.91.2+1.20.4
     canvas_version=
 
     # iris - needs 1.7.4+ to support the DH API
-    # chunky - isn't recommended since it can cause holes in the LODs
+    fabric_incompatibility_list={ "iris": "<=1.7.4" }
-    fabric_incompatibility_list={ "iris": "<=1.7.4", "chunky": "*" }
     fabric_recommend_list={}
     
     # Fabric mod run
@@ -44,7 +43,7 @@ fabric_api_version=0.91.2+1.20.4
 
 # (Neo)Forge loader
 forge_version=49.1.13
-neoforge_version=20.4.233
+neoforge_version=20.4.246
     neoforge_version_range=[*,)
 
     # (Neo)Forge mod versions

versionProperties/1.20.6.properties

@@ -25,8 +25,7 @@ fabric_api_version=0.97.8+1.20.6
     canvas_version=
 
     # iris - needs 1.7.4+ to support the DH API
-    # chunky - isn't recommended since it can cause holes in the LODs
+    fabric_incompatibility_list={ "iris": "<=1.7.4" }
-    fabric_incompatibility_list={ "iris": "<=1.7.4", "chunky": "*" }
     fabric_recommend_list={}
     
     # Fabric mod run
@@ -44,7 +43,7 @@ fabric_api_version=0.97.8+1.20.6
 
 # (Neo)Forge loader
 forge_version=50.0.19
-neoforge_version=20.6.70-beta
+neoforge_version=20.6.136
     neoforge_version_range=[*,)
 
     # (Neo)Forge mod versions

versionProperties/1.21.1.properties

@@ -25,8 +25,7 @@ fabric_api_version=0.115.0+1.21.1
     canvas_version=
 
     # iris - needs 1.7.4+ to support the DH API
-    # chunky - isn't recommended since it can cause holes in the LODs
+    fabric_incompatibility_list={ "iris": "<=1.7.4" }
-    fabric_incompatibility_list={ "iris": "<=1.7.4", "chunky": "*" }
     fabric_recommend_list={}
     
     # Fabric mod run
@@ -44,7 +43,7 @@ fabric_api_version=0.115.0+1.21.1
 
 # (Neo)Forge loader
 forge_version=
-neoforge_version=21.1.92
+neoforge_version=21.1.192
     neoforge_version_range=[*,)
     
     # (Neo)Forge mod versions

versionProperties/1.21.3.properties

@@ -25,8 +25,7 @@ fabric_api_version=0.110.0+1.21.3
     canvas_version=
     
     # fabric-api 0.110.0 fixed a bug in MC 1.21.3 with the rendering API DH relied on
-    # chunky - isn't recommended since it can cause holes in the LODs
+    fabric_incompatibility_list={ "fabric-api": "<0.110.0" }
-    fabric_incompatibility_list={ "fabric-api": "<0.110.0", "chunky": "*" }
     fabric_recommend_list={}
     
     # Fabric mod run
@@ -44,7 +43,7 @@ fabric_api_version=0.110.0+1.21.3
 
 # (Neo)Forge loader
 forge_version=
-neoforge_version=21.3.11-beta
+neoforge_version=21.3.86
     neoforge_version_range=[*,)
 
     # (Neo)Forge mod versions

versionProperties/1.21.4.properties

@@ -24,8 +24,7 @@ fabric_api_version=0.110.5+1.21.4
     immersive_portals_version=
     canvas_version=
 
-    # chunky - isn't recommended since it can cause holes in the LODs
+    fabric_incompatibility_list={ }
-    fabric_incompatibility_list={ "chunky": "*" }
     fabric_recommend_list={}
     
     # Fabric mod run
@@ -43,8 +42,9 @@ fabric_api_version=0.110.5+1.21.4
 
 # (Neo)Forge loader
 forge_version=
-neoforge_version=21.4.3-beta
+neoforge_version=21.4.147
-    neoforge_version_range=[*,)
+    # version range may not be necessary, but having compiled DH for an older version caused issues with shaders
+    neoforge_version_range=[21.4.147,)
 
     # (Neo)Forge mod versions
     starlight_version_forge=

versionProperties/1.21.5.properties

@@ -24,8 +24,7 @@ fabric_api_version=0.119.5+1.21.5
     canvas_version=
     
     # Iris - some versions of 1.8.11 nightly builds may not work, but the ones after 2025-03-30 should
-    # chunky - isn't recommended since it can cause holes in the LODs
+    fabric_incompatibility_list={ "iris": "<=1.8.10" }
-    fabric_incompatibility_list={ "iris": "<=1.8.10", "chunky": "*" }
     fabric_recommend_list={}
     
     # Fabric mod run
@@ -43,7 +42,7 @@ fabric_api_version=0.119.5+1.21.5
 
 # (Neo)Forge loader
 forge_version=
-neoforge_version=21.5.0-beta
+neoforge_version=21.5.87
     neoforge_version_range=[*,)
 
     # (Neo)Forge mod versions

versionProperties/1.21.6.properties

@@ -23,8 +23,7 @@ fabric_api_version=0.127.0+1.21.6
     immersive_portals_version=
     canvas_version=
 
-    # chunky - isn't recommended since it can cause holes in the LODs
+    fabric_incompatibility_list={ }
-    fabric_incompatibility_list={ "chunky": "*" }
     fabric_recommend_list={}
     
     # Fabric mod run
@@ -42,7 +41,7 @@ fabric_api_version=0.127.0+1.21.6
 
 # (Neo)Forge loader
 forge_version=
-neoforge_version=21.6.19-beta
+neoforge_version=21.6.20-beta
     # around 6.19 neo changed how their render API works, failing to meet this causes the game to crash
     neoforge_version_range=[21.6.19-beta,)
     

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=
@@ -23,8 +23,7 @@ fabric_api_version=0.128.2+1.21.7
     immersive_portals_version=
     canvas_version=
 
-    # chunky - isn't recommended since it can cause holes in the LODs
+    fabric_incompatibility_list={ }
-    fabric_incompatibility_list={ "chunky": "*" }
     fabric_recommend_list={}
     
     # Fabric mod run
@@ -42,7 +41,7 @@ fabric_api_version=0.128.2+1.21.7
 
 # (Neo)Forge loader
 forge_version=
-neoforge_version=21.7.3-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=[*,)