Bump protocol version

Fixes some Iris shader compile issues

.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

.gitignore

@@ -29,7 +29,6 @@ buildAllJars/
 relocate_natives/.venv/
 relocate_natives/__pycache__/
 relocate_natives/apple-codesign/
-relocate_natives/cache/
 
 # file from notepad++
 *.bak

.gitlab-ci.yml

@@ -17,9 +17,6 @@ variables:
 # These can be extended so code is a bit less duplicated
 .build_java:
   #image: eclipse-temurin:17
-  before_script:
-    - apt-get update
-    - apt-get install python3 python3-pip python-is-python3 python3-venv -y --no-install-recommends
   cache:
     key: "gradleCache_$CI_JOB_NAME_SLUG"
     policy: pull-push
@@ -38,13 +35,13 @@ 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"]
+      - 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/;
     - ./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,13 +13,13 @@ 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"
 
     // Architectury is used here only as a replacement for forge's own loom
-    id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.10-SNAPSHOT" apply false
 }
 
 
@@ -67,63 +67,16 @@ 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 boolean enabled = false
     private final HashMap<String, String> replacements = new HashMap()
     private final HashMap<String, byte[]> rewrittenFiles = new HashMap()
     private var nativeRelocator
 
     public File rootDir
 
-    NativeTransformer() {
-        try {
-            int exitCode = Runtime.getRuntime().exec(new String[]{"python", "--version"}).waitFor()
-            if (exitCode == 0) {
-                enabled = true
-            }
-        } catch (IOException e) {
-            println(e)
-        }
-    }
-
     void relocateNative(String target, String replacement) {
         if (replacement.length() > target.length()) {
             throw new GradleException("Length of value \"${replacement}\" exceeds the length of \"${target}\": ${replacement.length()} > ${target.length()}")
@@ -132,22 +85,15 @@ class NativeTransformer implements Transformer {
         replacements.put(target, replacement)
     }
 
-    void before(Closure closure) {
-        if (enabled)
-            closure.run()
-    }
-
-
     @Override
     boolean canTransformResource(@Nonnull FileTreeElement element) {
-        return enabled && replacements.keySet().stream().anyMatch {
+        return replacements.keySet().stream().anyMatch {
             element.name.startsWith(it as String)
         }
     }
 
     @Override
     void transform(@Nonnull TransformerContext context) {
-        println("Transforming $context.path...")
         byte[] content = context.is.readAllBytes()
 
         if (nativeRelocator == null) {
@@ -300,6 +246,8 @@ subprojects { p ->
         // We cannot relocate this library since we call some MC classes that reference it
         implementation("it.unimi.dsi:fastutil:${rootProject.fastutil_version}")
 
+        //forgeShadowMe("com.github.luben:zstd-jni:1.5.7-3")
+        //forgeShadowMe("org.apache.commons:commons-compress:1.27.1")
         
         // Compression
         forgeShadowMe("org.lz4:lz4-java:${rootProject.lz4_version}") // LZ4
@@ -395,16 +343,13 @@ subprojects { p ->
         // Sqlite Database
         // librariesLocation isn't used because it's too long for replacing paths in native libraries
         // Allowing strings larger than the original string would require shifting the entire binary's contents
+        relocate "org.sqlite", "dh_sqlite", {
+            exclude "org/sqlite/native/**"
+        }
+        relocate "jdbc:sqlite", "jdbc:dh_sqlite"
+
         transform(NativeTransformer) {
             rootDir = project.rootDir
-
-            before {
-                relocate "org.sqlite", "dh_sqlite", {
-                    exclude "org/sqlite/native/**"
-                }
-                relocate "jdbc:sqlite", "jdbc:dh_sqlite"
-            }
-
             relocateNative "org/sqlite", "dh_sqlite"
             relocateNative "org_sqlite", "dh_1sqlite"
         }
@@ -502,6 +447,8 @@ subprojects { p ->
 
                 fabric_incompatibility_list  : fabric_incompatibility_list,
                 fabric_recommend_list        : fabric_recommend_list,
+
+                neoforge_version_range       : neoforge_version_range,
         ]
         
         // replace any properties in the sub-projects with the values defined here
@@ -582,8 +529,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
@@ -748,14 +696,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)

buildAll

@@ -24,5 +24,5 @@ for d in versionProperties/*; do
   if [ $? != 0 ]; then continue; fi
   
   echo "==================== Moving jar ===================="
-  mv Merged/*.jar buildAllJars/
+  mv build/merged/*.jar buildAllJars/
 done

buildAll.bat

@@ -14,13 +14,16 @@ for %%f in (versionProperties\*) do (
 
     @rem Clean out the folders, build it, and merge it
     echo ==================== Cleaning workspace to build !version! ====================
-    call .\gradlew.bat clean -PmcVer="!version!"
+    call .\gradlew.bat clean
-    echo ==================== Building !version! ====================
+    
+	echo ==================== Building !version! ====================
     call .\gradlew.bat build -PmcVer="!version!"
-    echo ==================== Merging !version! ====================
+    
+	echo ==================== Merging !version! ====================
     call .\gradlew.bat mergeJars -PmcVer="!version!"
+	
     echo ==================== Moving jar ====================
-    move Merged\*.jar buildAllJars\
+    move build\merged\*.jar buildAllJars\
 )
 
 endlocal

buildSrc/src/main/java/NativeRelocator.java

@@ -12,14 +12,15 @@ class NativeRelocator
 	/**
 	 * Initializes the NativeRelocator by preparing the environment if necessary.
 	 * Executes the appropriate preparation script based on the OS.
-	 *
-	 * @throws Exception if the preparation script fails or an unsupported OS is detected.
 	 */
-	NativeRelocator(Path rootDirectory) throws Exception
+	NativeRelocator(Path rootDirectory)
 	{
 		this.rootDirectory = rootDirectory;
 		this.cacheRoot = this.rootDirectory.resolve("cache");
+	}
 	
+	private void prepare() throws Exception
+	{
 		if (this.rootDirectory.resolve(".venv").toFile().exists())
 		{
 			return;
@@ -31,7 +32,7 @@ class NativeRelocator
 		String os = System.getProperty("os.name").toLowerCase();
 		if (os.contains("win"))
 		{
-			processBuilder.command("powershell", "./prepare.ps1");
+			processBuilder.command("powershell", "-ExecutionPolicy", "Bypass", "./prepare.ps1");
 		}
 		else if (os.contains("nix") || os.contains("nux") || os.contains("mac"))
 		{
@@ -196,6 +197,9 @@ class NativeRelocator
 			return Files.readAllBytes(outputFilePath);
 		}
 		
+		System.out.println("Relocating to " + outputPath + "...");
+		this.prepare();
+		
 		for (Map.Entry<String, String> replacement : replacements.entrySet())
 		{
 			this.replaceInNullTerminatedStrings(content, replacement.getKey(), replacement.getValue());

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();
@@ -77,13 +77,12 @@ public abstract class AbstractModInitializer
 		
 		this.initializeModCompat();
 		
-		LOGGER.info(ModInfo.READABLE_NAME + " client Initialized.");
-		ApiEventInjector.INSTANCE.fireAllEvents(DhApiAfterDhInitEvent.class, null);
-		
 		// Client uses config for auto-updater, so it's initialized here instead of post-init stage
 		this.initConfig();
 		logModIncompatibilityWarnings(); // needs to be called after config loading
 		
+		LOGGER.info(ModInfo.READABLE_NAME + " client Initialized.");
+		
 		this.subscribeClientStartedEvent(this::postInit);
 	}
 	
@@ -91,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();
@@ -106,8 +105,7 @@ public abstract class AbstractModInitializer
 		
 		this.initializeModCompat();
 		
-		LOGGER.info(ModInfo.READABLE_NAME + " server Initialized.");
+		LOGGER.info(ModInfo.READABLE_NAME + " server Initialized, adding event subscribers...");
-		ApiEventInjector.INSTANCE.fireAllEvents(DhApiAfterDhInitEvent.class, null);
 		
 		this.subscribeRegisterCommandsEvent(dispatcher -> { this.commandInitializer = new CommandInitializer(dispatcher); });
 		
@@ -121,7 +119,7 @@ public abstract class AbstractModInitializer
 			
 			this.checkForUpdates();
 			
-			LOGGER.info("Dedicated server initialized at " + server.getServerDirectory());
+			LOGGER.info(ModInfo.READABLE_NAME + " server Initialized at " + server.getServerDirectory());
 		});
 	}
 	
@@ -183,9 +181,12 @@ 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/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/McObjectConverter.java

@@ -49,7 +49,9 @@ public class McObjectConverter
 	@Deprecated
 	public static Mat4f Convert(
 			#if MC_VER < MC_1_19_4 com.mojang.math.Matrix4f 
-			#else org.joml.Matrix4f #endif 
+			#elif MC_VER < MC_1_21_6 org.joml.Matrix4f
+			#else org.joml.Matrix4fc 
+			#endif 
 			mcMatrix)
 	{
 		FloatBuffer buffer = FloatBuffer.allocate(16);
@@ -63,7 +65,9 @@ public class McObjectConverter
 	/** Taken from Minecraft's com.mojang.math.Matrix4f class from 1.18.2 */
 	private static void storeMatrix(
 			#if MC_VER < MC_1_19_4 com.mojang.math.Matrix4f 
-			#else org.joml.Matrix4f #endif
+			#elif MC_VER < MC_1_21_6 org.joml.Matrix4f 
+			#else org.joml.Matrix4fc 
+			#endif
 			matrix, 
 			FloatBuffer buffer)
 	{

common/src/main/java/com/seibel/distanthorizons/common/wrappers/VersionConstants.java

@@ -20,8 +20,6 @@
 package com.seibel.distanthorizons.common.wrappers;
 
 import com.seibel.distanthorizons.core.wrapperInterfaces.IVersionConstants;
-import net.minecraft.SharedConstants;
-import net.minecraft.client.Minecraft;
 
 /**
  * @author James Seibel
@@ -41,11 +39,49 @@ public class VersionConstants implements IVersionConstants
 	@Override
 	public String getMinecraftVersion()
 	{
-		#if MC_VER < MC_1_19_2
+		// these values are hard-coded to prevent an issue with Forge (specifically 1.18.2) where
-		return Minecraft.getInstance().getGame().getVersion().getId();
+		// it can't load client classes when running as a dedicated server,
+		// which was how we were dynamically accessing the MC version string
+		
+		#if MC_VER == MC_1_16_5
+			return "1.16.5";
+		
+		#elif MC_VER == MC_1_17_1
+			return "1.17.1";
+		
+		#elif MC_VER == MC_1_18_2
+			return "1.18.2";
+		
+		#elif MC_VER == MC_1_19_2
+			return "1.19.2";
+		#elif MC_VER == MC_1_19_4
+			return "1.19.4";
+		
+		#elif MC_VER == MC_1_20_1
+			return "1.20.1";
+		#elif MC_VER == MC_1_20_2
+			return "1.20.2";
+		#elif MC_VER == MC_1_20_4
+			return "1.20.4";
+		#elif MC_VER == MC_1_20_6
+			return "1.20.6";
+		
+		#elif MC_VER == MC_1_21_1
+			return "1.21.1";
+		#elif MC_VER == MC_1_21_3
+			return "1.21.3";
+		#elif MC_VER == MC_1_21_4
+			return "1.21.4";
+		#elif MC_VER == MC_1_21_5
+			return "1.21.5";
+		#elif MC_VER == MC_1_21_6
+			return "1.21.6";
+		#elif MC_VER == MC_1_21_8
+			return "1.21.8";
 		#else
-		return SharedConstants.getCurrentVersion().getId();
+			ERROR MC version constant missing
 		#endif
+		
 	}
 	
 }

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/BlockStateWrapper.java

@@ -97,16 +97,14 @@ public class BlockStateWrapper implements IBlockStateWrapper
 	/** technically final, but since it requires a method call to generate it can't be marked as such */
 	private String serialString;
 	private final int hashCode;
-	/** 
+	/** Should be between {@link LodUtil#BLOCK_FULLY_OPAQUE} and {@link LodUtil#BLOCK_FULLY_OPAQUE} */
-	 * Cached opacity value, -1 if not populated. <br>
+	private final int opacity;
-	 * Should be between {@link LodUtil#BLOCK_FULLY_OPAQUE} and {@link LodUtil#BLOCK_FULLY_OPAQUE}
-	 */
-	private int opacity = -1;
 	/** used by the Iris shader mod to determine how each LOD should be rendered */
 	private byte blockMaterialId = 0;
 	
 	private final boolean isBeaconBlock; 
 	private final boolean isBeaconBaseBlock;
+	private final boolean allowsBeaconBeamPassage;
 	/** null if this block can't tint beacons */
 	private final Color beaconTintColor; 
 	private final Color mapColor;
@@ -163,9 +161,12 @@ public class BlockStateWrapper implements IBlockStateWrapper
 		this.serialString = this.serialize(levelWrapper);
 		this.hashCode = Objects.hash(this.serialString);
 		this.blockMaterialId = this.calculateEDhApiBlockMaterialId().index;
+		this.opacity = this.calculateOpacity();
+		
+		String lowercaseSerial = this.serialString.toLowerCase();
+		
 		
 		// beacon blocks
-		String lowercaseSerial = this.serialString.toLowerCase();
 		boolean isBeaconBaseBlock = false;
 		for (int i = 0; i < LodUtil.BEACON_BASE_BLOCK_NAME_LIST.size(); i++)
 		{
@@ -201,6 +202,39 @@ public class BlockStateWrapper implements IBlockStateWrapper
 		this.beaconTintColor = beaconTintColor;
 		
 		
+		// allow/deny beacon beam passage 
+		boolean allowsBeaconBeamPassage;
+		if (this.blockState != null)
+		{
+			// get block properties (defaults to the values used by air)
+			boolean canOcclude = this.getCanOcclude();
+			boolean propagatesSkyLightDown = this.getPropagatesSkyLightDown();
+			
+			if (lowercaseSerial.contains("minecraft:bedrock"))
+			{
+				// bedrock is a special case fully opaque block that does allow beacons through
+				allowsBeaconBeamPassage = true;
+			}
+			else if (propagatesSkyLightDown || !canOcclude)
+			{
+				// stairs, cake, fences, etc.
+				allowsBeaconBeamPassage = true;
+			}
+			else
+			{
+				// non-opaque blocks (glass, mob spawners, etc.)
+				// all allow beacons through
+				allowsBeaconBeamPassage = (this.opacity != LodUtil.BLOCK_FULLY_OPAQUE);
+			}
+		}
+		else
+		{
+			// air allows beacons through
+			allowsBeaconBeamPassage = true;
+		}
+		this.allowsBeaconBeamPassage = allowsBeaconBeamPassage;
+		
+		
 		int mcColor = 0;
 		if (this.blockState != null)
 		{
@@ -344,28 +378,12 @@ public class BlockStateWrapper implements IBlockStateWrapper
 	//=================//
 	
 	@Override
-	public int getOpacity()
+	public int getOpacity() { return this.opacity; }
+	private int calculateOpacity()
 	{
-		// use the cached opacity value if possible
+		// get block properties (defaults to the values used by air)
-		if (this.opacity != -1)
+		boolean canOcclude = this.getCanOcclude();
-		{
+		boolean propagatesSkyLightDown = this.getPropagatesSkyLightDown();
-			return this.opacity;
-		}
-		
-		
-		// get block properties (default to the values used by air)
-		boolean canOcclude = false;
-		boolean propagatesSkyLightDown = true;
-		if (this.blockState != null)
-		{
-			canOcclude = this.blockState.canOcclude();
-			
-			#if MC_VER < MC_1_21_3
-			propagatesSkyLightDown = this.blockState.propagatesSkylightDown(EmptyBlockGetter.INSTANCE, BlockPos.ZERO);
-			#else
-			propagatesSkyLightDown = this.blockState.propagatesSkylightDown();
-			#endif
-		}
 		
 		
 		
@@ -398,9 +416,37 @@ public class BlockStateWrapper implements IBlockStateWrapper
 		}
 		
 		
-		this.opacity = opacity;
+		return opacity;
-		return this.opacity;
 	}
+	private boolean getCanOcclude()
+	{
+		// defaults to the value used by air
+		boolean canOcclude = false;
+		if (this.blockState != null)
+		{
+			canOcclude = this.blockState.canOcclude();
+		}
+		
+		return canOcclude;
+	}
+	private boolean getPropagatesSkyLightDown()
+	{
+		// defaults to the value used by air
+		boolean propagatesSkyLightDown = true;
+		if (this.blockState != null)
+		{
+			#if MC_VER < MC_1_21_3
+			propagatesSkyLightDown = this.blockState.propagatesSkylightDown(EmptyBlockGetter.INSTANCE, BlockPos.ZERO);
+			#else
+			propagatesSkyLightDown = this.blockState.propagatesSkylightDown();
+			#endif
+		}
+		
+		return propagatesSkyLightDown;
+	}
+	
+	
+	
 	
 	@Override
 	public int getLightEmission() { return (this.blockState != null) ? this.blockState.getLightEmission() : 0; }
@@ -473,6 +519,8 @@ public class BlockStateWrapper implements IBlockStateWrapper
 	public boolean isBeaconBaseBlock() { return this.isBeaconBaseBlock; }
 	@Override
 	public boolean isBeaconTintBlock() { return this.beaconTintColor != null; }
+	@Override
+	public boolean allowsBeaconBeamPassage() { return this.allowsBeaconBeamPassage; }
 	
 	@Override
 	public Color getMapColor() { return this.mapColor; }

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

@@ -40,11 +40,18 @@ import java.util.Random;
 #endif
 import net.minecraft.world.level.block.state.BlockState;
 import org.apache.logging.log4j.Logger;
+import org.jetbrains.annotations.Nullable;
 
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.concurrent.locks.ReentrantLock;
 
+#if MC_VER < MC_1_21_5
+#else
+import net.minecraft.client.renderer.block.model.BlockModelPart;
+#endif
+
 /**
  * This stores and calculates the colors
  * the given {@link BlockState} should have based
@@ -84,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;
 	
@@ -167,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();
 	}
@@ -196,9 +203,7 @@ public class ClientBlockStateColorCache
 				List<BakedQuad> quads = null;
 				for (Direction direction : COLOR_RESOLUTION_DIRECTION_ORDER)
 				{
-					quads = Minecraft.getInstance().getModelManager().getBlockModelShaper().
+					quads = this.getQuadsForDirection(direction);
-							getBlockModel(this.blockState).getQuads(this.blockState, direction, RANDOM);
-					
 					if (quads != null && !quads.isEmpty()
 						&& !(
 							this.blockState.getBlock() instanceof RotatedPillarBlock
@@ -212,19 +217,37 @@ public class ClientBlockStateColorCache
 				
 				if (quads == null || quads.isEmpty())
 				{
-					quads = Minecraft.getInstance().getModelManager().getBlockModelShaper().
+					quads = this.getUnculledQuads();
-							getBlockModel(this.blockState).getQuads(this.blockState, null, RANDOM);
 				}
 				
-				if (quads != null && !quads.isEmpty())
+				if (quads != null 
+					&& !quads.isEmpty() 
+					&& quads.get(0) != null)
 				{
-					this.needPostTinting = quads.get(0).isTinted();
+					BakedQuad firstQuad = quads.get(0);
-					this.needShade = quads.get(0).isShade();
+					
-					this.tintIndex = quads.get(0).getTintIndex();
+					this.needPostTinting = firstQuad.isTinted();
+					#if MC_VER <= MC_1_21_4
+					this.needShade = firstQuad.isShade();
+					this.tintIndex = firstQuad.getTintIndex();
+					#else
+					this.needShade = firstQuad.shade();
+					this.tintIndex = firstQuad.tintIndex();
+					#endif
+					
+					#if MC_VER < MC_1_17_1
 					this.baseColor = calculateColorFromTexture(
-	                        #if MC_VER < MC_1_17_1 quads.get(0).sprite,
+                        firstQuad.sprite,
-							#else quads.get(0).getSprite(), #endif
+						ColorMode.getColorMode(this.blockState.getBlock()));
-							ColorMode.getColorMode(this.blockState.getBlock()));
+					#elif MC_VER < MC_1_21_5
+					this.baseColor = calculateColorFromTexture(
+                        firstQuad.getSprite(),
+						ColorMode.getColorMode(this.blockState.getBlock()));
+					#else
+					this.baseColor = calculateColorFromTexture(
+						firstQuad.sprite(),
+						ColorMode.getColorMode(this.blockState.getBlock()));
+					#endif
 				}
 				else
 				{
@@ -232,8 +255,7 @@ public class ClientBlockStateColorCache
 					this.needPostTinting = false;
 					this.needShade = false;
 					this.tintIndex = 0;
-					this.baseColor = calculateColorFromTexture(Minecraft.getInstance().getModelManager().getBlockModelShaper().getParticleIcon(this.blockState),
+					this.baseColor = this.getParticleIconColor();
-							ColorMode.getColorMode(this.blockState.getBlock()));
 				}
 			}
 			else
@@ -242,8 +264,7 @@ public class ClientBlockStateColorCache
 				this.needPostTinting = true;
 				this.needShade = false;
 				this.tintIndex = 0;
-				this.baseColor = calculateColorFromTexture(Minecraft.getInstance().getModelManager().getBlockModelShaper().getParticleIcon(this.blockState),
+				this.baseColor = this.getParticleIconColor();
-						ColorMode.getColorMode(this.blockState.getBlock()));
 			}
 			
 			this.isColorResolved = true;
@@ -253,6 +274,35 @@ public class ClientBlockStateColorCache
 			RESOLVE_LOCK.unlock();
 		}
 	}
+	
+	@Nullable
+	private List<BakedQuad> getUnculledQuads() { return this.getQuadsForDirection(null); }
+	@Nullable
+	private List<BakedQuad> getQuadsForDirection(@Nullable Direction direction)
+	{
+		List<BakedQuad> quads = null;
+		
+		#if MC_VER < MC_1_21_5
+		quads = Minecraft.getInstance().getModelManager().getBlockModelShaper().
+				getBlockModel(this.blockState).getQuads(this.blockState, direction, RANDOM);
+		#else
+		List<BlockModelPart> blockModelPartList = Minecraft.getInstance().getModelManager().getBlockModelShaper().
+				getBlockModel(this.blockState).collectParts(RANDOM);
+		
+		quads = new ArrayList<>();
+		if (blockModelPartList != null)
+		{
+			for (int i = 0; i < blockModelPartList.size(); i++)
+			{
+				// if direction is null this will return the unculled quads
+				quads.addAll(blockModelPartList.get(i).getQuads(direction));
+			}
+		}
+		#endif
+		
+		return quads;
+	}
+	
 	//TODO: Perhaps make this not just use the first frame?
 	private static int calculateColorFromTexture(TextureAtlasSprite texture, ColorMode colorMode)
 	{
@@ -383,6 +433,13 @@ public class ClientBlockStateColorCache
 		return (bias + (scale * t)) >>> 16;
 	}
 	
+	private int getParticleIconColor()
+	{
+		return calculateColorFromTexture(
+				Minecraft.getInstance().getModelManager().getBlockModelShaper().getParticleIcon(this.blockState),
+				ColorMode.getColorMode(this.blockState.getBlock()));
+	}
+	
 	
 	
 	//===============//
@@ -414,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

@@ -20,13 +20,13 @@
 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.*;
 import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.biome.Biomes;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.lighting.LevelLightEngine;
@@ -39,55 +39,54 @@ 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
+	#else
-	private final Biome biome;
+	public static final ConcurrentMap<String, Holder<Biome>> BIOME_BY_RESOURCE_STRING = new ConcurrentHashMap<>();
+    #endif
+	
+	
+	@NotNull
+	private final BiomeWrapper biomeWrapper;
 	
 	
 	
-	public TintWithoutLevelOverrider(BiomeWrapper biomeWrapper, IClientLevelWrapper clientLevelWrapper)
+	//=============//
-	{
+	// constructor //
-		// try to get the wrapped biome
+	//=============//
-		Biome unwrappedBiome = null;
-		if (biomeWrapper.biome != null)
-		{
-			unwrappedBiome = unwrap(biomeWrapper.biome);
-		}
 	
-		if(unwrappedBiome == null)
+	public TintWithoutLevelOverrider(@NotNull BiomeWrapper biomeWrapper, IClientLevelWrapper clientLevelWrapper)
-		{
+	{ this.biomeWrapper = biomeWrapper; }
-			// we are looking at the empty biome wrapper, try using plains as a backup
-			BiomeWrapper plainsBiomeWrapper = ((BiomeWrapper) clientLevelWrapper.getPlainsBiomeWrapper());
-			if (plainsBiomeWrapper != null)
-			{
-				unwrappedBiome = unwrap(plainsBiomeWrapper.biome);
-			}
-		}
-		
-		this.biome = unwrappedBiome;
-	}
 	
 	
 	
+	//=========//
+	// methods //
+	//=========//
+	
 	@Override
 	public int getBlockTint(@NotNull BlockPos blockPos, @NotNull ColorResolver colorResolver)
 	{
-		if (this.biome != null)
+		String biomeString = this.biomeWrapper.getSerialString();
+		if (biomeString == null 
+			|| biomeString.isEmpty() 
+			|| biomeString.equals(BiomeWrapper.EMPTY_BIOME_STRING))
 		{
-			return colorResolver.getColor(this.biome, blockPos.getX(), blockPos.getZ());
+			// default to "plains" for empty/invalid biomes
+			biomeString = "minecraft:plains";
 		}
-		else
-		{
-			// hopefully unneeded debug color
-			return ColorUtil.CYAN;
-		}
-	}
 		
+		
+		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
@@ -97,6 +96,88 @@ public class TintWithoutLevelOverrider implements BlockAndTintGetter
 		#endif
 	}
 	
+	/**
+	 * <p>Previously, this class might have immediately unwrapped the Holder like this:</p>
+	 * <pre>{@code
+	 * // Inside constructor (OLD WAY - PROBLEMATIC):
+	 * Holder<Biome> biomeHolder = getTheHolderFromSomewhere();
+	 * this.biome = biomeHolder.value(); // <-- PROBLEM HERE
+	 * }</pre>
+	 *
+	 * <p>This approach is problematic because the {@link net.minecraft.core.Holder} system,
+	 * particularly {@code Holder.Reference}, is designed for <strong>late binding</strong>. Here's why storing
+	 * the Holder itself is now necessary:</p>
+	 * <ol>
+	 *   <li>A {@code Holder.Reference<Biome>} might be created initially just with a
+	 *       {@link net.minecraft.resources.ResourceKey} (like {@code minecraft:plains}), but its actual
+	 *       {@link net.minecraft.core.Holder#value() value()} (the {@code Biome} object itself) might be {@code null}
+	 *       at construction time.</li>
+	 *   <li>Later, during game loading, registry population, or potentially due to modifications by other mods
+	 *       (e.g., Polytone), the system calls internal binding methods (like {@code bindValue(Biome)})
+	 *       on the {@code Holder} instance. This sets or <strong>updates</strong> the internal reference to the
+	 *       actual {@code Biome} object.</li>
+	 *   <li>Crucially, the binding process might assign a completely <strong>new</strong> {@code Biome} object
+	 *       instance to the {@code Holder} reference, replacing any previous one.</li>
+	 * </ol>
+	 *
+	 * <p>If we unwrapped the {@code Holder} using {@code .value()} within the constructor (the old way),
+	 * our class's internal {@code biome} field would permanently store a reference to whatever {@code Biome}
+	 * object the {@code Holder} pointed to *at that exact moment*. It would have no link back to the
+	 * {@code Holder} and would be unaware if the {@code Holder} was later updated to point to a different
+	 * (or the initially missing) {@code Biome} object. This would lead to using stale or even {@code null} data.</p>
+	 *
+	 * <p>By storing the {@code Holder<Biome>} itself, this class can call {@link net.minecraft.core.Holder#value()}
+	 * 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)
+	{
+		// 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;
+			});
+	}
+	
 	
 	
 	//================//

common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java

@@ -56,20 +56,20 @@ import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
 import static com.seibel.distanthorizons.common.wrappers.gui.GuiHelper.*;
+import static com.seibel.distanthorizons.common.wrappers.gui.GuiHelper.Translatable;
 
 
-/**
+/*
  * Based upon TinyConfig but is highly modified
  * https://github.com/Minenash/TinyConfig
  *
+ * Note: floats don't work with this system, use doubles.
+ *
  * Credits to Motschen
  *
  * @author coolGi
  * @version 5-21-2022
  */
-// FLOATS DONT WORK WITH THIS
-
-/** This file is going to be removed sometime soon, please dont hook onto anything within this file until the new UI is compleated */
 @SuppressWarnings("unchecked")
 public class ClassicConfigGUI
 {
@@ -178,7 +178,7 @@ public class ClassicConfigGUI
 				}
 				else
 				{
-					((ConfigEntry) info).uiSetWithoutSaving(value.intValue());
+					((ConfigEntry) info).uiSetWithoutSaving(value != null ? value.intValue() : 0);
 				}
 			}
 			
@@ -249,7 +249,7 @@ public class ClassicConfigGUI
 		protected void init()
 		{
 			super.init();
-			if (!reload)
+			if (!this.reload)
 			{
 				ConfigBase.INSTANCE.configFileINSTANCE.loadFromFile();
 			}
@@ -276,7 +276,7 @@ public class ClassicConfigGUI
 						(buttonWidget) -> {
 							ChangelogScreen changelogScreen = new ChangelogScreen(this);
 							if (changelogScreen.usable)
-								Objects.requireNonNull(minecraft).setScreen(changelogScreen);
+								Objects.requireNonNull(this.minecraft).setScreen(changelogScreen);
 							else 
 								LOGGER.warn("Changelog was not able to open");
 						},
@@ -286,17 +286,17 @@ public class ClassicConfigGUI
 			}
 			
 			
-			addBtn(MakeBtn(Translatable("distanthorizons.general.cancel"), 
+			this.addBtn(MakeBtn(Translatable("distanthorizons.general.cancel"), 
 					this.width / 2 - 154, this.height - 28, 
 					150, 20, 
 					button -> 
 					{
 						ConfigBase.INSTANCE.configFileINSTANCE.loadFromFile();
-						Objects.requireNonNull(minecraft).setScreen(parent);
+						Objects.requireNonNull(this.minecraft).setScreen(this.parent);
 					}));
-			doneButton = addBtn(MakeBtn(Translatable("distanthorizons.general.done"), this.width / 2 + 4, this.height - 28, 150, 20, (button) -> {
+			this.doneButton = this.addBtn(MakeBtn(Translatable("distanthorizons.general.done"), this.width / 2 + 4, this.height - 28, 150, 20, (button) -> {
 				ConfigBase.INSTANCE.configFileINSTANCE.saveToFile();
-				Objects.requireNonNull(minecraft).setScreen(parent);
+				Objects.requireNonNull(this.minecraft).setScreen(this.parent);
 			}));
 			
 			this.list = new ConfigListWidget(this.minecraft, this.width * 2, this.height, 32, 32, 25);
@@ -312,8 +312,8 @@ public class ClassicConfigGUI
 			{
 				try
 				{
-					if (info.getCategory().matches(category) && info.getAppearance().showInGui)
+					if (info.getCategory().matches(this.category) && info.getAppearance().showInGui)
-						addMenuItem(info);
+						this.addMenuItem(info);
 				}
 				catch (Exception e)
 				{
@@ -336,7 +336,7 @@ public class ClassicConfigGUI
 		private void addMenuItem(AbstractConfigType info)
 		{
 			initEntry(info, this.translationPrefix);
-			Component name = Translatable(translationPrefix + info.getNameWCategory());
+			Component name = Translatable(this.translationPrefix + info.getNameWCategory());
 			
 			
 			if (ConfigEntry.class.isAssignableFrom(info.getClass()))
@@ -345,7 +345,7 @@ public class ClassicConfigGUI
 					((ConfigEntry) info).uiSetWithoutSaving(((ConfigEntry) info).getDefaultValue());
 					((EntryInfo) info.guiValue).index = 0;
 					this.reload = true;
-					Objects.requireNonNull(minecraft).setScreen(this);
+					Objects.requireNonNull(this.minecraft).setScreen(this);
 				};
 				int posX = this.width - ConfigScreenConfigs.SpaceFromRightScreen - 150 - ConfigScreenConfigs.ButtonWidthSpacing - ConfigScreenConfigs.ResetButtonWidth;
 				int posZ = 0;
@@ -359,17 +359,17 @@ public class ClassicConfigGUI
 					Map.Entry<Button.OnPress, Function<Object, Component>> widget = (Map.Entry<Button.OnPress, Function<Object, Component>>) ((EntryInfo) info.guiValue).widget;
 					if (info.getType().isEnum())
 					{
-						widget.setValue(value -> Translatable(translationPrefix + "enum." + info.getType().getSimpleName() + "." + info.get().toString()));
+						widget.setValue(value -> Translatable(this.translationPrefix + "enum." + info.getType().getSimpleName() + "." + info.get().toString()));
 					}
 					this.list.addButton(MakeBtn(widget.getValue().apply(info.get()), this.width - 150 - ConfigScreenConfigs.SpaceFromRightScreen, 0, 150, 20, widget.getKey()), resetButton, null, name);
 					return;
 				}
 				else if (((EntryInfo) info.guiValue).widget != null)
 				{
-					EditBox widget = new EditBox(font, this.width - 150 - ConfigScreenConfigs.SpaceFromRightScreen + 2, 0, 150 - 4, 20, null);
+					EditBox widget = new EditBox(this.font, this.width - 150 - ConfigScreenConfigs.SpaceFromRightScreen + 2, 0, 150 - 4, 20, Translatable("")); 
 					widget.setMaxLength(150);
 					widget.insertText(String.valueOf(info.get()));
-					Predicate<String> processor = ((BiFunction<EditBox, Button, Predicate<String>>) ((EntryInfo) info.guiValue).widget).apply(widget, doneButton);
+					Predicate<String> processor = ((BiFunction<EditBox, Button, Predicate<String>>) ((EntryInfo) info.guiValue).widget).apply(widget, this.doneButton);
 					widget.setFilter(processor);
 					this.list.addButton(widget, resetButton, null, name);
 					return;
@@ -379,7 +379,7 @@ public class ClassicConfigGUI
 			{
 				Button widget = MakeBtn(name, this.width / 2 - 100, this.height - 28, 100 * 2, 20, (button -> {
 					ConfigBase.INSTANCE.configFileINSTANCE.saveToFile();
-					Objects.requireNonNull(minecraft).setScreen(ClassicConfigGUI.getScreen(this.configBase, this, ((ConfigCategory) info).getDestination()));
+					Objects.requireNonNull(this.minecraft).setScreen(ClassicConfigGUI.getScreen(this.configBase, this, ((ConfigCategory) info).getDestination()));
 				}));
 				this.list.addButton(widget, null, null, null);
 				return;
@@ -420,16 +420,34 @@ public class ClassicConfigGUI
 			#endif
 			this.list.render(matrices, mouseX, mouseY, delta); // Render buttons
 			
-			DhDrawCenteredString(matrices, font, title, width / 2, 15, 0xFFFFFF); // Render title
+			// Render title
+			this.DhDrawCenteredString(matrices, this.font, this.title, this.width / 2, 15, 
+					#if MC_VER < MC_1_21_6 
+					0xFFFFFF // RGB white
+					#else 
+					0xFFFFFFFF // ARGB white
+					#endif);
 			
 			if (this.configBase.modID.equals("distanthorizons"))
 			{
 				// Display version
-				DhDrawString(matrices, font, TextOrLiteral(ModInfo.VERSION), 2, height - 10, 0xAAAAAA);
+				this.DhDrawString(matrices, this.font, TextOrLiteral(ModInfo.VERSION), 2, this.height - 10, 
+						#if MC_VER < MC_1_21_6
+						0xAAAAAA // RGB white
+						#else
+						0xFFAAAAAA // ARGB white
+						#endif);
 				
 				// If the update is pending, display this message to inform the user that it will apply when the game restarts
 				if (SelfUpdater.deleteOldJarOnJvmShutdown)
-					DhDrawString(matrices, font, Translatable(configBase.modID + ".updater.waitingForClose"), 4, height - 38, 0xFFFFFF);
+				{
+					this.DhDrawString(matrices, this.font, Translatable(this.configBase.modID + ".updater.waitingForClose"), 4, this.height - 38, 
+						#if MC_VER < MC_1_21_6
+						0xFFFFFF // RGB white
+						#else 
+						0xFFFFFFFF // ARGB white
+						#endif);
+				}
 			}
 			
 			
@@ -659,8 +677,10 @@ public class ClassicConfigGUI
 			if (text != null && (!text.getString().contains("spacer") || button != null))
                 #if MC_VER < MC_1_20_1
 				GuiComponent.drawString(matrices, textRenderer, text, 12, y + 5, 0xFFFFFF);
+				#elif MC_VER < MC_1_21_6
+				matrices.drawString(textRenderer, this.text, 12, y + 5, 0xFFFFFF);
 				#else
-				matrices.drawString(textRenderer, text, 12, y + 5, 0xFFFFFF);
+				matrices.drawString(textRenderer, this.text, 12, y + 5, 0xFFFFFFFF);
 				#endif
 		}
 		

common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/DhScreen.java

@@ -52,6 +52,27 @@ public class DhScreen extends Screen
 	{
 		renderTooltip(guiStack, comp, x, y);
 	}
+	#elif MC_VER < MC_1_21_6
+	protected void DhDrawCenteredString(GuiGraphics guiStack, Font font, Component text, int x, int y, int color)
+	{
+		guiStack.drawCenteredString(font, text, x, y, color);
+	}
+	protected void DhDrawString(GuiGraphics guiStack, Font font, Component text, int x, int y, int color)
+	{
+		guiStack.drawString(font, text, x, y, color);
+	}
+	//protected void DhRenderTooltip(GuiGraphics guiStack, Font font, List<? extends net.minecraft.util.FormattedCharSequence> text, int x, int y)
+	//{
+	//	guiStack.renderTooltip(font, text, x, y);
+	//}
+	protected void DhRenderComponentTooltip(GuiGraphics guiStack, Font font, List<Component> comp, int x, int y)
+	{
+		guiStack.renderComponentTooltip(font, comp, x, y);
+	}
+	protected void DhRenderTooltip(GuiGraphics guiStack, Font font, Component text, int x, int y)
+	{
+		guiStack.renderTooltip(font, text, x, y);
+	}
 	#else
 	protected void DhDrawCenteredString(GuiGraphics guiStack, Font font, Component text, int x, int y, int color)
 	{
@@ -61,17 +82,20 @@ public class DhScreen extends Screen
 	{
 		guiStack.drawString(font, text, x, y, color);
 	}
-	protected void DhRenderTooltip(GuiGraphics guiStack, Font font, List<? extends net.minecraft.util.FormattedCharSequence> text, int x, int y)
+	//protected void DhRenderTooltip(GuiGraphics guiStack, Font font, List<? extends net.minecraft.util.FormattedCharSequence> text, int x, int y)
-	{
+	//{
-		guiStack.renderTooltip(font, text, x, y);
+	//	//guiStack.renderTooltip(font, text, x, y);
-	}
+	//}
 	protected void DhRenderComponentTooltip(GuiGraphics guiStack, Font font, List<Component> comp, int x, int y)
 	{
-		guiStack.renderComponentTooltip(font, comp, x, y);
+		guiStack.setComponentTooltipForNextFrame(font, comp, x, y);
 	}
 	protected void DhRenderTooltip(GuiGraphics guiStack, Font font, Component text, int x, int y)
 	{
-		guiStack.renderTooltip(font, text, x, y);
+		guiStack.setTooltipForNextFrame(font, text, x, y);
 	}
-        #endif
+    #endif
+	
+	
+	
 }

common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/TexturedButtonWidget.java

@@ -39,9 +39,13 @@ import net.minecraft.client.renderer.GameRenderer;
 #elif MC_VER < MC_1_20_2
 import net.minecraft.client.gui.components.ImageButton;
 import net.minecraft.client.gui.GuiGraphics;
+#elif MC_VER < MC_1_21_6
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.renderer.RenderType;
 #else
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.renderer.RenderType;
+import net.minecraft.client.renderer.RenderPipelines;
 #endif
 
 /**
@@ -172,9 +176,15 @@ public class TexturedButtonWidget extends Button
 		{
 			#if MC_VER < MC_1_21_3
 			matrices.blitSprite(SPRITES.get(this.active, this.isHoveredOrFocused()), this.getX(), this.getY(), this.getWidth(), this.getHeight());
+			#elif MC_VER < MC_1_21_6
+			matrices.blitSprite(
+					RenderType::guiTextured,
+					SPRITES.get(this.active, this.isHoveredOrFocused()),
+					this.getX(), this.getY(),
+					this.getWidth(), this.getHeight());
 			#else
 			matrices.blitSprite(
-				RenderType::guiTextured,
+				RenderPipelines.GUI_TEXTURED,
 				SPRITES.get(this.active, this.isHoveredOrFocused()),
 				this.getX(), this.getY(),
 				this.getWidth(), this.getHeight());
@@ -196,7 +206,7 @@ public class TexturedButtonWidget extends Button
 		
 		#if MC_VER < MC_1_21_3
 		matrices.blit(this.textureResourceLocation, this.getX(), this.getY(), this.u, this.v + (this.hoveredVOffset * i), this.width, this.height, this.textureWidth, this.textureHeight);
-		#else
+		#elif MC_VER < MC_1_21_6
 		matrices.blit(
 				RenderType::guiTextured,
 				this.textureResourceLocation,
@@ -204,6 +214,14 @@ public class TexturedButtonWidget extends Button
 				this.u, this.v + (this.hoveredVOffset * i),
 				this.width, this.height,
 				this.textureWidth, this.textureHeight);
+		#else
+		matrices.blit(
+				RenderPipelines.GUI_TEXTURED,
+				this.textureResourceLocation,
+				this.getX(), this.getY(),
+				this.u, this.v + (this.hoveredVOffset * i),
+				this.width, this.height,
+				this.textureWidth, this.textureHeight);
 
 		#endif
 	}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/UpdateModScreen.java

@@ -169,8 +169,10 @@ public class UpdateModScreen extends DhScreen
 	{
 		#if MC_VER < MC_1_20_2
 		this.renderBackground(matrices); // Render background
-		#else
+		#elif MC_VER < MC_1_21_6
 		this.renderBackground(matrices, mouseX, mouseY, delta); // Render background
+		#else
+		// background blur is already being rendered, rendering again causes the game to crash
 		#endif
 		
 		// TODO: add the tooltips for the buttons
@@ -178,16 +180,30 @@ public class UpdateModScreen extends DhScreen
 		// TODO: Add tooltips
 		
 		// Render the text's
-		DhDrawCenteredString(matrices, this.font, Translatable(ModInfo.ID + ".updater.text1"), this.width / 2, this.height / 2 - 35, 0xFFFFFF);
+		this.DhDrawCenteredString(matrices, this.font, 
-		DhDrawCenteredString(matrices, this.font, 
+				Translatable(ModInfo.ID + ".updater.text1"), 
-				Translatable(ModInfo.ID + ".updater.text2", currentVer, nextVer), 
+				this.width / 2, this.height / 2 - 35,
-				this.width / 2, this.height / 2 - 20, 0x52FD52);
+				#if MC_VER < MC_1_21_6
+				0xFFFFFF // RGB
+				#else
+				0xFFFFFFFF // ARGB
+				#endif
+		);
+		this.DhDrawCenteredString(matrices, this.font, 
+				Translatable(ModInfo.ID + ".updater.text2", this.currentVer, this.nextVer), 
+				this.width / 2, this.height / 2 - 20, 
+				#if MC_VER < MC_1_21_6
+				0x52FD52 // RGB
+				#else
+				0xFF52FD52 // ARGB
+				#endif
+		);
 	}
 	
 	@Override
 	public void onClose()
 	{
-		Objects.requireNonNull(minecraft).setScreen(this.parent); // Goto the parent screen
+		Objects.requireNonNull(this.minecraft).setScreen(this.parent); // Go to the parent screen
 	}
 	
 }

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

common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftGLWrapper.java

@@ -19,7 +19,11 @@
 
 package com.seibel.distanthorizons.common.wrappers.minecraft;
 
+#if MC_VER < MC_1_21_5
 import com.mojang.blaze3d.platform.GlStateManager;
+#elif MC_VER >= MC_1_21_5
+import com.mojang.blaze3d.opengl.GlStateManager;
+#endif
 
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftGLWrapper;
@@ -148,7 +152,10 @@ public class MinecraftGLWrapper implements IMinecraftGLWrapper
 	public void glBlendFunc(int sfactor, int dfactor) 
 	{
 		GL32.glBlendFunc(sfactor, dfactor);
+		
+		#if MC_VER < MC_1_21_5
 		GlStateManager._blendFunc(sfactor, dfactor);
+		#endif
 	}
 	/** @see GL32#glBlendFuncSeparate */
 	@Override
@@ -180,7 +187,15 @@ public class MinecraftGLWrapper implements IMinecraftGLWrapper
 	/** @see GL32#glDeleteBuffers(int)  */
 	@Override
 	public void glDeleteBuffers(int buffer)
-	{ GlStateManager._glDeleteBuffers(buffer); }
+	{
+		GL32.glDeleteBuffers(buffer);
+		
+		// MC's implementation has a bug where it will throw:
+		// GL_INVALID_OPERATION in glBufferData(immutable)
+		// when attempting to delete Storage Buffers
+		// So we need to manually delete the buffers ourselves
+		//GlStateManager._glDeleteBuffers(buffer); 
+	}
 	
 	
 	// culling //
@@ -218,7 +233,7 @@ public class MinecraftGLWrapper implements IMinecraftGLWrapper
 		GlStateManager._activeTexture(textureId);
 	}
 	@Override
-	public int getActiveTexture() { return GL32.glGetInteger(GL32.GL_ACTIVE_TEXTURE); }
+	public int getActiveTexture() { return GL32.glGetInteger(GL32.GL_TEXTURE_BINDING_2D); }
 	
 	/**
 	 * Always binds to {@link GL32#GL_TEXTURE_2D}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftRenderWrapper.java

@@ -33,9 +33,12 @@ import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.util.ColorUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.misc.ILightMapWrapper;
 
-#if MC_VER >= MC_1_17_1
+#if MC_VER < MC_1_17_1
+#elif MC_VER < MC_1_21_6
 import net.minecraft.client.renderer.FogRenderer;
 import com.mojang.blaze3d.systems.RenderSystem;
+#else
+import net.minecraft.client.renderer.fog.FogRenderer;
 #endif
 
 #if MC_VER < MC_1_19_4
@@ -43,8 +46,6 @@ import org.joml.Matrix4f;
 import org.joml.Vector3f;
 #else
 #endif
-#if MC_VER >= MC_1_20_2
-#endif
 
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.AbstractOptifineAccessor;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
@@ -71,6 +72,9 @@ import net.minecraft.world.phys.Vec3;
 import org.apache.logging.log4j.Logger;
 import org.joml.Vector4f;
 
+#if MC_VER >= MC_1_21_5
+import com.mojang.blaze3d.opengl.GlTexture;
+#endif
 
 /**
  * A singleton that contains everything
@@ -102,7 +106,19 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 	 */
 	public int finalLevelFrameBufferId = -1;
 	
+	public boolean colorTextureCastFailLogged = false;
+	public boolean depthTextureCastFailLogged = false;
 	
+	#if MC_VER < MC_1_21_6
+	#else
+	private static FogRenderer mcFogRenderer = null;
+	#endif
+	
+	
+	
+	//=========//
+	// methods //
+	//=========//
 	
 	@Override
 	public Vec3f getLookAtVector()
@@ -115,11 +131,22 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 	/** Unless you really need to know if the player is blind, use {@link MinecraftRenderWrapper#isFogStateSpecial()}/{@link IMinecraftRenderWrapper#isFogStateSpecial()} instead */
 	public boolean playerHasBlindingEffect()
 	{
-		return MC.player.getActiveEffectsMap().get(MobEffects.BLINDNESS) != null
+		if (MC.player == null)
+		{
+			return false;
+		}
+		else if (MC.player.getActiveEffectsMap() == null)
+		{
+			return false;
+		}
+		else
+		{
+			return MC.player.getActiveEffectsMap().get(MobEffects.BLINDNESS) != null
 				#if MC_VER >= MC_1_19_2
-				|| MC.player.getActiveEffectsMap().get(MobEffects.DARKNESS) != null // Deep dark effect
+					|| MC.player.getActiveEffectsMap().get(MobEffects.DARKNESS) != null // Deep dark effect
 				#endif
-				;
+					;
+		}
 	}
 	
 	@Override
@@ -152,7 +179,7 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 				Math.max(0f, Math.min(colorValues[2], 1f)), // b
 				Math.max(0f, Math.min(colorValues[3], 1f))  // a
 		);
-		#else
+		#elif MC_VER < MC_1_21_6
 		Vector4f colorValues = FogRenderer.computeFogColor(MC.gameRenderer.getMainCamera(), partialTicks, MC.level, 1, MC.gameRenderer.getDarkenWorldAmount(partialTicks));
 		return new Color(
 				Math.max(0f, Math.min(colorValues.x, 1f)), // r
@@ -160,6 +187,31 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 				Math.max(0f, Math.min(colorValues.z, 1f)), // b
 				Math.max(0f, Math.min(colorValues.w, 1f))  // a
 		);
+		#else
+			
+		if (mcFogRenderer == null)
+		{
+			mcFogRenderer = new FogRenderer();
+		}
+		
+		if (MC.level == null)
+		{
+			// shouldn't happen, but just in case
+			return Color.white;
+		}
+		
+		boolean isFoggy = 
+				MC.level.effects().isFoggyAt(
+						MC.gameRenderer.getMainCamera().getBlockPosition().getX(),
+						MC.gameRenderer.getMainCamera().getBlockPosition().getZ()) 
+					|| MC.gui.getBossOverlay().shouldCreateWorldFog();
+		Vector4f colorValues = mcFogRenderer.setupFog(MC.gameRenderer.getMainCamera(), MC.options.getEffectiveRenderDistance(), isFoggy, MC.deltaTracker, MC.gameRenderer.getDarkenWorldAmount(MC.deltaTracker.getGameTimeDeltaPartialTick(true)), MC.level);
+		return new Color(
+				Math.max(0f, Math.min(colorValues.x, 1f)), // r
+				Math.max(0f, Math.min(colorValues.y, 1f)), // g
+				Math.max(0f, Math.min(colorValues.z, 1f)), // b
+				Math.max(0f, Math.min(colorValues.w, 1f))  // a
+		);
 		#endif
 	}
 	// getSpecialFogColor() is the same as getFogColor()
@@ -250,6 +302,26 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 	
 	private RenderTarget getRenderTarget() { return MC.getMainRenderTarget(); }
 	
+	@Override
+	public boolean mcRendersToFrameBuffer()
+	{
+		#if MC_VER < MC_1_21_5
+		return true;
+		#else
+		return false;
+		#endif
+	}
+	
+	@Override
+	public boolean runningLegacyOpenGL()
+	{
+		#if MC_VER <= MC_1_16_5
+		return true;
+		#else
+		return false;
+		#endif
+	}
+	
 	@Override
 	public int getTargetFrameBuffer()
 	{
@@ -259,27 +331,87 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 			return this.finalLevelFrameBufferId;
 		}
 		
+		#if MC_VER < MC_1_21_5
 		return this.getRenderTarget().frameBufferId;
+		#else
+		// MC renders to a texture and then directly to the default FBO now
+		// we need to draw to their texture instead of the FBO
+		return 0; // 0 is the ID for the default frame buffer
+		#endif
 	}
 	
 	@Override
 	public void clearTargetFrameBuffer() { this.finalLevelFrameBufferId = -1; }
 	
 	@Override
-	public int getDepthTextureId() { return this.getRenderTarget().getDepthTextureId(); }
+	public int getDepthTextureId()
+	{
+		#if MC_VER < MC_1_21_5
+		return this.getRenderTarget().getDepthTextureId();
+		#else
+		try
+		{
+			GlTexture glTexture = (GlTexture) this.getRenderTarget().getDepthTexture();
+			if (glTexture == null)
+			{
+				// shouldn't happen, but just in case
+				return 0;
+			}
+			
+			return glTexture.glId();
+		}
+		catch (ClassCastException e)
+		{
+			// only log this error once per session
+			if (!this.depthTextureCastFailLogged)
+			{
+				this.depthTextureCastFailLogged = true;
+				LOGGER.error("Unable to cast render Target depth texture to GlTexture. MC or a rendering mod may have changed the object type.", e);
+			}
+			return 0;
+		}
+		#endif
+	}
 	@Override
-	public int getColorTextureId() { return this.getRenderTarget().getColorTextureId(); }
+	public int getColorTextureId() 
+	{
+		#if MC_VER < MC_1_21_5
+		return this.getRenderTarget().getColorTextureId();
+		#else
+		try
+		{
+			GlTexture glTexture = (GlTexture) this.getRenderTarget().getColorTexture();
+			if (glTexture == null)
+			{
+				// shouldn't happen, but just in case
+				return 0;
+			}
+			
+			return glTexture.glId();
+		}
+		catch (ClassCastException e)
+		{
+			// only log this error once per session
+			if (!this.colorTextureCastFailLogged)
+			{
+				this.colorTextureCastFailLogged = true;
+				LOGGER.error("Unable to cast render Target color texture to GlTexture. MC or a rendering mod may have changed the object type.", e);
+			}
+			return 0;
+		}
+		#endif
+	}
 	
 	@Override
 	public int getTargetFrameBufferViewportWidth()
 	{
-		return getRenderTarget().viewWidth;
+		return this.getRenderTarget().viewWidth;
 	}
 	
 	@Override
 	public int getTargetFrameBufferViewportHeight()
 	{
-		return getRenderTarget().viewHeight;
+		return this.getRenderTarget().viewHeight;
 	}
 	
 	@Override

common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/LightMapWrapper.java

@@ -21,8 +21,10 @@ package com.seibel.distanthorizons.common.wrappers.misc;
 
 import com.mojang.blaze3d.platform.NativeImage;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftGLWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.misc.ILightMapWrapper;
+import org.apache.logging.log4j.Logger;
 import org.lwjgl.opengl.GL32;
 
 import java.nio.ByteBuffer;
@@ -30,6 +32,7 @@ import java.nio.ByteBuffer;
 public class LightMapWrapper implements ILightMapWrapper
 {
 	private static final IMinecraftGLWrapper GLMC = SingletonInjector.INSTANCE.get(IMinecraftGLWrapper.class);
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
 	private int textureId = 0;
 	
@@ -49,6 +52,7 @@ public class LightMapWrapper implements ILightMapWrapper
 	
 	public void uploadLightmap(NativeImage image)
 	{
+		#if MC_VER < MC_1_21_5
 		int currentTexture = GLMC.getActiveTexture();
 		if (this.textureId == 0)
 		{
@@ -59,14 +63,27 @@ public class LightMapWrapper implements ILightMapWrapper
 			GLMC.glBindTexture(this.textureId);
 		}
 		image.upload(0, 0, 0, false);
-		GLMC.glBindTexture(currentTexture);
+		
+		// getActiveTexture() may return textures that aren't valid and attempting to bind them will
+		// throw a GL error in MC 1.21.1
+		if (GL32.glIsTexture(currentTexture))
+		{
+			GLMC.glBindTexture(currentTexture);
+		}
+		#else 
+		throw new UnsupportedOperationException("setLightmapId should be used for MC versions after 1.21.5"); // TODO that MC version number is wrong, when did we actually start using setLightmapId()?
+		#endif
 	}
 	private void createLightmap(NativeImage image)
 	{
+		#if MC_VER < MC_1_21_5
 		this.textureId = GLMC.glGenTextures();
 		GLMC.glBindTexture(this.textureId);
 		GL32.glTexImage2D(GL32.GL_TEXTURE_2D, 0, image.format().glFormat(), image.getWidth(), image.getHeight(),
 				0, image.format().glFormat(), GL32.GL_UNSIGNED_BYTE, (ByteBuffer) null);
+		#else
+		throw new UnsupportedOperationException("setLightmapId should be used for MC versions after 1.21.5"); // TODO that MC version number is wrong, when did we actually start using setLightmapId()?
+		#endif
 	}
 	
 	public void setLightmapId(int minecraftLightmapTetxureId)

common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/ServerPlayerWrapper.java

@@ -54,8 +54,10 @@ public class ServerPlayerWrapper implements IServerPlayerWrapper
 		{
 			#if MC_VER < MC_1_20_1
 			level = this.getServerPlayer().getLevel();
-			#else
+			#elif MC_VER < MC_1_21_6
 			level = this.getServerPlayer().serverLevel();
+			#else
+			level = this.getServerPlayer().level();
 			#endif
 		}
 		
@@ -70,7 +72,14 @@ public class ServerPlayerWrapper implements IServerPlayerWrapper
 	}
 	
 	@Override
-	public int getViewDistance() { return this.getServerPlayer().server.getPlayerList().getViewDistance(); }
+	public int getViewDistance() 
+	{
+		#if MC_VER < MC_1_21_6
+		return this.getServerPlayer().server.getPlayerList().getViewDistance();
+		#else
+		return this.getServerPlayer().getServer().getPlayerList().getViewDistance();
+		#endif
+	}
 	
 	@Override
 	public SocketAddress getRemoteAddress()

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

@@ -25,7 +25,6 @@ import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ChunkSource;
-import net.minecraft.world.phys.Vec3;
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -33,7 +32,12 @@ import org.jetbrains.annotations.Nullable;
 import java.awt.*;
 import java.io.File;
 import java.io.IOException;
+import java.lang.ref.WeakReference;
+import java.util.Collections;
+import java.util.Map;
+import java.util.WeakHashMap;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
 
 #if MC_VER <= MC_1_20_4
 import net.minecraft.world.level.chunk.ChunkStatus;
@@ -42,6 +46,7 @@ import net.minecraft.world.level.chunk.status.ChunkStatus;
 #endif
 
 #if MC_VER < MC_1_21_3
+import net.minecraft.world.phys.Vec3;
 #else
 import com.seibel.distanthorizons.core.util.ColorUtil;
 #endif
@@ -49,7 +54,12 @@ import com.seibel.distanthorizons.core.util.ColorUtil;
 public class ClientLevelWrapper implements IClientLevelWrapper
 {
 	private static final Logger LOGGER = DhLoggerBuilder.getLogger(ClientLevelWrapper.class.getSimpleName());
-	private static final ConcurrentHashMap<ClientLevel, ClientLevelWrapper> LEVEL_WRAPPER_BY_CLIENT_LEVEL = new ConcurrentHashMap<>(); // TODO can leak
+	/**
+	 * weak references are to prevent rare issues
+	 * where, upon world closure, some levels aren't shutdown/removed properly
+	 * and/or for servers were the level object isn't consistent
+	 */
+	private static final Map<ClientLevel, WeakReference<ClientLevelWrapper>> LEVEL_WRAPPER_REF_BY_CLIENT_LEVEL = Collections.synchronizedMap(new WeakHashMap<>());
 	private static final IKeyedClientLevelManager KEYED_CLIENT_LEVEL_MANAGER = SingletonInjector.INSTANCE.get(IKeyedClientLevelManager.class);
 	
 	private static final Minecraft MINECRAFT = Minecraft.getInstance();
@@ -57,6 +67,10 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 	private final ClientLevel level;
 	private final ConcurrentHashMap<BlockState, ClientBlockStateColorCache> blockCache = new ConcurrentHashMap<>();
 	
+	/** cached method reference to reduce GC overhead */
+	private final Function<BlockState, ClientBlockStateColorCache> cachedBlockColorCacheFunction = (blockState) -> this.createBlockColorCache(blockState);
+	
+	
 	private BlockStateWrapper dirtBlockWrapper;
 	private BiomeWrapper plainsBiomeWrapper;
 	@Deprecated // TODO circular references are bad
@@ -72,9 +86,9 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 	
 	
 	
-	//===============//
+	//==================//
-	// wrapper logic //
+	// instance methods //
-	//===============//
+	//==================//
 	
 	public static IClientLevelWrapper getWrapper(@NotNull ClientLevel level) { return getWrapper(level, false); }
 	
@@ -96,7 +110,31 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 			}
 		}
 		
-		return LEVEL_WRAPPER_BY_CLIENT_LEVEL.computeIfAbsent(level, ClientLevelWrapper::new);
+		
+		WeakReference<ClientLevelWrapper> levelRef = LEVEL_WRAPPER_REF_BY_CLIENT_LEVEL.get(level);
+		if (levelRef != null)
+		{
+			ClientLevelWrapper levelWrapper = levelRef.get();
+			if (levelWrapper != null)
+			{
+				return levelWrapper;
+			}
+		}
+		
+		
+		return LEVEL_WRAPPER_REF_BY_CLIENT_LEVEL.compute(level, (newLevel, newLevelRef) ->
+		{
+			if (newLevelRef != null)
+			{
+				ClientLevelWrapper oldLevelWrapper = newLevelRef.get();
+				if (oldLevelWrapper != null)
+				{
+					return newLevelRef;
+				}
+			}
+			
+			return new WeakReference<>(new ClientLevelWrapper(newLevel));
+		}).get();
 	}
 	
 	@Nullable
@@ -141,10 +179,13 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 	{
 		ClientBlockStateColorCache blockColorCache = this.blockCache.computeIfAbsent(
 				((BlockStateWrapper) blockWrapper).blockState,
-				(block) -> new ClientBlockStateColorCache(block, this));
+				this.cachedBlockColorCacheFunction);
 		
 		return blockColorCache.getColor((BiomeWrapper) biome, pos);
 	}
+	/** used by {@link ClientLevelWrapper#cachedBlockColorCacheFunction} */
+	private ClientBlockStateColorCache createBlockColorCache(BlockState block) { return new ClientBlockStateColorCache(block, this); }
+	
 	
 	@Override
 	public int getDirtBlockColor()
@@ -265,7 +306,7 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 	@Override
 	public void onUnload() 
 	{ 
-		LEVEL_WRAPPER_BY_CLIENT_LEVEL.remove(this.level);
+		LEVEL_WRAPPER_REF_BY_CLIENT_LEVEL.remove(this.level);
 		this.parentDhLevel = null;
 	}
 	

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

@@ -20,6 +20,10 @@
 package com.seibel.distanthorizons.common.wrappers.world;
 
 import java.io.File;
+import java.lang.ref.WeakReference;
+import java.util.Collections;
+import java.util.Map;
+import java.util.WeakHashMap;
 import java.util.concurrent.ConcurrentHashMap;
 
 import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiLevelType;
@@ -38,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;
 
@@ -57,7 +62,11 @@ import org.apache.logging.log4j.Logger;
 public class ServerLevelWrapper implements IServerLevelWrapper
 {
 	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
-	private static final ConcurrentHashMap<ServerLevel, ServerLevelWrapper> LEVEL_WRAPPER_BY_SERVER_LEVEL = new ConcurrentHashMap<>();
+	/** 
+	 * weak references are to prevent rare issues
+	 * where, upon world closure, some levels aren't shutdown/removed properly
+	 */
+	private static final Map<ServerLevel, WeakReference<ServerLevelWrapper>> LEVEL_WRAPPER_REF_BY_SERVER_LEVEL = Collections.synchronizedMap(new WeakHashMap<>());
 	
 	private final ServerLevel level;
 	@Deprecated // TODO circular references are bad
@@ -70,15 +79,29 @@ public class ServerLevelWrapper implements IServerLevelWrapper
 	//==============//
 	
 	public static ServerLevelWrapper getWrapper(ServerLevel level) 
-	{ return LEVEL_WRAPPER_BY_SERVER_LEVEL.computeIfAbsent(level, ServerLevelWrapper::new); }
+	{
+		return LEVEL_WRAPPER_REF_BY_SERVER_LEVEL.compute(level, (newLevel, levelRef) ->
+		{
+			if (levelRef != null)
+			{
+				ServerLevelWrapper oldLevelWrapper = levelRef.get();
+				if (oldLevelWrapper != null)
+				{
+					return levelRef;
+				}
+			}
+			
+			return new WeakReference<>(new ServerLevelWrapper(newLevel));
+		}).get();
+	}
 	
 	public ServerLevelWrapper(ServerLevel level) { this.level = level; }
 	
 	
 	
-	//=========//
+	//==================//
-	// methods //
+	// instance methods //
-	//=========//
+	//==================//
 	
 	@Override
 	public File getMcSaveFolder() 
@@ -93,10 +116,12 @@ public class ServerLevelWrapper implements IServerLevelWrapper
 	@Override
 	public String getWorldFolderName()
 	{
-		#if MC_VER >= MC_1_17_1
+		// Need specifically overworld since it's the only dimension that is stored in a server root folder
-		return this.level.getServer().getWorldScreenshotFile().get().getParent().getFileName().toString();
+		
-		#else // <= 1.16.5
+		#if MC_VER >= MC_1_21_3
-		return this.level.getServer().getWorldScreenshotFile().getParentFile().getName();
+		return this.level.getServer().getLevel(Level.OVERWORLD).getChunkSource().getDataStorage().dataFolder.getParent().getFileName().toString();
+		#else // <= 1.21.3
+		return this.level.getServer().getLevel(Level.OVERWORLD).getChunkSource().getDataStorage().dataFolder.getParentFile().getName();
 		#endif
 	}
 	
@@ -179,7 +204,7 @@ public class ServerLevelWrapper implements IServerLevelWrapper
 	public ServerLevel getWrappedMcObject() { return this.level; }
 	
 	@Override
-	public void onUnload() { LEVEL_WRAPPER_BY_SERVER_LEVEL.remove(this.level); }
+	public void onUnload() { LEVEL_WRAPPER_REF_BY_SERVER_LEVEL.remove(this.level); }
 	
 	
 	@Override

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java

@@ -113,7 +113,11 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 			new ConfigBasedLogger(LogManager.getLogger("LodWorldGen"),
 					() -> Config.Common.Logging.logWorldGenLoadEvent.get());
 	
+	#if MC_VER < MC_1_21_5
 	private static final TicketType<ChunkPos> DH_SERVER_GEN_TICKET = TicketType.create("dh_server_gen_ticket", Comparator.comparingLong(ChunkPos::toLong));
+	#else
+	private static final TicketType DH_SERVER_GEN_TICKET = new TicketType(/* timeout, 0 = disabled*/0L, /* persist */ false, TicketType.TicketUse.LOADING);
+	#endif
 	
 	private static final IModChecker MOD_CHECKER = SingletonInjector.INSTANCE.get(IModChecker.class);
 	
@@ -878,7 +882,11 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 			chunkLevel = generateUpToFeatures ? ChunkLevel.byStatus(ChunkStatus.FEATURES) : 33;
 			#endif
 			
+			#if MC_VER < MC_1_21_5
 			level.getChunkSource().distanceManager.addTicket(DH_SERVER_GEN_TICKET, pos, chunkLevel, pos);
+			#else
+			level.getChunkSource().addTicketWithRadius(DH_SERVER_GEN_TICKET, pos, 0);
+			#endif
 			level.getChunkSource().distanceManager.runAllUpdates(level.getChunkSource().chunkMap); // probably not the most optimal to run updates here, but fast enough
 			ChunkHolder holder = level.getChunkSource().chunkMap.getUpdatingChunkIfPresent(pos.toLong());
 			if (holder == null)
@@ -915,7 +923,11 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 				chunkLevel = chunkWasGeneratedUpToFeatures ? ChunkLevel.byStatus(ChunkStatus.FEATURES) : 33;
 				#endif
 				
+				#if MC_VER < MC_1_21_5
 				level.getChunkSource().distanceManager.removeTicket(DH_SERVER_GEN_TICKET, pos, chunkLevel, pos);
+				#else
+				level.getChunkSource().removeTicketWithRadius(DH_SERVER_GEN_TICKET, pos, 0);
+				#endif
 				
 				// mitigate OOM issues in vanilla chunk system: see https://github.com/pop4959/Chunky/pull/383
 				level.getChunkSource().chunkMap.tick(() -> false);

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

@@ -29,7 +29,9 @@ import com.seibel.distanthorizons.core.util.LodUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.ChunkLightStorage;
 
 import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 
 import it.unimi.dsi.fastutil.shorts.ShortList;
@@ -84,11 +86,13 @@ import net.minecraft.world.level.chunk.status.ChunkType;
 #endif
 
 import net.minecraft.world.level.material.Fluid;
+import org.jetbrains.annotations.Nullable;
 
 
 public class ChunkLoader
 {
-	private static boolean zeroChunkPosErrorLogged = false;
+	private static final AtomicBoolean ZERO_CHUNK_POS_ERROR_LOGGED_REF = new AtomicBoolean(false);
+	
 	
 	#if MC_VER >= MC_1_19_2
 	private static final Codec<PalettedContainer<BlockState>> BLOCK_STATE_CODEC = PalettedContainer.codecRW(Block.BLOCK_STATE_REGISTRY, BlockState.CODEC, PalettedContainer.Strategy.SECTION_STATES, Blocks.AIR.defaultBlockState());
@@ -120,19 +124,16 @@ public class ChunkLoader
 		CompoundTag tagLevel = chunkData;
 		#endif
 		
-		ChunkPos actualPos = new ChunkPos(tagLevel.getInt("xPos"), tagLevel.getInt("zPos"));
+		int chunkX = tagGetInt(tagLevel,"xPos");
+		int chunkZ = tagGetInt(tagLevel, "zPos");
+		ChunkPos actualPos = new ChunkPos(chunkX, chunkZ);
+		
 		if (!Objects.equals(chunkPos, actualPos))
 		{
-			#if MC_VER >= MC_1_18_2
+			if (chunkX == 0 && chunkZ == 0)
-			if (actualPos.equals(ChunkPos.ZERO))
-			#else
-			if (actualPos.equals(ChunkPos.INVALID_CHUNK_POS))
-			#endif
 			{
-				if (!zeroChunkPosErrorLogged)
+				if (!ZERO_CHUNK_POS_ERROR_LOGGED_REF.getAndSet(true))
 				{
-					zeroChunkPosErrorLogged = true;
-					
 					// explicit chunkPos toString is necessary otherwise the JDK 17 compiler breaks
 					LOGGER.warn("Chunk file at ["+chunkPos.toString()+"] doesn't have a chunk pos. \n" +
 						"This might happen if the world was created using an external program. \n" +
@@ -161,7 +162,7 @@ public class ChunkLoader
 		#if MC_VER < MC_1_18_2
 			if (chunkType != ChunkStatus.ChunkType.LEVELCHUNK)
 				return null;
-		#else
+		#elif MC_VER < MC_1_21_6
 			
 			BlendingData blendingData = readBlendingData(tagLevel);
 			#if MC_VER < MC_1_19_2
@@ -171,17 +172,42 @@ public class ChunkLoader
 			if (chunkType == #if MC_VER < MC_1_20_6 ChunkStatus.ChunkType.PROTOCHUNK #else ChunkType.PROTOCHUNK #endif && blendingData == null)
 				return null;
 			#endif
+		#else
 
+		// ignore blending data, there appears to be an issue with parsing it in 1.21.6
+		BlendingData blendingData = null;
+		
+		if (chunkType == ChunkType.PROTOCHUNK)
+		{
+			return null;
+		}
 		#endif
 		
-		long inhabitedTime = tagLevel.getLong("InhabitedTime");
+		long inhabitedTime = tagGetLong(tagLevel, "InhabitedTime");
 		
 		//================== Read params for making the LevelChunk ==================
-		UpgradeData upgradeData = tagLevel.contains(TAG_UPGRADE_DATA, 10)
-				? new UpgradeData(tagLevel.getCompound(TAG_UPGRADE_DATA)#if MC_VER >= MC_1_17_1 , level #endif )
-				: UpgradeData.EMPTY;
 		
-		boolean isLightOn = tagLevel.getBoolean("isLightOn");
+		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
+		
+		
+		boolean isLightOn = tagGetBoolean(tagLevel, "isLightOn");
 		#if MC_VER < MC_1_18_2
 		ChunkBiomeContainer chunkBiomeContainer = new ChunkBiomeContainer(
 				level.getLevel().registryAccess().registryOrThrow(Registry.BIOME_REGISTRY)#if MC_VER >= MC_1_17_1 , level #endif ,
@@ -198,17 +224,21 @@ public class ChunkLoader
 				: new ProtoTickList<Fluid>(fluid -> (fluid == null || fluid == Fluids.EMPTY), chunkPos,
 				tagLevel.getList("LiquidsToBeTicked", 9)#if MC_VER >= MC_1_17_1 , level #endif );
 		#else
-		#if MC_VER < MC_1_19_4
+			#if MC_VER < MC_1_19_4
-		LevelChunkTicks<Block> blockTicks = LevelChunkTicks.load(tagLevel.getList(BLOCK_TICKS_TAG_18, 10),
+				LevelChunkTicks<Block> blockTicks = LevelChunkTicks.load(tagLevel.getList(BLOCK_TICKS_TAG_18, 10),
-				string -> Registry.BLOCK.getOptional(ResourceLocation.tryParse(string)), chunkPos);
+						string -> Registry.BLOCK.getOptional(ResourceLocation.tryParse(string)), chunkPos);
-		LevelChunkTicks<Fluid> fluidTicks = LevelChunkTicks.load(tagLevel.getList(FLUID_TICKS_TAG_18, 10),
+				LevelChunkTicks<Fluid> fluidTicks = LevelChunkTicks.load(tagLevel.getList(FLUID_TICKS_TAG_18, 10),
-				string -> Registry.FLUID.getOptional(ResourceLocation.tryParse(string)), chunkPos);
+						string -> Registry.FLUID.getOptional(ResourceLocation.tryParse(string)), chunkPos);
-		#else
+			#elif MC_VER < MC_1_21_4
-		LevelChunkTicks<Block> blockTicks = LevelChunkTicks.load(tagLevel.getList(BLOCK_TICKS_TAG_18, 10),
+				LevelChunkTicks<Block> blockTicks = LevelChunkTicks.load(tagLevel.getList(BLOCK_TICKS_TAG_18, 10),
-				(string -> BuiltInRegistries.BLOCK.getOptional(ResourceLocation.tryParse(string))), chunkPos);
+						(string -> BuiltInRegistries.BLOCK.getOptional(ResourceLocation.tryParse(string))), chunkPos);
-		LevelChunkTicks<Fluid> fluidTicks = LevelChunkTicks.load(tagLevel.getList(FLUID_TICKS_TAG_18, 10),
+				LevelChunkTicks<Fluid> fluidTicks = LevelChunkTicks.load(tagLevel.getList(FLUID_TICKS_TAG_18, 10),
-				string -> BuiltInRegistries.FLUID.getOptional(ResourceLocation.tryParse(string)), chunkPos);
+						string -> BuiltInRegistries.FLUID.getOptional(ResourceLocation.tryParse(string)), chunkPos);
-		#endif
+			#else
+				// do we need the ticks for what we're doing?
+				LevelChunkTicks<Block> blockTicks = new LevelChunkTicks<>();
+				LevelChunkTicks<Fluid> fluidTicks = new LevelChunkTicks<>();
+			#endif
 		#endif
 		
 		LevelChunkSection[] levelChunkSections = readSections(level, chunkPos, tagLevel);
@@ -218,14 +248,13 @@ public class ChunkLoader
 		LevelChunk chunk = new LevelChunk((Level) level.getLevel(), chunkPos, chunkBiomeContainer, upgradeData, blockTicks,
 				fluidTicks, inhabitedTime, levelChunkSections, null);
 		#else
-		
 		LevelChunk chunk = new LevelChunk((Level) level, chunkPos, upgradeData, blockTicks,
 				fluidTicks, inhabitedTime, levelChunkSections, null, blendingData);
 		#endif
 		// 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)
@@ -252,90 +281,125 @@ public class ChunkLoader
 				biomes.asHolderIdMap(), biomes.holderByNameCodec(), PalettedContainer.Strategy.SECTION_BIOMES, biomes.getOrThrow(Biomes.PLAINS));
 			#endif
 		#endif
+		
 		int sectionYIndex = #if MC_VER < MC_1_17_1 16; #else level.getSectionsCount(); #endif
 		LevelChunkSection[] chunkSections = new LevelChunkSection[sectionYIndex];
 		
-		boolean isLightOn = chunkData.getBoolean("isLightOn");
+		ListTag tagSections = tagGetListTag(chunkData, "Sections", 10);
-		boolean hasSkyLight = level.dimensionType().hasSkyLight();
+		if (tagSections == null || tagSections.isEmpty())
-		ListTag tagSections = chunkData.getList("Sections", 10);
-		if (tagSections.isEmpty()) tagSections = chunkData.getList("sections", 10);
-		
-		for (int j = 0; j < tagSections.size(); ++j)
 		{
-			CompoundTag tagSection = tagSections.getCompound(j);
+			tagSections = tagGetListTag(chunkData, "sections", 10);
-			int sectionYPos = tagSection.getByte("Y");
+		}
 		
-			#if MC_VER < MC_1_18_2
+		
-			if (tagSection.contains("Palette", 9) && tagSection.contains("BlockStates", 12))
+		if (tagSections != null)
+		{
+			for (int j = 0; j < tagSections.size(); ++j)
 			{
-				LevelChunkSection levelChunkSection = new LevelChunkSection(sectionYPos << 4);
+				CompoundTag tagSection = tagGetCompoundTag(tagSections, j);
-				levelChunkSection.getStates().read(tagSection.getList("Palette", 10),
+				if (tagSection == null)
-						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
-				PalettedContainer<Holder<Biome>> biomeContainer;
-				#endif
-				
-				blockStateContainer = tagSection.contains("block_states", 10)
-						? BLOCK_STATE_CODEC.parse(NbtOps.INSTANCE, tagSection.getCompound("block_states"))
-							.promotePartial(string -> logBlockDeserializationWarning(chunkPos, sectionYPos, string))
-						#if MC_VER < MC_1_20_6 
-						.getOrThrow(false, (message) -> logWarningOnce(message))
-						#else
-						.getOrThrow((message) -> logErrorAndReturnException(message)) 
-						#endif
-						: new PalettedContainer<BlockState>(Block.BLOCK_STATE_REGISTRY, Blocks.AIR.defaultBlockState(), PalettedContainer.Strategy.SECTION_STATES);
-
-				#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 (tagSection.contains("biomes", 10))
 				{
-					biomeContainer =
+					continue;
-						biomeCodec.parse(NbtOps.INSTANCE, tagSection.getCompound("biomes"))
-								.promotePartial(string -> logBiomeDeserializationWarning(chunkPos, sectionYIndex, (String) string))
-						#if MC_VER < MC_1_20_6 
-						.getOrThrow(false, (message) -> logWarningOnce(message));
-						#else
-						.getOrThrow((message) -> logErrorAndReturnException(message));
-						#endif
 				}
-				else
+				
+				final int sectionYPos = tagGetByte(tagSection, "Y");
+
+				#if MC_VER < MC_1_18_2
+				if (tagSection.contains("Palette", 9) && tagSection.contains("BlockStates", 12))
 				{
-					biomeContainer = new PalettedContainer<Holder<Biome>>(biomes.asHolderIdMap(), 
+					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
+					PalettedContainer<Holder<Biome>> biomeContainer;
+					#endif
+					
+					
+					boolean containsBlockStates;
+					#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
+						blockStateContainer = BLOCK_STATE_CODEC.parse(NbtOps.INSTANCE, tagGetCompoundTag(tagSection, "block_states"))
+								.promotePartial(string -> logBlockDeserializationWarning(chunkPos, sectionYPos, string))
+								.getOrThrow((message) -> logErrorAndReturnException(message));
+						#endif
+					}
+					else
+					{
+						blockStateContainer = new PalettedContainer<BlockState>(Block.BLOCK_STATE_REGISTRY, Blocks.AIR.defaultBlockState(), PalettedContainer.Strategy.SECTION_STATES);
+					}
+				
+				
+					#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 (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
+						biomeContainer = biomeCodec.parse(NbtOps.INSTANCE, tagGetCompoundTag(tagSection, "biomes"))
+								.promotePartial(string -> logBiomeDeserializationWarning(chunkPos, sectionYIndex, (String) string))
+								.getOrThrow((message) -> logErrorAndReturnException(message));
+						#endif
+					}
+					else
+					{
+						biomeContainer = new PalettedContainer<Holder<Biome>>(biomes.asHolderIdMap(), 
 							#if MC_VER < MC_1_21_3
 							biomes.getHolderOrThrow(Biomes.PLAINS), 
 							#else
-							biomes.getOrThrow(Biomes.PLAINS),
+								biomes.getOrThrow(Biomes.PLAINS),
 							#endif
-							PalettedContainer.Strategy.SECTION_BIOMES);
+								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;
 	}
@@ -345,57 +409,108 @@ public class ChunkLoader
 		#else ChunkType #endif 
 	readChunkType(CompoundTag tagLevel)
 	{
-		ChunkStatus chunkStatus = ChunkStatus.byName(tagLevel.getString("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();
+			}
 		}
 		
-		return 
+		#if MC_VER <= MC_1_20_4
-				#if MC_VER <= MC_1_20_4 ChunkStatus.ChunkType.PROTOCHUNK;
+		return ChunkStatus.ChunkType.PROTOCHUNK;
-				#else ChunkType.PROTOCHUNK; #endif
+		#else
+		return ChunkType.PROTOCHUNK;
+		#endif
 	}
 	private static void readHeightmaps(LevelChunk chunk, CompoundTag chunkData)
 	{
-		CompoundTag tagHeightmaps = chunkData.getCompound("Heightmaps");
+		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 (tagHeightmaps.contains(heightmap, 12))
-				chunk.setHeightmap(type, tagHeightmaps.getLongArray(heightmap));
-		}
-		Heightmap.primeHeightmaps(chunk, ChunkStatus.FULL.heightmapsAfter());
-	}
-	private static void readPostPocessings(LevelChunk chunk, CompoundTag chunkData)
-	{
-		ListTag tagPostProcessings = chunkData.getList("PostProcessing", 9);
-		for (int i = 0; i < tagPostProcessings.size(); ++i)
-		{
-			ListTag listTag3 = tagPostProcessings.getList(i);
-			for (int j = 0; j < listTag3.size(); ++j)
 			{
-				#if MC_VER < MC_1_21_3
+				String heightmap = type.getSerializationKey();
-				chunk.addPackedPostProcess(listTag3.getShort(j), i);
+				#if MC_VER < MC_1_21_5
+				if (tagHeightmaps.contains(heightmap, 12))
+				{
+					chunk.setHeightmap(type, tagHeightmaps.getLongArray(heightmap));
+				}
 				#else
-				chunk.addPackedPostProcess(ShortList.of(listTag3.getShort(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)
 	{
 		BlendingData blendingData = null;
-		if (chunkData.contains("blending_data", 10))
+		
+		
+		boolean containsBlendingData;
+		#if MC_VER < MC_1_21_5
+		containsBlendingData = chunkData.contains("blending_data", 10);
+		#else
+		containsBlendingData = chunkData.contains("blending_data");
+		#endif
+		
+		if (containsBlendingData)
 		{
 			@SuppressWarnings({"unchecked", "rawtypes"})
 			Dynamic<CompoundTag> blendingDataTag = new Dynamic(NbtOps.INSTANCE, chunkData.getCompound("blending_data"));
 			
-			#if MC_VER < MC_1_21_3
+			try
-			blendingData = BlendingData.CODEC.parse(blendingDataTag).resultOrPartial((message) -> logWarningOnce(message)).orElse(null);
+			{
-			#else
+				#if MC_VER < MC_1_21_3
-			blendingData = BlendingData.unpack(BlendingData.Packed.CODEC.parse(blendingDataTag).resultOrPartial((message) -> logWarningOnce(message)).orElse(null));
+				blendingData = BlendingData.CODEC.parse(blendingDataTag).resultOrPartial((message) -> logParsingWarningOnce(message)).orElse(null);
-			#endif
+				#else
+				// blending data appears to have changed as of 1.21.6 causing a class cast exception here due to it being wrapped in a Java.Optional
+				blendingData = BlendingData.unpack(BlendingData.Packed.CODEC.parse(blendingDataTag).resultOrPartial((message) -> logParsingWarningOnce(message)).orElse(null));
+				#endif
+			}
+			catch (Exception e)
+			{
+				String message = e.getMessage();
+				if (message == null || message.trim().isEmpty())
+				{
+					message = "Failed to parse blending data";
+				}
+				
+				logParsingWarningOnce(message, e);
+			}
 		}
 		return blendingData;
 	}
@@ -472,33 +587,37 @@ public class ChunkLoader
 			
 			
 			// if null all lights = 0
-			byte[] blockLightNibbleArray = chunkSectionCompoundTag.getByteArray("BlockLight");
+			byte[] blockLightNibbleArray = tagGetByteArray(chunkSectionCompoundTag, "BlockLight");
-			byte[] skyLightNibbleArray = chunkSectionCompoundTag.getByteArray("SkyLight");
+			byte[] skyLightNibbleArray = tagGetByteArray(chunkSectionCompoundTag, "SkyLight");
 			
-			// if any sky light was found then all lights above will be max brightness
+			if (blockLightNibbleArray != null 
-			if (skyLightNibbleArray.length != 0)
+				&& skyLightNibbleArray != null)
 			{
-				foundSkyLight = true;
+				// if any sky light was found then all lights above will be max brightness
-			}
+				if (skyLightNibbleArray.length != 0)
-			
-			for (int relX = 0; relX < LodUtil.CHUNK_WIDTH; relX++)
-			{
-				for (int relZ = 0; relZ < LodUtil.CHUNK_WIDTH; relZ++)
 				{
-					// chunk sections are also 16 blocks tall
+					foundSkyLight = true;
-					for (int relY = 0; relY < LodUtil.CHUNK_WIDTH; relY++)
+				}
-					{
-						int blockPosIndex = relY*16*16 + relZ*16 + relX;
-						byte blockLight = (blockLightNibbleArray.length == 0) ? 0 : getNibbleAtIndex(blockLightNibbleArray, blockPosIndex);
-						byte skyLight = (skyLightNibbleArray.length == 0) ? 0 : getNibbleAtIndex(skyLightNibbleArray, blockPosIndex);
-						if (skyLightNibbleArray.length == 0 && foundSkyLight)
-						{
-							skyLight = LodUtil.MAX_MC_LIGHT;
-						}
 				
-						int y = relY + (sectionIndex * LodUtil.CHUNK_WIDTH) + ChunkWrapper.getInclusiveMinBuildHeight(chunk);
+				for (int relX = 0; relX < LodUtil.CHUNK_WIDTH; relX++)
-						blockLightStorage.set(relX, y, relZ, blockLight);
+				{
-						skyLightStorage.set(relX, y, relZ, skyLight);
+					for (int relZ = 0; relZ < LodUtil.CHUNK_WIDTH; relZ++)
+					{
+						// chunk sections are also 16 blocks tall
+						for (int relY = 0; relY < LodUtil.CHUNK_WIDTH; relY++)
+						{
+							int blockPosIndex = relY*16*16 + relZ*16 + relX;
+							byte blockLight = (blockLightNibbleArray.length == 0) ? 0 : getNibbleAtIndex(blockLightNibbleArray, blockPosIndex);
+							byte skyLight = (skyLightNibbleArray.length == 0) ? 0 : getNibbleAtIndex(skyLightNibbleArray, blockPosIndex);
+							if (skyLightNibbleArray.length == 0 && foundSkyLight)
+							{
+								skyLight = LodUtil.MAX_MC_LIGHT;
+							}
+							
+							int y = relY + (sectionIndex * LodUtil.CHUNK_WIDTH) + ChunkWrapper.getInclusiveMinBuildHeight(chunk);
+							blockLightStorage.set(relX, y, relZ, blockLight);
+							skyLightStorage.set(relX, y, relZ, skyLight);
+						}
 					}
 				}
 			}
@@ -547,9 +666,14 @@ public class ChunkLoader
 		});
 	}
 	
-	private static void logWarningOnce(String message) { logWarningOnce(message, null); }
+	private static void logParsingWarningOnce(String message) { logParsingWarningOnce(message, null); }
-	private static void logWarningOnce(String message, Exception e)
+	private static void logParsingWarningOnce(String message, Exception e)
 	{
+		if (message == null)
+		{
+			return;
+		}
+		
 		LOGGED_ERROR_MESSAGE_MAP.computeIfAbsent(message, (newMessage) ->
 		{
 			LOGGER.warn("Parsing error: ["+newMessage+"]. " +
@@ -576,6 +700,136 @@ public class ChunkLoader
 	
 	
 	
+	//====================//
+	// tag helper methods //
+	//====================//
+	
+	// TODO move into separate file (this file is getting long)
+	// these tag helpers are to simplify tag accessing between MC versions
+	
+	/** defaults to "false" if the tag isn't present */
+	private static boolean tagGetBoolean(CompoundTag tag, String key)
+	{
+		#if MC_VER < MC_1_21_5
+		return tag.getBoolean(key);
+		#else
+		return tag.getBoolean(key).orElse(false);
+		#endif
+	}
+	
+	/** defaults to "0" if the tag isn't present */
+	private static byte tagGetByte(CompoundTag tag, String key)
+	{
+		#if MC_VER < MC_1_21_5
+		return tag.getByte(key);
+		#else
+		return tag.getByte(key).orElse((byte)0);
+		#endif
+	}
+	
+	/** defaults to "0" if the tag isn't present */
+	private static short tagGetShort(ListTag tag, int index)
+	{
+		#if MC_VER < MC_1_21_5
+		return tag.getShort(index);
+		#else
+		return tag.getShort(index).orElse((short)0);
+		#endif
+	}
+	
+	/** defaults to "0" if the tag isn't present */
+	private static int tagGetInt(CompoundTag tag, String key)
+	{
+		#if MC_VER < MC_1_21_5
+		return tag.getInt(key);
+		#else
+		return tag.getInt(key).orElse(0);
+		#endif
+	}
+	
+	/** defaults to "0" if the tag isn't present */
+	private static long tagGetLong(CompoundTag tag, String key)
+	{
+		#if MC_VER < MC_1_21_5
+		return tag.getInt(key);
+		#else
+		return tag.getLong(key).orElse(0L);
+		#endif
+	}
+	
+	
+	
+	/** 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
+		return tag.getString(key);
+		#else
+		return tag.getString(key).orElse(null);
+		#endif
+	}
+	
+	/** 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
+		return tag.getByteArray(key);
+		#else
+		return tag.getByteArray(key).orElse(null);
+		#endif
+	}
+	
+	
+	
+	/** defaults to null if the tag isn't present */
+	@Nullable
+	private static CompoundTag tagGetCompoundTag(CompoundTag tag, String key)
+	{
+		#if MC_VER < MC_1_21_5
+		return tag.getCompound(key);
+		#else
+		return tag.getCompound(key).orElse(null);
+		#endif
+	}
+	/** defaults to null if the tag isn't present */
+	@Nullable
+	private static CompoundTag tagGetCompoundTag(ListTag tag, int index)
+	{
+		#if MC_VER < MC_1_21_5
+		return tag.getCompound(index);
+		#else
+		return tag.getCompound(index).orElse(null);
+		#endif
+	}
+	
+	/** 
+	 * defaults to null if the tag isn't present
+	 * @param elementType unused after MC 1.21.5
+	 */
+	@Nullable
+	private static ListTag tagGetListTag(CompoundTag tag, String key, int elementType)
+	{
+		#if MC_VER < MC_1_21_5
+		return tag.getList(key, elementType);
+		#else
+		return tag.getList(key).orElse(null);
+		#endif
+	}
+	
+	/** defaults to null if the tag isn't present */
+	@Nullable
+	private static ListTag tagGetListTag(ListTag tag, int index)
+	{
+		#if MC_VER < MC_1_21_5
+		return tag.getList(index);
+		#else
+		return tag.getList(index).orElse(null);
+		#endif
+	}
+	
+	
 	
 	//================//
 	// helper classes //

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

@@ -229,8 +229,16 @@ public class DhLitWorldGenRegion extends WorldGenRegion
 	{
 		ChunkAccess chunkAccess = this.getChunk(blockPos);
 		if (chunkAccess instanceof LevelChunk)
+		{
 			return true;
+		}
+		
+		#if MC_VER < MC_1_21_5
 		chunkAccess.setBlockState(blockPos, blockState, /*isBlockMoving*/false);
+		#else
+		chunkAccess.setBlockState(blockPos, blockState, /*flags*/0);
+		#endif
+		
 		// This is for post ticking for water on gen and stuff like that. Not enabled
 		// for now.
 		// if (blockState.hasPostProcess(this, blockPos))

fabric/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "fabric-loom" version "1.8-SNAPSHOT"
+    id "fabric-loom" version "1.10-SNAPSHOT"
 }
 
 loom {

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
@@ -226,6 +228,14 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 			modelViewMatrix = McObjectConverter.Convert(renderContext.positionMatrix());
 			#endif
 			
+			
+			//LOGGER.info("\n\n" +
+			//		"Level Render\n" +
+			//		"Mc MVM: \n" + modelViewMatrix.toString() + "\n" +
+			//		"Mc Proj: \n" + projectionMatrix.toString()
+			//);
+			
+			
 			this.clientApi.renderLods(ClientLevelWrapper.getWrapper(renderContext.world()),
 					modelViewMatrix,
 					projectionMatrix,
@@ -274,6 +284,17 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 			modelViewMatrix = McObjectConverter.Convert(renderContext.positionMatrix());
 			#endif
 			
+			
+			#if MC_VER < MC_1_21_6
+			// rendered in MixinLevelRenderer
+			#else
+			ClientApi.INSTANCE.renderDeferredLodsForShaders(ClientLevelWrapper.getWrapper(renderContext.world()),
+					ClientApi.RENDER_STATE.mcModelViewMatrix,
+					ClientApi.RENDER_STATE.mcProjectionMatrix,
+					ClientApi.RENDER_STATE.frameTime
+			);
+			#endif
+			
 			this.clientApi.renderFade(
 					modelViewMatrix,
 					projectionMatrix,
@@ -316,9 +337,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/FabricMain.java

@@ -20,6 +20,7 @@
 package com.seibel.distanthorizons.fabric;
 
 import com.mojang.brigadier.CommandDispatcher;
+import com.seibel.distanthorizons.api.enums.config.EDhApiMcRenderingFadeMode;
 import com.seibel.distanthorizons.common.AbstractModInitializer;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.config.ConfigBase;
@@ -90,8 +91,8 @@ public class FabricMain extends AbstractModInitializer implements ClientModIniti
 		{
 			ModAccessorInjector.INSTANCE.bind(ISodiumAccessor.class, new SodiumAccessor());
 			
-			// If sodium is installed Indium is also necessary in order to use the Fabric rendering API
+			// If sodium is installed Indium is also necessary for versions 0.5 and less in order to use the Fabric rendering API
-			if (!modChecker.isModLoaded("indium"))
+			if (!modChecker.isModLoaded("indium") && SodiumAccessor.isSodiumV5OrLess)
 			{
 				String indiumMissingMessage = ModInfo.READABLE_NAME + " needs Indium to work with Sodium.\nPlease download Indium from https://modrinth.com/mod/indium";
 				LOGGER.fatal(indiumMissingMessage);
@@ -126,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)

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

fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinFogRenderer.java

@@ -22,31 +22,51 @@ package com.seibel.distanthorizons.fabric.mixins.client;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
+import net.minecraft.client.Minecraft;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-import com.mojang.blaze3d.systems.RenderSystem;
 
 import net.minecraft.client.Camera;
-import net.minecraft.client.renderer.FogRenderer;
-import net.minecraft.client.renderer.FogRenderer.FogMode;
 import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
 
 #if MC_VER < MC_1_17_1
 import net.minecraft.world.level.material.FluidState;
+import net.minecraft.client.renderer.FogRenderer;
+import net.minecraft.client.renderer.FogRenderer.FogMode;
+import com.mojang.blaze3d.systems.RenderSystem;
+
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 #elif MC_VER < MC_1_21_3
 import net.minecraft.world.level.material.FogType;
-#else
+import net.minecraft.client.renderer.FogRenderer;
+import net.minecraft.client.renderer.FogRenderer.FogMode;
+import com.mojang.blaze3d.systems.RenderSystem;
+
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+#elif MC_VER < MC_1_21_6
 import net.minecraft.world.level.material.FogType;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 import com.mojang.blaze3d.shaders.FogShape;
+import net.minecraft.client.renderer.FogRenderer;
+import net.minecraft.client.renderer.FogRenderer.FogMode;
 import net.minecraft.client.renderer.FogParameters;
 import org.joml.Vector4f;
+import com.mojang.blaze3d.systems.RenderSystem;
+
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+#else
+import net.minecraft.world.level.material.FogType;
+import net.minecraft.client.renderer.fog.FogRenderer;
+import net.minecraft.client.renderer.fog.FogData;
+
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 #endif
 
 @Mixin(FogRenderer.class)
@@ -66,18 +86,23 @@ public class MixinFogRenderer
 	#elif MC_VER < MC_1_21_3
 	@Inject(at = @At("RETURN"), method = "setupFog")
 	private static void disableSetupFog(Camera camera, FogMode fogMode, float f, boolean bl, float g, CallbackInfo callback)
-	#else
+	#elif MC_VER < MC_1_21_6
 	@Inject(at = @At("RETURN"), method = "setupFog", cancellable = true)
 	private static void disableSetupFog(Camera camera, FogMode fogMode, Vector4f vector4f, float f, boolean bl, float g, CallbackInfoReturnable<FogParameters> callback)
+	#else
+	@Unique
+	private static void unused()
 	#endif
 	{
-		boolean cameraNotInFluid = cameraNotInFluid(camera);
+		#if MC_VER < MC_1_21_6
+		boolean cancelFog = cancelFog(camera, fogMode);
+		#elif MC_VER < MC_1_21_6
+		boolean cancelFog = cancelFog(camera);
+		#else
+		boolean cancelFog = cancelFog();
+		#endif
 		
-		Entity entity = camera.getEntity();
+		if (cancelFog)
-		boolean isSpecialFog = (entity instanceof LivingEntity) && ((LivingEntity) entity).hasEffect(MobEffects.BLINDNESS);
-		if (!isSpecialFog && cameraNotInFluid && fogMode == FogMode.FOG_TERRAIN
-				&& !SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class).isFogStateSpecial()
-				&& !Config.Client.Advanced.Graphics.Fog.enableVanillaFog.get())
 		{
 			#if MC_VER < MC_1_17_1
 			RenderSystem.fogStart(A_REALLY_REALLY_BIG_VALUE);
@@ -85,10 +110,74 @@ public class MixinFogRenderer
 			#elif MC_VER < MC_1_21_3
 			RenderSystem.setShaderFogStart(A_REALLY_REALLY_BIG_VALUE);
 			RenderSystem.setShaderFogEnd(A_EVEN_LARGER_VALUE);
-			#else
+			#elif MC_VER < MC_1_21_6
 			callback.setReturnValue(FogParameters.NO_FOG);
+			#else
 			#endif
 		}
+		
+	}
+	
+	
+	#if MC_VER < MC_1_21_6
+	#else
+	
+	// In MC's FogRenderer they clamp the "renderDistanceEnd" fog field to the render distance,
+	// which prevents us from disabling the vanilla fog.
+	// This mixin fires after they set the "renderDistanceEnd" so we can change it.
+	@WrapOperation(
+		method = "setupFog",
+		at = @At(
+			value = "FIELD",
+			target = "Lnet/minecraft/client/renderer/fog/FogData;renderDistanceEnd:F",
+			opcode = org.objectweb.asm.Opcodes.PUTFIELD
+		)
+	)
+	private void onSetRenderDistanceEnd(FogData instance, float value, Operation<Void> original) 
+	{
+		if (cancelFog())
+		{
+			instance.environmentalStart = A_REALLY_REALLY_BIG_VALUE;
+			instance.environmentalEnd = A_EVEN_LARGER_VALUE;
+			
+			instance.renderDistanceStart = A_REALLY_REALLY_BIG_VALUE;
+			instance.renderDistanceEnd = A_EVEN_LARGER_VALUE;
+		}
+		
+		// Always call the original with the modified or original value
+		original.call(instance, value);
+	}
+	
+	#endif
+	
+	
+	@Unique
+	#if MC_VER < MC_1_21_6
+	private static boolean cancelFog(Camera camera, FogMode fogMode)
+	#else
+	private static boolean cancelFog()
+	#endif
+	{
+		#if MC_VER < MC_1_21_6
+		Entity entity = camera.getEntity();
+		#else
+		Camera camera = Minecraft.getInstance().gameRenderer.getMainCamera();
+		Entity entity = camera.getEntity();	
+		#endif
+		
+		
+		boolean cameraNotInFluid = cameraNotInFluid(camera);
+		boolean isSpecialFog = (entity instanceof LivingEntity) && ((LivingEntity) entity).hasEffect(MobEffects.BLINDNESS);
+		
+		boolean cancelFog = !isSpecialFog;
+		cancelFog = cancelFog && cameraNotInFluid;
+		#if MC_VER < MC_1_21_6
+		cancelFog = cancelFog && (fogMode == FogMode.FOG_TERRAIN);
+		#endif
+		cancelFog = cancelFog && !SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class).isFogStateSpecial();
+		cancelFog = cancelFog && !Config.Client.Advanced.Graphics.Fog.enableVanillaFog.get();
+		
+		return cancelFog;
 	}
 	
 	@Unique
@@ -105,4 +194,6 @@ public class MixinFogRenderer
 		return cameraNotInFluid;
 	}
 	
+	
+	
 }

fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLevelRenderer.java

@@ -19,51 +19,54 @@
 
 package com.seibel.distanthorizons.fabric.mixins.client;
 
-import com.mojang.blaze3d.vertex.PoseStack;
 #if MC_VER < MC_1_19_4
+import net.minecraft.client.renderer.RenderType;
+import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Matrix4f;
 import org.lwjgl.opengl.GL32;
-#else
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+#elif MC_VER < MC_1_21_6
+import net.minecraft.client.renderer.RenderType;
+import com.mojang.blaze3d.vertex.PoseStack;
 import org.joml.Matrix4f;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+#else
+import net.minecraft.client.renderer.chunk.ChunkSectionsToRender;
+import org.joml.Matrix4fc;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 #endif
-import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
+
+
 import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
 import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
 import com.seibel.distanthorizons.core.api.internal.ClientApi;
+import com.seibel.distanthorizons.coreapi.ModInfo;
+import com.seibel.distanthorizons.fabric.FabricClientProxy;
 import com.seibel.distanthorizons.core.util.math.Mat4f;
-import net.minecraft.client.Camera;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.GameRenderer;
-import net.minecraft.client.renderer.LightTexture;
 import com.seibel.distanthorizons.core.config.Config;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.renderer.LevelRenderer;
-import net.minecraft.client.renderer.RenderType;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-/**
+import org.apache.logging.log4j.Logger;
- * This class is used to mix in my rendering code
+
- * before Minecraft starts rendering blocks.
+
- * If this wasn't done, and we used Forge's
- * render last event, the LODs would render on top
- * of the normal terrain.
- *
- * This is also the mixin for rendering the clouds
- *
- * @author coolGi
- * @author James Seibel
- * @version 12-31-2021
- */
 @Mixin(LevelRenderer.class)
 public class MixinLevelRenderer
 {
     @Shadow
     private ClientLevel level;
 	
+	@Unique
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	
+	
 	#if MC_VER < MC_1_17_1
     @Inject(at = @At("HEAD"),
 			method = "renderChunkLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDD)V",
@@ -84,51 +87,65 @@ public class MixinLevelRenderer
 			method = "Lnet/minecraft/client/renderer/LevelRenderer;renderSectionLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDDLorg/joml/Matrix4f;)V",
 			cancellable = true)
 	private void renderChunkLayer(RenderType renderType, PoseStack modelViewMatrixStack, double camX, double camY, double camZ, Matrix4f projectionMatrix, CallbackInfo callback)
-	#else
+	#elif MC_VER < MC_1_21_6
 	@Inject(at = @At("HEAD"),
 			method = "Lnet/minecraft/client/renderer/LevelRenderer;renderSectionLayer(Lnet/minecraft/client/renderer/RenderType;DDDLorg/joml/Matrix4f;Lorg/joml/Matrix4f;)V",
 			cancellable = true)
 	private void renderChunkLayer(RenderType renderType, double x, double y, double z, Matrix4f projectionMatrix, Matrix4f frustumMatrix, CallbackInfo callback)
+	#else
+	@Inject(at = @At("HEAD"), method = "prepareChunkRenders", cancellable = true)
+	private void prepareChunkRenders(Matrix4fc projectionMatrix, double d, double e, double f, CallbackInfoReturnable<ChunkSectionsToRender> callback)
     #endif
     {
 		#if MC_VER == MC_1_16_5
 	    // get the matrices from the OpenGL fixed pipeline
 	    float[] mcProjMatrixRaw = new float[16];
 	    GL32.glGetFloatv(GL32.GL_PROJECTION_MATRIX, mcProjMatrixRaw);
-	    Mat4f mcProjectionMatrix = new Mat4f(mcProjMatrixRaw);
+	    ClientApi.RENDER_STATE.mcProjectionMatrix = new Mat4f(mcProjMatrixRaw);
-	    mcProjectionMatrix.transpose();
+	    ClientApi.RENDER_STATE.mcProjectionMatrix.transpose();
 	    
-	    Mat4f mcModelViewMatrix = McObjectConverter.Convert(matrixStackIn.last().pose());
+	    ClientApi.RENDER_STATE.mcModelViewMatrix = McObjectConverter.Convert(matrixStackIn.last().pose());
 		
 		#elif MC_VER <= MC_1_20_4
 		// get the matrices directly from MC
-		Mat4f mcModelViewMatrix = McObjectConverter.Convert(modelViewMatrixStack.last().pose());
+		ClientApi.RENDER_STATE.mcModelViewMatrix = McObjectConverter.Convert(modelViewMatrixStack.last().pose());
-		Mat4f mcProjectionMatrix = McObjectConverter.Convert(projectionMatrix);
+		ClientApi.RENDER_STATE.mcProjectionMatrix = McObjectConverter.Convert(projectionMatrix);
 		#else
 	    // MC combined the model view and projection matricies
-	    Mat4f mcModelViewMatrix = McObjectConverter.Convert(projectionMatrix);
+	    ClientApi.RENDER_STATE.mcModelViewMatrix = McObjectConverter.Convert(projectionMatrix);
-	    Mat4f mcProjectionMatrix = new Mat4f();
+	    ClientApi.RENDER_STATE.mcProjectionMatrix = new Mat4f();
-	    mcProjectionMatrix.setIdentity();
+	    ClientApi.RENDER_STATE.mcProjectionMatrix.setIdentity();
 		#endif
 	    
 		// TODO move this into a common place
-		float frameTime;
 		#if MC_VER < MC_1_21_1
-		frameTime = Minecraft.getInstance().getFrameTime();
+		ClientApi.RENDER_STATE.frameTime = Minecraft.getInstance().getFrameTime();
 		#elif MC_VER < MC_1_21_3
-		frameTime = Minecraft.getInstance().getTimer().getRealtimeDeltaTicks();
+		ClientApi.RENDER_STATE.frameTime = Minecraft.getInstance().getTimer().getRealtimeDeltaTicks();
 		#else
-		frameTime = Minecraft.getInstance().deltaTracker.getRealtimeDeltaTicks();
+	    ClientApi.RENDER_STATE.frameTime = Minecraft.getInstance().deltaTracker.getRealtimeDeltaTicks();
 		#endif
 	    
+	    
+	    //LOGGER.info("\n\n" +
+		//	    "Level Mixin\n" +
+		//	    "Mc MVM: \n" + mcModelViewMatrix.toString() + "\n" +
+		//	    "Mc Proj: \n" + mcProjectionMatrix.toString()
+	    //);
+	    
+	    
+	    #if MC_VER < MC_1_21_6
 	    if (renderType.equals(RenderType.translucent())) 
 		{
-		    ClientApi.INSTANCE.renderDeferredLods(ClientLevelWrapper.getWrapper(this.level),
+		    ClientApi.INSTANCE.renderDeferredLodsForShaders(ClientLevelWrapper.getWrapper(this.level),
-				    mcModelViewMatrix,
+				    ClientApi.RENDER_STATE.mcModelViewMatrix,
-				    mcProjectionMatrix,
+				    ClientApi.RENDER_STATE.mcProjectionMatrix,
-				    frameTime
+				    ClientApi.RENDER_STATE.frameTime
 				    );
 	    }
+		#else
+		// rendering handled via Fabric Api render event
+	    #endif
 		
 		// FIXME completely disables rendering when sodium is installed
 		if (Config.Client.Advanced.Debugging.lodOnlyMode.get())
@@ -137,4 +154,6 @@ public class MixinLevelRenderer
 		}
     }
 	
+	
+	
 }

fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLightTexture.java

@@ -34,21 +34,34 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 #if MC_VER < MC_1_21_3
 import com.mojang.blaze3d.platform.NativeImage;
-#else
+#elif MC_VER < MC_1_21_5
 import com.mojang.blaze3d.pipeline.TextureTarget;
+#else
+import com.mojang.blaze3d.opengl.GlTexture;
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.textures.GpuTexture;
 #endif
 
 @Mixin(LightTexture.class)
 public class MixinLightTexture
 {
+	 
+	#if MC_VER < MC_1_21_3
 	@Shadow 
 	@Final
-	#if MC_VER < MC_1_21_3
 	private NativeImage lightPixels;
-	#else
+	#elif MC_VER < MC_1_21_5
+	@Shadow
+	@Final
 	private TextureTarget target;
+	#else
+	@Shadow
+	@Final
+	private GpuTexture texture;
 	#endif
 	
+	
+	
 	@Inject(method = "updateLightTexture(F)V", at = @At("RETURN"))
 	public void updateLightTexture(float partialTicks, CallbackInfo ci)
 	{
@@ -63,8 +76,11 @@ public class MixinLightTexture
 		
 		#if MC_VER < MC_1_21_3
 		MinecraftRenderWrapper.INSTANCE.updateLightmap(this.lightPixels, clientLevel);
-		#else
+		#elif MC_VER < MC_1_21_5
 		MinecraftRenderWrapper.INSTANCE.setLightmapId(this.target.getColorTextureId(), clientLevel);
+		#else
+		GlTexture glTexture = (GlTexture) this.texture;
+		MinecraftRenderWrapper.INSTANCE.setLightmapId(glTexture.glId(), clientLevel);
 		#endif
 	}
 	

fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinTextureUtil.java

@@ -1,12 +1,15 @@
 package com.seibel.distanthorizons.fabric.mixins.client;
 
+#if MC_VER < MC_1_21_5
 import com.mojang.blaze3d.platform.GlStateManager;
+#endif
 import com.mojang.blaze3d.platform.TextureUtil;
 import com.seibel.distanthorizons.core.config.Config;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
+
 /**
  * Sets Minecraft's LOD Bias (looks similar to mipmaps)
  *
@@ -15,6 +18,9 @@ import org.spongepowered.asm.mixin.injection.Redirect;
 @Mixin(TextureUtil.class)
 public class MixinTextureUtil
 {
+	// TODO fix for MC 1.21.5+
+	
+	#if MC_VER < MC_1_21_5
 	@Redirect(method = "Lcom/mojang/blaze3d/platform/TextureUtil;prepareImage(Lcom/mojang/blaze3d/platform/NativeImage$InternalGlFormat;IIII)V",
 			at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/platform/GlStateManager;_texParameter(IIF)V", #if MC_VER == MC_1_16_5 remap = true #else remap = false #endif))
 	private static void setLodBias(int target, int pname, float param)
@@ -27,5 +33,6 @@ public class MixinTextureUtil
 			GlStateManager._texParameter(target, pname, biasValue);
 		}
 	}
+	#endif
 	
 }

fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/server/MixinLevelTicks.java

@@ -0,0 +1,48 @@
+package com.seibel.distanthorizons.fabric.mixins.server;
+
+#if MC_VER < MC_1_21_4
+
+import net.minecraft.world.entity.Entity;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(Entity.class)
+public class MixinLevelTicks<T>
+{
+	// dummy mixin to make the loader happy
+}
+
+#else
+
+import com.seibel.distanthorizons.common.wrappers.DependencySetupDoneCheck;
+
+import net.minecraft.world.ticks.LevelTicks;
+import net.minecraft.world.ticks.ScheduledTick;
+
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(LevelTicks.class) // available in 1.18.2+, but only needed in 1.21.4+
+public class MixinLevelTicks<T>
+{
+	// TODO put in a common location
+	private static boolean isWorldGenThread()
+	{ return DependencySetupDoneCheck.isDone && DependencySetupDoneCheck.getIsCurrentThreadDistantGeneratorThread.get(); }
+	
+	
+	
+	@Inject(method = "schedule", at = @At(value = "HEAD"), cancellable = true)
+	private void onChunkSave(ScheduledTick<T> tick, CallbackInfo ci)
+	{
+		// In MC 1.21.4 an error check was added to log attempting to schedule ticks for unloaded chunks
+		// this caused a lot of unnecessary errors when generating sand (FallingBlock.class).
+		if (isWorldGenThread())
+		{
+			ci.cancel();
+		}
+	}
+	
+}
+
+#endif

fabric/src/main/java/com/seibel/distanthorizons/fabric/wrappers/modAccessor/SodiumAccessor.java

@@ -43,11 +43,22 @@ import net.minecraft.world.phys.AABB;
 
 public class SodiumAccessor implements ISodiumAccessor
 {
+	/**
+	 * True if sodium 0.5 or less is present. <br>
+	 * This field is public because it's also used to check if we need Indium to be present. <br>
+	 * We need Indium if Sodium 0.5 or less is present.
+	 */
+	public static final boolean isSodiumV5OrLess;
+	
 	#if MC_VER >= MC_1_20_1
 	private static MethodHandle setFogOcclusionMethod;
 	private static Object sodiumPerformanceOptions;
 	#endif
 	
+	static {
+		isSodiumV5OrLess = !classPresent("net.caffeinemc.mods.sodium.client.render.SodiumWorldRenderer");
+	}
+	
 	
 	
 	//======================//
@@ -72,8 +83,7 @@ public class SodiumAccessor implements ISodiumAccessor
 		{
 			if (sodiumPerformanceOptions == null)
 			{
-				boolean sodiumV6 = classPresent("net.caffeinemc.mods.sodium.client.render.SodiumWorldRenderer");
+				if (isSodiumV5OrLess)
-				if (!sodiumV6)
 				{
 					// sodium 0.5
 					

fabric/src/main/resources/DistantHorizons.fabric.mixins.json

@@ -8,7 +8,8 @@
     "server.MixinEntity",
     "server.MixinServerPlayer",
     "server.MixinTracingExecutor",
-    "server.MixinUtilBackgroundThread"
+    "server.MixinUtilBackgroundThread", 
+    "server.MixinLevelTicks"
   ],
   "client": [
     "client.MixinClientLevel",

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

@@ -24,13 +24,17 @@ import com.seibel.distanthorizons.common.util.ProxyUtil;
 import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftRenderWrapper;
 import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
 import com.seibel.distanthorizons.core.api.internal.ClientApi;
+import com.seibel.distanthorizons.core.api.internal.ServerApi;
 import com.seibel.distanthorizons.core.api.internal.SharedApi;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.network.messages.AbstractNetworkMessage;
 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;
 import net.minecraft.world.level.LevelAccessor;
@@ -52,6 +56,7 @@ import net.minecraft.world.level.chunk.ChunkAccess;
 
 import net.minecraftforge.common.MinecraftForge;
 import org.apache.logging.log4j.Logger;
+import org.jetbrains.annotations.NotNull;
 import org.lwjgl.glfw.GLFW;
 
 import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
@@ -75,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();
 	
 	
@@ -90,7 +96,13 @@ public class ForgeClientProxy implements AbstractModInitializer.IEventProxy
 	public void registerEvents()
 	{
 		MinecraftForge.EVENT_BUS.register(this);
-		ForgePluginPacketSender.setPacketHandler(ClientApi.INSTANCE::pluginMessageReceived);
+		
+		// handles singleplayer, LAN, and connecting to a server
+		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/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

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);
 		}
 	}
 	
@@ -78,10 +82,7 @@ public class ForgeServerProxy implements AbstractModInitializer.IEventProxy
 	// constructor //
 	//=============//
 	
-	public ForgeServerProxy(boolean isDedicated)
+	public ForgeServerProxy(boolean isDedicated) { this.isDedicated = isDedicated; }
-	{
-		this.isDedicated = isDedicated;
-	}
 	
 	
 	

forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLevelRenderer.java

@@ -156,7 +156,7 @@ public class MixinLevelRenderer
 		} 
 		else if (renderType.equals(RenderType.translucent())) 
 		{
-			ClientApi.INSTANCE.renderDeferredLods(ClientLevelWrapper.getWrapper(this.level), mcModelViewMatrix, mcProjectionMatrix, frameTime);
+			ClientApi.INSTANCE.renderDeferredLodsForShaders(ClientLevelWrapper.getWrapper(this.level), mcModelViewMatrix, mcProjectionMatrix, frameTime);
 		}
 		
 		// render fade

gradle.properties

@@ -5,7 +5,7 @@ org.gradle.caching=true
 
 # Mod Info
 mod_name=DistantHorizons
-mod_version=2.3.0-b
+mod_version=2.3.5-b-dev
 api_version=4.0.0
 maven_group=com.seibel.distanthorizons
 mod_readable_name=Distant Horizons
@@ -18,14 +18,14 @@ mod_issues=https://gitlab.com/jeseibel/distant-horizons/-/issues
 mod_discord=https://discord.gg/xAB8G4cENx
 
 # Global Plugin Versions
-manifold_version=2024.1.37
+manifold_version=2025.1.20
 # 2023.1.17 can be used if there are mystery Java compiler issues
 nightconfig_version=3.6.6
 lz4_version=1.8.0
 xz_version=1.9
+# Before updating, read relocate_natives/README.md
 sqlite_jdbc_version=3.47.2.0
 # 8.2.1 is the newest version we can use since that's the version MC 1.16.5 uses 
-# (at least until we can fix the gradle script so core and main can use/shade different fastutil versions)
 fastutil_version=8.2.1
 #svgSalamander_version=1.1.3
 
@@ -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.4
+mcVer=1.21.8
 
 # Defines the maximum amount of memory Minecraft is allowed when run in a development environment
 #minecraftMemoryJavaArg="-Xmx4G"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeClientProxy.java

@@ -78,13 +78,6 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
 	private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
 	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 
-//	private static SimpleChannel multiversePluginChannel;
-	
-	// Not the cleanest way of passing this to the LOD renderer, but it'll have to do for now
-	public static Mat4f currentModelViewMatrix = new Mat4f();
-	public static Mat4f currentProjectionMatrix = new Mat4f();
-	
-	
 	
 	
 	@Override
@@ -244,16 +237,7 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
 	// rendering //
 	//===========//
 	
-	@SubscribeEvent
+	#if MC_VER < MC_1_21_6
-	public void beforeLevelRenderEvent(RenderLevelStageEvent event)
-	{
-		if (event.getStage() == RenderLevelStageEvent.Stage.AFTER_SKY)
-		{
-			currentModelViewMatrix = McObjectConverter.Convert(event.getModelViewMatrix());
-			currentProjectionMatrix = McObjectConverter.Convert(event.getProjectionMatrix());
-		}
-	}
-	
 	@SubscribeEvent
 	public void afterLevelRenderEvent(RenderLevelStageEvent event)
 	{
@@ -272,6 +256,56 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
 			}
 		}
 	}
+	#else
+	
+	
+	@SubscribeEvent
+	public void afterLevelEntityRenderEvent(RenderLevelStageEvent.AfterEntities event)
+	{
+		ClientApi.INSTANCE.renderFade(
+				ClientApi.RENDER_STATE.mcModelViewMatrix,
+				ClientApi.RENDER_STATE.mcProjectionMatrix,
+				ClientApi.RENDER_STATE.frameTime,
+				ClientLevelWrapper.getWrapper((ClientLevel)event.getLevel())
+		);
+	}
+	
+	
+	@SubscribeEvent
+	public void afterLevelTranslucentRenderEvent(RenderLevelStageEvent.AfterTranslucentBlocks event)
+	{
+		ClientApi.INSTANCE.renderDeferredLodsForShaders(ClientLevelWrapper.getWrapper((ClientLevel)event.getLevel()),
+				ClientApi.RENDER_STATE.mcModelViewMatrix,
+				ClientApi.RENDER_STATE.mcProjectionMatrix,
+				ClientApi.RENDER_STATE.frameTime
+		);
+	}
+	
+	@SubscribeEvent
+	public void afterLevelRenderEvent(RenderLevelStageEvent.AfterLevel event)
+	{
+		try
+		{
+			// should generally only need to be set once per game session
+			// allows DH to render directly to Optifine's level frame buffer,
+			// allowing better shader support
+			MinecraftRenderWrapper.INSTANCE.finalLevelFrameBufferId = GL32.glGetInteger(GL32.GL_FRAMEBUFFER_BINDING);
+		}
+		catch (Exception | Error e)
+		{
+			LOGGER.error("Unexpected error in afterLevelRenderEvent: "+e.getMessage(), e);
+		}
+		
+		
+		ClientApi.INSTANCE.renderFadeOpaque(
+				ClientApi.RENDER_STATE.mcModelViewMatrix,
+				ClientApi.RENDER_STATE.mcProjectionMatrix,
+				ClientApi.RENDER_STATE.frameTime,
+				ClientLevelWrapper.getWrapper((ClientLevel)event.getLevel())
+		);
+	}
+	
+	#endif
 	
 	
 	
@@ -282,4 +316,5 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
 	private static LevelAccessor GetEventLevel(LevelEvent e) { return e.getLevel(); }
 	
 	
+	
 }

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeMain.java

@@ -23,10 +23,11 @@ import com.mojang.brigadier.CommandDispatcher;
 import com.seibel.distanthorizons.common.AbstractModInitializer;
 import com.seibel.distanthorizons.common.wrappers.gui.GetConfigScreen;
 import com.seibel.distanthorizons.core.api.internal.ClientApi;
-import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.api.internal.ServerApi;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
+import com.seibel.distanthorizons.core.network.messages.AbstractNetworkMessage;
 import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IPluginPacketSender;
+import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IServerPlayerWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IModChecker;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IOptifineAccessor;
 import com.seibel.distanthorizons.coreapi.ModInfo;
@@ -49,8 +50,13 @@ import java.util.function.Consumer;
 
 #if MC_VER < MC_1_20_6
 import net.neoforged.neoforge.client.ConfigScreenHandler;
+#elif MC_VER < MC_1_21_8
+import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
+import org.jetbrains.annotations.NotNull;
 #else
 import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
+import org.jetbrains.annotations.NotNull;
+import net.neoforged.neoforge.client.network.event.RegisterClientPayloadHandlersEvent;
 #endif
 
 /**
@@ -64,11 +70,21 @@ public class NeoforgeMain extends AbstractModInitializer
 {
 	public NeoforgeMain(IEventBus eventBus)
 	{
-		eventBus.addListener((FMLClientSetupEvent e) -> {
+		// handles singleplayer, LAN, and connecting to a server
+		eventBus.addListener((FMLClientSetupEvent e) -> 
+		{
 			this.onInitializeClient();
-			eventBus.addListener(this::registerNetworkingClient);
+			eventBus.addListener(this::registerNetworkingClientServer);
+			
+			#if MC_VER < MC_1_21_8
+			#else
+			eventBus.addListener(this::registerClientPayloadEvent);
+			#endif
 		});
-		eventBus.addListener((FMLDedicatedServerSetupEvent e) -> {
+		
+		// handles dedicated servers
+		eventBus.addListener((FMLDedicatedServerSetupEvent e) -> 
+		{
 			this.onInitializeServer();
 			eventBus.addListener(this::registerNetworkingServer);
 		});
@@ -79,11 +95,26 @@ public class NeoforgeMain extends AbstractModInitializer
 	//============//
 	// networking //
 	//============//
-	public void registerNetworkingClient(RegisterPayloadHandlersEvent event)
+	
-	{ NeoforgePluginPacketSender.setPacketHandler(event, ClientApi.INSTANCE::pluginMessageReceived); }
+	public void registerNetworkingClientServer(RegisterPayloadHandlersEvent event)
+	{ 
+		NeoforgePluginPacketSender.setPacketHandler(event, (IServerPlayerWrapper player, @NotNull AbstractNetworkMessage message) -> 
+		{
+			ClientApi.INSTANCE.pluginMessageReceived(message);
+			ServerApi.INSTANCE.pluginMessageReceived(player, message);
+		}); 
+	}
 	public void registerNetworkingServer(RegisterPayloadHandlersEvent event)
 	{ NeoforgePluginPacketSender.setPacketHandler(event, ServerApi.INSTANCE::pluginMessageReceived); }
 	
+	#if MC_VER < MC_1_21_8
+	#else
+	public void registerClientPayloadEvent(RegisterClientPayloadHandlersEvent event)
+	{ NeoforgePluginPacketSender.registerClientPacketHandler(event); }
+	#endif
+	
+	
+	
 	
 	
 	@Override
@@ -124,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,10 +14,19 @@ import java.util.Optional;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
+#if MC_VER < MC_1_21_8
+#else
+import net.neoforged.neoforge.client.network.ClientPacketDistributor;
+import net.neoforged.neoforge.client.network.event.RegisterClientPayloadHandlersEvent;
+#endif
+
+
 public class NeoforgePluginPacketSender extends AbstractPluginPacketSender
 {
 	private static BiConsumer<IServerPlayerWrapper, AbstractNetworkMessage> packetConsumer;
 	
+	
+	
 	public static void setPacketHandler(RegisterPayloadHandlersEvent event, Consumer<AbstractNetworkMessage> consumer)
 	{ setPacketHandler(event, (player, buffer) -> consumer.accept(buffer)); }
 	public static void setPacketHandler(RegisterPayloadHandlersEvent event, BiConsumer<IServerPlayerWrapper, AbstractNetworkMessage> consumer)
@@ -39,9 +48,31 @@ public class NeoforgePluginPacketSender extends AbstractPluginPacketSender
 		});
 	}
 	
+	#if MC_VER < MC_1_21_8
+	#else
+	public static void registerClientPacketHandler(RegisterClientPayloadHandlersEvent event)
+	{
+		// as of MC 1.21.7 Neo added a separate client network register 
+		// https://github.com/neoforged/NeoForge/pull/2272
+		event.register(CommonPacketPayload.TYPE, (payload, context) -> 
+		{
+			if (payload.message() != null)
+			{
+				packetConsumer.accept(null, payload.message());
+			}
+		});
+	}
+	#endif
+	
 	@Override
 	public void sendToServer(AbstractNetworkMessage message)
-	{ PacketDistributor.sendToServer(new CommonPacketPayload(message)); }
+	{
+		#if MC_VER < MC_1_21_8
+		PacketDistributor.sendToServer(new CommonPacketPayload(message));
+		#else
+		ClientPacketDistributor.sendToServer(new CommonPacketPayload(message));
+		#endif
+	}
 	
 	@Override
 	public void sendToClient(ServerPlayer serverPlayer, AbstractNetworkMessage message)

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinFogRenderer.java

@@ -22,67 +22,87 @@ package com.seibel.distanthorizons.neoforge.mixins.client;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
+import net.minecraft.client.Minecraft;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-
-import com.mojang.blaze3d.systems.RenderSystem;
 
 import net.minecraft.client.Camera;
-import net.minecraft.client.renderer.FogRenderer;
-import net.minecraft.client.renderer.FogRenderer.FogMode;
 import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
 
 #if MC_VER < MC_1_17_1
 import net.minecraft.world.level.material.FluidState;
-org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import net.minecraft.client.renderer.FogRenderer;
+import net.minecraft.client.renderer.FogRenderer.FogMode;
+import com.mojang.blaze3d.systems.RenderSystem;
+
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 #elif MC_VER < MC_1_21_3
 import net.minecraft.world.level.material.FogType;
+import net.minecraft.client.renderer.FogRenderer;
+import net.minecraft.client.renderer.FogRenderer.FogMode;
+import com.mojang.blaze3d.systems.RenderSystem;
+
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+#elif MC_VER < MC_1_21_6
+import net.minecraft.world.level.material.FogType;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import com.mojang.blaze3d.shaders.FogShape;
+import net.minecraft.client.renderer.FogRenderer;
+import net.minecraft.client.renderer.FogRenderer.FogMode;
+import net.minecraft.client.renderer.FogParameters;
+import org.joml.Vector4f;
+import com.mojang.blaze3d.systems.RenderSystem;
+
+import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 #else
-import net.minecraft.client.renderer.FogParameters;
 import net.minecraft.world.level.material.FogType;
-import org.joml.Vector4f;
+import net.minecraft.client.renderer.fog.FogRenderer;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import net.minecraft.client.renderer.fog.FogData;
+
+import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
+import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;
 #endif
 
-
-
 @Mixin(FogRenderer.class)
 public class MixinFogRenderer
 {
 	// Using this instead of Float.MAX_VALUE because Sodium don't like it.
+	@Unique
 	private static final float A_REALLY_REALLY_BIG_VALUE = 420694206942069.F;
+	@Unique
 	private static final float A_EVEN_LARGER_VALUE = 42069420694206942069.F;
 	
 	
 	
-	#if MC_VER == MC_1_17_1 || MC_VER == MC_1_18_2
+	#if MC_VER < MC_1_19_2
-	@Inject(at = @At("RETURN"),
+	@Inject(at = @At("RETURN"), method = "setupFog")
-			method = "setupFog(Lnet/minecraft/client/Camera;Lnet/minecraft/client/renderer/FogRenderer$FogMode;FZF)V",
+	private static void disableSetupFog(Camera camera, FogMode fogMode, float f, boolean bl, CallbackInfo callback)
-			remap = false)
-	private static void disableSetupFog(Camera camera, FogMode fogMode, float f, boolean bl, float partTick, CallbackInfo callback)
 	#elif MC_VER < MC_1_21_3
-	@Inject(at = @At("RETURN"),
+	@Inject(at = @At("RETURN"), method = "setupFog")
-			method = "setupFog(Lnet/minecraft/client/Camera;Lnet/minecraft/client/renderer/FogRenderer$FogMode;FZF)V",
+	private static void disableSetupFog(Camera camera, FogMode fogMode, float f, boolean bl, float g, CallbackInfo callback)
-			remap = true)
+	#elif MC_VER < MC_1_21_6
-	private static void disableSetupFog(Camera camera, FogMode fogMode, float f, boolean bl, float partTick, CallbackInfo callback)
+	@Inject(at = @At("RETURN"), method = "setupFog", cancellable = true)
+	private static void disableSetupFog(Camera camera, FogMode fogMode, Vector4f vector4f, float f, boolean bl, float g, CallbackInfoReturnable<FogParameters> callback)
 	#else
-	@Inject(at = @At("RETURN"),
+	@Unique
-			method = "setupFog(Lnet/minecraft/client/Camera;Lnet/minecraft/client/renderer/FogRenderer$FogMode;Lorg/joml/Vector4f;FZF)Lnet/minecraft/client/renderer/FogParameters;",
+	private static void unused()
-			remap = true, cancellable = true)
-	private static void disableSetupFog(Camera camera, FogMode fogMode, Vector4f vector4f, float f, boolean bl, float partTick, CallbackInfoReturnable<FogParameters> callback)
 	#endif
 	{
-		boolean cameraNotInFluid = cameraNotInFluid(camera);
+		#if MC_VER < MC_1_21_6
+		boolean cancelFog = cancelFog(camera, fogMode);
+		#elif MC_VER < MC_1_21_6
+		boolean cancelFog = cancelFog(camera);
+		#else
+		boolean cancelFog = cancelFog();
+		#endif
 		
-		Entity entity = camera.getEntity();
+		if (cancelFog)
-		boolean isSpecialFog = (entity instanceof LivingEntity) && ((LivingEntity) entity).hasEffect(MobEffects.BLINDNESS);
-		if (!isSpecialFog && cameraNotInFluid && fogMode == FogMode.FOG_TERRAIN
-				&& !SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class).isFogStateSpecial()
-				&& !Config.Client.Advanced.Graphics.Fog.enableVanillaFog.get())
 		{
 			#if MC_VER < MC_1_17_1
 			RenderSystem.fogStart(A_REALLY_REALLY_BIG_VALUE);
@@ -90,12 +110,77 @@ public class MixinFogRenderer
 			#elif MC_VER < MC_1_21_3
 			RenderSystem.setShaderFogStart(A_REALLY_REALLY_BIG_VALUE);
 			RenderSystem.setShaderFogEnd(A_EVEN_LARGER_VALUE);
-			#else
+			#elif MC_VER < MC_1_21_6
 			callback.setReturnValue(FogParameters.NO_FOG);
+			#else
 			#endif
 		}
+		
 	}
 	
+	
+	#if MC_VER < MC_1_21_6
+	#else
+	
+	// In MC's FogRenderer they clamp the "renderDistanceEnd" fog field to the render distance,
+	// which prevents us from disabling the vanilla fog.
+	// This mixin fires after they set the "renderDistanceEnd" so we can change it.
+	@WrapOperation(
+			method = "setupFog",
+			at = @At(
+					value = "FIELD",
+					target = "Lnet/minecraft/client/renderer/fog/FogData;renderDistanceEnd:F",
+					opcode = org.objectweb.asm.Opcodes.PUTFIELD
+			)
+	)
+	private void onSetRenderDistanceEnd(FogData instance, float value, Operation<Void> original)
+	{
+		if (cancelFog())
+		{
+			instance.environmentalStart = A_REALLY_REALLY_BIG_VALUE;
+			instance.environmentalEnd = A_EVEN_LARGER_VALUE;
+			
+			instance.renderDistanceStart = A_REALLY_REALLY_BIG_VALUE;
+			instance.renderDistanceEnd = A_EVEN_LARGER_VALUE;
+		}
+		
+		// Always call the original with the modified or original value
+		original.call(instance, value);
+	}
+	
+	#endif
+	
+	
+	@Unique
+	#if MC_VER < MC_1_21_6
+	private static boolean cancelFog(Camera camera, FogMode fogMode)
+	#else
+	private static boolean cancelFog()
+	#endif
+	{
+		#if MC_VER < MC_1_21_6
+		Entity entity = camera.getEntity();
+		#else
+		Camera camera = Minecraft.getInstance().gameRenderer.getMainCamera();
+		Entity entity = camera.getEntity();	
+		#endif
+		
+		
+		boolean cameraNotInFluid = cameraNotInFluid(camera);
+		boolean isSpecialFog = (entity instanceof LivingEntity) && ((LivingEntity) entity).hasEffect(MobEffects.BLINDNESS);
+		
+		boolean cancelFog = !isSpecialFog;
+		cancelFog = cancelFog && cameraNotInFluid;
+		#if MC_VER < MC_1_21_6
+		cancelFog = cancelFog && (fogMode == FogMode.FOG_TERRAIN);
+		#endif
+		cancelFog = cancelFog && !SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class).isFogStateSpecial();
+		cancelFog = cancelFog && !Config.Client.Advanced.Graphics.Fog.enableVanillaFog.get();
+		
+		return cancelFog;
+	}
+	
+	@Unique
 	private static boolean cameraNotInFluid(Camera camera)
 	{
 		#if MC_VER < MC_1_17_1
@@ -110,4 +195,5 @@ public class MixinFogRenderer
 	}
 	
 	
+	
 }

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinLevelRenderer.java

@@ -19,39 +19,53 @@
 
 package com.seibel.distanthorizons.neoforge.mixins.client;
 
-import com.mojang.blaze3d.systems.RenderSystem;
+#if MC_VER < MC_1_21_6
-import com.mojang.blaze3d.vertex.PoseStack;
-#if MC_VER < MC_1_19_4
-import com.mojang.math.Matrix4f;
-#else
-import com.seibel.distanthorizons.core.util.math.Mat4f;
-import com.seibel.distanthorizons.neoforge.NeoforgeClientProxy;
-import net.minecraft.client.Camera;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.GameRenderer;
-import net.minecraft.client.renderer.LightTexture;
-import org.joml.Matrix4f;
-#endif
-import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
-import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
-import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
-import com.seibel.distanthorizons.core.config.Config;
-import com.seibel.distanthorizons.core.api.internal.ClientApi;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.renderer.LevelRenderer;
 import net.minecraft.client.renderer.RenderType;
+import net.neoforged.neoforge.client.event.RenderLevelStageEvent;
+import org.joml.Matrix4f;
+#else
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.renderer.chunk.ChunkSectionsToRender;
+import net.minecraft.client.Camera;
+import net.minecraft.client.DeltaTracker;
+import net.minecraft.client.multiplayer.ClientLevel;
+import net.minecraft.client.renderer.LevelRenderer;
+
+import org.joml.Matrix4f;
+import org.joml.Matrix4fc;
+import org.joml.Vector4f;
+	
+import com.mojang.blaze3d.buffers.GpuBufferSlice;
+import com.mojang.blaze3d.resource.GraphicsResourceAllocator;
+
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+#endif
+
+
+
+import org.apache.logging.log4j.Logger;
+
+import com.seibel.distanthorizons.neoforge.NeoforgeClientProxy;
+import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
+import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
+import com.seibel.distanthorizons.core.api.internal.ClientApi;
+import com.seibel.distanthorizons.core.config.Config;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.util.math.Mat4f;
+import com.seibel.distanthorizons.coreapi.ModInfo;
+
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
-import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-#if MC_VER < MC_1_17_1
-import org.lwjgl.opengl.GL15;
-#endif
-
-
 /**
  * This class is used to mix in DH's rendering code
  * before Minecraft starts rendering blocks.
@@ -70,73 +84,66 @@ public class MixinLevelRenderer
 	#endif
 	private ClientLevel level;
 	
+	@Unique
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
-	#if MC_VER < MC_1_17_1
+	
-    @Inject(at = @At("HEAD"),
+	
-			method = "renderChunkLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDD)V",
+	#if MC_VER < MC_1_21_6
-			cancellable = true)
+	@Inject(at = @At("HEAD"), method = "renderSectionLayer", cancellable = true)
-	private void renderChunkLayer(RenderType renderType, PoseStack matrixStackIn, double xIn, double yIn, double zIn, CallbackInfo callback)
+	private void renderChunkLayer(RenderType renderType, double x, double y, double z, Matrix4f modelViewMatrix, Matrix4f projectionMatrix, CallbackInfo callback)
-	#elif MC_VER < MC_1_19_4
-	@Inject(at = @At("HEAD"),
-			method = "renderChunkLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDDLcom/mojang/math/Matrix4f;)V",
-			cancellable = true)
-	private void renderChunkLayer(RenderType renderType, PoseStack modelViewMatrixStack, double cameraXBlockPos, double cameraYBlockPos, double cameraZBlockPos, Matrix4f projectionMatrix, CallbackInfo callback)
-	#elif MC_VER < MC_1_20_2
-	@Inject(at = @At("HEAD"),
-			method = "renderChunkLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDDLorg/joml/Matrix4f;)V",
-			cancellable = true)
-	private void renderChunkLayer(RenderType renderType, PoseStack modelViewMatrixStack, double cameraXBlockPos, double cameraYBlockPos, double cameraZBlockPos, Matrix4f projectionMatrix, CallbackInfo callback)
-    #elif MC_VER < MC_1_20_6
-    @Inject(at = @At("HEAD"),
-            method = "Lnet/minecraft/client/renderer/LevelRenderer;renderSectionLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDDLorg/joml/Matrix4f;)V",
-            cancellable = true)
-    private void renderChunkLayer(RenderType renderType, PoseStack modelViewMatrixStack, double camX, double camY, double camZ, Matrix4f projectionMatrix, CallbackInfo callback)
 	#else
-	@Inject(at = @At("HEAD"),
+	@Inject(at = @At("HEAD"), method = "renderLevel", cancellable = true)
-			method = "Lnet/minecraft/client/renderer/LevelRenderer;renderSectionLayer(Lnet/minecraft/client/renderer/RenderType;DDDLorg/joml/Matrix4f;Lorg/joml/Matrix4f;)V",
+	private void onRenderLevel(GraphicsResourceAllocator resourceAllocator, DeltaTracker deltaTracker, boolean renderBlockOutline, Camera camera, Matrix4f positionMatrix, Matrix4f projectionMatrix, GpuBufferSlice gpuBufferSlice, Vector4f skyColor, boolean thinFog, CallbackInfo callback)
-			cancellable = true)
+    #endif
-	private void renderChunkLayer(RenderType renderType, double x, double y, double z, Matrix4f projectionMatrix, Matrix4f frustumMatrix, CallbackInfo callback)
-	#endif
 	{
-		#if MC_VER == MC_1_16_5
+		#if MC_VER < MC_1_21_6
-		// get the matrices from the OpenGL fixed pipeline
+		// MC combined the model view and projection matricies
-		float[] mcProjMatrixRaw = new float[16];
+		ClientApi.RENDER_STATE.mcModelViewMatrix = McObjectConverter.Convert(modelViewMatrix);
-		GL15.glGetFloatv(GL15.GL_PROJECTION_MATRIX, mcProjMatrixRaw);
+		ClientApi.RENDER_STATE.mcProjectionMatrix = McObjectConverter.Convert(projectionMatrix);
-		Mat4f mcProjectionMatrix = new Mat4f(mcProjMatrixRaw);
-		mcProjectionMatrix.transpose();
-		
-		Mat4f mcModelViewMatrix = McObjectConverter.Convert(matrixStackIn.last().pose());
-		
-		#elif MC_VER <= MC_1_20_4
-		// get the matrices directly from MC
-		Mat4f mcModelViewMatrix = McObjectConverter.Convert(modelViewMatrixStack.last().pose());
-		Mat4f mcProjectionMatrix = McObjectConverter.Convert(projectionMatrix);
 		#else
-		// get the matrices from neoForge's render event.
+		ClientApi.RENDER_STATE.mcProjectionMatrix = McObjectConverter.Convert(projectionMatrix);
-		// We can't call the renderer there because we don't have access to the level that's being rendered
-		Mat4f mcModelViewMatrix = NeoforgeClientProxy.currentModelViewMatrix;
-		Mat4f mcProjectionMatrix = NeoforgeClientProxy.currentProjectionMatrix;
 		#endif
 	
+		//LOGGER.info("\n\n" +
+		//		"Level Mixin\n" +
+		//		"Mc MVM: \n" + ClientApi.RENDER_STATE.mcModelViewMatrix.toString() + "\n" +
+		//		"Mc Proj: \n" + ClientApi.RENDER_STATE.mcProjectionMatrix.toString()
+		//);
+		
+		
 		
-		float frameTime;
 		#if MC_VER < MC_1_21_1
-		frameTime = Minecraft.getInstance().getFrameTime();
+		ClientApi.RENDER_STATE.frameTime = Minecraft.getInstance().getFrameTime();
 		#elif MC_VER < MC_1_21_3
-		frameTime = Minecraft.getInstance().getTimer().getRealtimeDeltaTicks();
+		ClientApi.RENDER_STATE.frameTime = Minecraft.getInstance().getTimer().getRealtimeDeltaTicks();
 		#else
-		frameTime = Minecraft.getInstance().deltaTracker.getRealtimeDeltaTicks();
+		ClientApi.RENDER_STATE.frameTime = Minecraft.getInstance().deltaTracker.getRealtimeDeltaTicks();
 		#endif
 		
 		
+		#if MC_VER < MC_1_21_6
+		
+		// only crash during development
+		if (ModInfo.IS_DEV_BUILD)
+		{
+			ClientApi.RENDER_STATE.canRenderOrThrow();
+		}
+		
 		// render LODs
 		if (renderType.equals(RenderType.solid()))
 		{
-			ClientApi.INSTANCE.renderLods(ClientLevelWrapper.getWrapper(this.level), mcModelViewMatrix, mcProjectionMatrix, frameTime);
+			ClientApi.INSTANCE.renderLods(ClientLevelWrapper.getWrapper(this.level),
+					ClientApi.RENDER_STATE.mcModelViewMatrix,
+					ClientApi.RENDER_STATE.mcProjectionMatrix,
+					ClientApi.RENDER_STATE.frameTime);
 		} 
 		else if (renderType.equals(RenderType.translucent())) 
 		{
-			ClientApi.INSTANCE.renderDeferredLods(ClientLevelWrapper.getWrapper(this.level), mcModelViewMatrix, mcProjectionMatrix, frameTime);
+			ClientApi.INSTANCE.renderDeferredLodsForShaders(ClientLevelWrapper.getWrapper(this.level),
+					ClientApi.RENDER_STATE.mcModelViewMatrix,
+					ClientApi.RENDER_STATE.mcProjectionMatrix,
+					ClientApi.RENDER_STATE.frameTime);
 		}
 		
 		// render fade
@@ -146,21 +153,22 @@ public class MixinLevelRenderer
 		if (renderType.equals(RenderType.cutout()))
 		{
 			ClientApi.INSTANCE.renderFadeOpaque(
-					mcModelViewMatrix,
+					ClientApi.RENDER_STATE.mcModelViewMatrix,
-					mcProjectionMatrix,
+					ClientApi.RENDER_STATE.mcProjectionMatrix,
-					frameTime,
+					ClientApi.RENDER_STATE.frameTime,
 					ClientLevelWrapper.getWrapper(this.level)
 			);
 		}
 		else if (renderType.equals(RenderType.tripwire()))
 		{
 			ClientApi.INSTANCE.renderFade(
-					mcModelViewMatrix,
+					ClientApi.RENDER_STATE.mcModelViewMatrix,
-					mcProjectionMatrix,
+					ClientApi.RENDER_STATE.mcProjectionMatrix,
-					frameTime,
+					ClientApi.RENDER_STATE.frameTime,
 					ClientLevelWrapper.getWrapper(this.level)
 			);
 		}
+		#endif
 		
 		if (Config.Client.Advanced.Debugging.lodOnlyMode.get())
 		{
@@ -169,4 +177,30 @@ public class MixinLevelRenderer
 	}
 	
 	
+	#if MC_VER < MC_1_21_6
+	
+	// formerly handled in renderChunkLayer()
+	
+	#else
+	@Inject(at = @At("HEAD"), method = "prepareChunkRenders", cancellable = true)
+	private void renderChunkLayer(Matrix4fc modelViewMatrix, double d, double e, double f, CallbackInfoReturnable<ChunkSectionsToRender> callback)
+	{
+		ClientApi.RENDER_STATE.mcModelViewMatrix = McObjectConverter.Convert(modelViewMatrix);
+
+		// only crash during development
+		if (ModInfo.IS_DEV_BUILD)
+		{
+			ClientApi.RENDER_STATE.canRenderOrThrow();
+		}
+		
+		ClientApi.INSTANCE.renderLods(ClientLevelWrapper.getWrapper(this.level), 
+				ClientApi.RENDER_STATE.mcModelViewMatrix, 
+				ClientApi.RENDER_STATE.mcProjectionMatrix, 
+				ClientApi.RENDER_STATE.frameTime);
+	}
+	
+	#endif
+	
+	
+	
 }

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinLightTexture.java

@@ -19,17 +19,12 @@
 
 package com.seibel.distanthorizons.neoforge.mixins.client;
 
-
-import com.mojang.blaze3d.pipeline.TextureTarget;
-import com.mojang.blaze3d.platform.NativeImage;
-
 import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftRenderWrapper;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import net.minecraft.client.renderer.LightTexture;
 
-import org.lwjgl.opengl.GL32;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
@@ -37,6 +32,16 @@ import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
+#if MC_VER < MC_1_21_3
+import com.mojang.blaze3d.platform.NativeImage;
+#elif MC_VER < MC_1_21_5
+import com.mojang.blaze3d.pipeline.TextureTarget;
+#else
+import com.mojang.blaze3d.opengl.GlTexture;
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.textures.GpuTexture;
+#endif
+
 @Mixin(LightTexture.class)
 public class MixinLightTexture
 {
@@ -44,23 +49,16 @@ public class MixinLightTexture
 	@Shadow 
 	@Final
 	private NativeImage lightPixels;
-	
+	#elif MC_VER < MC_1_21_5
-	
+	@Shadow
-	@Inject(method = "updateLightTexture(F)V", at = @At("RETURN"))
+	@Final
-	public void updateLightTexture(float partialTicks, CallbackInfo ci)
+	private TextureTarget target;
-	{
-		IMinecraftClientWrapper mc = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
-		if (mc == null || mc.getWrappedClientLevel() == null)
-		{
-			return;
-		}
-		
-		IClientLevelWrapper clientLevel = mc.getWrappedClientLevel();
-		MinecraftRenderWrapper.INSTANCE.updateLightmap(this.lightPixels, clientLevel);
-	}
 	#else
+	@Shadow
+	@Final
+	private GpuTexture texture;
+	#endif
 	
-	@Shadow @Final private TextureTarget target;
 	@Inject(method = "updateLightTexture(F)V", at = @At("RETURN"))
 	public void updateLightTexture(float partialTicks, CallbackInfo ci)
 	{
@@ -70,9 +68,17 @@ public class MixinLightTexture
 			return;
 		}
 		
+		
 		IClientLevelWrapper clientLevel = mc.getWrappedClientLevel();
+		
+		#if MC_VER < MC_1_21_3
+		MinecraftRenderWrapper.INSTANCE.updateLightmap(this.lightPixels, clientLevel);
+		#elif MC_VER < MC_1_21_5
 		MinecraftRenderWrapper.INSTANCE.setLightmapId(this.target.getColorTextureId(), clientLevel);
+		#else
+		GlTexture glTexture = (GlTexture) this.texture;
+		MinecraftRenderWrapper.INSTANCE.setLightmapId(glTexture.glId(), clientLevel);
+		#endif
 	}
 	
-	#endif
 }

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinTextureUtil.java

@@ -1,6 +1,8 @@
 package com.seibel.distanthorizons.neoforge.mixins.client;
 
+#if MC_VER < MC_1_21_5
 import com.mojang.blaze3d.platform.GlStateManager;
+#endif
 import com.mojang.blaze3d.platform.TextureUtil;
 import com.seibel.distanthorizons.core.config.Config;
 import org.spongepowered.asm.mixin.Mixin;
@@ -15,6 +17,9 @@ import org.spongepowered.asm.mixin.injection.Redirect;
 @Mixin(TextureUtil.class)
 public class MixinTextureUtil
 {
+	// TODO fix for MC 1.21.5+
+	
+	#if MC_VER < MC_1_21_5
 	@Redirect(method = "prepareImage(Lcom/mojang/blaze3d/platform/NativeImage$InternalGlFormat;IIII)V",
 			at = @At(value = "INVOKE", target = "Lcom/mojang/blaze3d/platform/GlStateManager;_texParameter(IIF)V"), remap = false)
 	private static void setLodBias(int target, int pname, float param)
@@ -27,5 +32,6 @@ public class MixinTextureUtil
 			GlStateManager._texParameter(target, pname, biasValue);
 		}
 	}
+	#endif
 	
 }

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/server/MixinLevelTicks.java

@@ -0,0 +1,46 @@
+package com.seibel.distanthorizons.neoforge.mixins.server;
+
+#if MC_VER < MC_1_21_4
+
+import net.minecraft.world.entity.Entity;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(Entity.class)
+public class MixinLevelTicks<T>
+{
+	// dummy mixin to make the loader happy
+}
+
+#else
+
+import com.seibel.distanthorizons.common.wrappers.DependencySetupDoneCheck;
+import net.minecraft.world.ticks.LevelTicks;
+import net.minecraft.world.ticks.ScheduledTick;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(LevelTicks.class) // available in 1.18.2+, but only needed in 1.21.4+
+public class MixinLevelTicks<T>
+{
+	// TODO put in a common location
+	private static boolean isWorldGenThread()
+	{ return DependencySetupDoneCheck.isDone && DependencySetupDoneCheck.getIsCurrentThreadDistantGeneratorThread.get(); }
+	
+	
+	
+	@Inject(method = "schedule", at = @At(value = "HEAD"), cancellable = true)
+	private void onChunkSave(ScheduledTick<T> tick, CallbackInfo ci)
+	{
+		// In MC 1.21.4 an error check was added to log attempting to schedule ticks for unloaded chunks
+		// this caused a lot of unnecessary errors when generating sand (FallingBlock.class).
+		if (isWorldGenThread())
+		{
+			ci.cancel();
+		}
+	}
+	
+}
+
+#endif

neoforge/src/main/resources/DistantHorizons.neoforge.mixins.json

@@ -8,7 +8,8 @@
     "server.MixinServerPlayer",
     "server.MixinTFChunkGenerator",
     "server.MixinTracingExecutor",
-    "server.MixinUtilBackgroundThread"
+    "server.MixinUtilBackgroundThread",
+    "server.MixinLevelTicks"
   ],
   "client": [
     "client.MixinClientPacketListener",

neoforge/src/main/resources/META-INF/neoforge.mods.toml

@@ -3,6 +3,8 @@ loaderVersion = "*" # // mandatory. Allow all forge versions as we are definding
 license = "LGPL"
 issueTrackerURL = "${issues}"
 
+# https://docs.neoforged.net/docs/gettingstarted/modfiles/#neoforgemodstoml
+
 
 [[mods]] #//mandatory
     modId = "distanthorizons" #//mandatory
@@ -33,3 +35,10 @@ issueTrackerURL = "${issues}"
     versionRange = "${compatible_forgemc_versions}" # Where we set what version of mc it is avalible for
     ordering = "NONE"
     side = "BOTH"
+
+[[dependencies.distanthorizons]]
+    modId = "neoforge"
+    type = "required"
+    versionRange = "${neoforge_version_range}" 
+    ordering = "NONE"
+    side = "BOTH"

relocate_natives/README.md

@@ -0,0 +1,46 @@
+This directory contains the native files of libraries that were modified for relocation. They will be copied from here during the normal build steps.
+
+Before adding/updating a library, make sure you have Python 3.8+ installed and check the instructions below.
+
+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 be mapped to `_1` so account for that as well.
+- Exclude the native files and add them as `relocateNative` (see example).
+
+Example:
+
+```groovy
+relocate "org.sqlite", "dh_sqlite", {
+    exclude "org/sqlite/native/**"
+}
+
+transform(NativeTransformer) {
+    // NativeTransformer configuration
+    rootDir = project.rootDir
+
+    // Replace native strings, e.g. used in calls back to Java
+    relocateNative "org/sqlite", "dh_sqlite"
+    // Rename native methods used when calling from Java
+    relocateNative "org_sqlite", "dh_1sqlite"
+}
+```
+
+How to update a library's natives:
+
+1. Delete the library's folder in cache/.
+2. It will repopulate during the next build.
+
+Why does this step exist?
+
+- Native files are not handled by the shadow plugin correctly.
+- I preferred it as a more streamlined approach, although a bit hacky.
+- Possible alternatives:
+    - Use edited libraries' source code: although more straightforward, it requires maintaining and updating the repositories for the libraries being added
+    - Interfacing with the necessary libraries directly: an absolute mess for technical reasons
+
+What are libraries used?
+
+- LIEF: for fixing binaries after replacing strings
+- apple-codesign: for re-signing Mac binaries, since their signatures get invalidated after previous steps

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={}
 
@@ -43,6 +44,9 @@ fabric_api_version=0.42.0+1.16
 
 # Forge loader
 forge_version=36.2.39
+	# Neo not used but the variable still needs to be defined to make gradle happy
+	neoforge_version_range=[*,)
+	
     # Forge mod versions
     starlight_version_forge=
     terraforged_version=4044290

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={}
 
@@ -42,6 +43,9 @@ fabric_api_version=0.46.1+1.17
 
 # Forge loader
 forge_version=37.1.1
+	# Neo not used but the variable still needs to be defined to make gradle happy
+	neoforge_version_range=[*,)
+	
     # Forge mod versions
     starlight_version_forge=3457784
     terraforged_version=

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={}
 
@@ -51,6 +52,9 @@ quilted_api_version=1.0.0-beta.28+0.67.0-1.18.2
 
 # Forge loader
 forge_version=40.2.10
+	# Neo not used but the variable still needs to be defined to make gradle happy
+	neoforge_version_range=[*,)
+	
     # Forge mod versions
     starlight_version_forge=
     terraforged_version=

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={}
 
@@ -42,6 +43,9 @@ fabric_api_version=0.76.1+1.19.2
 
 # Forge loader
 forge_version=43.3.2
+	# Neo not used but the variable still needs to be defined to make gradle happy
+	neoforge_version_range=[*,)
+	
     # Forge mod versions
     starlight_version_forge=
     terraforged_version=

versionProperties/1.19.4.properties

@@ -23,6 +23,7 @@ fabric_api_version=0.87.1+1.19.4
     immersive_portals_version=
     canvas_version=
 
+    # iris - needs 1.7.4+ to support the DH API
     fabric_incompatibility_list={ "iris": "*" }
     fabric_recommend_list={}
 
@@ -41,6 +42,9 @@ fabric_api_version=0.87.1+1.19.4
 
 # Forge loader
 forge_version=45.2.4
+	# Neo not used but the variable still needs to be defined to make gradle happy
+	neoforge_version_range=[*,)
+	
     # Forge mod versions
     starlight_version_forge=
     terraforged_version=

versionProperties/1.20.1.properties

@@ -23,6 +23,7 @@ fabric_api_version=0.90.4+1.20.1
     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={}
     
@@ -41,6 +42,9 @@ fabric_api_version=0.90.4+1.20.1
 
 # Forge loader
 forge_version=47.2.1
+	# Neo not used but the variable still needs to be defined to make gradle happy
+	neoforge_version_range=[*,)
+	
     # Forge mod versions
     starlight_version_forge=
     terraforged_version=

versionProperties/1.20.2.properties

@@ -23,6 +23,7 @@ fabric_api_version=0.90.4+1.20.2
     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={}
     
@@ -41,6 +42,9 @@ fabric_api_version=0.90.4+1.20.2
 
 # Forge loader
 forge_version=48.0.13
+	# Neo not used but the variable still needs to be defined to make gradle happy
+	neoforge_version_range=[*,)
+
     # Forge mod versions
     starlight_version_forge=
     terraforged_version=

versionProperties/1.20.4.properties

@@ -24,6 +24,7 @@ fabric_api_version=0.91.2+1.20.4
     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={}
     
@@ -42,7 +43,9 @@ 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
     starlight_version_forge=
     terraforged_version=

versionProperties/1.20.6.properties

@@ -24,6 +24,7 @@ fabric_api_version=0.97.8+1.20.6
     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={}
     
@@ -42,7 +43,9 @@ 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
     starlight_version_forge=
     terraforged_version=

versionProperties/1.21.1.properties

@@ -24,6 +24,7 @@ fabric_api_version=0.115.0+1.21.1
     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={}
     
@@ -42,7 +43,9 @@ 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
     starlight_version_forge=
     terraforged_version=

versionProperties/1.21.3.properties

@@ -43,7 +43,9 @@ 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
     starlight_version_forge=
     terraforged_version=

versionProperties/1.21.4.properties

@@ -42,7 +42,10 @@ 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
+    # 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=
     terraforged_version=

versionProperties/1.21.5.properties

@@ -0,0 +1,58 @@
+# 1.21.5 version
+java_version=21
+minecraft_version=1.21.5
+parchment_version=1.21:2024.07.28
+compatible_minecraft_versions=["1.21.5"]
+accessWidenerVersion=1_21_4
+builds_for=fabric,neoforge
+# forge is broken due to gradle/build script issues
+
+# Netty
+netty_version=4.1.97.Final
+
+# Fabric loader
+fabric_loader_version=0.16.10
+fabric_api_version=0.119.5+1.21.5
+    modmenu_version=14.0.0-rc.2
+    starlight_version_fabric=
+    phosphor_version_fabric=
+    lithium_version=
+    sodium_version=mc1.21.5-0.6.11-fabric
+    iris_version=1.8.10+1.21.5-fabric
+    bclib_version=
+    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
+    fabric_incompatibility_list={ "iris": "<=1.8.10" }
+    fabric_recommend_list={}
+    
+    # Fabric mod run
+    # 0 = Don't enable and don't run
+    # 1 = Can be referenced in code but doesn't run
+    # 2 = Can be referenced in code and runs in client
+    enable_starlight=0
+    enable_phosphor=0
+    enable_sodium=1
+    enable_lithium=0
+    enable_iris=1
+    enable_bclib=0
+    enable_immersive_portals=0
+    enable_canvas=0
+
+# (Neo)Forge loader
+forge_version=
+neoforge_version=21.5.87
+    neoforge_version_range=[*,)
+
+    # (Neo)Forge mod versions
+    starlight_version_forge=
+    terraforged_version=
+
+    # (Neo)Forge mod run
+    # 0 = Don't enable and don't run
+    # 1 = Can be referenced in code but doesn't run
+    # 2 = Can be referenced in code and runs in client
+    enable_starlight_forge=0
+    enable_terraforged=0
+    enable_terrafirmacraft=0

versionProperties/1.21.6.properties

@@ -0,0 +1,58 @@
+# 1.21.6 version
+java_version=21
+minecraft_version=1.21.6
+parchment_version=1.21:2024.07.28
+compatible_minecraft_versions=["1.21.6"]
+accessWidenerVersion=1_21_4
+builds_for=fabric,neoforge
+# forge is broken due to gradle/build script issues
+
+# Netty
+netty_version=4.1.97.Final
+
+# Fabric loader
+fabric_loader_version=0.16.13
+fabric_api_version=0.127.0+1.21.6
+    modmenu_version=15.0.0-beta.2
+    starlight_version_fabric=
+    phosphor_version_fabric=
+    lithium_version=
+    sodium_version=mc1.21.6-0.6.13-fabric
+    iris_version=1.9.0+1.21.6-fabric
+    bclib_version=
+    immersive_portals_version=
+    canvas_version=
+
+    fabric_incompatibility_list={ }
+    fabric_recommend_list={}
+    
+    # Fabric mod run
+    # 0 = Don't enable and don't run
+    # 1 = Can be referenced in code but doesn't run
+    # 2 = Can be referenced in code and runs in client
+    enable_starlight=0
+    enable_phosphor=0
+    enable_sodium=1
+    enable_lithium=0
+    enable_iris=1
+    enable_bclib=0
+    enable_immersive_portals=0
+    enable_canvas=0
+
+# (Neo)Forge loader
+forge_version=
+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,)
+    
+    # (Neo)Forge mod versions
+    starlight_version_forge=
+    terraforged_version=
+
+    # (Neo)Forge mod run
+    # 0 = Don't enable and don't run
+    # 1 = Can be referenced in code but doesn't run
+    # 2 = Can be referenced in code and runs in client
+    enable_starlight_forge=0
+    enable_terraforged=0
+    enable_terrafirmacraft=0