Update Forgix

.editorconfig

@@ -5,6 +5,7 @@ root = true
 
 [*]
 charset = utf-8
+end_of_line = crlf
 indent_size = 4
 indent_style = space
 insert_final_newline = false
@@ -687,7 +688,7 @@ ij_markdown_wrap_text_inside_blockquotes = true
 ij_toml_keep_indents_on_empty_lines = false
 
 [{*.yaml,*.yml}]
-indent_size = 4
+indent_size = 2
 ij_yaml_align_values_properties = do_not_align
 ij_yaml_autoinsert_sequence_marker = true
 ij_yaml_block_mapping_on_new_line = false

.gitlab-ci.yml

@@ -6,6 +6,7 @@ image: eclipse-temurin:21
 # TODO: Make stages depend on what is in versionProperties
 stages:
   - build
+  - multiversion
   - api
   - pages
 
@@ -38,23 +39,46 @@ build:
       - 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"]
   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/;
     - ./gradlew build -PmcVer="${MC_VER}" -PinfoGitCommit="${CI_COMMIT_SHA}" -PinfoGitBranch="${CI_COMMIT_BRANCH}" -PinfoBuildSource="GitLab CI (${CI_PIPELINE_ID})" --gradle-user-home cache/;
     - ./gradlew mergeJars -PmcVer="${MC_VER}" -PinfoGitCommit="${CI_COMMIT_SHA}" -PinfoGitBranch="${CI_COMMIT_BRANCH}" -PinfoBuildSource="GitLab CI (${CI_PIPELINE_ID})" --gradle-user-home cache/;
-    - cp ./fabric/build/libs/* ./forge/build/libs/* ./neoforge/build/libs/* ./build/merged/* . || true
+    - cp ./build/forgix/* . || true
+    - mkdir -p ./builds
+    - cp ./fabric/build/libs/* ./forge/build/libs/* ./neoforge/build/libs/* ./builds || true
+    # When the archive is created, the merged jar will be the main jar and a subfolder named "builds" will contain the other jars
   artifacts:
     name: "NightlyBuild_${MC_VER}-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
     paths:
       - ./*.jar
+      - ./builds/*.jar
     exclude:
-      - ./*-all.jar
-      - ./*-dev.jar
-      - ./*-sources.jar
+      - ./builds/*-all.jar
+      - ./builds/*-dev.jar
+      - ./builds/*-sources.jar
     expire_in: 14 days
     when: always
   extends: .build_java
 
 
+multiversion:
+  stage: multiversion
+  needs: [build]
+  script:
+    # Create a semicolon-separated list of jar paths
+    - MC_VER_PATHS=$(find . -maxdepth 1 -name "*.jar" -type f | tr '\n' ';')
+    # Run the mergeVersions task
+    - ./gradlew mergeVersions -PmergeVersions="${MC_VER_PATHS}" -PinfoGitCommit="${CI_COMMIT_SHA}" -PinfoGitBranch="${CI_COMMIT_BRANCH}" -PinfoBuildSource="GitLab CI (${CI_PIPELINE_ID})" --gradle-user-home cache/;
+    # Clean up existing jars and make sure only the multiversion jar remains which will be uploaded
+    - rm -f ./*.jar
+    - cp ./build/forgix/multiversion/* .
+  artifacts:
+    name: "NightlyBuild_Multiversion-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
+    paths:
+      - ./*.jar
+    expire_in: 30 days
+    when: always
+  extends: .build_java
+
+
 api:
   stage: api
   needs: []

build.gradle

@@ -13,7 +13,7 @@ plugins {
     id "com.github.johnrengelman.shadow" version '8.1.1' apply false
 
     // Plugin to create merged jars
-    id "io.github.pacifistmc.forgix" version "1.3.4"
+    id "io.github.pacifistmc.forgix" version "2.0.0-SNAPSHOT.2"
 
     // Manifold preprocessor
     id "systems.manifold.manifold-gradle-plugin" version "0.0.2-alpha"
@@ -22,6 +22,14 @@ plugins {
     id "dev.architectury.loom" version "1.10-SNAPSHOT" apply false
 }
 
+// Sets up Forgix for multiversion merging
+forgix {
+    if (project.hasProperty('mergeVersions')) { // This is set using -PmergeVersions by the GitLab CI
+        multiversion {
+            inputJars = project.files(project.property('mergeVersions').toString().split(';'))
+        }
+    }
+}
 
 /**
  * Creates the list of preprocessors to use.

common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java

@@ -47,7 +47,6 @@ import net.minecraft.core.registries.Registries;
 
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.biome.Biome;
-
 #if MC_VER >= MC_1_18_2
 import net.minecraft.world.level.biome.Biomes;
 #endif
@@ -131,6 +130,14 @@ public class BiomeWrapper implements IBiomeWrapper
 		//LOGGER.trace("Created BiomeWrapper ["+this.serialString+"] for ["+biome+"]");
 	}
 	
+	/** should only be used to create {@link BiomeWrapper#EMPTY_WRAPPER} */
+	private BiomeWrapper()
+	{
+		this.biome = null;
+		this.serialString = EMPTY_BIOME_STRING;
+		this.hashCode = Objects.hash(this.serialString);
+	}
+	
 	
 	
 	//=========//
