Move max generation distance check functionality to render distance config

Should fix WorldPainter worlds

.editorconfig

@@ -5,7 +5,6 @@ root = true
 
 [*]
 charset = utf-8
-end_of_line = crlf
 indent_size = 4
 indent_style = space
 insert_final_newline = false
@@ -688,7 +687,7 @@ ij_markdown_wrap_text_inside_blockquotes = true
 ij_toml_keep_indents_on_empty_lines = false
 
 [{*.yaml,*.yml}]
-indent_size = 2
+indent_size = 4
 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

@@ -41,7 +41,7 @@ build:
     - ./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/* ./Merged/* . || true
+    - cp ./fabric/build/libs/* ./forge/build/libs/* ./neoforge/build/libs/* ./build/merged/* . || true
   artifacts:
     name: "NightlyBuild_${MC_VER}-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
     paths:

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.2.9"
+    id "io.github.pacifistmc.forgix" version "1.3.4"
 
     // Manifold preprocessor
     id "systems.manifold.manifold-gradle-plugin" version "0.0.2-alpha"
@@ -67,43 +67,8 @@ project.gradle.ext.getProperties().each { prop ->
 // Sets up manifold stuff
 writeBuildGradlePredefine(rootProject.mcVers, rootProject.mcIndex)
 
-
-
-
 // Sets up the version string (the name we use for our jar)
 rootProject.versionStr = rootProject.mod_version + "-" + rootProject.minecraft_version // + "-" + new Date().format("yyyy_MM_dd_HH_mm")
-// Forgix settings (used for merging jars)
-forgix {
-    
-    String loaderHyphenSeparatedList = ((String)gradle.builds_for).replaceAll(",", "-");
-    
-    group = "com.seibel.distanthorizons"
-    mergedJarName = "DistantHorizons-${loaderHyphenSeparatedList}-${rootProject.versionStr}.jar"
-
-    if (findProject(":forge"))
-        forge {
-            jarLocation = "build/libs/DistantHorizons-forge-${rootProject.versionStr}.jar"
-        }
-    
-    if (findProject(":neoforge"))
-        custom {
-            projectName = "neoforge"
-            jarLocation = "build/libs/DistantHorizons-neoforge-${rootProject.versionStr}.jar"
-        }
-
-    if (findProject(":fabric"))
-        fabric {
-            jarLocation = "build/libs/DistantHorizons-fabric-${rootProject.versionStr}.jar"
-        }
-
-    if (findProject(":quilt"))
-        quilt {
-            jarLocation = "build/libs/DistantHorizons-quilt-${rootProject.versionStr}.jar"
-        }
-
-    removeDuplicate "com.seibel.distanthorizons"
-}
-
 
 class NativeTransformer implements Transformer {
     private final HashMap<String, String> replacements = new HashMap()
@@ -560,8 +525,9 @@ allprojects { p ->
     apply plugin: "java"
     apply plugin: "maven-publish"
     
+    // Sets the name of the jar, the version will contain the name of the project if it isn't the root project
     archivesBaseName = rootProject.mod_name
-    version = project.name + "-" + rootProject.versionStr
+    version = (project == rootProject ? "" : project.name + "-") + rootProject.versionStr
     group = rootProject.maven_group
     
     // this is the text that appears at the top of the overview (home) page
@@ -726,14 +692,3 @@ allprojects { p ->
         withSourcesJar()
     }
 }
-
-
-// Delete the merged folder when running clean
-task cleanMergedJars() {
-    def mergedFolder = file("Merged")
-    if (mergedFolder.exists()) {
-        delete(mergedFolder)
-    }
-}
-// add cleanMergedJars to the end of the "clean" task
-tasks["clean"].finalizedBy(cleanMergedJars)

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

@@ -1,6 +1,7 @@
 package com.seibel.distanthorizons.common;
 
 import com.seibel.distanthorizons.core.config.Config;
+import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.logging.ConfigBasedLogger;
 import com.seibel.distanthorizons.core.network.event.internal.IncompatibleMessageInternalEvent;
 import com.seibel.distanthorizons.core.network.event.internal.ProtocolErrorInternalEvent;
@@ -30,6 +31,16 @@ public abstract class AbstractPluginPacketSender implements IPluginPacketSender
 	public static final ResourceLocation WRAPPER_PACKET_RESOURCE = new ResourceLocation(ModInfo.RESOURCE_NAMESPACE, ModInfo.WRAPPER_PACKET_PATH);
 	#endif
 	
+	// "Forge byte" is an unused packet ID. We have our own system which works with all mod loaders,
+	// so we're just accounting for it by reading the protocol version as a byte instead of a short in Forge, to keep cross-loader compatibility
+	private final boolean forgeByteInProtocolVersion;
+	
+	
+	public AbstractPluginPacketSender() { this(false); }
+	public AbstractPluginPacketSender(boolean forgeByteInProtocolVersion)
+	{
+		this.forgeByteInProtocolVersion = forgeByteInProtocolVersion;
+	}
 	
 	@Override
 	public final void sendToClient(IServerPlayerWrapper serverPlayer, AbstractNetworkMessage message)
@@ -41,7 +52,7 @@ public abstract class AbstractPluginPacketSender implements IPluginPacketSender
 	@Override
 	public abstract void sendToServer(AbstractNetworkMessage message);
 	
-	public static AbstractNetworkMessage decodeMessage(FriendlyByteBuf in)
+	public AbstractNetworkMessage decodeMessage(FriendlyByteBuf in)
 	{
 		AbstractNetworkMessage message = null;
 		
@@ -49,7 +60,7 @@ public abstract class AbstractPluginPacketSender implements IPluginPacketSender
 		{
 			in.markReaderIndex();
 			
-			int protocolVersion = in.readShort();
+			int protocolVersion = this.forgeByteInProtocolVersion ? in.readByte() : in.readShort();
 			if (protocolVersion != ModInfo.PROTOCOL_VERSION)
 			{
 				return new IncompatibleMessageInternalEvent(protocolVersion);
@@ -82,11 +93,19 @@ public abstract class AbstractPluginPacketSender implements IPluginPacketSender
 		}
 	}
 	
-	public static void encodeMessage(FriendlyByteBuf out, AbstractNetworkMessage message)
+	public void encodeMessage(FriendlyByteBuf out, AbstractNetworkMessage message)
 	{
 		// This is intentionally unhandled, because errors related to this are unlikely to appear in wild
 		Objects.requireNonNull(message);
-		out.writeShort(ModInfo.PROTOCOL_VERSION);
+		
+		if (this.forgeByteInProtocolVersion)
+		{
+			out.writeByte(ModInfo.PROTOCOL_VERSION);
+		}
+		else
+		{
+			out.writeShort(ModInfo.PROTOCOL_VERSION);
+		}
 		
 		try
 		{

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

@@ -2,7 +2,9 @@ package com.seibel.distanthorizons.common;
 
 #if MC_VER >= MC_1_20_6
 
+import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.network.messages.AbstractNetworkMessage;
+import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IPluginPacketSender;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
@@ -12,6 +14,7 @@ import org.jetbrains.annotations.Nullable;
 public record CommonPacketPayload(@Nullable AbstractNetworkMessage message) implements CustomPacketPayload
 {
 	public static final Type<CommonPacketPayload> TYPE = new Type<>(AbstractPluginPacketSender.WRAPPER_PACKET_RESOURCE);
+	private static final AbstractPluginPacketSender PACKET_SENDER = (AbstractPluginPacketSender) SingletonInjector.INSTANCE.get(IPluginPacketSender.class);
 	
 	@NotNull
 	@Override
@@ -23,11 +26,11 @@ public record CommonPacketPayload(@Nullable AbstractNetworkMessage message) impl
 		@NotNull
 		@Override
 		public CommonPacketPayload decode(@NotNull FriendlyByteBuf in)
-		{ return new CommonPacketPayload(AbstractPluginPacketSender.decodeMessage(in)); }
+		{ return new CommonPacketPayload(PACKET_SENDER.decodeMessage(in)); }
 		
 		@Override
 		public void encode(@NotNull FriendlyByteBuf out, CommonPacketPayload payload)
-		{ AbstractPluginPacketSender.encodeMessage(out, payload.message()); }
+		{ PACKET_SENDER.encodeMessage(out, payload.message()); }
 		
 	}
 	

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

@@ -47,6 +47,7 @@ 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
@@ -130,14 +131,6 @@ 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);
-	}
-	
 	
 	
 	//=========//
@@ -286,64 +279,16 @@ 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();
 				
-				boolean success;
+				BiomeDeserializeResult deserializeResult = deserializeBiome(resourceLocationString, registryAccess);
-				#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 (!success)
+				if (!deserializeResult.success)
 				{
 					if (!brokenResourceLocationStrings.contains(resourceLocationString))
 					{
@@ -354,7 +299,7 @@ public class BiomeWrapper implements IBiomeWrapper
 				}
 				
 				
-				foundWrapper = (BiomeWrapper) getBiomeWrapper(biome, levelWrapper);
+				foundWrapper = (BiomeWrapper) getBiomeWrapper(deserializeResult.biome, levelWrapper);
 				return foundWrapper;
 			}
 			catch (Exception e)
@@ -368,4 +313,82 @@ 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 levelWrapper;
+	private final IClientLevelWrapper clientLevelWrapper;
 	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.levelWrapper = samplingLevel;
+		this.clientLevelWrapper = 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.levelWrapper), McObjectConverter.Convert(pos), this.tintIndex);
+							.getColor(this.blockState, new TintWithoutLevelOverrider(biome, this.clientLevelWrapper), McObjectConverter.Convert(pos), this.tintIndex);
 				}
 				catch (UnsupportedOperationException e)
 				{

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

@@ -19,8 +19,10 @@
 
 package com.seibel.distanthorizons.common.wrappers.block;
 
-import com.seibel.distanthorizons.core.util.ColorUtil;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 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.*;
@@ -29,6 +31,7 @@ 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;
 
@@ -36,22 +39,64 @@ 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();
-	 * This will only ever be null if there was an issue with {@link IClientLevelWrapper#getPlainsBiomeWrapper()}
+	
-	 * but {@link Nullable} is there just in case. 
+	#if MC_VER < MC_1_18_2
-	 */
+	public static final ConcurrentMap<String, Biome> BIOME_BY_RESOURCE_STRING = new ConcurrentHashMap<>();
-	@Nullable
-	#if MC_VER >= MC_1_18_2
-	public final Holder<Biome> biome;
 	#else