@@ -279,16 +286,64 @@ public class BiomeWrapper implements IBiomeWrapper
 		BiomeWrapper foundWrapper = EMPTY_WRAPPER;
 		try
 		{
+			// parse the resource location
+			int separatorIndex = resourceLocationString.indexOf(":");
+			if (separatorIndex == -1)
+			{
+				throw new IOException("Unable to parse resource location string: [" + resourceLocationString + "].");
+			}
+			
+			ResourceLocation resourceLocation;
+			try
+			{
+				#if MC_VER < MC_1_21_1
+				resourceLocation = new ResourceLocation(resourceLocationString.substring(0, separatorIndex), resourceLocationString.substring(separatorIndex + 1));
+				#else
+				resourceLocation = ResourceLocation.fromNamespaceAndPath(resourceLocationString.substring(0, separatorIndex), resourceLocationString.substring(separatorIndex + 1));
+				#endif
+			}
+			catch (Exception e)
+			{
+				throw new IOException("No Resource Location found for the string: [" + resourceLocationString + "] Error: [" + e.getMessage() + "].");
+			}
+			
+			
 			try
 			{
 				Level level = (Level) levelWrapper.getWrappedMcObject();
 				net.minecraft.core.RegistryAccess registryAccess = level.registryAccess();
 				
-				BiomeDeserializeResult deserializeResult = deserializeBiome(resourceLocationString, registryAccess);
+				boolean success;
+				#if MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1
+				Biome biome = registryAccess.registryOrThrow(Registry.BIOME_REGISTRY).get(resourceLocation);
+				success = (biome != null);
+				#elif MC_VER == MC_1_18_2 || MC_VER == MC_1_19_2
+				Biome unwrappedBiome = registryAccess.registryOrThrow(Registry.BIOME_REGISTRY).get(resourceLocation);
+				success = (unwrappedBiome != null);
+				Holder<Biome> biome = new Holder.Direct<>(unwrappedBiome);
+				#elif MC_VER < MC_1_21_3
+				Biome unwrappedBiome = registryAccess.registryOrThrow(Registries.BIOME).get(resourceLocation);
+				success = (unwrappedBiome != null);
+				Holder<Biome> biome = new Holder.Direct<>(unwrappedBiome);
+				#else
+				Holder<Biome> biome;
+				Optional<Holder.Reference<Biome>> optionalBiomeHolder = registryAccess.lookupOrThrow(Registries.BIOME).get(resourceLocation);
+				if (optionalBiomeHolder.isPresent())
+				{
+					Biome unwrappedBiome = optionalBiomeHolder.get().value();
+					success = (unwrappedBiome != null);
+					biome = new Holder.Direct<>(unwrappedBiome);
+				}
+				else
+				{
+					success = false;
+					biome = null;
+				}
+				#endif
 				
 				
 				
-				if (!deserializeResult.success)
+				if (!success)
 				{
 					if (!brokenResourceLocationStrings.contains(resourceLocationString))
 					{
@@ -299,7 +354,7 @@ public class BiomeWrapper implements IBiomeWrapper
 				}
 				
 				
-				foundWrapper = (BiomeWrapper) getBiomeWrapper(deserializeResult.biome, levelWrapper);
+				foundWrapper = (BiomeWrapper) getBiomeWrapper(biome, levelWrapper);
 				return foundWrapper;
 			}
 			catch (Exception e)
@@ -313,82 +368,4 @@ public class BiomeWrapper implements IBiomeWrapper
 		}
 	}
 	
-	public static BiomeDeserializeResult deserializeBiome(String resourceLocationString, net.minecraft.core.RegistryAccess registryAccess) throws IOException
-	{
-		// parse the resource location
-		int separatorIndex = resourceLocationString.indexOf(":");
-		if (separatorIndex == -1)
-		{
-			throw new IOException("Unable to parse resource location string: [" + resourceLocationString + "].");
-		}
-		
-		ResourceLocation resourceLocation;
-		try
-		{
-			#if MC_VER < MC_1_21_1
-			resourceLocation = new ResourceLocation(resourceLocationString.substring(0, separatorIndex), resourceLocationString.substring(separatorIndex + 1));
-			#else
-			resourceLocation = ResourceLocation.fromNamespaceAndPath(resourceLocationString.substring(0, separatorIndex), resourceLocationString.substring(separatorIndex + 1));
-			#endif
-		}
-		catch (Exception e)
-		{
-			throw new IOException("No Resource Location found for the string: [" + resourceLocationString + "] Error: [" + e.getMessage() + "].");
-		}
-		
-		
-		boolean success;
-		#if MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1
-		Biome biome = registryAccess.registryOrThrow(Registry.BIOME_REGISTRY).get(resourceLocation);
-		success = (biome != null);
-		#elif MC_VER == MC_1_18_2 || MC_VER == MC_1_19_2
-		Biome unwrappedBiome = registryAccess.registryOrThrow(Registry.BIOME_REGISTRY).get(resourceLocation);
-		success = (unwrappedBiome != null);
-		Holder<Biome> biome = new Holder.Direct<>(unwrappedBiome);
-		#elif MC_VER < MC_1_21_3
-		Biome unwrappedBiome = registryAccess.registryOrThrow(Registries.BIOME).get(resourceLocation);
-		success = (unwrappedBiome != null);
-		Holder<Biome> biome = new Holder.Direct<>(unwrappedBiome);
-		#else
-		Holder<Biome> biome;
-		Optional<Holder.Reference<Biome>> optionalBiomeHolder = registryAccess.lookupOrThrow(Registries.BIOME).get(resourceLocation);
-		if (optionalBiomeHolder.isPresent())
-		{
-			Biome unwrappedBiome = optionalBiomeHolder.get().value();
-			success = (unwrappedBiome != null);
-			biome = new Holder.Direct<>(unwrappedBiome);
-		}
-		else
-		{
-			success = false;
-			biome = null;
-		}
-		#endif
-		
-		return new BiomeDeserializeResult(success, biome);
-	}
-	
-	
-	//================//
-	// helper classes //
-	//================//
-	
-	public static class BiomeDeserializeResult
-	{
-		public final boolean success;
-		
-		#if MC_VER < MC_1_18_2
-		public final Biome biome;
-		#else
-		public final Holder<Biome> biome;
-    #endif
-		
-		public BiomeDeserializeResult(boolean success, #if MC_VER < MC_1_18_2 Biome #else Holder<Biome> #endif biome)
-		{
-			this.success = success;
-			this.biome = biome;
-		}
-	}
-	
-	
 }

common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/ClientBlockStateColorCache.java

@@ -91,7 +91,7 @@ public class ClientBlockStateColorCache
 	private static final RandomSource RANDOM = RandomSource.create();
 	#endif
 	
-	private final IClientLevelWrapper clientLevelWrapper;
+	private final IClientLevelWrapper levelWrapper;
 	private final BlockState blockState;
 	private final LevelReader level;
 	
@@ -174,7 +174,7 @@ public class ClientBlockStateColorCache
 	public ClientBlockStateColorCache(BlockState blockState, IClientLevelWrapper samplingLevel)
 	{
 		this.blockState = blockState;
-		this.clientLevelWrapper = samplingLevel;
+		this.levelWrapper = samplingLevel;
 		this.level = (LevelReader) samplingLevel.getWrappedMcObject();
 		this.resolveColors();
 	}