-	public final Biome biome;
+	public static final ConcurrentMap<String, Holder<Biome>> BIOME_BY_RESOURCE_STRING = new ConcurrentHashMap<>();
-	#endif
+    #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
+	}
 	
 	/**
-	 * 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):
@@ -85,41 +130,52 @@ 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>
 	 */
-	public TintWithoutLevelOverrider(BiomeWrapper biomeWrapper, IClientLevelWrapper clientLevelWrapper)
+	private static #if MC_VER < MC_1_18_2 Biome #else Holder<Biome> #endif getClientBiome(String biomeResourceString)
 	{
-		#if MC_VER >= MC_1_18_2 Holder<Biome> #else Biome #endif biome = biomeWrapper.biome;
+		// cache the client biomes so we don't have to re-parse the resource location every time
-		if (biome == null) // We are looking at the empty biome wrapper
+		return BIOME_BY_RESOURCE_STRING.compute(biomeResourceString, 
-		{
+			(resourceString, existingBiome) -> 
-			BiomeWrapper plainsBiomeWrapper = ((BiomeWrapper) clientLevelWrapper.getPlainsBiomeWrapper());
+			{ 
-			if (plainsBiomeWrapper != null)
+				if (existingBiome != null)
-			{
+				{
-				biome = plainsBiomeWrapper.biome;
+					return existingBiome;
-			}
+				}
-		}
+				
-		
+				ClientLevel clientLevel = Minecraft.getInstance().level;
-		this.biome = biome;
+				if (clientLevel == null)
-	}
+				{
-	
+					// shouldn't happen, but just in case
-	
+					throw new IllegalStateException("Attempted to get client biome when no client level was loaded.");
-	
+				}
-	@Override
+				
-	public int getBlockTint(@NotNull BlockPos blockPos, @NotNull ColorResolver colorResolver)
+				BiomeWrapper.BiomeDeserializeResult result;
-	{
+				try
-		if (this.biome == null)
+				{
-		{
+					result = BiomeWrapper.deserializeBiome(resourceString, clientLevel.registryAccess());
-			// hopefully unneeded debug color
+				}
-			return ColorUtil.CYAN;
+				catch (Exception e)
-		}
+				{
-		return colorResolver.getColor(unwrap(biome), blockPos.getX(), blockPos.getZ());
+					LOGGER.warn("Unable to deserialize client biome ["+resourceString+"], using fallback...");
-	}
+					
-	
+					try
-	private static Biome unwrap(#if MC_VER >= MC_1_18_2 Holder<Biome> #else Biome #endif biome)
+					{
-	{
+						result = BiomeWrapper.deserializeBiome("minecraft:plains", clientLevel.registryAccess());
-		#if MC_VER >= MC_1_18_2
+					}
-		return biome.value();
+					catch (IOException ex)
-		#else
+					{
-		return biome;
+						// should never happen, if it does this log will explode, but just in case
-		#endif
+						LOGGER.error("Unable to deserialize fallback client biome [minecraft:plains], returning NULL.");
+						return null;
+					}
+				}
+				
+				if (result.success)
+				{
+					existingBiome = result.biome;
+				}
+				
+				return existingBiome;
+			});
 	}
 	
 	

common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ServerLevelWrapper.java

@@ -42,6 +42,7 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper;
 
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.Level;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ChunkSource;
 
@@ -115,12 +116,12 @@ public class ServerLevelWrapper implements IServerLevelWrapper
 	@Override
 	public String getWorldFolderName()
 	{
-		// TODO can we just replace this with getMcSaveFolder()? Why are we using the screenshot file anyway?
+		// Need specifically overworld since it's the only dimension that is stored in a server root folder
-		//  this can have issues when the screenshot file is null/missing
+		
-		#if MC_VER >= MC_1_17_1
+		#if MC_VER >= MC_1_21_3
-		return this.level.getServer().getWorldScreenshotFile().get().getParent().getFileName().toString();
+		return this.level.getServer().getLevel(Level.OVERWORLD).getChunkSource().getDataStorage().dataFolder.getParent().getFileName().toString();
-		#else // <= 1.16.5
+		#else // <= 1.21.3
-		return this.level.getServer().getWorldScreenshotFile().getParentFile().getName();
+		return this.level.getServer().getLevel(Level.OVERWORLD).getChunkSource().getDataStorage().dataFolder.getParentFile().getName();
 		#endif
 	}
 	

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

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

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

@@ -33,6 +33,7 @@ import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IPluginPacketSender;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.ISodiumAccessor;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import com.seibel.distanthorizons.core.util.math.Mat4f;
@@ -82,6 +83,7 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 {
 	private final ClientApi clientApi = ClientApi.INSTANCE;
 	private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
+	private static final AbstractPluginPacketSender PACKET_SENDER = (AbstractPluginPacketSender) SingletonInjector.INSTANCE.get(IPluginPacketSender.class);
 	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
 	// TODO we shouldn't be filtering keys on the Forge/Fabric side, only in ClientApi
@@ -316,9 +318,7 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 		#else
 		ClientPlayNetworking.registerGlobalReceiver(AbstractPluginPacketSender.WRAPPER_PACKET_RESOURCE, (client, handler, buffer, packetSender) ->
 		{
-			// Forge packet ID
+			AbstractNetworkMessage message = PACKET_SENDER.decodeMessage(buffer);
-			buffer.readByte();
-			AbstractNetworkMessage message = AbstractPluginPacketSender.decodeMessage(buffer);
 			if (message != null)
 			{
 				ClientApi.INSTANCE.pluginMessageReceived(message);

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

@@ -22,9 +22,7 @@ public class FabricPluginPacketSender extends AbstractPluginPacketSender
 		ClientPlayNetworking.send(new CommonPacketPayload(message));
 		#else // < 1.20.6
 		FriendlyByteBuf buffer = PacketByteBufs.create();
-		// Forge packet ID
+		this.encodeMessage(buffer, message);
-		buffer.writeByte(0);
-		AbstractPluginPacketSender.encodeMessage(buffer, message);
 		ClientPlayNetworking.send(WRAPPER_PACKET_RESOURCE, buffer);
 		#endif
 	}
@@ -36,9 +34,7 @@ public class FabricPluginPacketSender extends AbstractPluginPacketSender
 		ServerPlayNetworking.send(serverPlayer, new CommonPacketPayload(message));
 		#else // < 1.20.6
 		FriendlyByteBuf buffer = PacketByteBufs.create();
-		// Forge packet ID
+		this.encodeMessage(buffer, message);
-		buffer.writeByte(0);
-		AbstractPluginPacketSender.encodeMessage(buffer, message);
 		ServerPlayNetworking.send(serverPlayer, WRAPPER_PACKET_RESOURCE, buffer);
 		#endif
 	}

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

@@ -9,7 +9,10 @@ import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
 import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
 import com.seibel.distanthorizons.core.api.internal.ServerApi;
+import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
+import com.seibel.distanthorizons.common.AbstractPluginPacketSender;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IPluginPacketSender;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
 import com.seibel.distanthorizons.fabric.testing.TestWorldGenBindingEvent;
@@ -32,7 +35,6 @@ import com.seibel.distanthorizons.common.CommonPacketPayload;
 import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
 #else
 import com.seibel.distanthorizons.core.network.messages.AbstractNetworkMessage;
-import com.seibel.distanthorizons.common.AbstractPluginPacketSender;
 #endif
 
 import java.util.function.Supplier;
@@ -48,6 +50,8 @@ import java.util.function.Supplier;
 public class FabricServerProxy implements AbstractModInitializer.IEventProxy
 {
 	private static final ServerApi SERVER_API = ServerApi.INSTANCE;
+	@SuppressWarnings("unused")
+	private static final AbstractPluginPacketSender PACKET_SENDER = (AbstractPluginPacketSender) SingletonInjector.INSTANCE.get(IPluginPacketSender.class);
 	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
 	private final boolean isDedicatedServer;
@@ -192,9 +196,7 @@ public class FabricServerProxy implements AbstractModInitializer.IEventProxy
 		#else
 		ServerPlayNetworking.registerGlobalReceiver(AbstractPluginPacketSender.WRAPPER_PACKET_RESOURCE, (server, serverPlayer, handler, buffer, packetSender) ->
 		{
-			// Forge packet ID
+			AbstractNetworkMessage message = PACKET_SENDER.decodeMessage(buffer);
-			buffer.readByte();
-			AbstractNetworkMessage message = AbstractPluginPacketSender.decodeMessage(buffer);
 			if (message != null)
 			{
 				ServerApi.INSTANCE.pluginMessageReceived(ServerPlayerWrapper.getWrapper(serverPlayer), message);

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

@@ -33,6 +33,7 @@ import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
 
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IPluginPacketSender;
 import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IServerPlayerWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
@@ -79,6 +80,7 @@ import java.util.concurrent.ThreadPoolExecutor;
 public class ForgeClientProxy implements AbstractModInitializer.IEventProxy
 {
 	private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
+	private static final ForgePluginPacketSender PACKET_SENDER = (ForgePluginPacketSender) SingletonInjector.INSTANCE.get(IPluginPacketSender.class);
 	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
 	
@@ -96,7 +98,7 @@ public class ForgeClientProxy implements AbstractModInitializer.IEventProxy
 		MinecraftForge.EVENT_BUS.register(this);
 		
 		// handles singleplayer, LAN, and connecting to a server
-		ForgePluginPacketSender.setPacketHandler((IServerPlayerWrapper player, @NotNull AbstractNetworkMessage message) ->
+		PACKET_SENDER.setPacketHandler((IServerPlayerWrapper player, @NotNull AbstractNetworkMessage message) ->
 		{
 			ClientApi.INSTANCE.pluginMessageReceived(message);
 			ServerApi.INSTANCE.pluginMessageReceived(player, message);

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

@@ -45,16 +45,18 @@ public class ForgePluginPacketSender extends AbstractPluginPacketSender
 			);
 			#endif
 	
-	public static void setPacketHandler(Consumer<AbstractNetworkMessage> consumer)
+	public ForgePluginPacketSender() { super(true); }
+	
+	public void setPacketHandler(Consumer<AbstractNetworkMessage> consumer)
 	{
-		setPacketHandler((player, message) -> consumer.accept(message));
+		this.setPacketHandler((player, message) -> consumer.accept(message));
 	}
-	public static void setPacketHandler(BiConsumer<IServerPlayerWrapper, AbstractNetworkMessage> consumer)
+	public void setPacketHandler(BiConsumer<IServerPlayerWrapper, AbstractNetworkMessage> consumer)
 	{
 		#if MC_VER >= MC_1_20_2
 		PLUGIN_CHANNEL.messageBuilder(MessageWrapper.class, 0)
-				.encoder((wrapper, out) -> AbstractPluginPacketSender.encodeMessage(out, wrapper.message))
+				.encoder((wrapper, out) -> this.encodeMessage(out, wrapper.message))
-				.decoder(in -> new MessageWrapper(AbstractPluginPacketSender.decodeMessage(in)))
+				.decoder(in -> new MessageWrapper(this.decodeMessage(in)))
 				.consumerNetworkThread((wrapper, context) ->
 				{
 					if (wrapper.message != null)
@@ -73,8 +75,8 @@ public class ForgePluginPacketSender extends AbstractPluginPacketSender
 				.add();
 		#else // < 1.20.2
 		PLUGIN_CHANNEL.registerMessage(0, MessageWrapper.class,
-				(wrapper, out) -> AbstractPluginPacketSender.encodeMessage(out, wrapper.message),
+				(wrapper, out) -> this.encodeMessage(out, wrapper.message),
-				in -> new MessageWrapper(AbstractPluginPacketSender.decodeMessage(in)),
+				in -> new MessageWrapper(this.decodeMessage(in)),
 				(wrapper, context) ->
 				{
 					if (wrapper.message != null)

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

@@ -7,7 +7,9 @@ import com.seibel.distanthorizons.common.wrappers.misc.ServerPlayerWrapper;
 import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
 import com.seibel.distanthorizons.core.api.internal.ServerApi;
+import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IPluginPacketSender;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.level.ServerLevel;
@@ -51,6 +53,8 @@ import java.util.function.Supplier;
 
 public class ForgeServerProxy implements AbstractModInitializer.IEventProxy
 {
+	private static final ForgePluginPacketSender PACKET_SENDER = (ForgePluginPacketSender) SingletonInjector.INSTANCE.get(IPluginPacketSender.class);
+
 	#if MC_VER < MC_1_19_2
 	private static LevelAccessor GetEventLevel(WorldEvent e) { return e.getWorld(); }
 	#else
@@ -68,7 +72,7 @@ public class ForgeServerProxy implements AbstractModInitializer.IEventProxy
 		MinecraftForge.EVENT_BUS.register(this);
 		if (this.isDedicated)
 		{
-			ForgePluginPacketSender.setPacketHandler(ServerApi.INSTANCE::pluginMessageReceived);
+			PACKET_SENDER.setPacketHandler(ServerApi.INSTANCE::pluginMessageReceived);
 		}
 	}
 	

relocate_natives/README.md

@@ -6,7 +6,7 @@ How to add a library's natives:
 
 1. In `build.gradle`:
 
-- Make sure the target package is the same length or shorter (untested) than the source package. Underscores in native methods will take 2 characters so account for that as well.
+- Make sure the target package is the same length or shorter (untested) than the source package. Underscores in native methods will be mapped to `_1` so account for that as well.
 - Exclude the native files and add them as `relocateNative` (see example).
 
 Example:

versionProperties/1.16.5.properties

@@ -24,6 +24,7 @@ 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,6 +24,7 @@ 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,6 +25,7 @@ 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,6 +24,7 @@ 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,7 +22,8 @@ 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,7 +22,8 @@ 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,7 +22,8 @@ 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,7 +23,8 @@ 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,7 +23,8 @@ 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,7 +23,8 @@ 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=
     
-    # some versions of 1.8.11 nightly builds may not work, but the ones after 2025-03-30 should
+    # Iris - 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={}