@@ -471,7 +471,7 @@ public class ClientBlockStateColorCache
 				try
 				{
 					tintColor = Minecraft.getInstance().getBlockColors()
-							.getColor(this.blockState, new TintWithoutLevelOverrider(biome, this.clientLevelWrapper), McObjectConverter.Convert(pos), this.tintIndex);
+							.getColor(this.blockState, new TintWithoutLevelOverrider(biome, this.levelWrapper), McObjectConverter.Convert(pos), this.tintIndex);
 				}
 				catch (UnsupportedOperationException e)
 				{

common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintWithoutLevelOverrider.java

@@ -19,10 +19,8 @@
 
 package com.seibel.distanthorizons.common.wrappers.block;
 
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.util.ColorUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.*;
@@ -31,7 +29,6 @@ import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.lighting.LevelLightEngine;
 import net.minecraft.world.level.material.FluidState;
-import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -39,64 +36,22 @@ import org.jetbrains.annotations.Nullable;
 import net.minecraft.core.Holder;
 #endif
 
-import java.io.IOException;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
 public class TintWithoutLevelOverrider implements BlockAndTintGetter
 {
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
-	
-	#if MC_VER < MC_1_18_2
-	public static final ConcurrentMap<String, Biome> BIOME_BY_RESOURCE_STRING = new ConcurrentHashMap<>();
+	/** 
+	 * This will only ever be null if there was an issue with {@link IClientLevelWrapper#getPlainsBiomeWrapper()}
+	 * but {@link Nullable} is there just in case. 
+	 */
+	@Nullable
+	#if MC_VER >= MC_1_18_2
+	public final Holder<Biome> biome;
 	#else
-	public static final ConcurrentMap<String, Holder<Biome>> BIOME_BY_RESOURCE_STRING = new ConcurrentHashMap<>();
-    #endif
-	
-	
-	@NotNull
-	private final BiomeWrapper biomeWrapper;
-	
-	
-	
-	//=============//
-	// constructor //
-	//=============//
-	
-	public TintWithoutLevelOverrider(@NotNull BiomeWrapper biomeWrapper, IClientLevelWrapper clientLevelWrapper)
-	{ this.biomeWrapper = biomeWrapper; }
-	
-	
-	
-	//=========//
-	// methods //
-	//=========//
-	
-	@Override
-	public int getBlockTint(@NotNull BlockPos blockPos, @NotNull ColorResolver colorResolver)
-	{
-		String biomeString = this.biomeWrapper.getSerialString();
-		if (biomeString == null 
-			|| biomeString.isEmpty() 
-			|| biomeString.equals(BiomeWrapper.EMPTY_BIOME_STRING))
-		{
-			// default to "plains" for empty/invalid biomes
-			biomeString = "minecraft:plains";
-		}
-		
-		
-		return colorResolver.getColor(unwrap(getClientBiome(biomeString)), blockPos.getX(), blockPos.getZ());
-	}
-	private static Biome unwrap(#if MC_VER >= MC_1_18_2 Holder<Biome> #else Biome #endif biome)
-	{
-		#if MC_VER >= MC_1_18_2
-		return biome.value();
-		#else
-		return biome;
-		#endif
-	}
+	public final Biome biome;
+	#endif
 	
 	/**
+	 * Constructs the TintWithoutLevelOverrider, storing the provided Biome Holder for late-binding access.
+	 *
 	 * <p>Previously, this class might have immediately unwrapped the Holder like this:</p>
 	 * <pre>{@code
 	 * // Inside constructor (OLD WAY - PROBLEMATIC):
@@ -130,52 +85,41 @@ public class TintWithoutLevelOverrider implements BlockAndTintGetter
 	 * whenever the biome information is needed, ensuring it always retrieves the most current {@code Biome}
 	 * instance associated with the holder at that time.</p>
 	 */
-	private static #if MC_VER < MC_1_18_2 Biome #else Holder<Biome> #endif getClientBiome(String biomeResourceString)
+	public TintWithoutLevelOverrider(BiomeWrapper biomeWrapper, IClientLevelWrapper clientLevelWrapper)
 	{
-		// cache the client biomes so we don't have to re-parse the resource location every time
-		return BIOME_BY_RESOURCE_STRING.compute(biomeResourceString, 
-			(resourceString, existingBiome) -> 
-			{ 
-				if (existingBiome != null)
-				{
-					return existingBiome;
-				}
-				
-				ClientLevel clientLevel = Minecraft.getInstance().level;
-				if (clientLevel == null)
-				{
-					// shouldn't happen, but just in case
-					throw new IllegalStateException("Attempted to get client biome when no client level was loaded.");
-				}
-				
-				BiomeWrapper.BiomeDeserializeResult result;
-				try
-				{
-					result = BiomeWrapper.deserializeBiome(resourceString, clientLevel.registryAccess());
-				}
-				catch (Exception e)
-				{
-					LOGGER.warn("Unable to deserialize client biome ["+resourceString+"], using fallback...");
-					
-					try
-					{
-						result = BiomeWrapper.deserializeBiome("minecraft:plains", clientLevel.registryAccess());
-					}
-					catch (IOException ex)
-					{
-						// should never happen, if it does this log will explode, but just in case
-						LOGGER.error("Unable to deserialize fallback client biome [minecraft:plains], returning NULL.");
-						return null;
-					}
-				}
-				
-				if (result.success)
-				{
-					existingBiome = result.biome;
-				}
-				
-				return existingBiome;
-			});
+		#if MC_VER >= MC_1_18_2 Holder<Biome> #else Biome #endif biome = biomeWrapper.biome;
+		if (biome == null) // We are looking at the empty biome wrapper
+		{
+			BiomeWrapper plainsBiomeWrapper = ((BiomeWrapper) clientLevelWrapper.getPlainsBiomeWrapper());
+			if (plainsBiomeWrapper != null)
+			{
+				biome = plainsBiomeWrapper.biome;
+			}
+		}
+		
+		this.biome = biome;
+	}
+	
+	
+	
+	@Override
+	public int getBlockTint(@NotNull BlockPos blockPos, @NotNull ColorResolver colorResolver)
+	{
+		if (this.biome == null)
+		{
+			// hopefully unneeded debug color
+			return ColorUtil.CYAN;
+		}
+		return colorResolver.getColor(unwrap(biome), blockPos.getX(), blockPos.getZ());
+	}
+	
+	private static Biome unwrap(#if MC_VER >= MC_1_18_2 Holder<Biome> #else Biome #endif biome)
+	{
+		#if MC_VER >= MC_1_18_2
+		return biome.value();
+		#else
+		return biome;
+		#endif
 	}
 	
 	

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/ChunkLoader.java

@@ -179,24 +179,20 @@ public class ChunkLoader
 		
 		//================== Read params for making the LevelChunk ==================
 		
-		UpgradeData upgradeData = UpgradeData.EMPTY;
-		// commented out 2025-06-04 as a test to see if the upgrade data
-		// is actually necessary for DH or if it can be ignored
-		// (if it can't be ignored we'll need to handle null responses from tagGetCompoundTag())
-		//
-		//#if MC_VER < MC_1_17_1
-		//upgradeData = tagLevel.contains(TAG_UPGRADE_DATA, 10)
-		//		? new UpgradeData(tagGetCompoundTag(tagLevel, TAG_UPGRADE_DATA))
-		//		: UpgradeData.EMPTY;
-		//#elif MC_VER < MC_1_21_5
-		//upgradeData = tagLevel.contains(TAG_UPGRADE_DATA, 10)
-		//		? new UpgradeData(tagGetCompoundTag(tagLevel, TAG_UPGRADE_DATA), level)
-		//		: UpgradeData.EMPTY;
-		//#else
-		//upgradeData = tagLevel.contains(TAG_UPGRADE_DATA)
-		//		? new UpgradeData(tagGetCompoundTag(tagLevel, TAG_UPGRADE_DATA), level)
-		//		: UpgradeData.EMPTY;
-		//#endif
+		UpgradeData upgradeData;
+		#if MC_VER < MC_1_17_1
+		upgradeData = tagLevel.contains(TAG_UPGRADE_DATA, 10)
+				? new UpgradeData(tagGetCompoundTag(tagLevel, TAG_UPGRADE_DATA))
+				: UpgradeData.EMPTY;
+		#elif MC_VER < MC_1_21_5
+		upgradeData = tagLevel.contains(TAG_UPGRADE_DATA, 10)
+				? new UpgradeData(tagGetCompoundTag(tagLevel, TAG_UPGRADE_DATA), level)
+				: UpgradeData.EMPTY;
+		#else
+		upgradeData = tagLevel.contains(TAG_UPGRADE_DATA)
+				? new UpgradeData(tagGetCompoundTag(tagLevel, TAG_UPGRADE_DATA), level)
+				: UpgradeData.EMPTY;
+		#endif
 		
 		
 		boolean isLightOn = tagGetBoolean(tagLevel, "isLightOn");
@@ -246,7 +242,7 @@ public class ChunkLoader
 		// Set some states after object creation
 		chunk.setLightCorrect(isLightOn);
 		readHeightmaps(chunk, chunkData);
-		//readPostPocessings(chunk, chunkData);
+		readPostPocessings(chunk, chunkData);
 		return chunk;
 	}
 	private static LevelChunkSection[] readSections(LevelAccessor level, ChunkPos chunkPos, CompoundTag chunkData)
@@ -289,54 +285,48 @@ public class ChunkLoader
 			for (int j = 0; j < tagSections.size(); ++j)
 			{
 				CompoundTag tagSection = tagGetCompoundTag(tagSections, j);
-				if (tagSection == null)
-				{
-					continue;
-				}
-				
-				final int sectionYPos = tagGetByte(tagSection, "Y");
+				int sectionYPos = tagGetByte(tagSection, "Y");
 
-				#if MC_VER < MC_1_18_2
-				if (tagSection.contains("Palette", 9) && tagSection.contains("BlockStates", 12))
-				{
-					LevelChunkSection levelChunkSection = new LevelChunkSection(sectionYPos << 4);
-					levelChunkSection.getStates().read(tagSection.getList("Palette", 10),
-							tagSection.getLongArray("BlockStates"));
-					levelChunkSection.recalcBlockCounts();
-					if (!levelChunkSection.isEmpty())
-						chunkSections[#if MC_VER < MC_1_17_1 sectionYPos #else level.getSectionIndexFromSectionY(sectionYPos) #endif ]
-								= levelChunkSection;
-				}
-				#else
+			#if MC_VER < MC_1_18_2
+			if (tagSection.contains("Palette", 9) && tagSection.contains("BlockStates", 12))
+			{
+				LevelChunkSection levelChunkSection = new LevelChunkSection(sectionYPos << 4);
+				levelChunkSection.getStates().read(tagSection.getList("Palette", 10),
+						tagSection.getLongArray("BlockStates"));
+				levelChunkSection.recalcBlockCounts();
+				if (!levelChunkSection.isEmpty())
+					chunkSections[#if MC_VER < MC_1_17_1 sectionYPos #else level.getSectionIndexFromSectionY(sectionYPos) #endif ]
+							= levelChunkSection;
+			}
+			#else
 				int sectionId = level.getSectionIndexFromSectionY(sectionYPos);
 				if (sectionId >= 0 && sectionId < chunkSections.length)
 				{
 					PalettedContainer<BlockState> blockStateContainer;
-					#if MC_VER < MC_1_18_2
-					PalettedContainer<Biome> biomeContainer;
-					#else
+				#if MC_VER < MC_1_18_2
+				PalettedContainer<Biome> biomeContainer;
+				#else
 					PalettedContainer<Holder<Biome>> biomeContainer;
-					#endif
-					
+				#endif
 					
 					boolean containsBlockStates;
-					#if MC_VER < MC_1_21_5
-					containsBlockStates = tagSection.contains("block_states", 10);
-					#else
-						containsBlockStates = tagSection.contains("block_states");
-					#endif
+				#if MC_VER < MC_1_21_5
+				containsBlockStates = tagSection.contains("block_states", 10);
+				#else
+					containsBlockStates = tagSection.contains("block_states");
+				#endif
 					
 					if (containsBlockStates)
 					{
-						#if MC_VER < MC_1_20_6 
-						blockStateContainer = BLOCK_STATE_CODEC.parse(NbtOps.INSTANCE, tagGetCompoundTag(tagSection, "block_states"))
-							.promotePartial(string -> logBlockDeserializationWarning(chunkPos, sectionYPos, string))
-							.getOrThrow(false, (message) -> logParsingWarningOnce(message));
-						#else
+					#if MC_VER < MC_1_20_6 
+					blockStateContainer = BLOCK_STATE_CODEC.parse(NbtOps.INSTANCE, tagGetCompoundTag(tagSection, "block_states"))
+						.promotePartial(string -> logBlockDeserializationWarning(chunkPos, sectionYPos, string))
+						.getOrThrow(false, (message) -> logParsingWarningOnce(message));
+					#else
 						blockStateContainer = BLOCK_STATE_CODEC.parse(NbtOps.INSTANCE, tagGetCompoundTag(tagSection, "block_states"))
 								.promotePartial(string -> logBlockDeserializationWarning(chunkPos, sectionYPos, string))
 								.getOrThrow((message) -> logErrorAndReturnException(message));
-						#endif
+					#endif
 					}
 					else
 					{
@@ -344,31 +334,31 @@ public class ChunkLoader
 					}
 				
 				
-					#if MC_VER < MC_1_18_2
-					biomeContainer = tagSection.contains("biomes", 10)
-							? biomeCodec.parse(NbtOps.INSTANCE, tagSection.getCompound("biomes")).promotePartial(string -> logErrors(chunkPos, sectionYPos, string)).getOrThrow(false, (message) -> logWarningOnce(message))
-							: new PalettedContainer<Biome>(biomes, biomes.getOrThrow(Biomes.PLAINS), PalettedContainer.Strategy.SECTION_BIOMES);
-					#else
+				#if MC_VER < MC_1_18_2
+				biomeContainer = tagSection.contains("biomes", 10)
+						? biomeCodec.parse(NbtOps.INSTANCE, tagSection.getCompound("biomes")).promotePartial(string -> logErrors(chunkPos, sectionYPos, string)).getOrThrow(false, (message) -> logWarningOnce(message))
+						: new PalettedContainer<Biome>(biomes, biomes.getOrThrow(Biomes.PLAINS), PalettedContainer.Strategy.SECTION_BIOMES);
+				#else
 					
 					
 					boolean containsBiomes;
-					#if MC_VER < MC_1_21_5
-					containsBiomes = tagSection.contains("biomes", 10);
-					#else
-						containsBiomes = tagSection.contains("biomes");
-					#endif
+				#if MC_VER < MC_1_21_5
+				containsBiomes = tagSection.contains("biomes", 10);
+				#else
+					containsBiomes = tagSection.contains("biomes");
+				#endif
 					
 					if (containsBiomes)
 					{
-						#if MC_VER < MC_1_20_6 
-						biomeContainer = biomeCodec.parse(NbtOps.INSTANCE, tagGetCompoundTag(tagSection, "biomes"))
-							.promotePartial(string -> logBiomeDeserializationWarning(chunkPos, sectionYIndex, (String) string))
-							.getOrThrow(false, (message) -> logParsingWarningOnce(message));
-						#else
+					#if MC_VER < MC_1_20_6 
+					biomeContainer = biomeCodec.parse(NbtOps.INSTANCE, tagGetCompoundTag(tagSection, "biomes"))
+						.promotePartial(string -> logBiomeDeserializationWarning(chunkPos, sectionYIndex, (String) string))
+						.getOrThrow(false, (message) -> logParsingWarningOnce(message));
+					#else
 						biomeContainer = biomeCodec.parse(NbtOps.INSTANCE, tagGetCompoundTag(tagSection, "biomes"))
 								.promotePartial(string -> logBiomeDeserializationWarning(chunkPos, sectionYIndex, (String) string))
 								.getOrThrow((message) -> logErrorAndReturnException(message));
-						#endif
+					#endif
 					}
 					else
 					{
@@ -381,16 +371,16 @@ public class ChunkLoader
 								PalettedContainer.Strategy.SECTION_BIOMES);
 					}
 				
-					#endif
-					
-					#if MC_VER < MC_1_20_1
-					chunkSections[sectionId] = new LevelChunkSection(sectionYPos, blockStateContainer, biomeContainer);
-					#else
-					chunkSections[sectionId] = new LevelChunkSection(blockStateContainer, biomeContainer);
-					#endif
-				}
 				#endif
 				
+				#if MC_VER < MC_1_20_1
+				chunkSections[sectionId] = new LevelChunkSection(sectionYPos, blockStateContainer, biomeContainer);
+				#else
+					chunkSections[sectionId] = new LevelChunkSection(blockStateContainer, biomeContainer);
+				#endif
+				}
+			#endif
+				
 			}	
 		}
 		return chunkSections;
@@ -401,14 +391,10 @@ public class ChunkLoader
 		#else ChunkType #endif 
 	readChunkType(CompoundTag tagLevel)
 	{
-		String statusString = tagGetString(tagLevel,"Status");
-		if (statusString != null)
+		ChunkStatus chunkStatus = ChunkStatus.byName(tagGetString(tagLevel,"Status"));
+		if (chunkStatus != null)
 		{
-			ChunkStatus chunkStatus = ChunkStatus.byName(statusString);
-			if (chunkStatus != null)
-			{
-				return chunkStatus.getChunkType();
-			}
+			return chunkStatus.getChunkType();
 		}
 		
 		#if MC_VER <= MC_1_20_4
@@ -420,52 +406,43 @@ public class ChunkLoader
 	private static void readHeightmaps(LevelChunk chunk, CompoundTag chunkData)
 	{
 		CompoundTag tagHeightmaps = tagGetCompoundTag(chunkData, "Heightmaps");
-		if (tagHeightmaps != null)
+		for (Heightmap.Types type : ChunkStatus.FULL.heightmapsAfter())
 		{
-			for (Heightmap.Types type : ChunkStatus.FULL.heightmapsAfter())
+			String heightmap = type.getSerializationKey();
+			#if MC_VER < MC_1_21_5
+			if (tagHeightmaps.contains(heightmap, 12))
 			{
-				String heightmap = type.getSerializationKey();
-				#if MC_VER < MC_1_21_5
-				if (tagHeightmaps.contains(heightmap, 12))
+				chunk.setHeightmap(type, tagHeightmaps.getLongArray(heightmap));
+			}
+			#else
+			if (tagHeightmaps.contains(heightmap))
+			{
+				Optional<long[]> optionalHeightmap = tagHeightmaps.getLongArray(heightmap);
+				if (optionalHeightmap.isPresent())
 				{
-					chunk.setHeightmap(type, tagHeightmaps.getLongArray(heightmap));
+					chunk.setHeightmap(type, optionalHeightmap.get());
 				}
+			}
+			#endif
+		}
+		Heightmap.primeHeightmaps(chunk, ChunkStatus.FULL.heightmapsAfter());
+	}
+	private static void readPostPocessings(LevelChunk chunk, CompoundTag chunkData)
+	{
+		ListTag tagPostProcessings = tagGetListTag(chunkData,"PostProcessing", 9);
+		for (int i = 0; i < tagPostProcessings.size(); ++i)
+		{
+			ListTag listTag3 = tagGetListTag(tagPostProcessings, i);
+			for (int j = 0; j < listTag3.size(); ++j)
+			{
+				#if MC_VER < MC_1_21_3
+				chunk.addPackedPostProcess(listTag3.getShort(j), i);
 				#else
-				if (tagHeightmaps.contains(heightmap))
-				{
-					Optional<long[]> optionalHeightmap = tagHeightmaps.getLongArray(heightmap);
-					if (optionalHeightmap.isPresent())
-					{
-						chunk.setHeightmap(type, optionalHeightmap.get());
-					}
-				}
+				chunk.addPackedPostProcess(ShortList.of(tagGetShort(listTag3, j)), i);
 				#endif
 			}
-			
-			Heightmap.primeHeightmaps(chunk, ChunkStatus.FULL.heightmapsAfter());
 		}
 	}
-	// commented out as a test as of 2025-06-04 to see if this is actually necessary for DH
-	// DH probably doesn't need any chunk post-processing data
-	//private static void readPostPocessings(LevelChunk chunk, CompoundTag chunkData)
-	//{
-	//	ListTag tagPostProcessings = tagGetListTag(chunkData,"PostProcessing", 9);
-	//	if (tagPostProcessings != null)
-	//	{
-	//		for (int i = 0; i < tagPostProcessings.size(); ++i)
-	//		{
-	//			ListTag listTag3 = tagGetListTag(tagPostProcessings, i);
-	//			for (int j = 0; j < listTag3.size(); ++j)
-	//			{
-	//			#if MC_VER < MC_1_21_3
-	//				chunk.addPackedPostProcess(listTag3.getShort(j), i);
-	//			#else
-	//			chunk.addPackedPostProcess(ShortList.of(tagGetShort(listTag3, j)), i);
-	//			#endif
-	//			}
-	//		}
-	//	}
-	//}
 	#if MC_VER >= MC_1_18_2
 	private static BlendingData readBlendingData(CompoundTag chunkData)
 	{
@@ -751,7 +728,6 @@ public class ChunkLoader
 	
 	
 	/** defaults to null if the tag isn't present */
-	@Nullable
 	private static String tagGetString(CompoundTag tag, String key)
 	{
 		#if MC_VER < MC_1_21_5
@@ -762,7 +738,6 @@ public class ChunkLoader
 	}
 	
 	/** defaults to null if the tag isn't present */
-	@Nullable
 	private static byte[] tagGetByteArray(CompoundTag tag, String key)
 	{
 		#if MC_VER < MC_1_21_5

gradle.properties

@@ -48,6 +48,7 @@ infoBuildSource=User
 
 # Internal Properties (These are set at runtime for Forgix to merge jar's)
 versionStr=
+mergeVersions=
 
 # This defines what MC version Intellij will use for the preprocessor
 # and what version is used automatically by build and run commands

settings.gradle

@@ -58,7 +58,7 @@ If you still need help with compiling, please read the Readme.md
 
 
 
-/** Loads the VersionProperties fiel for the currently selected Minecraft version. */
+/** Loads the VersionProperties field for the currently selected Minecraft version. */
 def loadProperties() {
     def defaultMcVersion = "1.20.1" // 1.20.1 is our current most stable version so we use that if no version was defined
 

versionProperties/1.16.5.properties

@@ -24,7 +24,6 @@ fabric_api_version=0.42.0+1.16
     immersive_portals_version=
     canvas_version=
 
-    # iris - needs 1.7.4+ to support the DH API  
     fabric_incompatibility_list={ "iris": "*" }
     fabric_recommend_list={}
 

versionProperties/1.17.1.properties

@@ -24,7 +24,6 @@ fabric_api_version=0.46.1+1.17
     immersive_portals_version=
     canvas_version=
 
-    # iris - needs 1.7.4+ to support the DH API  
     fabric_incompatibility_list={ "iris": "*" }
     fabric_recommend_list={}
 

versionProperties/1.18.2.properties

@@ -25,7 +25,6 @@ fabric_api_version=0.76.0+1.18.2
     immersive_portals_version=v1.4.11-1.18
     canvas_version=mc118:1.0.2616
 
-    # iris - needs 1.7.4+ to support the DH API
     fabric_incompatibility_list={ "iris": "*" }
     fabric_recommend_list={}
 

versionProperties/1.19.2.properties

@@ -24,7 +24,6 @@ fabric_api_version=0.76.1+1.19.2
     immersive_portals_version=
     canvas_version=mc119-1.0.2480
 
-    # iris - needs 1.7.4+ to support the DH API
     fabric_incompatibility_list={ "iris": "*" }
     fabric_recommend_list={}
 

versionProperties/1.19.4.properties

@@ -22,8 +22,7 @@ fabric_api_version=0.87.1+1.19.4
     bclib_version=2.3.3
     immersive_portals_version=
     canvas_version=
-
-    # iris - needs 1.7.4+ to support the DH API
+    
     fabric_incompatibility_list={ "iris": "*" }
     fabric_recommend_list={}
 

versionProperties/1.20.1.properties

@@ -22,8 +22,7 @@ fabric_api_version=0.90.4+1.20.1
     bclib_version=3.0.13
     immersive_portals_version=
     canvas_version=
-
-    # iris - needs 1.7.4+ to support the DH API
+    
     fabric_incompatibility_list={ "iris": "<=1.7.4" }
     fabric_recommend_list={}
     

versionProperties/1.20.2.properties

@@ -22,8 +22,7 @@ fabric_api_version=0.90.4+1.20.2
     bclib_version=3.0.13
     immersive_portals_version=
     canvas_version=
-
-    # iris - needs 1.7.4+ to support the DH API
+    
     fabric_incompatibility_list={ "iris": "<=1.7.4" }
     fabric_recommend_list={}
     

versionProperties/1.20.4.properties

@@ -23,8 +23,7 @@ fabric_api_version=0.91.2+1.20.4
     bclib_version=
     immersive_portals_version=
     canvas_version=
-
-    # iris - needs 1.7.4+ to support the DH API
+    
     fabric_incompatibility_list={ "iris": "<=1.7.4" }
     fabric_recommend_list={}
     

versionProperties/1.20.6.properties

@@ -23,8 +23,7 @@ fabric_api_version=0.97.8+1.20.6
     bclib_version=
     immersive_portals_version=
     canvas_version=
-
-    # iris - needs 1.7.4+ to support the DH API
+    
     fabric_incompatibility_list={ "iris": "<=1.7.4" }
     fabric_recommend_list={}
     

versionProperties/1.21.1.properties

@@ -23,8 +23,7 @@ fabric_api_version=0.115.0+1.21.1
     bclib_version=
     immersive_portals_version=
     canvas_version=
-
-    # iris - needs 1.7.4+ to support the DH API
+    
     fabric_incompatibility_list={ "iris": "<=1.7.4" }
     fabric_recommend_list={}
     

versionProperties/1.21.4.properties

@@ -23,7 +23,7 @@ fabric_api_version=0.110.5+1.21.4
     bclib_version=
     immersive_portals_version=
     canvas_version=
-
+    
     fabric_incompatibility_list={ }
     fabric_recommend_list={}
     

versionProperties/1.21.5.properties

@@ -23,7 +23,7 @@ fabric_api_version=0.119.5+1.21.5
     immersive_portals_version=
     canvas_version=
     
-    # Iris - some versions of 1.8.11 nightly builds may not work, but the ones after 2025-03-30 should
+    # some versions of 1.8.11 nightly builds may not work, but the ones after 2025-03-30 should
     fabric_incompatibility_list={ "iris": "<=1.8.10" }
     fabric_recommend_list={}