Update Forgix

.editorconfig

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

.gitlab-ci.yml

@@ -6,6 +6,7 @@ image: eclipse-temurin:21
 # TODO: Make stages depend on what is in versionProperties
 stages:
   - build
+  - multiversion
   - api
   - pages
 
@@ -35,33 +36,49 @@ build:
   stage: build
   parallel:
     matrix:
-      - MC_VER: [
-      "1.21.10", "1.21.9", "1.21.8", "1.21.6", "1.21.5", "1.21.4", "1.21.3", "1.21.1", 
-      "1.20.6", "1.20.4", "1.20.2", "1.20.1", 
-      "1.19.4", "1.19.2",
-      "1.18.2", 
-      "1.17.1", 
-      "1.16.5"
-      ]
+      - MC_VER: ["1.16.5", "1.17.1", "1.18.2", "1.19.2", "1.19.4", "1.20.1", "1.20.2", "1.20.4", "1.20.6", "1.21.1", "1.21.3", "1.21.4", "1.21.5"]
   script:
     # this both runs the unit tests and assembles the code
-    - ./gradlew clean -PmcVer="${MC_VER}" -PinfoGitCommit="${CI_COMMIT_SHA}" -PinfoGitBranch="${CI_COMMIT_BRANCH}" -PinfoBuildSource="GitLab CI (${CI_PIPELINE_ID})" --gradle-user-home cache/;
     - ./gradlew build -PmcVer="${MC_VER}" -PinfoGitCommit="${CI_COMMIT_SHA}" -PinfoGitBranch="${CI_COMMIT_BRANCH}" -PinfoBuildSource="GitLab CI (${CI_PIPELINE_ID})" --gradle-user-home cache/;
     - ./gradlew mergeJars -PmcVer="${MC_VER}" -PinfoGitCommit="${CI_COMMIT_SHA}" -PinfoGitBranch="${CI_COMMIT_BRANCH}" -PinfoBuildSource="GitLab CI (${CI_PIPELINE_ID})" --gradle-user-home cache/;
-    - cp ./fabric/build/libs/* ./forge/build/libs/* ./neoforge/build/libs/* ./build/merged/* . || true
+    - cp ./build/forgix/* . || true
+    - mkdir -p ./builds
+    - cp ./fabric/build/libs/* ./forge/build/libs/* ./neoforge/build/libs/* ./builds || true
+    # When the archive is created, the merged jar will be the main jar and a subfolder named "builds" will contain the other jars
   artifacts:
     name: "NightlyBuild_${MC_VER}-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
     paths:
       - ./*.jar
+      - ./builds/*.jar
     exclude:
-      - ./*-all.jar
-      - ./*-dev.jar
-      - ./*-sources.jar
+      - ./builds/*-all.jar
+      - ./builds/*-dev.jar
+      - ./builds/*-sources.jar
     expire_in: 14 days
     when: always
   extends: .build_java
 
 
+multiversion:
+  stage: multiversion
+  needs: [build]
+  script:
+    # Create a semicolon-separated list of jar paths
+    - MC_VER_PATHS=$(find . -maxdepth 1 -name "*.jar" -type f | tr '\n' ';')
+    # Run the mergeVersions task
+    - ./gradlew mergeVersions -PmergeVersions="${MC_VER_PATHS}" -PinfoGitCommit="${CI_COMMIT_SHA}" -PinfoGitBranch="${CI_COMMIT_BRANCH}" -PinfoBuildSource="GitLab CI (${CI_PIPELINE_ID})" --gradle-user-home cache/;
+    # Clean up existing jars and make sure only the multiversion jar remains which will be uploaded
+    - rm -f ./*.jar
+    - cp ./build/forgix/multiversion/* .
+  artifacts:
+    name: "NightlyBuild_Multiversion-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
+    paths:
+      - ./*.jar
+    expire_in: 30 days
+    when: always
+  extends: .build_java
+
+
 api:
   stage: api
   needs: []

build.gradle

@@ -13,15 +13,23 @@ plugins {
     id "com.github.johnrengelman.shadow" version '8.1.1' apply false
 
     // Plugin to create merged jars
-    id "io.github.pacifistmc.forgix" version "1.3.4"
+    id "io.github.pacifistmc.forgix" version "2.0.0-SNAPSHOT.2"
 
     // Manifold preprocessor
     id "systems.manifold.manifold-gradle-plugin" version "0.0.2-alpha"
 
     // Architectury is used here only as a replacement for forge's own loom
-    id "dev.architectury.loom" version "1.11-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.10-SNAPSHOT" apply false
 }
 
+// Sets up Forgix for multiversion merging
+forgix {
+    if (project.hasProperty('mergeVersions')) { // This is set using -PmergeVersions by the GitLab CI
+        multiversion {
+            inputJars = project.files(project.property('mergeVersions').toString().split(';'))
+        }
+    }
+}
 
 /**
  * Creates the list of preprocessors to use.
@@ -42,10 +50,8 @@ def writeBuildGradlePredefine(List<String> mcVers, int mcIndex)
         String verStr = mcVers[i].replace(".", "_");
         sb.append("MC_" + verStr + "=" + i.toString() + "\n");
         
-        if (mcIndex == i) 
-        {
+        if (mcIndex == i)
             sb.append("MC_VER=" + i.toString() + "\n");
-        }
     }
     
 
@@ -247,8 +253,7 @@ subprojects { p ->
         // Note: MC 1.16 uses 8.2.1, and versions after use 8.5.12
         // 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:${rootProject.zstd_version}")
+        
         
         // Compression
         forgeShadowMe("org.lz4:lz4-java:${rootProject.lz4_version}") // LZ4
@@ -448,8 +453,6 @@ 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

buildAll

@@ -22,7 +22,7 @@ for d in versionProperties/*; do
   echo "==================== Merging $version ===================="
   sh gradlew mergeJars -PmcVer=$version
   if [ $? != 0 ]; then continue; fi
-  
+
   echo "==================== Moving jar ===================="
-  mv build/merged/*.jar buildAllJars/
+  mv Merged/*.jar buildAllJars/
 done

buildAll.bat

@@ -15,15 +15,12 @@ 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
-    
-	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 build\merged\*.jar buildAllJars\
+    move Merged\*.jar buildAllJars\
 )
 
 endlocal

buildSrc/src/main/java/NativeRelocator.java

@@ -34,10 +34,7 @@ class NativeRelocator
 		{
 			processBuilder.command("powershell", "-ExecutionPolicy", "Bypass", "./prepare.ps1");
 		}
-		else if (os.contains("nix") 
-				|| os.contains("nux") 
-				|| os.contains("mac")
-				|| os.contains("freebsd"))
+		else if (os.contains("nix") || os.contains("nux") || os.contains("mac"))
 		{
 			processBuilder.command("./prepare.sh");
 		}

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

@@ -5,12 +5,11 @@ import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiAfterDh
 import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiBeforeDhInitEvent;
 import com.seibel.distanthorizons.common.commands.CommandInitializer;
 import com.seibel.distanthorizons.common.wrappers.DependencySetup;
-import com.seibel.distanthorizons.common.wrappers.gui.DhDebugScreenEntry;
 import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftServerWrapper;
 import com.seibel.distanthorizons.core.api.internal.ClientApi;
 import com.seibel.distanthorizons.core.api.internal.SharedApi;
 import com.seibel.distanthorizons.core.config.Config;
-import com.seibel.distanthorizons.core.config.ConfigHandler;
+import com.seibel.distanthorizons.core.config.ConfigBase;
 import com.seibel.distanthorizons.core.config.eventHandlers.presets.ThreadPresetConfigEventHandler;
 import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
@@ -24,7 +23,7 @@ import com.seibel.distanthorizons.coreapi.ModInfo;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.dedicated.DedicatedServer;
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.Logger;
 
 import java.lang.invoke.MethodHandles;
 import java.util.function.Consumer;
@@ -36,7 +35,7 @@ import java.util.function.Supplier;
  */
 public abstract class AbstractModInitializer
 {
-	protected static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	protected static final Logger LOGGER = DhLoggerBuilder.getLogger(MethodHandles.lookup().lookupClass().getSimpleName());
 	
 	private CommandInitializer commandInitializer;
 	
@@ -46,8 +45,7 @@ public abstract class AbstractModInitializer
 	// abstract methods //
 	//==================//
 	
-	protected abstract void createInitialSharedBindings();
-	protected abstract void createInitialClientBindings();
+	protected abstract void createInitialBindings();
 	protected abstract IEventProxy createClientProxy();
 	protected abstract IEventProxy createServerProxy(boolean isDedicated);
 	protected abstract void initializeModCompat();
@@ -67,9 +65,8 @@ public abstract class AbstractModInitializer
 	public void onInitializeClient()
 	{
 		DependencySetup.createClientBindings();
-		this.createInitialClientBindings();
 		
-		LOGGER.info("Initializing " + ModInfo.READABLE_NAME + " client, firing DhApiBeforeDhInitEvent...");
+		LOGGER.info("Initializing " + ModInfo.READABLE_NAME + " client.");
 		ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeDhInitEvent.class, null);
 		
 		this.startup();
@@ -80,18 +77,13 @@ 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.");
-		
-		#if MC_VER < MC_1_21_9
-		// debug screen rendering handled via a mixin
-		#else
-		DhDebugScreenEntry.register();
-		#endif
-		
 		this.subscribeClientStartedEvent(this::postInit);
 	}
 	
@@ -99,7 +91,7 @@ public abstract class AbstractModInitializer
 	{
 		DependencySetup.createServerBindings();
 		
-		LOGGER.info("Initializing " + ModInfo.READABLE_NAME + " server, firing DhApiBeforeDhInitEvent event...");
+		LOGGER.info("Initializing " + ModInfo.READABLE_NAME + " server.");
 		ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeDhInitEvent.class, null);
 		
 		this.startup();
@@ -114,7 +106,8 @@ public abstract class AbstractModInitializer
 		
 		this.initializeModCompat();
 		
-		LOGGER.info(ModInfo.READABLE_NAME + " server Initialized, adding event subscribers...");
+		LOGGER.info(ModInfo.READABLE_NAME + " server Initialized.");
+		ApiEventInjector.INSTANCE.fireAllEvents(DhApiAfterDhInitEvent.class, null);
 		
 		this.subscribeRegisterCommandsEvent(dispatcher -> { this.commandInitializer = new CommandInitializer(dispatcher); });
 		
@@ -128,7 +121,7 @@ public abstract class AbstractModInitializer
 			
 			this.checkForUpdates();
 			
-			LOGGER.info(ModInfo.READABLE_NAME + " server Initialized at " + server.getServerDirectory());
+			LOGGER.info("Dedicated server initialized at " + server.getServerDirectory());
 		});
 	}
 	
@@ -142,7 +135,7 @@ public abstract class AbstractModInitializer
 	{
 		DependencySetup.createSharedBindings();
 		SharedApi.init();
-		this.createInitialSharedBindings();
+		this.createInitialBindings();
 	}
 	
 	private void logBuildInfo()
@@ -170,9 +163,8 @@ public abstract class AbstractModInitializer
 	
 	private void initConfig()
 	{
-		ConfigHandler.tryRunFirstTimeSetup();
+		ConfigBase.INSTANCE = new ConfigBase(ModInfo.ID, ModInfo.NAME, Config.class, ModInfo.CONFIG_FILE_VERSION);
 		Config.completeDelayedSetup();
-		DhLogger.runDelayedConfigSetup();
 	}
 	
 	private void checkForUpdates()
@@ -191,18 +183,9 @@ public abstract class AbstractModInitializer
 	
 	private void postInit()
 	{
-		LOGGER.info("Running Delayed setup...");
+		LOGGER.info("Post-Initializing Mod");
 		this.runDelayedSetup();
-		
-		if (ConfigHandler.INSTANCE == null)
-		{
-			throw new IllegalStateException("Config was not initialized. Make sure to call LodCommonMain.initConfig() before calling this method.");
-		}
-		
-		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);
+		LOGGER.info("Mod Post-Initialized");
 	}
 	
 	

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

@@ -1,8 +1,8 @@
 package com.seibel.distanthorizons.common;
 
 import com.seibel.distanthorizons.core.config.Config;
-import com.seibel.distanthorizons.core.logging.DhLogger;
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+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;
 import com.seibel.distanthorizons.core.network.messages.MessageRegistry;
@@ -15,15 +15,15 @@ import io.netty.buffer.ByteBufUtil;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerPlayer;
+import org.apache.logging.log4j.LogManager;
 
 import java.io.IOException;
 import java.util.Objects;
 
 public abstract class AbstractPluginPacketSender implements IPluginPacketSender
 {
-	private static final DhLogger LOGGER = new DhLoggerBuilder()
-			.fileLevelConfig(Config.Common.Logging.logNetworkEventToFile)
-			.build();
+	private static final ConfigBasedLogger LOGGER = new ConfigBasedLogger(LogManager.getLogger(),
+			() -> Config.Common.Logging.logNetworkEvent.get());
 	
 	#if MC_VER >= MC_1_21_1
 	public static final ResourceLocation WRAPPER_PACKET_RESOURCE = ResourceLocation.fromNamespaceAndPath(ModInfo.RESOURCE_NAMESPACE, ModInfo.WRAPPER_PACKET_PATH);

common/src/main/java/com/seibel/distanthorizons/common/commands/ConfigCommand.java

@@ -3,8 +3,8 @@ package com.seibel.distanthorizons.common.commands;
 import com.mojang.brigadier.arguments.*;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
-import com.seibel.distanthorizons.core.config.ConfigHandler;
-import com.seibel.distanthorizons.core.config.types.AbstractConfigBase;
+import com.seibel.distanthorizons.core.config.ConfigBase;
+import com.seibel.distanthorizons.core.config.types.AbstractConfigType;
 import com.seibel.distanthorizons.core.config.types.ConfigEntry;
 import net.minecraft.commands.CommandSourceStack;
 
@@ -43,7 +43,7 @@ public class ConfigCommand extends AbstractCommand
 		LiteralArgumentBuilder<CommandSourceStack> builder = literal("config");
 		HashSet<String> addedCommands = new HashSet<>();
 		
-		for (AbstractConfigBase<?> type : ConfigHandler.INSTANCE.configBaseList)
+		for (AbstractConfigType<?, ?> type : ConfigBase.INSTANCE.entries)
 		{
 			// Skip non-config entries
 			if (!(type instanceof ConfigEntry))

common/src/main/java/com/seibel/distanthorizons/common/commands/CrashCommand.java

@@ -17,9 +17,9 @@ public class CrashCommand extends AbstractCommand
 				.requires(this::isPlayerSource)
 				.then(literal("encode")
 						.executes(c -> {
-							assert SharedApi.tryGetDhServerWorld() != null;
+							assert SharedApi.getIDhServerWorld() != null;
 							
-							ServerPlayerState serverPlayerState = SharedApi.tryGetDhServerWorld().getServerPlayerStateManager()
+							ServerPlayerState serverPlayerState = SharedApi.getIDhServerWorld().getServerPlayerStateManager()
 									.getConnectedPlayer(this.getSourcePlayer(c));
 							if (serverPlayerState != null)
 							{
@@ -29,9 +29,9 @@ public class CrashCommand extends AbstractCommand
 						}))
 				.then(literal("decode")
 						.executes(c -> {
-							assert SharedApi.tryGetDhServerWorld() != null;
+							assert SharedApi.getIDhServerWorld() != null;
 							
-							ServerPlayerState serverPlayerState = SharedApi.tryGetDhServerWorld().getServerPlayerStateManager()
+							ServerPlayerState serverPlayerState = SharedApi.getIDhServerWorld().getServerPlayerStateManager()
 									.getConnectedPlayer(this.getSourcePlayer(c));
 							if (serverPlayerState != null)
 							{

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

@@ -59,9 +59,13 @@ public class DependencySetup
 		DependencySetupDoneCheck.isDone = true;
 	}
 	
+	//@Environment(EnvType.SERVER)
 	public static void createServerBindings()
-	{ SingletonInjector.INSTANCE.bind(IMinecraftSharedWrapper.class, MinecraftServerWrapper.INSTANCE); }
+	{
+		SingletonInjector.INSTANCE.bind(IMinecraftSharedWrapper.class, MinecraftServerWrapper.INSTANCE);
+	}
 	
+	//@Environment(EnvType.CLIENT)
 	public static void createClientBindings()
 	{
 		SingletonInjector.INSTANCE.bind(IMinecraftClientWrapper.class, MinecraftClientWrapper.INSTANCE);

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

@@ -49,9 +49,7 @@ public class McObjectConverter
 	@Deprecated
 	public static Mat4f Convert(
 			#if MC_VER < MC_1_19_4 com.mojang.math.Matrix4f 
-			#elif MC_VER < MC_1_21_6 org.joml.Matrix4f
-			#else org.joml.Matrix4fc 
-			#endif 
+			#else org.joml.Matrix4f #endif 
 			mcMatrix)
 	{
 		FloatBuffer buffer = FloatBuffer.allocate(16);
@@ -65,9 +63,7 @@ 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 
-			#elif MC_VER < MC_1_21_6 org.joml.Matrix4f 
-			#else org.joml.Matrix4fc 
-			#endif
+			#else org.joml.Matrix4f #endif
 			matrix, 
 			FloatBuffer buffer)
 	{

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

@@ -74,15 +74,6 @@ public class VersionConstants implements IVersionConstants
 			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";
-		
-		#elif MC_VER == MC_1_21_9
-			return "1.21.9";
-		#elif MC_VER == MC_1_21_10
-			return "1.21.10";
 		#else
 			ERROR MC version constant missing
 		#endif

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

@@ -1,335 +0,0 @@
-package com.seibel.distanthorizons.common.wrappers.block;
-
-import com.seibel.distanthorizons.core.config.Config;
-import com.seibel.distanthorizons.core.dataObjects.BlockBiomeWrapperPair;
-import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.pos.DhSectionPos;
-import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPosMutable;
-import com.seibel.distanthorizons.core.util.ColorUtil;
-import com.seibel.distanthorizons.core.util.FullDataPointUtil;
-
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
-import it.unimi.dsi.fastutil.longs.LongArrayList;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.BlockAndTintGetter;
-import net.minecraft.world.level.ColorResolver;
-import net.minecraft.world.level.biome.Biome;
-
-import java.io.IOException;
-import java.util.concurrent.ConcurrentHashMap;
-
-import com.seibel.distanthorizons.core.logging.DhLogger;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-#if MC_VER >= MC_1_18_2
-import net.minecraft.core.Holder;
-#endif
-
-
-public abstract class AbstractDhTintGetter implements BlockAndTintGetter
-{
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
-	
-	#if MC_VER < MC_1_18_2
-	private static final ConcurrentHashMap<String, Biome> BIOME_BY_RESOURCE_STRING = new ConcurrentHashMap<>();
-	#else
-	private static final ConcurrentHashMap<String, Holder<Biome>> BIOME_BY_RESOURCE_STRING = new ConcurrentHashMap<>();
-    #endif
-	
-	private static final ConcurrentHashMap<BlockBiomeWrapperPair, Integer> COLOR_BY_BLOCK_BIOME_PAIR = new ConcurrentHashMap<>();
-	/** returned if the color cache is incomplete */
-	public static final int INVALID_COLOR = Integer.MIN_VALUE;
-	
-	
-	protected BiomeWrapper biomeWrapper;
-	protected BlockStateWrapper blockStateWrapper;
-	protected FullDataSourceV2 fullDataSource;
-	protected int smoothingRadiusInBlocks;
-	protected IClientLevelWrapper clientLevelWrapper;
-	
-	
-	
-	//=============//
-	// constructor //
-	//=============//
-	
-	public AbstractDhTintGetter() { }
-	
-	/** 
-	 * Mutates this getter so we can access the necessary
-	 * variables for tint getting.
-	 */
-	public void update(BiomeWrapper biomeWrapper, BlockStateWrapper blockStateWrapper, FullDataSourceV2 fullDataSource, IClientLevelWrapper clientLevelWrapper)
-	{
-		this.biomeWrapper = biomeWrapper;
-		this.blockStateWrapper = blockStateWrapper;
-		this.fullDataSource = fullDataSource;
-		this.clientLevelWrapper = clientLevelWrapper;
-		this.smoothingRadiusInBlocks = Config.Client.Advanced.Graphics.Quality.lodBiomeBlending.get();
-	}
-	
-	
-	
-	//================//
-	// shared methods //
-	//================//
-	
-	/** Called by MC's tint getter */
-	@Override
-	public int getBlockTint(@NotNull BlockPos blockPos, @NotNull ColorResolver colorResolver)
-	{
-		DhBlockPosMutable mutableBlockPos = new DhBlockPosMutable(blockPos.getX(), blockPos.getY(), blockPos.getZ());
-		return this.tryGetBlockTint(mutableBlockPos, colorResolver);
-	}
-	
-	/**
-	 * Can be called by DH directly, skipping some of MC's logic
-	 * to speed up tint getting slightly.
-	 * 
-	 * @return {@link AbstractDhTintGetter#INVALID_COLOR} if any of the biomes needed for this position
-	 *          were not cached. In that case calling {@link AbstractDhTintGetter#getBlockTint(BlockPos, ColorResolver)}
-	 *          will need to be called by MC's ColorResolver so we can
-	 *          populate the color cache.
-	 */
-	public int tryGetBlockTint(DhBlockPosMutable mutableBlockPos)
-	{ return this.tryGetBlockTint(mutableBlockPos, null); }
-	
-	private int tryGetBlockTint(DhBlockPosMutable mutableBlockPos, @Nullable ColorResolver colorResolver)
-	{
-		// determine how wide this data source is so we can determine
-		// if blending should be used
-		byte dataSourceDetailLevel = DhSectionPos.getDetailLevel(this.fullDataSource.getPos());
-		// convert from section detail level to absolute detail level
-		dataSourceDetailLevel = (byte)(dataSourceDetailLevel - DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL);
-		int dataSourceLodWidthInBlocks = DhSectionPos.getDetailLevelWidthInBlocks(dataSourceDetailLevel);
-		
-		// don't do any smoothing if smoothing is disabled or if the LOD
-		// is to large for block-based smoothing to show up
-		if (this.smoothingRadiusInBlocks == 0
-			|| dataSourceLodWidthInBlocks > this.smoothingRadiusInBlocks)
-		{
-			return this.tryGetClientBiomeColor(colorResolver, this.biomeWrapper);
-		}
-		
-		
-		// use a rolling average to calculate the color
-		int dataPointCount = 0;
-		int rollingRed = 0;
-		int rollingGreen = 0;
-		int rollingBlue = 0;
-		
-		int xMin = mutableBlockPos.getX() - this.smoothingRadiusInBlocks;
-		int xMax = mutableBlockPos.getX() + this.smoothingRadiusInBlocks;
-		
-		int zMin = mutableBlockPos.getZ() - this.smoothingRadiusInBlocks;
-		int zMax = mutableBlockPos.getZ() + this.smoothingRadiusInBlocks;
-		
-		
-		for (int x = xMin; x < xMax; x++)
-		{
-			for (int z = zMin; z < zMax; z++)
-			{
-				mutableBlockPos.setX(x);
-				mutableBlockPos.setZ(z);
-				
-				// this can return the same position/datapoint for larger LODs duplicating work,
-				// however for small smoothing ranges that isn't a big deal and for large LODs
-				// we ignore smoothing anyway
-				long dataPoint = this.fullDataSource.getDataPointAtBlockPos(mutableBlockPos);
-				if (dataPoint == FullDataPointUtil.EMPTY_DATA_POINT)
-				{
-					continue;
-				}
-				
-				// get the color for this nearby position
-				int id = FullDataPointUtil.getId(dataPoint);
-				BiomeWrapper biomeWrapper = (BiomeWrapper) this.fullDataSource.mapping.getBiomeWrapper(id);
-				int color = this.tryGetClientBiomeColor(colorResolver, biomeWrapper);
-				if (color == INVALID_COLOR)
-				{
-					return INVALID_COLOR;
-				}
-				
-				
-				// rolling average
-				rollingRed += ColorUtil.getRed(color);
-				rollingGreen += ColorUtil.getGreen(color);
-				rollingBlue += ColorUtil.getBlue(color);
-				
-				dataPointCount++;
-			}
-		}
-		
-		
-		// if no data was present (rarely possible)
-		// just use the default center's color
-		if (dataPointCount == 0)
-		{
-			return this.tryGetClientBiomeColor(colorResolver, this.biomeWrapper);
-		}
-		
-		int colorInt = ColorUtil.argbToInt(
-				255, // blending often ignores alpha, having it always 255 prevents multiplication issues later
-				rollingRed / dataPointCount,
-				rollingGreen / dataPointCount,
-				rollingBlue / dataPointCount);
-		return colorInt;
-	}
-	
-	/** 
-	 * If given a ColorResolver this will always succeed. <Br> 
-	 * If not it will attempt to use the cached color.
-	 */
-	private int tryGetClientBiomeColor(@Nullable ColorResolver colorResolver, BiomeWrapper biomeWrapper)
-	{
-		BlockBiomeWrapperPair pair = BlockBiomeWrapperPair.get(this.blockStateWrapper, biomeWrapper);
-		
-		// use the cached color if possible
-		Integer cachedColor = COLOR_BY_BLOCK_BIOME_PAIR.get(pair); // explicit Integer return here reduces unnecessary allocations
-		if (cachedColor != null)
-		{
-			return cachedColor;
-		}
-		
-		if (colorResolver == null)
-		{
-			// no color resolver is present,
-			// the cache needs to be populated before 
-			// we can use the fast path
-			return INVALID_COLOR;
-		}
-		
-		
-		int color = colorResolver.getColor(unwrapClientBiome(biomeWrapper), 0, 0);
-		COLOR_BY_BLOCK_BIOME_PAIR.put(pair, color);
-		return color;
-	}
-	
-	protected static Biome unwrapClientBiome(BiomeWrapper biomeWrapper)
-	{
-		String biomeString = biomeWrapper.getSerialString();
-		if (biomeString == null
-			|| biomeString.isEmpty()
-			|| biomeString.equals(BiomeWrapper.EMPTY_BIOME_STRING))
-		{
-			// default to "plains" for empty/invalid biomes
-			biomeString = "minecraft:plains";
-		}
-		
-		return unwrapBiome(getClientBiome(biomeString));
-	}
-	
-	protected static Biome unwrapBiome(#if MC_VER >= MC_1_18_2 Holder<Biome> #else Biome #endif biome)
-	{
-		#if MC_VER >= MC_1_18_2
-		return biome.value();
-		#else
-		return biome;
-		#endif
-	}
-	
-	/**
-	 * <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)
-	{
-		#if MC_VER < MC_1_18_2 
-		Biome biome;
-		#else 
-		Holder<Biome> biome; 
-		#endif
-		
-		// calling get instead of compute is slightly faster for already
-		// computed values
-		biome = BIOME_BY_RESOURCE_STRING.get(biomeResourceString);
-		if (biome != null)
-		{
-			return biome;
-		}
-		
-		
-		// 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(BiomeWrapper.PLAINS_RESOURCE_LOCATION_STRING, 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 ["+BiomeWrapper.PLAINS_RESOURCE_LOCATION_STRING+"], returning NULL.");
-							return null;
-						}
-					}
-					
-					if (result.success)
-					{
-						existingBiome = result.biome;
-					}
-					
-					return existingBiome;
-				});
-	}
-	
-	
-	
-}

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

@@ -26,11 +26,10 @@ import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
 import net.minecraft.world.level.Level;
 import org.apache.logging.log4j.LogManager;
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.Logger;
 
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper;
 
@@ -48,7 +47,6 @@ import net.minecraft.core.registries.Registries;
 
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.biome.Biome;
-
 #if MC_VER >= MC_1_18_2
 import net.minecraft.world.level.biome.Biomes;
 #endif
@@ -58,7 +56,7 @@ import net.minecraft.world.level.biome.Biomes;
 public class BiomeWrapper implements IBiomeWrapper
 {
 	// must be defined before AIR, otherwise a null pointer will be thrown
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = LogManager.getLogger();
 	
 	
 	#if MC_VER < MC_1_18_2
@@ -104,7 +102,7 @@ public class BiomeWrapper implements IBiomeWrapper
 	// constructors //
 	//==============//
 	
-	public static BiomeWrapper getBiomeWrapper(#if MC_VER < MC_1_18_2 Biome #else Holder<Biome> #endif biome, ILevelWrapper levelWrapper)
+	static public IBiomeWrapper getBiomeWrapper(#if MC_VER < MC_1_18_2 Biome #else Holder<Biome> #endif biome, ILevelWrapper levelWrapper)
 	{
 		if (biome == null)
 		{
@@ -112,10 +110,9 @@ public class BiomeWrapper implements IBiomeWrapper
 		}
 		
 		
-		BiomeWrapper biomeWrapper = WRAPPER_BY_BIOME.get(biome);
-		if (biomeWrapper != null)
+		if (WRAPPER_BY_BIOME.containsKey(biome))
 		{
-			return biomeWrapper;
+			return WRAPPER_BY_BIOME.get(biome);
 		}
 		else
 		{
@@ -133,6 +130,14 @@ public class BiomeWrapper implements IBiomeWrapper
 		//LOGGER.trace("Created BiomeWrapper ["+this.serialString+"] for ["+biome+"]");
 	}
 	
+	/** should only be used to create {@link BiomeWrapper#EMPTY_WRAPPER} */
+	private BiomeWrapper()
+	{
+		this.biome = null;
+		this.serialString = EMPTY_BIOME_STRING;
+		this.hashCode = Objects.hash(this.serialString);
+	}
+	
 	
 	
 	//=========//
@@ -281,16 +286,64 @@ public class BiomeWrapper implements IBiomeWrapper
 		BiomeWrapper foundWrapper = EMPTY_WRAPPER;
 		try
 		{
+			// parse the resource location
+			int separatorIndex = resourceLocationString.indexOf(":");
+			if (separatorIndex == -1)
+			{
+				throw new IOException("Unable to parse resource location string: [" + resourceLocationString + "].");
+			}
+			
+			ResourceLocation resourceLocation;
+			try
+			{
+				#if MC_VER < MC_1_21_1
+				resourceLocation = new ResourceLocation(resourceLocationString.substring(0, separatorIndex), resourceLocationString.substring(separatorIndex + 1));
+				#else
+				resourceLocation = ResourceLocation.fromNamespaceAndPath(resourceLocationString.substring(0, separatorIndex), resourceLocationString.substring(separatorIndex + 1));
+				#endif
+			}
+			catch (Exception e)
+			{
+				throw new IOException("No Resource Location found for the string: [" + resourceLocationString + "] Error: [" + e.getMessage() + "].");
+			}
+			
+			
 			try
 			{
 				Level level = (Level) levelWrapper.getWrappedMcObject();
 				net.minecraft.core.RegistryAccess registryAccess = level.registryAccess();
 				
-				BiomeDeserializeResult deserializeResult = deserializeBiome(resourceLocationString, registryAccess);
+				boolean success;
+				#if MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1
+				Biome biome = registryAccess.registryOrThrow(Registry.BIOME_REGISTRY).get(resourceLocation);
+				success = (biome != null);
+				#elif MC_VER == MC_1_18_2 || MC_VER == MC_1_19_2
+				Biome unwrappedBiome = registryAccess.registryOrThrow(Registry.BIOME_REGISTRY).get(resourceLocation);
+				success = (unwrappedBiome != null);
+				Holder<Biome> biome = new Holder.Direct<>(unwrappedBiome);
+				#elif MC_VER < MC_1_21_3
+				Biome unwrappedBiome = registryAccess.registryOrThrow(Registries.BIOME).get(resourceLocation);
+				success = (unwrappedBiome != null);
+				Holder<Biome> biome = new Holder.Direct<>(unwrappedBiome);
+				#else
+				Holder<Biome> biome;
+				Optional<Holder.Reference<Biome>> optionalBiomeHolder = registryAccess.lookupOrThrow(Registries.BIOME).get(resourceLocation);
+				if (optionalBiomeHolder.isPresent())
+				{
+					Biome unwrappedBiome = optionalBiomeHolder.get().value();
+					success = (unwrappedBiome != null);
+					biome = new Holder.Direct<>(unwrappedBiome);
+				}
+				else
+				{
+					success = false;
+					biome = null;
+				}
+				#endif
 				
 				
 				
-				if (!deserializeResult.success)
+				if (!success)
 				{
 					if (!brokenResourceLocationStrings.contains(resourceLocationString))
 					{
@@ -301,7 +354,7 @@ public class BiomeWrapper implements IBiomeWrapper
 				}
 				
 				
-				foundWrapper = getBiomeWrapper(deserializeResult.biome, levelWrapper);
+				foundWrapper = (BiomeWrapper) getBiomeWrapper(biome, levelWrapper);
 				return foundWrapper;
 			}
 			catch (Exception e)
@@ -315,82 +368,4 @@ public class BiomeWrapper implements IBiomeWrapper
 		}
 	}
 	
-	public static BiomeDeserializeResult deserializeBiome(String resourceLocationString, net.minecraft.core.RegistryAccess registryAccess) throws IOException
-	{
-		// parse the resource location
-		int separatorIndex = resourceLocationString.indexOf(":");
-		if (separatorIndex == -1)
-		{
-			throw new IOException("Unable to parse resource location string: [" + resourceLocationString + "].");
-		}
-		
-		ResourceLocation resourceLocation;
-		try
-		{
-			#if MC_VER < MC_1_21_1
-			resourceLocation = new ResourceLocation(resourceLocationString.substring(0, separatorIndex), resourceLocationString.substring(separatorIndex + 1));
-			#else
-			resourceLocation = ResourceLocation.fromNamespaceAndPath(resourceLocationString.substring(0, separatorIndex), resourceLocationString.substring(separatorIndex + 1));
-			#endif
-		}
-		catch (Exception e)
-		{
-			throw new IOException("No Resource Location found for the string: [" + resourceLocationString + "] Error: [" + e.getMessage() + "].");
-		}
-		
-		
-		boolean success;
-		#if MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1
-		Biome biome = registryAccess.registryOrThrow(Registry.BIOME_REGISTRY).get(resourceLocation);
-		success = (biome != null);
-		#elif MC_VER == MC_1_18_2 || MC_VER == MC_1_19_2
-		Biome unwrappedBiome = registryAccess.registryOrThrow(Registry.BIOME_REGISTRY).get(resourceLocation);
-		success = (unwrappedBiome != null);
-		Holder<Biome> biome = new Holder.Direct<>(unwrappedBiome);
-		#elif MC_VER < MC_1_21_3
-		Biome unwrappedBiome = registryAccess.registryOrThrow(Registries.BIOME).get(resourceLocation);
-		success = (unwrappedBiome != null);
-		Holder<Biome> biome = new Holder.Direct<>(unwrappedBiome);
-		#else
-		Holder<Biome> biome;
-		Optional<Holder.Reference<Biome>> optionalBiomeHolder = registryAccess.lookupOrThrow(Registries.BIOME).get(resourceLocation);
-		if (optionalBiomeHolder.isPresent())
-		{
-			Biome unwrappedBiome = optionalBiomeHolder.get().value();
-			success = (unwrappedBiome != null);
-			biome = new Holder.Direct<>(unwrappedBiome);
-		}
-		else
-		{
-			success = false;
-			biome = null;
-		}
-		#endif
-		
-		return new BiomeDeserializeResult(success, biome);
-	}
-	
-	
-	//================//
-	// helper classes //
-	//================//
-	
-	public static class BiomeDeserializeResult
-	{
-		public final boolean success;
-		
-		#if MC_VER < MC_1_18_2
-		public final Biome biome;
-		#else
-		public final Holder<Biome> biome;
-    #endif
-		
-		public BiomeDeserializeResult(boolean success, #if MC_VER < MC_1_18_2 Biome #else Holder<Biome> #endif biome)
-		{
-			this.success = success;
-			this.biome = biome;
-		}
-	}
-	
-	
 }

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

@@ -35,7 +35,7 @@ import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.state.BlockState;
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.Logger;
 
 import java.awt.*;
 import java.io.IOException;
@@ -72,7 +72,7 @@ public class BlockStateWrapper implements IBlockStateWrapper
 	
 	
 	// must be defined before AIR, otherwise a null pointer will be thrown
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
     public static final ConcurrentHashMap<BlockState, BlockStateWrapper> WRAPPER_BY_BLOCK_STATE = new ConcurrentHashMap<>();
     public static final ConcurrentHashMap<String, BlockStateWrapper> WRAPPER_BY_RESOURCE_LOCATION = new ConcurrentHashMap<>();
@@ -81,7 +81,6 @@ public class BlockStateWrapper implements IBlockStateWrapper
 	public static final BlockStateWrapper AIR = new BlockStateWrapper(null, null);
 	
 	public static final String DIRT_RESOURCE_LOCATION_STRING = "minecraft:dirt";
-	public static final String WATER_RESOURCE_LOCATION_STRING = "minecraft:water";
 	
 	public static HashSet<IBlockStateWrapper> rendererIgnoredBlocks = null;
 	public static HashSet<IBlockStateWrapper> rendererIgnoredCaveBlocks = null;

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

@@ -20,16 +20,15 @@
 package com.seibel.distanthorizons.common.wrappers.block;
 
 import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
-import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos;
-import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPosMutable;
 import com.seibel.distanthorizons.core.util.ColorUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.block.model.BakedQuad;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.core.Direction;
+import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.FlowerBlock;
 import net.minecraft.world.level.block.LeavesBlock;
@@ -40,7 +39,7 @@ import net.minecraft.util.RandomSource;
 import java.util.Random;
 #endif
 import net.minecraft.world.level.block.state.BlockState;
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
@@ -62,7 +61,7 @@ import net.minecraft.client.renderer.block.model.BlockModelPart;
  */
 public class ClientBlockStateColorCache
 {
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
 	private static final HashSet<BlockState> BLOCK_STATES_THAT_NEED_LEVEL = new HashSet<>();
 	private static final HashSet<BlockState> BROKEN_BLOCK_STATES = new HashSet<>();
@@ -92,12 +91,13 @@ public class ClientBlockStateColorCache
 	private static final RandomSource RANDOM = RandomSource.create();
 	#endif
 	
-	private final IClientLevelWrapper clientLevelWrapper;
+	private final IClientLevelWrapper levelWrapper;
 	private final BlockState blockState;
-	private final BlockStateWrapper blockStateWrapper;
+	private final LevelReader level;
 	
 	private boolean isColorResolved = false;
 	private int baseColor = 0;
+	private boolean needShade = true;
 	private boolean needPostTinting = false;
 	private int tintIndex = 0;
 	
@@ -165,21 +165,17 @@ public class ClientBlockStateColorCache
 			0.93011117f, 0.9386859f, 0.9473069f, 0.9559735f, 0.9646866f, 0.9734455f, 0.98225087f, 0.9911022f, 1.0f
 		};
 	
-	private static final ThreadLocal<TintWithoutLevelOverrider> TintWithoutLevelOverrideGetter = ThreadLocal.withInitial(() -> new TintWithoutLevelOverrider());
-	private static final ThreadLocal<TintGetterOverride> TintOverrideGetter = ThreadLocal.withInitial(() -> new TintGetterOverride());
-	
 	
 	
 	//=============//
 	// constructor //
 	//=============//
 	
-	public ClientBlockStateColorCache(BlockState blockState, IClientLevelWrapper clientLevelWrapper)
+	public ClientBlockStateColorCache(BlockState blockState, IClientLevelWrapper samplingLevel)
 	{
 		this.blockState = blockState;
-		this.blockStateWrapper = BlockStateWrapper.fromBlockState(blockState, clientLevelWrapper);
-		this.clientLevelWrapper = clientLevelWrapper;
-		
+		this.levelWrapper = samplingLevel;
+		this.level = (LevelReader) samplingLevel.getWrappedMcObject();
 		this.resolveColors();
 	}
 	
@@ -232,29 +228,32 @@ public class ClientBlockStateColorCache
 					
 					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(
                         firstQuad.sprite,
-						EColorMode.getColorMode(this.blockState.getBlock()));
+						ColorMode.getColorMode(this.blockState.getBlock()));
 					#elif MC_VER < MC_1_21_5
 					this.baseColor = calculateColorFromTexture(
                         firstQuad.getSprite(),
-						EColorMode.getColorMode(this.blockState.getBlock()));
+						ColorMode.getColorMode(this.blockState.getBlock()));
 					#else
 					this.baseColor = calculateColorFromTexture(
 						firstQuad.sprite(),
-						EColorMode.getColorMode(this.blockState.getBlock()));
+						ColorMode.getColorMode(this.blockState.getBlock()));
 					#endif
 				}
 				else
 				{
 					// Backup method.
 					this.needPostTinting = false;
+					this.needShade = false;
 					this.tintIndex = 0;
 					this.baseColor = this.getParticleIconColor();
 				}
@@ -263,11 +262,11 @@ public class ClientBlockStateColorCache
 			{
 				// Liquid Block
 				this.needPostTinting = true;
+				this.needShade = false;
 				this.tintIndex = 0;
 				this.baseColor = this.getParticleIconColor();
 			}
 			
-			
 			this.isColorResolved = true;
 		}
 		finally
@@ -305,7 +304,7 @@ public class ClientBlockStateColorCache
 	}
 	
 	//TODO: Perhaps make this not just use the first frame?
-	private static int calculateColorFromTexture(TextureAtlasSprite texture, EColorMode colorMode)
+	private static int calculateColorFromTexture(TextureAtlasSprite texture, ColorMode colorMode)
 	{
 		int count = 0;
 		int alpha = 0;
@@ -315,8 +314,8 @@ public class ClientBlockStateColorCache
 		int tempColor;
 		
 		// don't render Chiseled blocks.
-		// Since EColorMode is set per block, you only need to check this once.
-		if (colorMode != EColorMode.Chisel)
+		// Since ColorMode is set per block, you only need to check this once.
+		if (colorMode != ColorMode.Chisel)
 		{
 			// textures normally use u and v instead of x and y
 			for (int v = 0; v < getTextureHeight(texture); v++)
@@ -334,7 +333,7 @@ public class ClientBlockStateColorCache
 					int b = (tempColor & 0x00FF0000) >>> 16;
 					int a = (tempColor & 0xFF000000) >>> 24;
 					int scale = 1;
-					if (colorMode == EColorMode.Leaves)
+					if (colorMode == ColorMode.Leaves)
 					{
 						//switch (//FIXME add config option)
 						//	case BLACK:
@@ -353,11 +352,11 @@ public class ClientBlockStateColorCache
 						//		break; //do nothing, let it count towards transparency
 						
 					}
-					else if (a == 0 && colorMode != EColorMode.Glass)
+					else if (a == 0 && colorMode != ColorMode.Glass)
 					{
 						continue;
 					}
-					else if (colorMode == EColorMode.Flower && (g + 25 < b || g + 25 < r))
+					else if (colorMode == ColorMode.Flower && (g + 25 < b || g + 25 < r))
 					{
 						scale = FLOWER_COLOR_SCALE;
 					}
@@ -415,18 +414,16 @@ public class ClientBlockStateColorCache
 	 * This method was suggested by IMS from the Iris/Sodium team. 
 	 * That's where the numbers and code are based.
 	 */
-	private static int linearToSrgb(float color)
+	private static int linearToSrgb(float c)
 	{
-		if (!(color > MIN_SRGB_BOUND)) 
-		{
-			color = MIN_SRGB_BOUND;
+		if (!(c > MIN_SRGB_BOUND)) {
+			c = MIN_SRGB_BOUND;
 		}
 		
-		if (color > MAX_SRGB_BOUND) 
-		{
-			color = MAX_SRGB_BOUND;
+		if (c > MAX_SRGB_BOUND) {
+			c = MAX_SRGB_BOUND;
 		}
-		int inputBits = Float.floatToRawIntBits(color);
+		int inputBits = Float.floatToRawIntBits(c);
 		int entry = linearToSrgbTable[((inputBits - MIN_SRGB_BITS) >> 20)];
 		
 		int bias = (entry >>> 16) << 9;
@@ -440,7 +437,7 @@ public class ClientBlockStateColorCache
 	{
 		return calculateColorFromTexture(
 				Minecraft.getInstance().getModelManager().getBlockModelShaper().getParticleIcon(this.blockState),
-				EColorMode.getColorMode(this.blockState.getBlock()));
+				ColorMode.getColorMode(this.blockState.getBlock()));
 	}
 	
 	
@@ -449,7 +446,7 @@ public class ClientBlockStateColorCache
 	// public getter //
 	//===============//
 	
-	public int getColor(BiomeWrapper biomeWrapper, FullDataSourceV2 fullDataSource, DhBlockPos blockPos)
+	public int getColor(BiomeWrapper biome, DhBlockPos pos)
 	{
 		// only get the tint if the block needs to be tinted
 		if (!this.needPostTinting)
@@ -473,27 +470,13 @@ public class ClientBlockStateColorCache
 			{
 				try
 				{
-					TintWithoutLevelOverrider tintOverride = TintWithoutLevelOverrideGetter.get();
-					tintOverride.update(biomeWrapper, this.blockStateWrapper, fullDataSource, this.clientLevelWrapper);
-					
-					// try using DH's cached tint values first if possible
-					tintColor = tintOverride.tryGetBlockTint(new DhBlockPosMutable(blockPos));
-					if (tintColor == AbstractDhTintGetter.INVALID_COLOR)
-					{
-						// one or more tint values weren't calculated,
-						// we need MC's color resolver
-						tintColor = Minecraft.getInstance()
-								.getBlockColors()
-								.getColor(this.blockState,
-										tintOverride,
-										McObjectConverter.Convert(blockPos),
-										this.tintIndex);
-					}
+					tintColor = Minecraft.getInstance().getBlockColors()
+							.getColor(this.blockState, new TintWithoutLevelOverrider(biome, this.levelWrapper), McObjectConverter.Convert(pos), this.tintIndex);
 				}
 				catch (UnsupportedOperationException e)
 				{
 					// this exception generally occurs if the tint requires other blocks besides itself
-					LOGGER.debug("Unable to use ["+ TintWithoutLevelOverrider.class.getSimpleName()+"] to get the block tint for block: [" + this.blockState + "] and biome: [" + biomeWrapper + "] at pos: " + blockPos + ". Error: [" + e.getMessage() + "]. Attempting to use backup method...", e);
+					LOGGER.debug("Unable to use ["+TintWithoutLevelOverrider.class.getSimpleName()+"] to get the block tint for block: [" + this.blockState + "] and biome: [" + biome + "] at pos: " + pos + ". Error: [" + e.getMessage() + "]. Attempting to use backup method...", e);
 					BLOCK_STATES_THAT_NEED_LEVEL.add(this.blockState);
 				}
 			}
@@ -501,22 +484,10 @@ public class ClientBlockStateColorCache
 			// use the level logic only if requested
 			if (BLOCK_STATES_THAT_NEED_LEVEL.contains(this.blockState))
 			{
-				// the level shouldn't be used all the time due to it breaking some blocks tinting
+				// this logic can't be used all the time due to it breaking some blocks tinting
 				// specifically oceans don't render correctly
-				
-				TintGetterOverride tintOverride = TintOverrideGetter.get();
-				tintOverride.update(biomeWrapper, this.blockStateWrapper, fullDataSource, this.clientLevelWrapper);
-				
-				tintColor = tintOverride.tryGetBlockTint(new DhBlockPosMutable(blockPos));
-				if (tintColor == AbstractDhTintGetter.INVALID_COLOR)
-				{
-					tintColor = Minecraft.getInstance()
-							.getBlockColors()
-							.getColor(this.blockState,
-									tintOverride,
-									McObjectConverter.Convert(blockPos),
-									this.tintIndex);
-				}
+				tintColor = Minecraft.getInstance().getBlockColors()
+						.getColor(this.blockState, new TintGetterOverrideFast(this.level), McObjectConverter.Convert(pos), this.tintIndex);
 			}
 		}
 		catch (Exception e)
@@ -524,7 +495,7 @@ public class ClientBlockStateColorCache
 			// only display the error once per block/biome type to reduce log spam
 			if (!BROKEN_BLOCK_STATES.contains(this.blockState))
 			{
-				LOGGER.warn("Failed to get block color for block: [" + this.blockState + "] and biome: [" + biomeWrapper + "] at pos: " + blockPos + ". Error: ["+e.getMessage() + "]. Note: future errors for this block/biome will be ignored.", e);
+				LOGGER.warn("Failed to get block color for block: [" + this.blockState + "] and biome: [" + biome + "] at pos: " + pos + ". Error: ["+e.getMessage() + "]. Note: future errors for this block/biome will be ignored.", e);
 				BROKEN_BLOCK_STATES.add(this.blockState);
 			}
 		}
@@ -548,7 +519,7 @@ public class ClientBlockStateColorCache
 	// helper classes //
 	//================//
 	
-	private enum EColorMode
+	enum ColorMode
 	{
 		Default,
 		Flower,
@@ -556,7 +527,7 @@ public class ClientBlockStateColorCache
 		Chisel,
 		Glass;
 		
-		static EColorMode getColorMode(Block block)
+		static ColorMode getColorMode(Block block)
 		{
 			if (block instanceof LeavesBlock) return Leaves;
 			if (block instanceof FlowerBlock) return Flower;

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

@@ -19,11 +19,10 @@
 
 package com.seibel.distanthorizons.common.wrappers.block;
 
-import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 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.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
@@ -39,9 +38,9 @@ import java.util.Optional;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
 
-public class TintGetterOverride extends AbstractDhTintGetter
+public class TintGetterOverrideFast implements BlockAndTintGetter
 {
-	private LevelReader parent;
+	LevelReader parent;
 	
 	
 	
@@ -49,13 +48,7 @@ public class TintGetterOverride extends AbstractDhTintGetter
 	// constructor //
 	//=============//
 	
-	public TintGetterOverride() { }
-	
-	public void update(LevelReader parent, BiomeWrapper biomeWrapper, BlockStateWrapper blockStateWrapper, FullDataSourceV2 fullDataSource, IClientLevelWrapper clientLevelWrapper)
-	{
-		super.update(biomeWrapper, blockStateWrapper, fullDataSource, clientLevelWrapper);
-		this.parent = parent;
-	}
+	public TintGetterOverrideFast(LevelReader parent) { this.parent = parent; }
 	
 	
 	
@@ -63,6 +56,18 @@ public class TintGetterOverride extends AbstractDhTintGetter
 	// methods //
 	//=========//
 	
+	private Biome _getBiome(BlockPos pos)
+	{
+		#if MC_VER >= MC_1_18_2
+		return this.parent.getBiome(pos).value();
+		#else
+		return parent.getBiome(pos);
+		#endif
+	}
+	
+	@Override
+	public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver) { return colorResolver.getColor(this._getBiome(blockPos), blockPos.getX(), blockPos.getZ()); }
+	
 	@Override
 	public float getShade(Direction direction, boolean bl) { return this.parent.getShade(direction, bl); }
 	
@@ -82,6 +87,7 @@ public class TintGetterOverride extends AbstractDhTintGetter
 	@Nullable
 	public BlockEntity getBlockEntity(BlockPos blockPos) { return this.parent.getBlockEntity(blockPos); }
 	
+	
 	@Override
 	public BlockState getBlockState(BlockPos blockPos) { return this.parent.getBlockState(blockPos); }
 	
@@ -93,25 +99,26 @@ public class TintGetterOverride extends AbstractDhTintGetter
 	
 	#if MC_VER < MC_1_21_3
 	@Override
-	public int getMaxLightLevel() { return this.parent.getMaxLightLevel(); }
+	public int getMaxLightLevel() { return parent.getMaxLightLevel(); }
 	#else
 	#endif
 	
 	@Override
-	public Stream<BlockState> getBlockStates(AABB aABB) { return this.parent.getBlockStates(aABB); }
+	public Stream<BlockState> getBlockStates(AABB aABB)
+	{ return this.parent.getBlockStates(aABB); }
 	
 	@Override
-	public BlockHitResult clip(ClipContext clipContext) { return this.parent.clip(clipContext); }
+	public BlockHitResult clip(ClipContext clipContext)
+	{ return this.parent.clip(clipContext); }
 	
 	@Override
 	@Nullable
 	public BlockHitResult clipWithInteractionOverride(Vec3 vec3, Vec3 vec32, BlockPos blockPos, VoxelShape voxelShape, BlockState blockState)
-	{
-		return this.parent.clipWithInteractionOverride(vec3, vec32, blockPos, voxelShape, blockState);
-	}
+	{ return this.parent.clipWithInteractionOverride(vec3, vec32, blockPos, voxelShape, blockState); }
 	
 	@Override
-	public double getBlockFloorHeight(VoxelShape voxelShape, Supplier<VoxelShape> supplier) { return this.parent.getBlockFloorHeight(voxelShape, supplier); }
+	public double getBlockFloorHeight(VoxelShape voxelShape, Supplier<VoxelShape> supplier)
+	{ return this.parent.getBlockFloorHeight(voxelShape, supplier); }
 	
 	@Override
 	public double getBlockFloorHeight(BlockPos blockPos) { return this.parent.getBlockFloorHeight(blockPos); }
@@ -124,12 +131,20 @@ public class TintGetterOverride extends AbstractDhTintGetter
 	public int getMaxY() { return this.parent.getMaxY(); }
 	#endif
 	
+	
+	
+	//==============//
+	// post MC 1.17 //
+	//==============//
+	
 	#if MC_VER >= MC_1_17_1
 	@Override
-	public <T extends BlockEntity> Optional<T> getBlockEntity(BlockPos blockPos, BlockEntityType<T> blockEntityType) { return this.parent.getBlockEntity(blockPos, blockEntityType); }
+	public <T extends BlockEntity> Optional<T> getBlockEntity(BlockPos blockPos, BlockEntityType<T> blockEntityType)
+	{ return this.parent.getBlockEntity(blockPos, blockEntityType); }
 	
 	@Override
-	public BlockHitResult isBlockInLine(ClipBlockStateContext clipBlockStateContext) { return this.parent.isBlockInLine(clipBlockStateContext); }
+	public BlockHitResult isBlockInLine(ClipBlockStateContext clipBlockStateContext)
+	{ return this.parent.isBlockInLine(clipBlockStateContext); }
 	
 	@Override
 	public int getHeight() { return this.parent.getHeight(); }
@@ -150,7 +165,7 @@ public class TintGetterOverride extends AbstractDhTintGetter
 	public int getMinSection() { return this.parent.getMinSection(); }
 	#else
 	@Override
-	public int getMinSectionY() { return super.getMinSectionY(); }	
+	public int getMinSectionY() { return BlockAndTintGetter.super.getMinSectionY(); }	
 	#endif
 	
 	#if MC_VER < MC_1_21_3
@@ -176,7 +191,4 @@ public class TintGetterOverride extends AbstractDhTintGetter
 	@Override
 	public int getSectionYFromSectionIndex(int i) { return this.parent.getSectionYFromSectionIndex(i); }
     #endif
-	
-	
-	
 }

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

@@ -0,0 +1,214 @@
+/*
+ *    This file is part of the Distant Horizons mod
+ *    licensed under the GNU LGPL v3 License.
+ *
+ *    Copyright (C) 2020 James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU Lesser General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.distanthorizons.common.wrappers.block;
+
+import com.seibel.distanthorizons.core.util.LodUtil;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Cursor3D;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.*;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.lighting.LevelLightEngine;
+import net.minecraft.world.level.material.FluidState;
+import net.minecraft.world.phys.AABB;
+import net.minecraft.world.phys.BlockHitResult;
+import net.minecraft.world.phys.Vec3;
+import net.minecraft.world.phys.shapes.VoxelShape;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Optional;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+
+public class TintGetterOverrideSmooth implements BlockAndTintGetter
+{
+	LevelReader parent;
+	public int smoothingRange;
+	
+	
+	
+	//=============//
+	// constructor //
+	//=============//
+	
+	public TintGetterOverrideSmooth(LevelReader parent, int smoothingRange)
+	{
+		this.parent = parent;
+		this.smoothingRange = smoothingRange;
+	}
+	
+	
+	
+	//=========//
+	// methods //
+	//=========//
+	
+	private Biome _getBiome(BlockPos pos)
+	{
+		#if MC_VER >= MC_1_18_2
+		return this.parent.getBiome(pos).value();
+		#else
+		return parent.getBiome(pos);
+		#endif
+	}
+	
+	public int calculateBlockTint(BlockPos blockPos, ColorResolver colorResolver)
+	{
+		int i = smoothingRange;
+		if (i == 0)
+			return colorResolver.getColor(_getBiome(blockPos), blockPos.getX(), blockPos.getZ());
+		int j = (i * 2 + 1) * (i * 2 + 1);
+		int k = 0;
+		int l = 0;
+		int m = 0;
+		Cursor3D cursor3D = new Cursor3D(blockPos.getX() - i, blockPos.getY(), blockPos.getZ() - i, blockPos.getX() + i, blockPos.getY(), blockPos.getZ() + i);
+		BlockPos.MutableBlockPos mutableBlockPos = new BlockPos.MutableBlockPos();
+		while (cursor3D.advance())
+		{
+			mutableBlockPos.set(cursor3D.nextX(), cursor3D.nextY(), cursor3D.nextZ());
+			int n = colorResolver.getColor(this._getBiome(mutableBlockPos), mutableBlockPos.getX(), mutableBlockPos.getZ());
+			
+			k += (n & 0xFF0000) >> 16;
+			l += (n & 0xFF00) >> 8;
+			m += n & 0xFF;
+		}
+		return (k / j & 0xFF) << 16 | (l / j & 0xFF) << 8 | m / j & 0xFF;
+	}
+	
+	@Override
+	public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver) { return this.calculateBlockTint(blockPos, colorResolver); }
+	
+	@Override
+	public float getShade(Direction direction, boolean bl) { return this.parent.getShade(direction, bl); }
+	
+	@Override
+	public LevelLightEngine getLightEngine() { return this.parent.getLightEngine(); }
+	
+	@Override
+	public int getBrightness(LightLayer lightLayer, BlockPos blockPos) { return this.parent.getBrightness(lightLayer, blockPos); }
+	
+	@Override
+	public int getRawBrightness(BlockPos blockPos, int i) { return this.parent.getRawBrightness(blockPos, i); }
+	
+	@Override
+	public boolean canSeeSky(BlockPos blockPos) { return this.parent.canSeeSky(blockPos); }
+	
+	@Override
+	@Nullable
+	public BlockEntity getBlockEntity(BlockPos blockPos) { return this.parent.getBlockEntity(blockPos); }
+	
+	@Override
+	public BlockState getBlockState(BlockPos blockPos) { return this.parent.getBlockState(blockPos); }
+	
+	@Override
+	public FluidState getFluidState(BlockPos blockPos) { return this.parent.getFluidState(blockPos); }
+	
+	@Override
+	public int getLightEmission(BlockPos blockPos) { return this.parent.getLightEmission(blockPos); }
+	
+	#if MC_VER < MC_1_21_3
+	@Override
+	public int getMaxLightLevel() { return this.parent.getMaxLightLevel(); }
+	#else
+	#endif
+	
+	@Override
+	public Stream<BlockState> getBlockStates(AABB aABB) { return this.parent.getBlockStates(aABB); }
+	
+	@Override
+	public BlockHitResult clip(ClipContext clipContext) { return this.parent.clip(clipContext); }
+	
+	@Override
+	@Nullable
+	public BlockHitResult clipWithInteractionOverride(Vec3 vec3, Vec3 vec32, BlockPos blockPos, VoxelShape voxelShape, BlockState blockState)
+	{
+		return this.parent.clipWithInteractionOverride(vec3, vec32, blockPos, voxelShape, blockState);
+	}
+	
+	@Override
+	public double getBlockFloorHeight(VoxelShape voxelShape, Supplier<VoxelShape> supplier) { return this.parent.getBlockFloorHeight(voxelShape, supplier); }
+	
+	@Override
+	public double getBlockFloorHeight(BlockPos blockPos) { return this.parent.getBlockFloorHeight(blockPos); }
+	
+	#if MC_VER < MC_1_21_3
+	@Override
+	public int getMaxBuildHeight() { return this.parent.getMaxBuildHeight(); }
+	#else
+	@Override
+	public int getMaxY() { return this.parent.getMaxY(); }
+	#endif
+	
+	#if MC_VER >= MC_1_17_1
+	@Override
+	public <T extends BlockEntity> Optional<T> getBlockEntity(BlockPos blockPos, BlockEntityType<T> blockEntityType) { return this.parent.getBlockEntity(blockPos, blockEntityType); }
+	
+	@Override
+	public BlockHitResult isBlockInLine(ClipBlockStateContext clipBlockStateContext) { return this.parent.isBlockInLine(clipBlockStateContext); }
+	
+	@Override
+	public int getHeight() { return this.parent.getHeight(); }
+	
+	#if MC_VER < MC_1_21_3
+	@Override
+	public int getMinBuildHeight() { return this.parent.getMinBuildHeight(); }
+	#else
+	@Override
+	public int getMinY() { return this.parent.getMinY(); }
+	#endif
+	
+	@Override
+	public int getSectionsCount() { return this.parent.getSectionsCount(); }
+	
+	#if MC_VER < MC_1_21_3
+	@Override
+	public int getMinSection() { return this.parent.getMinSection(); }
+	#else
+	@Override
+	public int getMinSectionY() { return BlockAndTintGetter.super.getMinSectionY(); }	
+	#endif
+	
+	#if MC_VER < MC_1_21_3
+	@Override
+	public int getMaxSection() { return this.parent.getMaxSection(); }
+	#else
+	@Override
+	public int getMaxSectionY() { return this.parent.getMaxSectionY(); }
+	#endif
+	
+	@Override
+	public boolean isOutsideBuildHeight(BlockPos blockPos) { return this.parent.isOutsideBuildHeight(blockPos); }
+	
+	@Override
+	public boolean isOutsideBuildHeight(int i) { return this.parent.isOutsideBuildHeight(i); }
+	
+	@Override
+	public int getSectionIndex(int i) { return this.parent.getSectionIndex(i); }
+	
+	@Override
+	public int getSectionIndexFromSectionY(int i) { return this.parent.getSectionIndexFromSectionY(i); }
+	
+	@Override
+	public int getSectionYFromSectionIndex(int i) { return this.parent.getSectionYFromSectionIndex(i); }
+    #endif
+}

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

@@ -19,50 +19,143 @@
 
 package com.seibel.distanthorizons.common.wrappers.block;
 
-import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
+import com.seibel.distanthorizons.core.util.ColorUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
-import net.minecraft.world.level.LevelReader;
+import net.minecraft.world.level.*;
+import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.lighting.LevelLightEngine;
 import net.minecraft.world.level.material.FluidState;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-public class TintWithoutLevelOverrider extends AbstractDhTintGetter
+#if MC_VER >= MC_1_18_2
+import net.minecraft.core.Holder;
+#endif
+
+public class TintWithoutLevelOverrider implements BlockAndTintGetter
 {
+	/** 
+	 * This will only ever be null if there was an issue with {@link IClientLevelWrapper#getPlainsBiomeWrapper()}
+	 * but {@link Nullable} is there just in case. 
+	 */
+	@Nullable
+	#if MC_VER >= MC_1_18_2
+	public final Holder<Biome> biome;
+	#else
+	public final Biome biome;
+	#endif
 	
-	//=============//
-	// constructor //
-	//=============//
-	
-	public TintWithoutLevelOverrider()
-	{ }
+	/**
+	 * Constructs the TintWithoutLevelOverrider, storing the provided Biome Holder for late-binding access.
+	 *
+	 * <p>Previously, this class might have immediately unwrapped the Holder like this:</p>
+	 * <pre>{@code
+	 * // Inside constructor (OLD WAY - PROBLEMATIC):
+	 * 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>
+	 */
+	public TintWithoutLevelOverrider(BiomeWrapper biomeWrapper, IClientLevelWrapper clientLevelWrapper)
+	{
+		#if MC_VER >= MC_1_18_2 Holder<Biome> #else Biome #endif biome = biomeWrapper.biome;
+		if (biome == null) // We are looking at the empty biome wrapper
+		{
+			BiomeWrapper plainsBiomeWrapper = ((BiomeWrapper) clientLevelWrapper.getPlainsBiomeWrapper());
+			if (plainsBiomeWrapper != null)
+			{
+				biome = plainsBiomeWrapper.biome;
+			}
+		}
+		
+		this.biome = biome;
+	}
 	
 	
 	
-	//=========//
-	// methods //
-	//=========//
-	
 	@Override
-	public float getShade(Direction direction, boolean shade)
-	{ throw new UnsupportedOperationException("ERROR: getShade() called on TintWithoutLevelOverrider. Object is for tinting only."); }
+	public int getBlockTint(@NotNull BlockPos blockPos, @NotNull ColorResolver colorResolver)
+	{
+		if (this.biome == null)
+		{
+			// hopefully unneeded debug color
+			return ColorUtil.CYAN;
+		}
+		return colorResolver.getColor(unwrap(biome), blockPos.getX(), blockPos.getZ());
+	}
+	
+	private static Biome unwrap(#if MC_VER >= MC_1_18_2 Holder<Biome> #else Biome #endif biome)
+	{
+		#if MC_VER >= MC_1_18_2
+		return biome.value();
+		#else
+		return biome;
+		#endif
+	}
+	
+	
+	
+	//================//
+	// unused methods //
+	//================//
+	
 	@Override
-	public LevelLightEngine getLightEngine()
-	{ throw new UnsupportedOperationException("ERROR: getLightEngine() called on TintWithoutLevelOverrider. Object is for tinting only."); }
+	public float getShade(@NotNull Direction direction, boolean shade)
+	{
+		throw new UnsupportedOperationException("ERROR: getShade() called on TintWithoutLevelOverrider. Object is for tinting only.");
+	}
+	@Override
+	public @NotNull LevelLightEngine getLightEngine()
+	{
+		throw new UnsupportedOperationException("ERROR: getLightEngine() called on TintWithoutLevelOverrider. Object is for tinting only.");
+	}
 	@Nullable
 	@Override
-	public BlockEntity getBlockEntity(BlockPos pos)
-	{ throw new UnsupportedOperationException("ERROR: getBlockEntity() called on TintWithoutLevelOverrider. Object is for tinting only."); }
+	public BlockEntity getBlockEntity(@NotNull BlockPos pos)
+	{
+		throw new UnsupportedOperationException("ERROR: getBlockEntity() called on TintWithoutLevelOverrider. Object is for tinting only.");
+	}
 	
 	@Override
-	public BlockState getBlockState(BlockPos pos)
-	{ throw new UnsupportedOperationException("ERROR: getBlockState() called on TintWithoutLevelOverrider. Object is for tinting only."); }
+	public @NotNull BlockState getBlockState(@NotNull BlockPos pos)
+	{
+		throw new UnsupportedOperationException("ERROR: getBlockState() called on TintWithoutLevelOverrider. Object is for tinting only.");
+	}
 	@Override
-	public FluidState getFluidState(BlockPos pos)
-	{ throw new UnsupportedOperationException("ERROR: getFluidState() called on TintWithoutLevelOverrider. Object is for tinting only."); }
+	public @NotNull FluidState getFluidState(@NotNull BlockPos pos)
+	{
+		throw new UnsupportedOperationException("ERROR: getFluidState() called on TintWithoutLevelOverrider. Object is for tinting only.");
+	}
+	
 	
 	
 	//==============//
@@ -78,7 +171,7 @@ public class TintWithoutLevelOverrider extends AbstractDhTintGetter
 	#if MC_VER < MC_1_21_3
 	@Override
 	public int getMinBuildHeight() 
-	{ throw new UnsupportedOperationException("ERROR: getMinBuildHeight() called on TintWithoutLevelSmoothOverrider. Object is for tinting only."); }
+	{ throw new UnsupportedOperationException("ERROR: getMinBuildHeight() called on TintWithoutLevelOverrider. Object is for tinting only."); }
 	#else
 	@Override
 	public int getMinY()

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

@@ -0,0 +1,144 @@
+/*
+ *    This file is part of the Distant Horizons mod
+ *    licensed under the GNU LGPL v3 License.
+ *
+ *    Copyright (C) 2020 James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU Lesser General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.distanthorizons.common.wrappers.block;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.BlockAndTintGetter;
+import net.minecraft.world.level.ColorResolver;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.lighting.LevelLightEngine;
+import net.minecraft.world.level.material.FluidState;
+import org.jetbrains.annotations.Nullable;
+
+#if MC_VER >= MC_1_18_2
+import net.minecraft.core.Holder;
+#endif
+
+public class TintWithoutLevelSmoothOverrider implements BlockAndTintGetter
+{
+	final BiomeWrapper biome;
+	public int smoothingRange;
+	
+	
+	
+	//=============//
+	// constructor //
+	//=============//
+	
+	public TintWithoutLevelSmoothOverrider(BiomeWrapper biome, int smoothingRange)
+	{
+		this.biome = biome;
+		this.smoothingRange = smoothingRange;
+	}
+	
+	
+	
+	//=========//
+	// methods //
+	//=========//
+	
+	@Override
+	public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver)
+	{
+		return colorResolver.getColor(_unwrap(biome.biome), blockPos.getX(), blockPos.getZ());
+	}
+	private Biome _unwrap(#if MC_VER >= MC_1_18_2 Holder<Biome> #else Biome #endif biome)
+	{
+		#if MC_VER >= MC_1_18_2
+		return biome.value();
+		#else
+		return biome;
+		#endif
+	}
+
+//    public int calculateBlockTint(BlockPos blockPos, ColorResolver colorResolver)
+//    {
+//        int i = smoothingRange;
+//        if (i == 0)
+//            return colorResolver.getColor(_getBiome(blockPos), blockPos.getX(), blockPos.getZ());
+//        int j = (i * 2 + 1) * (i * 2 + 1);
+//        int k = 0;
+//        int l = 0;
+//        int m = 0;
+//        Cursor3D cursor3D = new Cursor3D(blockPos.getX() - i, blockPos.getY(), blockPos.getZ() - i, blockPos.getX() + i, blockPos.getY(), blockPos.getZ() + i);
+//        BlockPos.MutableBlockPos mutableBlockPos = new BlockPos.MutableBlockPos();
+//        while (cursor3D.advance())
+//        {
+//            mutableBlockPos.set(cursor3D.nextX(), cursor3D.nextY(), cursor3D.nextZ());
+//            int n;
+//            if (LodCommonMain.forgeMethodCaller != null) {
+//                n = LodCommonMain.forgeMethodCaller.colorResolverGetColor(colorResolver, _getBiome(mutableBlockPos),
+//                        mutableBlockPos.getX(), mutableBlockPos.getZ());
+//            } else {
+//                n = colorResolver.getColor(_getBiome(mutableBlockPos), mutableBlockPos.getX(), mutableBlockPos.getZ());
+//            }
+//
+//            k += (n & 0xFF0000) >> 16;
+//            l += (n & 0xFF00) >> 8;
+//            m += n & 0xFF;
+//        }
+//        return (k / j & 0xFF) << 16 | (l / j & 0xFF) << 8 | m / j & 0xFF;
+//    }
+	
+	@Override
+	public float getShade(Direction direction, boolean shade)
+	{ throw new UnsupportedOperationException("ERROR: getShade() called on TintWithoutLevelSmoothOverrider. Object is for tinting only."); }
+	@Override
+	public LevelLightEngine getLightEngine()
+	{ throw new UnsupportedOperationException("ERROR: getLightEngine() called on TintWithoutLevelSmoothOverrider. Object is for tinting only."); }
+	@Nullable
+	@Override
+	public BlockEntity getBlockEntity(BlockPos pos)
+	{ throw new UnsupportedOperationException("ERROR: getBlockEntity() called on TintWithoutLevelSmoothOverrider. Object is for tinting only."); }
+	
+	@Override
+	public BlockState getBlockState(BlockPos pos)
+	{ throw new UnsupportedOperationException("ERROR: getBlockState() called on TintWithoutLevelSmoothOverrider. Object is for tinting only."); }
+	@Override
+	public FluidState getFluidState(BlockPos pos)
+	{ throw new UnsupportedOperationException("ERROR: getFluidState() called on TintWithoutLevelSmoothOverrider. Object is for tinting only."); }
+	
+	
+	//==============//
+	// post MC 1.17 //
+	//==============//
+	
+	#if MC_VER >= MC_1_17_1
+	
+	@Override
+	public int getHeight()
+	{ throw new UnsupportedOperationException("ERROR: getHeight() called on TintWithoutLevelSmoothOverrider. Object is for tinting only."); }
+	
+	#if MC_VER < MC_1_21_3
+	@Override
+	public int getMinBuildHeight() 
+	{ throw new UnsupportedOperationException("ERROR: getMinBuildHeight() called on TintWithoutLevelSmoothOverrider. Object is for tinting only."); }
+	#else
+	@Override
+	public int getMinY()
+	{ throw new UnsupportedOperationException("ERROR: getMinY() called on TintWithoutLevelSmoothOverrider. Object is for tinting only."); }
+	#endif
+	
+	#endif
+	
+}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/chunk/ChunkWrapper.java

@@ -38,7 +38,7 @@ import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ProtoChunk;
 import net.minecraft.world.level.levelgen.Heightmap;
 
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.Logger;
 
 import java.util.*;
 
@@ -75,7 +75,7 @@ import net.minecraft.world.level.chunk.status.ChunkStatus;
 
 public class ChunkWrapper implements IChunkWrapper
 {
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
 	/** can be used for interactions with the underlying chunk where creating new BlockPos objects could cause issues for the garbage collector. */
 	private static final ThreadLocal<BlockPos.MutableBlockPos> MUTABLE_BLOCK_POS_REF = ThreadLocal.withInitial(() -> new BlockPos.MutableBlockPos());

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

@@ -1,89 +0,0 @@
-package com.seibel.distanthorizons.common.wrappers.gui;
-
-#if MC_VER < MC_1_21_9
-// not supported for older MC versions
-#else
-import com.seibel.distanthorizons.core.logging.f3.F3Screen;
-import com.seibel.distanthorizons.coreapi.ModInfo;
-
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import net.minecraft.client.gui.components.debug.DebugScreenDisplayer;
-import net.minecraft.client.gui.components.debug.DebugScreenEntries;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.chunk.LevelChunk;
-#endif
-
-#if MC_VER < MC_1_21_9
-// not supported for older MC versions
-public class DhDebugScreenEntry
-{}
-#else
-public class DhDebugScreenEntry implements net.minecraft.client.gui.components.debug.DebugScreenEntry
-{
-	public static void register()
-	{
-		// This method is private, so its access will need to be widened
-		DebugScreenEntries.register(
-				// The id, this will be displayed on the options screen
-				ResourceLocation.fromNamespaceAndPath(ModInfo.RESOURCE_NAMESPACE, "distant_horizons"),
-				// The screen entry
-				new DhDebugScreenEntry()
-		);
-	}
-	
-	
-	@Override
-	public void display(@NotNull DebugScreenDisplayer displayer, @Nullable Level level, @Nullable LevelChunk clientChunk, @Nullable LevelChunk serverChunk)
-	{
-		List<String> messageList = new ArrayList<>();
-		F3Screen.addStringToDisplay(messageList);
-		
-		for (String message : messageList)
-		{
-			displayer.addLine(message);
-		}
-		
-		//// The following will display like so if it is the only entry on the screen:
-		//// First left!                                                First Right!
-		//// 
-		//// Hello world!                                               Random text!
-		//// Lorem ipsum.
-		////                                                            I am another group!
-		//// I am one group                                             This will appear after with no line breaks!
-		//// All in a row
-		//// Provided in a list.
-		////
-		//
-		//displayer.addLine("Hello world!");
-		//displayer.addLine("Lorem ipsum.");
-		//displayer.addLine("Random text!");
-		//
-		//// These will be displayed first
-		//displayer.addPriorityLine("First left!");
-		//displayer.addPriorityLine("First right!");
-		//
-		//// These will be grouped separately based on the key
-		//displayer.addToGroup(GROUP_ONE, List.of(
-		//		"I am one group",
-		//		"All in a row",
-		//		"Provided in a list."
-		//));
-		//
-		//displayer.addToGroup(GROUP_TWO, "I am another group!");
-		//displayer.addToGroup(GROUP_TWO, "This will appear after with no line breaks!");
-	}
-	
-	@Override
-	public boolean isAllowed(boolean reducedDebugInfo)
-	{
-		// Always show regardless of accessibility option
-		return true;
-	}
-}
-#endif

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

@@ -52,27 +52,6 @@ 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)
 	{
@@ -82,20 +61,17 @@ 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)
-	//{
-	//	//guiStack.renderTooltip(font, text, x, 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);
+	}
 	protected void DhRenderComponentTooltip(GuiGraphics guiStack, Font font, List<Component> comp, int x, int y)
 	{
-		guiStack.setComponentTooltipForNextFrame(font, comp, x, y);
+		guiStack.renderComponentTooltip(font, comp, x, y);
 	}
 	protected void DhRenderTooltip(GuiGraphics guiStack, Font font, Component text, int x, int y)
 	{
-		guiStack.setTooltipForNextFrame(font, text, x, y);
+		guiStack.renderTooltip(font, text, x, y);
 	}
-    #endif
-	
-	
-	
+        #endif
 }

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

@@ -1,52 +1,40 @@
 package com.seibel.distanthorizons.common.wrappers.gui;
 
-import com.seibel.distanthorizons.core.config.ConfigHandler;
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.coreapi.ModInfo;
+import com.seibel.distanthorizons.core.config.ConfigBase;
+import com.seibel.distanthorizons.core.config.gui.ConfigScreen;
 import com.seibel.distanthorizons.core.config.gui.JavaScreenHandlerScreen;
+import com.seibel.distanthorizons.core.config.gui.OpenGLConfigScreen;
 import net.minecraft.client.gui.screens.Screen;
-import com.seibel.distanthorizons.core.logging.DhLogger;
 
 public class GetConfigScreen
 {
-	protected static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	public static type useScreen = type.Classic;
 	
-	public static EType useScreen = EType.Classic;
-	
-	public enum EType
+	public enum type
 	{
 		Classic,
-		JavaSwing;
+		@Deprecated
+		OpenGL, // This was just an attempt, it didn't work out, and we are going to change to javafx soon (as soon as that works)
+		JavaFX;
 	}
 	
 	public static Screen getScreen(Screen parent)
 	{
-		// TODO it'd be nice to have this run automatically on startup
-		//  but this will only work once MC has added our lang file,
-		//  which won't be for sure added until we request a GUI
-		if (ModInfo.IS_DEV_BUILD)
-		{
-			String missingLangEntries = ConfigHandler.INSTANCE.generateLang(true, true);
-			
-			// trim to remove any newlines/spaces
-			// that may be present when no lang entries need changing
-			// then we can check length != 0 if any items are missing and need adding 
-			String trimmedMissingEntries = missingLangEntries.trim();
-			if (!trimmedMissingEntries.isEmpty())
-			{
-				LOGGER.warn("One or more language entries is missing:");
-				LOGGER.warn(missingLangEntries);
-			}
-		}
-		
+		// Generate the language
+		// This shouldn't be here, but I need a way to test it after Minecraft inits its assets
+		//System.out.println(ConfigBase.INSTANCE.generateLang(false, true));
 		
 		switch (useScreen)
 		{
 			case Classic:
-				return ClassicConfigGUI.getScreen(parent, "client");
-			case JavaSwing:
-				//return MinecraftScreen.getScreen(parent, new JavaScreenHandlerScreen(new ConfigScreen()), ModInfo.ID + ".title");
-				return MinecraftScreen.getScreen(parent, new JavaScreenHandlerScreen(new JavaScreenHandlerScreen.ExampleScreen()), ModInfo.ID + ".title");
+				return ClassicConfigGUI.getScreen(ConfigBase.INSTANCE, parent, "client");
+			case OpenGL:
+				MinecraftScreen.getScreen(parent, new OpenGLConfigScreen(), ModInfo.ID + ".title");
+				return null;
+//            case JavaFX -> MinecraftScreen.getScreen(parent, new JavaScreenHandlerScreen(new JavaScreenHandlerScreen.ExampleScreen()), ModInfo.ID + ".title");
+			case JavaFX:
+				return MinecraftScreen.getScreen(parent, new JavaScreenHandlerScreen(new ConfigScreen()), ModInfo.ID + ".title");
 			default:
 				throw new IllegalArgumentException("No config screen implementation defined for ["+useScreen+"].");
 		}

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

@@ -24,26 +24,26 @@ public class MinecraftScreen
 	private static class ConfigScreenRenderer extends DhScreen
 	{
 		private final Screen parent;
-		private ConfigListWidget configListWidget;
+		private ConfigListWidget list;
 		private AbstractScreen screen;
 		
 		
 		#if MC_VER < MC_1_19_2
 		public static net.minecraft.network.chat.TranslatableComponent translate(String str, Object... args)
-		{ return new net.minecraft.network.chat.TranslatableComponent(str, args); }
+		{
+			return new net.minecraft.network.chat.TranslatableComponent(str, args);
+		}
 		#else
 		public static net.minecraft.network.chat.MutableComponent translate(String str, Object... args)
-		{ return net.minecraft.network.chat.Component.translatable(str, args); }
-        #endif
+		{
+			return net.minecraft.network.chat.Component.translatable(str, args);
+		}
+    #endif
 		
 		protected ConfigScreenRenderer(Screen parent, AbstractScreen screen, String translationName)
 		{
 			super(translate(translationName));
-			#if MC_VER < MC_1_21_9
 			screen.minecraftWindow = Minecraft.getInstance().getWindow().getWindow();
-			#else
-			screen.minecraftWindow = Minecraft.getInstance().getWindow().handle();
-			#endif
 			this.parent = parent;
 			this.screen = screen;
 		}
@@ -53,22 +53,20 @@ public class MinecraftScreen
 		{
 			super.init(); // Init Minecraft's screen
 			Window mcWindow = this.minecraft.getWindow();
-			this.screen.width = mcWindow.getWidth();
-			this.screen.height = mcWindow.getHeight();
-			this.screen.scaledWidth = this.width;
-			this.screen.scaledHeight = this.height;
-			this.screen.init(); // Init our own config screen
+			screen.width = mcWindow.getWidth();
+			screen.height = mcWindow.getHeight();
+			screen.scaledWidth = this.width;
+			screen.scaledHeight = this.height;
+			screen.init(); // Init our own config screen
 			
-			this.configListWidget = new ConfigListWidget(this.minecraft, this.width, this.height, 0, 0, 25); // Select the area to tint
+			this.list = new ConfigListWidget(this.minecraft, this.width, this.height, 0, 0, 25); // Select the area to tint
 			
 			#if MC_VER < MC_1_20_6 // no background is rendered in MC 1.20.6+
 			if (this.minecraft != null && this.minecraft.level != null) // Check if in game
-			{
-				this.configListWidget.setRenderBackground(false); // Disable from rendering
-			}
+				this.list.setRenderBackground(false); // Disable from rendering
 			#endif
 			
-			this.addWidget(this.configListWidget); // Add the tint to the things to be rendered
+			this.addWidget(this.list); // Add the tint to the things to be rendered
 		}
 		
 		@Override
@@ -80,17 +78,14 @@ public class MinecraftScreen
 		{
 			#if MC_VER < MC_1_20_2
 			this.renderBackground(matrices); // Render background
-			#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
+			this.renderBackground(matrices, mouseX, mouseY, delta); // Render background
 			#endif
+			this.list.render(matrices, mouseX, mouseY, delta); // Renders the items in the render list (currently only used to tint background darker)
 			
-			this.configListWidget.render(matrices, mouseX, mouseY, delta); // Renders the items in the render list (currently only used to tint background darker)
-			
-			this.screen.mouseX = mouseX;
-			this.screen.mouseY = mouseY;
-			this.screen.render(delta); // Render everything on the main screen
+			screen.mouseX = mouseX;
+			screen.mouseY = mouseY;
+			screen.render(delta); // Render everything on the main screen
 			
 			super.render(matrices, mouseX, mouseY, delta); // Render the vanilla stuff (currently only used for the background and tint)
 		}
@@ -100,39 +95,41 @@ public class MinecraftScreen
 		{
 			super.resize(mc, width, height); // Resize Minecraft's screen
 			Window mcWindow = this.minecraft.getWindow();
-			this.screen.width = mcWindow.getWidth();
-			this.screen.height = mcWindow.getHeight();
-			this.screen.scaledWidth = this.width;
-			this.screen.scaledHeight = this.height;
-			this.screen.onResize(); // Resize our screen
+			screen.width = mcWindow.getWidth();
+			screen.height = mcWindow.getHeight();
+			screen.scaledWidth = this.width;
+			screen.scaledHeight = this.height;
+			screen.onResize(); // Resize our screen
 		}
 		
 		@Override
 		public void tick()
 		{
 			super.tick(); // Tick Minecraft's screen
-			this.screen.tick(); // Tick our screen
-			if (this.screen.close) // If we decide to close the screen, then actually close the screen
-			{
-				this.onClose();
-			}
+			screen.tick(); // Tick our screen
+			if (screen.close) // If we decide to close the screen, then actually close the screen
+				onClose();
 		}
 		
 		@Override
 		public void onClose()
 		{
-			this.screen.onClose(); // Close our screen
-			Objects.requireNonNull(this.minecraft).setScreen(this.parent); // Goto the parent screen
+			screen.onClose(); // Close our screen
+			Objects.requireNonNull(minecraft).setScreen(this.parent); // Goto the parent screen
 		}
 		
 		@Override
 		public void onFilesDrop(@NotNull List<Path> files)
-		{ this.screen.onFilesDrop(files); }
+		{
+			screen.onFilesDrop(files);
+		}
 		
 		// For checking if it should close when you press the escape key
 		@Override
 		public boolean shouldCloseOnEsc()
-		{ return this.screen.shouldCloseOnEsc; }
+		{
+			return screen.shouldCloseOnEsc;
+		}
 		
 	}
 	

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

@@ -39,13 +39,9 @@ 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
 
 /**
@@ -176,15 +172,9 @@ 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(
-				RenderPipelines.GUI_TEXTURED,
+				RenderType::guiTextured,
 				SPRITES.get(this.active, this.isHoveredOrFocused()),
 				this.getX(), this.getY(),
 				this.getWidth(), this.getHeight());
@@ -206,17 +196,9 @@ 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);
-		#elif MC_VER < MC_1_21_6
-		matrices.blit(
-				RenderType::guiTextured,
-				this.textureResourceLocation,
-				this.getX(), this.getY(),
-				this.u, this.v + (this.hoveredVOffset * i),
-				this.width, this.height,
-				this.textureWidth, this.textureHeight);
 		#else
 		matrices.blit(
-				RenderPipelines.GUI_TEXTURED,
+				RenderType::guiTextured,
 				this.textureResourceLocation,
 				this.getX(), this.getY(),
 				this.u, this.v + (this.hoveredVOffset * i),

common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/config/ConfigGuiInfo.java

@@ -1,33 +0,0 @@
-package com.seibel.distanthorizons.common.wrappers.gui.config;
-
-import com.seibel.distanthorizons.core.config.gui.IConfigGuiInfo;
-import com.seibel.distanthorizons.core.config.types.AbstractConfigBase;
-import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.components.EditBox;
-import net.minecraft.network.chat.Component;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.AbstractMap;
-import java.util.function.BiFunction;
-import java.util.function.Function;
-import java.util.function.Predicate;
-
-/** 
- * holds information needed by the config GUI for rendering.
- * 
- * @see AbstractConfigBase
- */
-public class ConfigGuiInfo implements IConfigGuiInfo
-{
-	/**
-	 * Used to display validation errors.
-	 * Null if no error is present.
-	 */
-	@Nullable
-	public Component errorMessage;
-	
-	public BiFunction<EditBox, Button, Predicate<String>> tooltipFunction;
-	/** determines which options the button will show */
-	public AbstractMap.SimpleEntry<Button.OnPress, Function<Object, Component>> buttonOptionMap;
-	
-}

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

@@ -14,7 +14,7 @@ import net.minecraft.client.gui.components.ContainerObjectSelectionList;
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.Logger;
 
 #if MC_VER >= MC_1_17_1
 import net.minecraft.client.gui.narration.NarratableEntry;
@@ -41,7 +41,7 @@ import java.util.*;
 // TODO: Make this
 public class ChangelogScreen extends DhScreen
 {
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
 	
 	private Screen parent;
@@ -74,7 +74,6 @@ public class ChangelogScreen extends DhScreen
 		{
 			return;
 		}
-		
 		try
 		{
 			this.setupChangelog(versionID);
@@ -176,12 +175,9 @@ public class ChangelogScreen extends DhScreen
 	{
 		#if MC_VER < MC_1_20_2
 		this.renderBackground(matrices); // Render background
-		#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
+		this.renderBackground(matrices, mouseX, mouseY, delta); // Render background
 		#endif
-		
 		if (!this.usable)
 		{
 			return;
@@ -253,35 +249,42 @@ public class ChangelogScreen extends DhScreen
 		private final Component text;
 		private final List<AbstractWidget> children = new ArrayList<>();
 		
-		private ButtonEntry(Component text) { this.text = text; }
+		private ButtonEntry(Component text)
+		{
+			this.text = text;
+		}
 		
 		public static ButtonEntry create(Component text)
-		{ return new ButtonEntry(text); }
+		{
+			return new ButtonEntry(text);
+		}
 		
 		#if MC_VER < MC_1_20_1
 		@Override
 		public void render(PoseStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta)
-		{ GuiComponent.drawString(matrices, textRenderer, text, 12, y + 5, 0xFFFFFF); }
-		#elif MC_VER < MC_1_21_9
+		{
+			GuiComponent.drawString(matrices, textRenderer, text, 12, y + 5, 0xFFFFFF);
+		}
+		#else
 		@Override
 		public void render(GuiGraphics matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta)
-		{ matrices.drawString(textRenderer, this.text, 12, y + 5, 0xFFFFFF); }
-		#else
-		@Override 
-		public void renderContent(GuiGraphics matrices, int y, int x, boolean hovered, float tickDelta)
-		{ matrices.drawString(textRenderer, this.text, 12, y + 5, 0xFFFFFF); }
+		{
+			matrices.drawString(textRenderer, this.text, 12, y + 5, 0xFFFFFF);
+		}
         #endif
 		
 		@Override
-		public List<? extends GuiEventListener> children() { return this.children; }
-		
+		public List<? extends GuiEventListener> children()
+		{
+			return this.children;
+		}
 		#if MC_VER >= MC_1_17_1
 		@Override
-		public List<? extends NarratableEntry> narratables() { return this.children; }
+		public List<? extends NarratableEntry> narratables()
+		{
+			return this.children;
+		}
 		#endif
-		
-		
-		
 	}
 	
 }

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

@@ -16,7 +16,7 @@ import com.mojang.blaze3d.vertex.PoseStack;
 #endif
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.resources.ResourceLocation;
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.Logger;
 
 import static com.seibel.distanthorizons.common.wrappers.gui.GuiHelper.*;
 
@@ -31,7 +31,7 @@ import java.util.*;
 // and also maybe add this suggestion https://discord.com/channels/881614130614767666/1035863487110467625/1035949054485594192
 public class UpdateModScreen extends DhScreen
 {
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
 	
 	private Screen parent;
@@ -169,10 +169,8 @@ public class UpdateModScreen extends DhScreen
 	{
 		#if MC_VER < MC_1_20_2
 		this.renderBackground(matrices); // Render background
-		#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
+		this.renderBackground(matrices, mouseX, mouseY, delta); // Render background
 		#endif
 		
 		// TODO: add the tooltips for the buttons
@@ -180,30 +178,16 @@ public class UpdateModScreen extends DhScreen
 		// TODO: Add tooltips
 		
 		// Render the text's
-		this.DhDrawCenteredString(matrices, this.font, 
-				Translatable(ModInfo.ID + ".updater.text1"), 
-				this.width / 2, this.height / 2 - 35,
-				#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
-		);
+		DhDrawCenteredString(matrices, this.font, Translatable(ModInfo.ID + ".updater.text1"), this.width / 2, this.height / 2 - 35, 0xFFFFFF);
+		DhDrawCenteredString(matrices, this.font, 
+				Translatable(ModInfo.ID + ".updater.text2", currentVer, nextVer), 
+				this.width / 2, this.height / 2 - 20, 0x52FD52);
 	}
 	
 	@Override
 	public void onClose()
 	{
-		Objects.requireNonNull(this.minecraft).setScreen(this.parent); // Go to the parent screen
+		Objects.requireNonNull(minecraft).setScreen(this.parent); // Goto 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 serverKey, String levelKey)
+	public IServerKeyedClientLevel setServerKeyedLevel(IClientLevelWrapper clientLevel, String levelKey)
 	{
-		IServerKeyedClientLevel keyedLevel = new ServerKeyedClientLevelWrapper((ClientLevel) clientLevel.getWrappedMcObject(), serverKey, levelKey);
+		IServerKeyedClientLevel keyedLevel = new ServerKeyedClientLevel((ClientLevel) clientLevel.getWrappedMcObject(), levelKey);
 		this.serverKeyedLevel = keyedLevel;
 		this.enabled = true;
 		return keyedLevel;

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

@@ -2,36 +2,24 @@ 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 ServerKeyedClientLevelWrapper extends ClientLevelWrapper implements IServerKeyedClientLevel
+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;
 	
 	
 	
-	//=============//
-	// constructor //
-	//=============//
-	
-	public ServerKeyedClientLevelWrapper(ClientLevel level, String serverKey, String serverLevelKey)
+	public ServerKeyedClientLevel(ClientLevel level, String serverLevelKey)
 	{
 		super(level);
-		this.serverKey = serverKey;
 		this.serverLevelKey = serverLevelKey;
 	}
 	
 	
-	@Override
-	public String getServerKey() { return this.serverKey; }
-	
-	//======================//
-	// level identification //
-	//======================//
 	
 	@Override
 	public String getServerLevelKey() { return this.serverLevelKey; }
@@ -39,6 +27,4 @@ public class ServerKeyedClientLevelWrapper extends ClientLevelWrapper implements
 	@Override
 	public String getDhIdentifier() { return this.getServerLevelKey(); }
 	
-	
-	
 }

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

@@ -33,7 +33,6 @@ import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.enums.EDhDirection;
 import com.seibel.distanthorizons.core.file.structure.ClientOnlySaveStructure;
-import com.seibel.distanthorizons.core.render.glObject.GLProxy;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import com.seibel.distanthorizons.coreapi.ModInfo;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
@@ -57,7 +56,7 @@ import net.minecraft.network.chat.TextComponent;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.util.profiling.ProfilerFiller;
 import net.minecraft.world.level.ChunkPos;
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.Nullable;
 
 #if MC_VER < MC_1_21_3
@@ -72,7 +71,7 @@ import net.minecraft.util.profiling.Profiler;
  */
 public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecraftSharedWrapper
 {
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger(MethodHandles.lookup().lookupClass().getSimpleName());
 	private static final Minecraft MINECRAFT = Minecraft.getInstance();
 	
 	public static final MinecraftClientWrapper INSTANCE = new MinecraftClientWrapper();
@@ -158,17 +157,9 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
 	@Override
 	public boolean hasSinglePlayerServer() { return MINECRAFT.hasSingleplayerServer(); }
 	@Override
-	public boolean clientConnectedToDedicatedServer() 
-	{ 
-		return MINECRAFT.getCurrentServer() != null 
-				&& !this.hasSinglePlayerServer(); 
-	}
+	public boolean clientConnectedToDedicatedServer() { return MINECRAFT.getCurrentServer() != null && !this.hasSinglePlayerServer(); }
 	@Override
-	public boolean connectedToReplay() 
-	{ 
-		return MINECRAFT.getCurrentServer() == null
-				&& !this.hasSinglePlayerServer() ; 
-	}
+	public boolean connectedToReplay() { return !MINECRAFT.hasSingleplayerServer() && MINECRAFT.getCurrentServer() == null; }
 	
 	@Override
 	public String getCurrentServerName() 
@@ -315,22 +306,10 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
 			return;
 		}
 		
-		if (!GLProxy.hasInstance())
-		{
-			// rendering setup hasn't finished
-			return;
-		}
-		
         #if MC_VER < MC_1_19_2
 		player.sendMessage(new TextComponent(string), getPlayer().getUUID());
-        #elif MC_VER < MC_1_21_9
+        #else
 		player.displayClientMessage(net.minecraft.network.chat.Component.translatable(string), /*isOverlay*/false);
-		#else
-		
-		GLProxy.getInstance().queueRunningOnRenderThread(() -> 
-		{
-			player.displayClientMessage(net.minecraft.network.chat.Component.translatable(string), /*isOverlay*/false);
-		});
         #endif
 	}
 	

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

@@ -21,14 +21,14 @@ package com.seibel.distanthorizons.common.wrappers.minecraft;
 
 #if MC_VER < MC_1_21_5
 import com.mojang.blaze3d.platform.GlStateManager;
-#else
+#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;
 
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.Logger;
 import org.lwjgl.opengl.GL32;
 
 
@@ -54,7 +54,7 @@ public class MinecraftGLWrapper implements IMinecraftGLWrapper
 {
 	public static final MinecraftGLWrapper INSTANCE = new MinecraftGLWrapper();
 	
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
 	
 	
@@ -233,7 +233,7 @@ public class MinecraftGLWrapper implements IMinecraftGLWrapper
 		GlStateManager._activeTexture(textureId);
 	}
 	@Override
-	public int getActiveTexture() { return GL32.glGetInteger(GL32.GL_TEXTURE_BINDING_2D); }
+	public int getActiveTexture() { return GL32.glGetInteger(GL32.GL_ACTIVE_TEXTURE); }
 	
 	/**
 	 * Always binds to {@link GL32#GL_TEXTURE_2D}

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

@@ -25,6 +25,7 @@ import java.util.concurrent.ConcurrentHashMap;
 
 import com.mojang.blaze3d.pipeline.RenderTarget;
 import com.mojang.blaze3d.platform.NativeImage;
+import com.seibel.distanthorizons.common.wrappers.WrapperFactory;
 import com.seibel.distanthorizons.common.wrappers.misc.LightMapWrapper;
 import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector;
 
@@ -32,12 +33,9 @@ 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
-#elif MC_VER < MC_1_21_6
+#if MC_VER >= MC_1_17_1
 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
@@ -45,6 +43,8 @@ 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;
@@ -59,12 +59,6 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IOptifineAc
 import net.minecraft.client.Camera;
 import net.minecraft.client.Minecraft;
 import net.minecraft.world.effect.MobEffects;
-
-import net.minecraft.world.phys.Vec3;
-import com.seibel.distanthorizons.core.logging.DhLogger;
-import org.jetbrains.annotations.NotNull;
-import org.joml.Vector4f;
-
 #if MC_VER < MC_1_17_1
 import net.minecraft.tags.FluidTags;
 import net.minecraft.world.entity.Entity;
@@ -73,22 +67,30 @@ import org.lwjgl.opengl.GL15;
 #else
 import net.minecraft.world.level.material.FogType;
 #endif
+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;
-#else
+import org.lwjgl.opengl.GL32;
 #endif
 
 /**
  * A singleton that contains everything
  * related to rendering in Minecraft.
+ *
+ * @author James Seibel
+ * @version 12-12-2021
  */
+//@Environment(EnvType.CLIENT)
 public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 {
 	public static final MinecraftRenderWrapper INSTANCE = new MinecraftRenderWrapper();
 	
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger(MethodHandles.lookup().lookupClass().getSimpleName());
 	private static final Minecraft MC = Minecraft.getInstance();
+	private static final IWrapperFactory FACTORY = WrapperFactory.INSTANCE;
 	
 	private static final IOptifineAccessor OPTIFINE_ACCESSOR = ModAccessorInjector.INSTANCE.get(IOptifineAccessor.class);
 	
@@ -107,11 +109,6 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 	public boolean colorTextureCastFailLogged = false;
 	public boolean depthTextureCastFailLogged = false;
 	
-	#if MC_VER < MC_1_21_6
-	#else
-	private static FogRenderer mcFogRenderer = null;
-	#endif
-	
 	
 	
 	//=========//
@@ -129,22 +126,11 @@ 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()
 	{
-		if (MC.player == null)
-		{
-			return false;
-		}
-		else if (MC.player.getActiveEffectsMap() == null)
-		{
-			return false;
-		}
-		else
-		{
-			return MC.player.getActiveEffectsMap().get(MobEffects.BLINDNESS) != null
+		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
@@ -177,33 +163,8 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 				Math.max(0f, Math.min(colorValues[2], 1f)), // b
 				Math.max(0f, Math.min(colorValues[3], 1f))  // a
 		);
-		#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
-				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
-		);
 		#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);
+		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
 				Math.max(0f, Math.min(colorValues.y, 1f)), // g
@@ -298,7 +259,7 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 		return height;
 	}
 	
-	protected RenderTarget getRenderTarget() { return MC.getMainRenderTarget(); }
+	private RenderTarget getRenderTarget() { return MC.getMainRenderTarget(); }
 	
 	@Override
 	public boolean mcRendersToFrameBuffer()
@@ -321,7 +282,7 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 	}
 	
 	@Override
-	public int getTargetFramebuffer()
+	public int getTargetFrameBuffer()
 	{
 		// used so we can access the framebuffer shaders end up rendering to
 		if (AbstractOptifineAccessor.optifinePresent())
@@ -348,18 +309,17 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 		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();
 			
+			return glTexture.glId();
 		}
-		catch (Exception e)
+		catch (ClassCastException e)
 		{
 			// only log this error once per session
 			if (!this.depthTextureCastFailLogged)
@@ -388,7 +348,7 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 			
 			return glTexture.glId();
 		}
-		catch (Exception e)
+		catch (ClassCastException e)
 		{
 			// only log this error once per session
 			if (!this.colorTextureCastFailLogged)
@@ -402,27 +362,19 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 	}
 	
 	@Override
-	public int getTargetFramebufferViewportWidth()
+	public int getTargetFrameBufferViewportWidth()
 	{
-		#if MC_VER < MC_1_21_9
 		return this.getRenderTarget().viewWidth;
-		#else
-		return this.getRenderTarget().width;
-		#endif
 	}
 	
 	@Override
-	public int getTargetFramebufferViewportHeight()
+	public int getTargetFrameBufferViewportHeight()
 	{
-		#if MC_VER < MC_1_21_9
 		return this.getRenderTarget().viewHeight;
-		#else
-		return this.getRenderTarget().height;
-		#endif
 	}
 	
 	@Override
-	public ILightMapWrapper getLightmapWrapper(@NotNull ILevelWrapper level) { return this.lightmapByDimensionType.get(level.getDimensionType()); }
+	public ILightMapWrapper getLightmapWrapper(ILevelWrapper level) { return this.lightmapByDimensionType.get(level.getDimensionType()); }
 	
 	@Override
 	public boolean isFogStateSpecial()

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

@@ -24,7 +24,7 @@ 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 com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.Logger;
 import org.lwjgl.opengl.GL32;
 
 import java.nio.ByteBuffer;
@@ -32,7 +32,7 @@ import java.nio.ByteBuffer;
 public class LightMapWrapper implements ILightMapWrapper
 {
 	private static final IMinecraftGLWrapper GLMC = SingletonInjector.INSTANCE.get(IMinecraftGLWrapper.class);
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
 	private int textureId = 0;
 	

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

@@ -54,10 +54,8 @@ public class ServerPlayerWrapper implements IServerPlayerWrapper
 		{
 			#if MC_VER < MC_1_20_1
 			level = this.getServerPlayer().getLevel();
-			#elif MC_VER < MC_1_21_6
-			level = this.getServerPlayer().serverLevel();
 			#else
-			level = this.getServerPlayer().level();
+			level = this.getServerPlayer().serverLevel();
 			#endif
 		}
 		
@@ -71,6 +69,19 @@ public class ServerPlayerWrapper implements IServerPlayerWrapper
 		return new Vec3d(position.x, position.y, position.z);
 	}
 	
+	@Override
+	public int getViewDistance() { return this.getServerPlayer().server.getPlayerList().getViewDistance(); }
+	
+	@Override
+	public SocketAddress getRemoteAddress()
+	{
+		#if MC_VER >= MC_1_19_4
+		return this.getServerPlayer().connection.getRemoteAddress();
+		#else // < 1.19.4
+		return this.getServerPlayer().connection.connection.getRemoteAddress();
+		#endif
+	}
+	
 	
 	
 	//================//

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

@@ -2,11 +2,11 @@ package com.seibel.distanthorizons.common.wrappers.world;
 
 import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiLevelType;
 import com.seibel.distanthorizons.api.interfaces.render.IDhApiCustomRenderRegister;
+import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
 import com.seibel.distanthorizons.common.wrappers.block.BiomeWrapper;
 import com.seibel.distanthorizons.common.wrappers.block.BlockStateWrapper;
 import com.seibel.distanthorizons.common.wrappers.block.ClientBlockStateColorCache;
 import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
-import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.level.*;
 import com.seibel.distanthorizons.core.level.IServerKeyedClientLevel;
@@ -24,7 +24,8 @@ import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.chunk.ChunkAccess;
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import net.minecraft.world.level.chunk.ChunkSource;
+import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -36,7 +37,6 @@ 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;
@@ -52,7 +52,7 @@ import com.seibel.distanthorizons.core.util.ColorUtil;
 
 public class ClientLevelWrapper implements IClientLevelWrapper
 {
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger(ClientLevelWrapper.class.getSimpleName());
 	/**
 	 * weak references are to prevent rare issues
 	 * where, upon world closure, some levels aren't shutdown/removed properly
@@ -64,14 +64,12 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 	private static final Minecraft MINECRAFT = Minecraft.getInstance();
 	
 	private final ClientLevel level;
-	private final ConcurrentHashMap<BlockState, ClientBlockStateColorCache> blockColorCacheByBlockState = new ConcurrentHashMap<>();
-	
-	/** cached method reference to reduce GC overhead */
-	private final Function<BlockState, ClientBlockStateColorCache> createCachedBlockColorCacheFunc = (blockState) -> new ClientBlockStateColorCache(blockState, this);
-	
+	private final ConcurrentHashMap<BlockState, ClientBlockStateColorCache> blockCache = new ConcurrentHashMap<>();
 	
 	private BlockStateWrapper dirtBlockWrapper;
-	private IDhLevel dhLevel;
+	private BiomeWrapper plainsBiomeWrapper;
+	@Deprecated // TODO circular references are bad
+	private IDhLevel parentDhLevel;
 	
 	
 	
@@ -87,29 +85,6 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 	// instance methods //
 	//==================//
 	
-	/** 
-	 * can be used when speed is important and the same level is likely to be passed in,
-	 * IE rendering.
-	 */
-	@Nullable
-	public static IClientLevelWrapper getWrapperIfDifferent(@Nullable IClientLevelWrapper levelWrapper, @NotNull ClientLevel level)
-	{
-		if (KEYED_CLIENT_LEVEL_MANAGER.isEnabled() && KEYED_CLIENT_LEVEL_MANAGER.getServerKeyedLevel() != levelWrapper)
-		{
-			return getWrapper(level);
-		}
-		
-		ClientLevelWrapper clientLevelWrapper = (ClientLevelWrapper)levelWrapper;
-		if (clientLevelWrapper == null
-			|| clientLevelWrapper.level != level)
-		{
-			return getWrapper(level);
-		}
-		
-		return clientLevelWrapper;
-	}
-	
-	@Nullable
 	public static IClientLevelWrapper getWrapper(@NotNull ClientLevel level) { return getWrapper(level, false); }
 	
 	@Nullable
@@ -130,26 +105,14 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 			}
 		}
 		
-		
-		WeakReference<ClientLevelWrapper> levelRef = LEVEL_WRAPPER_REF_BY_CLIENT_LEVEL.get(level);
-		if (levelRef != null)
+		return LEVEL_WRAPPER_REF_BY_CLIENT_LEVEL.compute(level, (newLevel, levelRef) ->
 		{
-			ClientLevelWrapper levelWrapper = levelRef.get();
-			if (levelWrapper != null)
+			if (levelRef != null)
 			{
-				return levelWrapper;
-			}
-		}
-		
-		
-		return LEVEL_WRAPPER_REF_BY_CLIENT_LEVEL.compute(level, (newLevel, newLevelRef) ->
-		{
-			if (newLevelRef != null)
-			{
-				ClientLevelWrapper oldLevelWrapper = newLevelRef.get();
+				ClientLevelWrapper oldLevelWrapper = levelRef.get();
 				if (oldLevelWrapper != null)
 				{
-					return newLevelRef;
+					return levelRef;
 				}
 			}
 			
@@ -163,17 +126,13 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 	{
 		try
 		{
-			// this method only makes sense if we are running a single-player server
-			if (MINECRAFT.getSingleplayerServer() == null)
-			{
-				return null;
-			}
-			
 			Iterable<ServerLevel> serverLevels = MINECRAFT.getSingleplayerServer().getAllLevels();
 			
 			// attempt to find the server level with the same dimension type
-			// Note: this assumes only one level per dimension type, multiverse servers may not behave correctly
+			// TODO this assumes only one level per dimension type, the SubDimensionLevelMatcher will need to be added for supporting multiple levels per dimension
 			ServerLevelWrapper foundLevelWrapper = null;
+			
+			// TODO: Surely there is a more efficient way to write this code
 			for (ServerLevel serverLevel : serverLevels)
 			{
 				if (serverLevel.dimension() == this.level.dimension())
@@ -199,20 +158,15 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 	//====================//
 	
 	@Override
-	public int getBlockColor(DhBlockPos blockPos, IBiomeWrapper biome, FullDataSourceV2 fullDataSource, IBlockStateWrapper blockWrapper)
+	public int getBlockColor(DhBlockPos pos, IBiomeWrapper biome, IBlockStateWrapper blockWrapper)
 	{
-		ClientBlockStateColorCache blockColorCache = this.blockColorCacheByBlockState.get(((BlockStateWrapper) blockWrapper).blockState);
-		if (blockColorCache == null)
-		{
-			blockColorCache = this.blockColorCacheByBlockState.computeIfAbsent(
-					((BlockStateWrapper) blockWrapper).blockState,
-					this.createCachedBlockColorCacheFunc);
-		}
+		ClientBlockStateColorCache blockColorCache = this.blockCache.computeIfAbsent(
+				((BlockStateWrapper) blockWrapper).blockState,
+				(block) -> new ClientBlockStateColorCache(block, this));
 		
-		return blockColorCache.getColor((BiomeWrapper) biome, fullDataSource, blockPos);
+		return blockColorCache.getColor((BiomeWrapper) biome, pos);
 	}
 	
-	
 	@Override
 	public int getDirtBlockColor()
 	{
@@ -230,11 +184,31 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 			}
 		}
 		
-		return this.getBlockColor(DhBlockPos.ZERO, BiomeWrapper.EMPTY_WRAPPER, null, this.dirtBlockWrapper);
+		return this.getBlockColor(DhBlockPos.ZERO,BiomeWrapper.EMPTY_WRAPPER, this.dirtBlockWrapper);
 	}
 	
 	@Override 
-	public void clearBlockColorCache() { this.blockColorCacheByBlockState.clear(); }
+	public void clearBlockColorCache() { this.blockCache.clear(); }
+	
+	@Override
+	public IBiomeWrapper getPlainsBiomeWrapper()
+	{
+		if (this.plainsBiomeWrapper == null)
+		{
+			try
+			{
+				this.plainsBiomeWrapper = (BiomeWrapper) BiomeWrapper.deserialize(BiomeWrapper.PLAINS_RESOURCE_LOCATION_STRING, this);
+			}
+			catch (IOException e)
+			{
+				// shouldn't happen, but just in case
+				LOGGER.warn("Unable to get planes biome with resource location ["+BiomeWrapper.PLAINS_RESOURCE_LOCATION_STRING+"] with level ["+this+"].", e);
+				return null;
+			}
+		}
+		
+		return this.plainsBiomeWrapper;
+	}
 	
 	@Override
 	public IDimensionTypeWrapper getDimensionType() { return DimensionTypeWrapper.getDimensionTypeWrapper(this.level.dimensionType()); }
@@ -292,6 +266,20 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 		return new ChunkWrapper(chunk, this);
 	}
 	
+	@Override
+	public boolean hasChunkLoaded(int chunkX, int chunkZ)
+	{
+		ChunkSource source = this.level.getChunkSource();
+		return source.hasChunk(chunkX, chunkZ);
+	}
+	
+	@Override
+	public IBlockStateWrapper getBlockState(DhBlockPos pos)
+	{ return BlockStateWrapper.fromBlockState(this.level.getBlockState(McObjectConverter.Convert(pos)), this); }
+	
+	@Override
+	public IBiomeWrapper getBiome(DhBlockPos pos) { return BiomeWrapper.getBiomeWrapper(this.level.getBiome(McObjectConverter.Convert(pos)), this); }
+	
 	@Override
 	public ClientLevel getWrappedMcObject() { return this.level; }
 	
@@ -299,18 +287,18 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 	public void onUnload() 
 	{ 
 		LEVEL_WRAPPER_REF_BY_CLIENT_LEVEL.remove(this.level);
-		this.dhLevel = null;
+		this.parentDhLevel = null;
 	}
 	
 	@Override
 	public File getDhSaveFolder()
 	{
-		if (this.dhLevel == null)
+		if (this.parentDhLevel == null)
 		{
 			return null;
 		}
 		
-		return this.dhLevel.getSaveStructure().getSaveFolder(this);
+		return this.parentDhLevel.getSaveStructure().getSaveFolder(this);
 	}
 	
 	
@@ -321,19 +309,17 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 	//===================//
 	
 	@Override
-	public void setDhLevel(IDhLevel dhLevel) { this.dhLevel = dhLevel; }
-	@Override 
-	public IDhLevel getDhLevel() { return this.dhLevel; }
+	public void setParentLevel(IDhLevel parentLevel) { this.parentDhLevel = parentLevel; }
 	
 	@Override 
 	public IDhApiCustomRenderRegister getRenderRegister()
 	{
-		if (this.dhLevel == null)
+		if (this.parentDhLevel == null)
 		{
 			return null;
 		}
 		
-		return this.dhLevel.getGenericRenderer();
+		return this.parentDhLevel.getGenericRenderer();
 	}
 	
 	@Override

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

@@ -24,18 +24,21 @@ 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;
 import com.seibel.distanthorizons.api.interfaces.render.IDhApiCustomRenderRegister;
+import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
+import com.seibel.distanthorizons.common.wrappers.block.BiomeWrapper;
+import com.seibel.distanthorizons.common.wrappers.block.BlockStateWrapper;
 import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
-import com.seibel.distanthorizons.core.api.internal.SharedApi;
-import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.level.IDhLevel;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.network.messages.base.LevelInitMessage;
+import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos;
 import com.seibel.distanthorizons.core.pos.DhChunkPos;
-import com.seibel.distanthorizons.core.world.EWorldEnvironment;
+import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper;
 
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper;
 import net.minecraft.server.level.ServerLevel;
@@ -49,12 +52,16 @@ import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.status.ChunkStatus;
 #endif
 
-import com.seibel.distanthorizons.core.logging.DhLogger;
-import org.jetbrains.annotations.Nullable;
+#if MC_VER < MC_1_21_3
+#else
+import java.nio.file.Path;
+#endif
+
+import org.apache.logging.log4j.Logger;
 
 public class ServerLevelWrapper implements IServerLevelWrapper
 {
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	/** 
 	 * weak references are to prevent rare issues
 	 * where, upon world closure, some levels aren't shutdown/removed properly
@@ -62,13 +69,8 @@ public class ServerLevelWrapper implements IServerLevelWrapper
 	private static final Map<ServerLevel, WeakReference<ServerLevelWrapper>> LEVEL_WRAPPER_REF_BY_SERVER_LEVEL = Collections.synchronizedMap(new WeakHashMap<>());
 	
 	private final ServerLevel level;
-	private IDhLevel dhLevel;
-	
-	/** 
-	 * this name is cached to prevent issues during shutdown where
-	 * the server variables needed may no longer be available.
-	 */
-	private final String KeyedLevelDimensionName;
+	@Deprecated // TODO circular references are bad
+	private IDhLevel parentDhLevel;
 	
 	
 	
@@ -93,11 +95,7 @@ public class ServerLevelWrapper implements IServerLevelWrapper
 		}).get();
 	}
 	
-	public ServerLevelWrapper(ServerLevel level) 
-	{ 
-		this.level = level;
-		this.KeyedLevelDimensionName = this.createKeyedLevelDimensionName();
-	}
+	public ServerLevelWrapper(ServerLevel level) { this.level = level; }
 	
 	
 	
@@ -116,60 +114,16 @@ public class ServerLevelWrapper implements IServerLevelWrapper
 	}
 	
 	@Override
-	public String getKeyedLevelDimensionName() { return this.KeyedLevelDimensionName; }
-	
-	private String createKeyedLevelDimensionName()
+	public String getWorldFolderName()
 	{
-		String dimensionName = this.getDhIdentifier();
+		// Need specifically overworld since it's the only dimension that is stored in a server root folder
 		
-		if (Config.Server.sendLevelKeys.get())
-		{
-			String levelKeyPrefix = Config.Server.levelKeyPrefix.get();
-			
-			if (SharedApi.getEnvironment() == EWorldEnvironment.CLIENT_SERVER)
-			{
-				String cleanWorldFolderName = this.getWorldFolderName()
-						.replaceAll("[^" + LevelInitMessage.ALLOWED_CHARS_REGEX + " ]", "")
-						.replaceAll(" ", "_");
-				
-				levelKeyPrefix += (!levelKeyPrefix.isEmpty() ? "_" : "") + cleanWorldFolderName
-						+ "_" + this.getHashedSeedEncoded();
-			}
-			
-			if (levelKeyPrefix.isEmpty())
-			{
-				levelKeyPrefix = this.getHashedSeedEncoded();
-			}
-			
-			String mainPart = "@" + dimensionName;
-			
-			return levelKeyPrefix.substring(0, Math.min(
-					LevelInitMessage.MAX_LENGTH - mainPart.length(),
-					levelKeyPrefix.length()
-			)) + mainPart;
-		}
-		
-		return dimensionName;
+		#if MC_VER >= MC_1_21_3
+		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
 	}
-	private String getWorldFolderName()
-	{
-		try
-		{
-			// We use the overworld since it's the only dimension that is stored in the server root folder
-			
-			#if MC_VER >= MC_1_21_3
-			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
-		}
-		catch (Exception e)
-		{
-			LOGGER.warn("Unable to get world folder name. LODs may not load or save correctly. Error: ["+e.getMessage()+"].", e);
-			return "unknown_world";
-		}
-	}
-	
 	
 	@Override
 	public DimensionTypeWrapper getDimensionType() { return DimensionTypeWrapper.getDimensionTypeWrapper(this.level.dimensionType()); }
@@ -226,6 +180,26 @@ public class ServerLevelWrapper implements IServerLevelWrapper
 		return new ChunkWrapper(chunk, this);
 	}
 	
+	@Override
+	public boolean hasChunkLoaded(int chunkX, int chunkZ)
+	{
+		// world.hasChunk(chunkX, chunkZ); THIS DOES NOT WORK FOR CLIENT LEVEL CAUSE MOJANG ALWAYS RETURN TRUE FOR THAT!
+		ChunkSource source = this.level.getChunkSource();
+		return source.hasChunk(chunkX, chunkZ);
+	}
+	
+	@Override
+	public IBlockStateWrapper getBlockState(DhBlockPos pos)
+	{
+		return BlockStateWrapper.fromBlockState(this.level.getBlockState(McObjectConverter.Convert(pos)), this);
+	}
+	
+	@Override
+	public IBiomeWrapper getBiome(DhBlockPos pos)
+	{
+		return BiomeWrapper.getBiomeWrapper(this.level.getBiome(McObjectConverter.Convert(pos)), this);
+	}
+	
 	@Override
 	public ServerLevel getWrappedMcObject() { return this.level; }
 	
@@ -234,31 +208,28 @@ public class ServerLevelWrapper implements IServerLevelWrapper
 	
 	
 	@Override
-	public void setDhLevel(IDhLevel dhLevel) { this.dhLevel = dhLevel; }
-	@Override
-	@Nullable
-	public IDhLevel getDhLevel() { return this.dhLevel; }
+	public void setParentLevel(IDhLevel parentLevel) { this.parentDhLevel = parentLevel; }
 	
 	@Override
 	public IDhApiCustomRenderRegister getRenderRegister()
 	{
-		if (this.dhLevel == null)
+		if (this.parentDhLevel == null)
 		{
 			return null;
 		}
 		
-		return this.dhLevel.getGenericRenderer();
+		return this.parentDhLevel.getGenericRenderer();
 	}
 	
 	@Override
 	public File getDhSaveFolder()
 	{
-		if (this.dhLevel == null)
+		if (this.parentDhLevel == null)
 		{
 			return null;
 		}
 		
-		return this.dhLevel.getSaveStructure().getSaveFolder(this);
+		return this.parentDhLevel.getSaveStructure().getSaveFolder(this);
 	}
 	
 	

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

@@ -29,8 +29,8 @@ import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.generation.DhLightingEngine;
 import com.seibel.distanthorizons.core.level.IDhServerLevel;
 import com.seibel.distanthorizons.core.config.Config;
-import com.seibel.distanthorizons.core.logging.DhLogger;
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.logging.ConfigBasedLogger;
+import com.seibel.distanthorizons.core.logging.ConfigBasedSpamLogger;
 import com.seibel.distanthorizons.core.pos.DhChunkPos;
 import com.seibel.distanthorizons.core.util.objects.EventTimer;
 import com.seibel.distanthorizons.core.util.LodUtil;
@@ -42,8 +42,6 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.worldGeneration.Abstrac
 import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
 
 import java.io.IOException;
-import java.nio.channels.ClosedByInterruptException;
-import java.nio.channels.ClosedChannelException;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicReference;
@@ -52,9 +50,6 @@ import java.util.function.Function;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
 import com.seibel.distanthorizons.common.wrappers.DependencySetupDoneCheck;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.step.StepBiomes;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.step.StepFeatures;
@@ -65,7 +60,10 @@ import com.seibel.distanthorizons.common.wrappers.worldGeneration.step.StepSurfa
 
 import net.minecraft.server.level.*;
 import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.level.chunk.*;
+import net.minecraft.world.level.chunk.ChunkAccess;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+import net.minecraft.world.level.chunk.ProtoChunk;
+import net.minecraft.world.level.chunk.UpgradeData;
 import net.minecraft.world.level.chunk.storage.IOWorker;
 import net.minecraft.world.level.chunk.storage.RegionFileStorage;
 import net.minecraft.world.level.levelgen.DebugLevelSource;
@@ -73,21 +71,21 @@ import net.minecraft.world.level.levelgen.FlatLevelSource;
 import net.minecraft.world.level.levelgen.Heightmap;
 import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator;
 import net.minecraft.nbt.CompoundTag;
+import org.apache.logging.log4j.LogManager;
 
-#if MC_VER <= MC_1_17_1
-#elif MC_VER <= MC_1_19_2
+#if MC_VER >= MC_1_19_4
+import net.minecraft.core.registries.Registries;
+#else
 import net.minecraft.core.Registry;
-#elif MC_VER <= MC_1_19_4
-import net.minecraft.core.registries.Registries;
-#elif MC_VER < MC_1_21_3
-import net.minecraft.core.registries.Registries;
 #endif
 
-
 #if MC_VER <= MC_1_20_4
 import net.minecraft.world.level.chunk.ChunkStatus;
+import org.jetbrains.annotations.Nullable;
 #else
 import net.minecraft.world.level.chunk.status.ChunkStatus;
+
+import javax.annotation.Nullable;
 #endif
 
 /*
@@ -105,32 +103,26 @@ Lod Generation:          0.269023348s
 */
 public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnvironmentWrapper
 {
-	public static final DhLogger PREF_LOGGER = new DhLoggerBuilder()
-			.name("LOD World Gen")
-			.fileLevelConfig(Config.Common.Logging.logWorldGenPerformanceToFile)
-			.maxCountPerSecond(1)
-			.build();
-	public static final DhLogger EVENT_LOGGER = new DhLoggerBuilder()
-			.name("LOD World Gen")
-			.fileLevelConfig(Config.Common.Logging.logWorldGenEventToFile)
-			.build();
-	public static final DhLogger CHUNK_LOAD_LOGGER = new DhLoggerBuilder()
-			.name("LOD World Gen")
-			.fileLevelConfig(Config.Common.Logging.logWorldGenChunkLoadEventToFile)
-			.build();
+	public static final ConfigBasedSpamLogger PREF_LOGGER =
+			new ConfigBasedSpamLogger(LogManager.getLogger("LodWorldGen"),
+					() -> Config.Common.Logging.logWorldGenPerformance.get(), 1);
+	public static final ConfigBasedLogger EVENT_LOGGER =
+			new ConfigBasedLogger(LogManager.getLogger("LodWorldGen"),
+					() -> Config.Common.Logging.logWorldGenEvent.get());
+	public static final ConfigBasedLogger LOAD_LOGGER =
+			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));
-	#elif MC_VER < MC_1_21_9
-	private static final TicketType DH_SERVER_GEN_TICKET = new TicketType(/* timeout, 0 = disabled*/0L, /* persist */ false, TicketType.TicketUse.LOADING);
 	#else
-	private static final TicketType DH_SERVER_GEN_TICKET = new TicketType(/* timeout, 0 = disabled*/0L, /* flags */TicketType.FLAG_LOADING);
+	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);
 	
 	
-	private final IDhServerLevel serverLevel;
+	private final IDhServerLevel serverlevel;
 	
 	/** 
 	 * will be true if C2ME is installed (since they require us to
@@ -182,7 +174,6 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 	// constructors //
 	//==============//
 	
-	@NotNull
 	public static final ImmutableMap<EDhApiWorldGenerationStep, Integer> WORLD_GEN_CHUNK_BORDER_NEEDED_BY_GEN_STEP;
 	public static final int MAX_WORLD_GEN_CHUNK_BORDER_NEEDED;
 	
@@ -214,24 +205,23 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 		builder.put(EDhApiWorldGenerationStep.LIGHT, 0);
 		WORLD_GEN_CHUNK_BORDER_NEEDED_BY_GEN_STEP = builder.build();
 		
-		// in James' testing as of 2025-09-13 a border here of 2
-		// and a getChunkPosToGenerateStream() radius of 14 provided more accurate
-		// structure generation, however it also caused extreme server lag
-		// a border of 0 here and a getChunkPosToGenerateStream() radius of 8 provided 
-		// good-enough structure generation while not lagging the server
+		// TODO this is a test to see if the additional boarder is actually necessary or not.
+		//  If world generators end up having infinite loops or other unexplained issues,
+		//  this should be set back to the commented out logic below
 		MAX_WORLD_GEN_CHUNK_BORDER_NEEDED = 0;
+		//MAX_WORLD_GEN_CHUNK_BORDER_NEEDED = WORLD_GEN_CHUNK_BORDER_NEEDED_BY_GEN_STEP.values().stream().mapToInt(Integer::intValue).max().getAsInt();
 	}
 	
-	public BatchGenerationEnvironment(IDhServerLevel serverLevel)
+	public BatchGenerationEnvironment(IDhServerLevel serverlevel)
 	{
-		super(serverLevel);
-		this.serverLevel = serverLevel;
+		super(serverlevel);
+		this.serverlevel = serverlevel;
 		
 		EVENT_LOGGER.info("================WORLD_GEN_STEP_INITING=============");
 		
-		serverLevel.getServerLevelWrapper().getDimensionType();
+		serverlevel.getServerLevelWrapper().getDimensionType();
 		
-		ChunkGenerator generator = ((ServerLevelWrapper) (serverLevel.getServerLevelWrapper())).getLevel().getChunkSource().getGenerator();
+		ChunkGenerator generator = ((ServerLevelWrapper) (serverlevel.getServerLevelWrapper())).getLevel().getChunkSource().getGenerator();
 		if (!(generator instanceof NoiseBasedChunkGenerator ||
 				generator instanceof DebugLevelSource ||
 				generator instanceof FlatLevelSource))
@@ -259,7 +249,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 			this.pullExistingChunkUsingMcAsyncMethod = true;
 		}
 		
-		this.params = new GlobalParameters(serverLevel);
+		this.params = new GlobalParameters(serverlevel);
 	}
 	
 	
@@ -319,7 +309,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 					try
 					{
 						event.future.get(); // Should throw exception
-						LodUtil.assertNotReach("Exceptionally completed world gen Future should have thrown an exception.");
+						LodUtil.assertNotReach();
 					}
 					catch (Exception e)
 					{
@@ -397,9 +387,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 		CompletableFuture.allOf(readFutures).join();
 		
 		// future chain for generation
-		return CompletableFuture.runAsync(() ->
-		{
-			try
+		return CompletableFuture.runAsync(() -> 
 			{
 				// offset 1 chunk in both X and Z direction so we can generate an even number of chunks wide
 				// while still submitting an odd number width to MC's internal generators
@@ -422,10 +410,10 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 						int centerZ = refPosZ + radius + zOffset;
 						
 						// get/create the list of chunks we're going to generate
-						IEmptyChunkRetrievalFunc fallbackFunc =
+						IEmptyChunkRetrievalFunc fallbackFunc = 
 								(chunkPosX, chunkPosZ) -> Objects.requireNonNull(
-										generatedChunkByDhPos.get(new DhChunkPos(chunkPosX, chunkPosZ)),
-										() -> String.format("Requested chunk [%d, %d] unavailable during world generation", chunkPosX, chunkPosZ));
+											generatedChunkByDhPos.get(new DhChunkPos(chunkPosX, chunkPosZ)), 
+											() -> String.format("Requested chunk [%d, %d] unavailable during world generation", chunkPosX, chunkPosZ));
 						
 						ArrayGridList<ChunkAccess> regionChunks = new ArrayGridList<>(
 								refSize,
@@ -447,7 +435,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 								// this method shouldn't be necessary since we're passing in a pre-populated
 								// list of chunks, but just in case
 								fallbackFunc
-						);
+							);
 						lightGetterAdaptor.setRegion(region);
 						genEvent.threadedParam.makeStructFeat(region, this.params);
 						
@@ -473,7 +461,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 							else if (chunk != null)
 							{
 								// wrap the chunk
-								ChunkWrapper chunkWrapper = new ChunkWrapper(chunk, this.serverLevel.getLevelWrapper());
+								ChunkWrapper chunkWrapper = new ChunkWrapper(chunk, this.serverlevel.getLevelWrapper());
 								chunkWrapperList.set(relX, relZ, chunkWrapper);
 								
 								// try setting the wrapper's lighting
@@ -531,17 +519,12 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 				
 				genEvent.timer.complete();
 				genEvent.refreshTimeout();
-				if (PREF_LOGGER.canLog())
+				if (PREF_LOGGER.canMaybeLog())
 				{
 					genEvent.threadedParam.perf.recordEvent(genEvent.timer);
-					PREF_LOGGER.debug(genEvent.timer.toString());
+					PREF_LOGGER.debugInc(genEvent.timer.toString());
 				}
-			}
-			catch (Exception e)
-			{
-				EVENT_LOGGER.error("Unexpected error during world gen for min chunk pos ["+genEvent.minPos+"], error: ["+e.getMessage()+"].", e);
-			}
-		}, executor);
+			}, executor);
 	}
 	/** @param extraRadius in both the positive and negative directions */
 	private static Stream<ChunkPos> getChunkPosToGenerateStream(int genMinX, int genMinZ, int width, int extraRadius)
@@ -580,7 +563,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 				if (Config.Common.LodBuilding.pullLightingForPregeneratedChunks.get())
 				{
 					// attempt to get chunk lighting
-					ChunkFileReader.CombinedChunkLightStorage combinedLights = ChunkFileReader.readLight(newChunk, chunkData);
+					ChunkLoader.CombinedChunkLightStorage combinedLights = ChunkLoader.readLight(newChunk, chunkData);
 					if (combinedLights != null)
 					{
 						chunkSkyLightingByDhPos.put(dhChunkPos, combinedLights.skyLightStorage);
@@ -683,28 +666,15 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 								actualThrowable = completionException.getCause();
 							}
 							
-							// interrupts mean the world generator is being shut down, no need to log that
-							boolean isShutdownException = 
-									actualThrowable instanceof InterruptedException
-									|| actualThrowable instanceof ClosedByInterruptException;
-							if (!isShutdownException)
-							{
-								CHUNK_LOAD_LOGGER.warn("DistantHorizons: Couldn't load or make chunk ["+chunkPos+"], error: ["+actualThrowable.getMessage()+"].", actualThrowable);
-							}
-							
+							LOAD_LOGGER.warn("DistantHorizons: Couldn't load or make chunk ["+chunkPos+"], error: ["+actualThrowable.getMessage()+"].", actualThrowable);
 							return null;
 						});
 			}
 			#endif
 		}
-		catch (ClosedByInterruptException ignore) 
-		{ 
-			// this just means the world generator is being shut down
-			return CompletableFuture.completedFuture(null);
-		}
 		catch (Exception e)
 		{
-			CHUNK_LOAD_LOGGER.warn("DistantHorizons: Couldn't load or make chunk [" + chunkPos + "]. Error: [" + e.getMessage() + "].", e);
+			LOAD_LOGGER.warn("DistantHorizons: Couldn't load or make chunk [" + chunkPos + "]. Error: [" + e.getMessage() + "].", e);
 			return CompletableFuture.completedFuture(null);
 		}
 	}
@@ -720,10 +690,10 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 		{
 			try
 			{
-				CHUNK_LOAD_LOGGER.debug("DistantHorizons: Loading chunk [" + chunkPos + "] from disk.");
+				LOAD_LOGGER.debug("DistantHorizons: Loading chunk [" + chunkPos + "] from disk.");
 				
 				@Nullable
-				ChunkAccess chunk = ChunkFileReader.read(level, chunkPos, chunkData);
+				ChunkAccess chunk = ChunkLoader.read(level, chunkPos, chunkData);
 				if (chunk != null)
 				{
 					if (Config.Common.LodBuilding.assumePreExistingChunksAreFinished.get())
@@ -742,7 +712,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 			}
 			catch (Exception e)
 			{
-				CHUNK_LOAD_LOGGER.error(
+				LOAD_LOGGER.error(
 						"DistantHorizons: couldn't load or make chunk at [" + chunkPos + "]." +
 								"Please try optimizing your world to fix this issue. \n" +
 								"World optimization can be done from the singleplayer world selection screen.\n" +
@@ -765,10 +735,8 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 		return new ProtoChunk(chunkPos, UpgradeData.EMPTY, level, level.registryAccess().registryOrThrow(Registries.BIOME), null);
 		#elif MC_VER < MC_1_21_3
 		return new ProtoChunk(chunkPos, UpgradeData.EMPTY, level, level.registryAccess().registryOrThrow(Registries.BIOME), null);
-		#elif MC_VER < MC_1_21_9
-		return new ProtoChunk(chunkPos, UpgradeData.EMPTY, level, level.registryAccess().lookupOrThrow(Registries.BIOME), null);
 		#else
-		return new ProtoChunk(chunkPos, UpgradeData.EMPTY, level, PalettedContainerFactory.create(level.registryAccess()), null);
+		return new ProtoChunk(chunkPos, UpgradeData.EMPTY, level, level.registryAccess().lookupOrThrow(Registries.BIOME), null);
 		#endif
 	}
 	
@@ -804,12 +772,12 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 							
 							if (throwable != null)
 							{
-								CHUNK_LOAD_LOGGER.warn("DistantHorizons: Couldn't load chunk [" + chunkPos + "] from server, error: [" + actualThrowable.getMessage() + "].", actualThrowable);
+								LOAD_LOGGER.warn("DistantHorizons: Couldn't load chunk [" + chunkPos + "] from server, error: [" + actualThrowable.getMessage() + "].", actualThrowable);
 							}
 							
 							if (chunk != null)
 							{
-								ChunkWrapper chunkWrapper = new ChunkWrapper(chunk, this.serverLevel.getLevelWrapper());
+								ChunkWrapper chunkWrapper = new ChunkWrapper(chunk, this.serverlevel.getLevelWrapper());
 								chunkWrappersByDhPos.put(new DhChunkPos(chunkPos.x, chunkPos.z), chunkWrapper);
 							}
 						}, runnableQueue::add);
@@ -823,7 +791,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 				{
 					// generate chunk lighting using DH's lighting engine
 					genEvent.timer.nextEvent("light");
-					int maxSkyLight = this.serverLevel.getServerLevelWrapper().hasSkyLight() ? LodUtil.MAX_MC_LIGHT : LodUtil.MIN_MC_LIGHT;
+					int maxSkyLight = this.serverlevel.getServerLevelWrapper().hasSkyLight() ? LodUtil.MAX_MC_LIGHT : LodUtil.MIN_MC_LIGHT;
 					
 					ArrayList<IChunkWrapper> generatedChunks = new ArrayList<>(chunkWrappersByDhPos.values());
 					for (IChunkWrapper iChunkWrapper : generatedChunks)
@@ -836,7 +804,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 							DhLightingEngine.INSTANCE.bakeChunkBlockLighting(iChunkWrapper, generatedChunks, maxSkyLight);
 						}
 						
-						this.serverLevel.updateBeaconBeamsForChunk(iChunkWrapper, generatedChunks);
+						this.serverlevel.updateBeaconBeamsForChunk(iChunkWrapper, generatedChunks);
 					}
 					
 					genEvent.timer.nextEvent("cleanup");
@@ -859,10 +827,10 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 					
 					genEvent.timer.complete();
 					genEvent.refreshTimeout();
-					if (PREF_LOGGER.canLog())
+					if (PREF_LOGGER.canMaybeLog())
 					{
 						genEvent.threadedParam.perf.recordEvent(genEvent.timer);
-						PREF_LOGGER.debug(genEvent.timer.toString());
+						PREF_LOGGER.debugInc(genEvent.timer.toString());
 					}
 				});
 		
@@ -1067,7 +1035,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 			
 			// generate lighting using DH's lighting engine
 				
-			int maxSkyLight = this.serverLevel.getServerLevelWrapper().hasSkyLight() ? 15 : 0;
+			int maxSkyLight = this.serverlevel.getServerLevelWrapper().hasSkyLight() ? 15 : 0;
 			
 			// only light generated chunks,
 			// attempting to light un-generated chunks will cause lighting issues on bordering generated chunks
@@ -1103,15 +1071,15 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 					DhLightingEngine.INSTANCE.bakeChunkBlockLighting(centerChunk, iChunkWrapperList, maxSkyLight);
 				}
 				
-				this.serverLevel.updateBeaconBeamsForChunk(centerChunk, iChunkWrapperList);
+				this.serverlevel.updateBeaconBeamsForChunk(centerChunk, iChunkWrapperList);
 			}
 			
 			genEvent.refreshTimeout();
 		}
 	}
 	private static <T> ArrayGridList<T> GetCutoutFrom(ArrayGridList<T> total, int border) { return new ArrayGridList<>(total, border, total.gridSize - border); }
-	private static <T> ArrayGridList<T> GetCutoutFrom(ArrayGridList<T> total, EDhApiWorldGenerationStep step) { return GetCutoutFrom(total, WORLD_GEN_CHUNK_BORDER_NEEDED_BY_GEN_STEP.get(step)); }
-	//private static <T> ArrayGridList<T> GetCutoutFrom(ArrayGridList<T> total, EDhApiWorldGenerationStep step) { return GetCutoutFrom(total, 0); }
+	//private static <T> ArrayGridList<T> GetCutoutFrom(ArrayGridList<T> total, EDhApiWorldGenerationStep step) { return GetCutoutFrom(total, MaxBorderNeeded - WORLD_GEN_CHUNK_BORDER_NEEDED_BY_GEN_STEP.get(step)); }
+	private static <T> ArrayGridList<T> GetCutoutFrom(ArrayGridList<T> total, EDhApiWorldGenerationStep step) { return GetCutoutFrom(total, 0); }
 	
 	
 	@Override
@@ -1139,10 +1107,9 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 			{
 				regionStorage.close();
 			}
-			catch (ClosedChannelException ignore) { /* world generator is being shut down */ }
 			catch (IOException e)
 			{
-				EVENT_LOGGER.error("Failed to close region file storage cache, error: ["+e.getMessage()+"].", e);
+				EVENT_LOGGER.error("Failed to close region file storage cache!", e);
 			}
 		}
 		

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

@@ -32,11 +32,11 @@ import com.seibel.distanthorizons.core.util.objects.EventTimer;
 import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
 
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.Logger;
 
 public final class GenerationEvent
 {
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();;
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger(MethodHandles.lookup().lookupClass().getSimpleName());
 	private static int generationFutureDebugIDs = 0;
 	
 	public final int id;

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

@@ -24,7 +24,7 @@ import com.mojang.serialization.Dynamic;
 import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
 
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import com.seibel.distanthorizons.core.logging.ConfigBasedLogger;
 import com.seibel.distanthorizons.core.util.LodUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.ChunkLightStorage;
 
@@ -89,27 +89,22 @@ import net.minecraft.world.level.material.Fluid;
 import org.jetbrains.annotations.Nullable;
 
 
-public class ChunkFileReader
+public class ChunkLoader
 {
 	private static final AtomicBoolean ZERO_CHUNK_POS_ERROR_LOGGED_REF = new AtomicBoolean(false);
 	
-	private static final DhLogger LOGGER = BatchGenerationEnvironment.CHUNK_LOAD_LOGGER;
 	
-	
-	#if MC_VER >= MC_1_21_9
-	// BLOCK_STATE_CODEC can no longer be statically created since
-	// it needs a level reference
-	#elif MC_VER >= MC_1_19_2
+	#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());
 	#elif MC_VER >= MC_1_18_2
 	private static final Codec<PalettedContainer<BlockState>> BLOCK_STATE_CODEC = PalettedContainer.codec(Block.BLOCK_STATE_REGISTRY, BlockState.CODEC, PalettedContainer.Strategy.SECTION_STATES, Blocks.AIR.defaultBlockState());
 	#endif
-	
 	private static final String TAG_UPGRADE_DATA = "UpgradeData";
 	private static final String BLOCK_TICKS_TAG_18 = "block_ticks";
 	private static final String FLUID_TICKS_TAG_18 = "fluid_ticks";
 	private static final String BLOCK_TICKS_TAG_PRE18 = "TileTicks";
 	private static final String FLUID_TICKS_TAG_PRE18 = "LiquidTicks";
+	private static final ConfigBasedLogger LOGGER = BatchGenerationEnvironment.LOAD_LOGGER;
 	
 	private static boolean lightingSectionErrorLogged = false;
 	
@@ -167,7 +162,7 @@ public class ChunkFileReader
 		#if MC_VER < MC_1_18_2
 			if (chunkType != ChunkStatus.ChunkType.LEVELCHUNK)
 				return null;
-		#elif MC_VER < MC_1_21_6
+		#else
 			
 			BlendingData blendingData = readBlendingData(tagLevel);
 			#if MC_VER < MC_1_19_2
@@ -177,39 +172,27 @@ public class ChunkFileReader
 			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 = tagGetLong(tagLevel, "InhabitedTime");
 		
 		//================== Read params for making the LevelChunk ==================
 		
-		UpgradeData upgradeData = UpgradeData.EMPTY;
-		// commented out 2025-06-04 as a test to see if the upgrade data
-		// is actually necessary for DH or if it can be ignored
-		// (if it can't be ignored we'll need to handle null responses from tagGetCompoundTag())
-		//
-		//#if MC_VER < MC_1_17_1
-		//upgradeData = tagLevel.contains(TAG_UPGRADE_DATA, 10)
-		//		? new UpgradeData(tagGetCompoundTag(tagLevel, TAG_UPGRADE_DATA))
-		//		: UpgradeData.EMPTY;
-		//#elif MC_VER < MC_1_21_5
-		//upgradeData = tagLevel.contains(TAG_UPGRADE_DATA, 10)
-		//		? new UpgradeData(tagGetCompoundTag(tagLevel, TAG_UPGRADE_DATA), level)
-		//		: UpgradeData.EMPTY;
-		//#else
-		//upgradeData = tagLevel.contains(TAG_UPGRADE_DATA)
-		//		? new UpgradeData(tagGetCompoundTag(tagLevel, TAG_UPGRADE_DATA), level)
-		//		: UpgradeData.EMPTY;
-		//#endif
+		UpgradeData upgradeData;
+		#if MC_VER < MC_1_17_1
+		upgradeData = tagLevel.contains(TAG_UPGRADE_DATA, 10)
+				? new UpgradeData(tagGetCompoundTag(tagLevel, TAG_UPGRADE_DATA))
+				: UpgradeData.EMPTY;
+		#elif MC_VER < MC_1_21_5
+		upgradeData = tagLevel.contains(TAG_UPGRADE_DATA, 10)
+				? new UpgradeData(tagGetCompoundTag(tagLevel, TAG_UPGRADE_DATA), level)
+				: UpgradeData.EMPTY;
+		#else
+		upgradeData = tagLevel.contains(TAG_UPGRADE_DATA)
+				? new UpgradeData(tagGetCompoundTag(tagLevel, TAG_UPGRADE_DATA), level)
+				: UpgradeData.EMPTY;
+		#endif
 		
 		
 		boolean isLightOn = tagGetBoolean(tagLevel, "isLightOn");
@@ -259,19 +242,11 @@ public class ChunkFileReader
 		// 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)
 	{
-		#if MC_VER < MC_1_21_9
-		// BLOCK_STATE_CODEC is created statically
-		// TODO clean up this code separation
-		#else
-		final Codec<PalettedContainer<BlockState>> BLOCK_STATE_CODEC = PalettedContainerFactory.create(level.registryAccess()).blockStatesContainerCodec();
-		#endif
-		
-		
 		#if MC_VER >= MC_1_18_2
 		#if MC_VER < MC_1_19_4
 		Registry<Biome> biomes = level.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY);
@@ -289,12 +264,9 @@ public class ChunkFileReader
 			#elif MC_VER < MC_1_21_3
 			Codec<PalettedContainer<Holder<Biome>>> biomeCodec = PalettedContainer.codecRW(
 				biomes.asHolderIdMap(), biomes.holderByNameCodec(), PalettedContainer.Strategy.SECTION_BIOMES, biomes.getHolderOrThrow(Biomes.PLAINS));
-			#elif MC_VER < MC_1_21_9
-			Codec<PalettedContainer<Holder<Biome>>> biomeCodec = PalettedContainer.codecRW(
-				biomes.asHolderIdMap(), biomes.holderByNameCodec(), PalettedContainer.Strategy.SECTION_BIOMES, biomes.getOrThrow(Biomes.PLAINS));
 			#else
 			Codec<PalettedContainer<Holder<Biome>>> biomeCodec = PalettedContainer.codecRW(
-				biomes.holderByNameCodec(), PalettedContainerFactory.create(level.registryAccess()).biomeStrategy(), biomes.getOrThrow(Biomes.PLAINS));
+				biomes.asHolderIdMap(), biomes.holderByNameCodec(), PalettedContainer.Strategy.SECTION_BIOMES, biomes.getOrThrow(Biomes.PLAINS));
 			#endif
 		#endif
 		
@@ -313,117 +285,102 @@ public class ChunkFileReader
 			for (int j = 0; j < tagSections.size(); ++j)
 			{
 				CompoundTag tagSection = tagGetCompoundTag(tagSections, j);
-				if (tagSection == null)
-				{
-					continue;
-				}
-				
-				final int sectionYPos = tagGetByte(tagSection, "Y");
+				int sectionYPos = tagGetByte(tagSection, "Y");
 
-				#if MC_VER < MC_1_18_2
-				if (tagSection.contains("Palette", 9) && tagSection.contains("BlockStates", 12))
-				{
-					LevelChunkSection levelChunkSection = new LevelChunkSection(sectionYPos << 4);
-					levelChunkSection.getStates().read(tagSection.getList("Palette", 10),
-							tagSection.getLongArray("BlockStates"));
-					levelChunkSection.recalcBlockCounts();
-					if (!levelChunkSection.isEmpty())
-						chunkSections[#if MC_VER < MC_1_17_1 sectionYPos #else level.getSectionIndexFromSectionY(sectionYPos) #endif ]
-								= levelChunkSection;
-				}
-				#else
+			#if MC_VER < MC_1_18_2
+			if (tagSection.contains("Palette", 9) && tagSection.contains("BlockStates", 12))
+			{
+				LevelChunkSection levelChunkSection = new LevelChunkSection(sectionYPos << 4);
+				levelChunkSection.getStates().read(tagSection.getList("Palette", 10),
+						tagSection.getLongArray("BlockStates"));
+				levelChunkSection.recalcBlockCounts();
+				if (!levelChunkSection.isEmpty())
+					chunkSections[#if MC_VER < MC_1_17_1 sectionYPos #else level.getSectionIndexFromSectionY(sectionYPos) #endif ]
+							= levelChunkSection;
+			}
+			#else
 				int sectionId = level.getSectionIndexFromSectionY(sectionYPos);
 				if (sectionId >= 0 && sectionId < chunkSections.length)
 				{
 					PalettedContainer<BlockState> blockStateContainer;
-					#if MC_VER < MC_1_18_2
-					PalettedContainer<Biome> biomeContainer;
-					#else
+				#if MC_VER < MC_1_18_2
+				PalettedContainer<Biome> biomeContainer;
+				#else
 					PalettedContainer<Holder<Biome>> biomeContainer;
-					#endif
-					
+				#endif
 					
 					boolean containsBlockStates;
-					#if MC_VER < MC_1_21_5
-					containsBlockStates = tagSection.contains("block_states", 10);
-					#else
-						containsBlockStates = tagSection.contains("block_states");
-					#endif
+				#if MC_VER < MC_1_21_5
+				containsBlockStates = tagSection.contains("block_states", 10);
+				#else
+					containsBlockStates = tagSection.contains("block_states");
+				#endif
 					
 					if (containsBlockStates)
 					{
-						#if MC_VER < MC_1_20_6 
-						blockStateContainer = BLOCK_STATE_CODEC.parse(NbtOps.INSTANCE, tagGetCompoundTag(tagSection, "block_states"))
-							.promotePartial(string -> logBlockDeserializationWarning(chunkPos, sectionYPos, string))
-							.getOrThrow(false, (message) -> logParsingWarningOnce(message));
-						#else
+					#if MC_VER < MC_1_20_6 
+					blockStateContainer = BLOCK_STATE_CODEC.parse(NbtOps.INSTANCE, tagGetCompoundTag(tagSection, "block_states"))
+						.promotePartial(string -> logBlockDeserializationWarning(chunkPos, sectionYPos, string))
+						.getOrThrow(false, (message) -> logParsingWarningOnce(message));
+					#else
 						blockStateContainer = BLOCK_STATE_CODEC.parse(NbtOps.INSTANCE, tagGetCompoundTag(tagSection, "block_states"))
 								.promotePartial(string -> logBlockDeserializationWarning(chunkPos, sectionYPos, string))
 								.getOrThrow((message) -> logErrorAndReturnException(message));
-						#endif
+					#endif
 					}
 					else
 					{
-						#if MC_VER < MC_1_21_9
 						blockStateContainer = new PalettedContainer<BlockState>(Block.BLOCK_STATE_REGISTRY, Blocks.AIR.defaultBlockState(), PalettedContainer.Strategy.SECTION_STATES);
-						#else
-						blockStateContainer = PalettedContainerFactory.create(level.registryAccess()).createForBlockStates();
-						#endif
 					}
 				
 				
-					#if MC_VER < MC_1_18_2
-					biomeContainer = tagSection.contains("biomes", 10)
-							? biomeCodec.parse(NbtOps.INSTANCE, tagSection.getCompound("biomes")).promotePartial(string -> logErrors(chunkPos, sectionYPos, string)).getOrThrow(false, (message) -> logWarningOnce(message))
-							: new PalettedContainer<Biome>(biomes, biomes.getOrThrow(Biomes.PLAINS), PalettedContainer.Strategy.SECTION_BIOMES);
-					#else
+				#if MC_VER < MC_1_18_2
+				biomeContainer = tagSection.contains("biomes", 10)
+						? biomeCodec.parse(NbtOps.INSTANCE, tagSection.getCompound("biomes")).promotePartial(string -> logErrors(chunkPos, sectionYPos, string)).getOrThrow(false, (message) -> logWarningOnce(message))
+						: new PalettedContainer<Biome>(biomes, biomes.getOrThrow(Biomes.PLAINS), PalettedContainer.Strategy.SECTION_BIOMES);
+				#else
 					
 					
 					boolean containsBiomes;
-					#if MC_VER < MC_1_21_5
-					containsBiomes = tagSection.contains("biomes", 10);
-					#else
-						containsBiomes = tagSection.contains("biomes");
-					#endif
+				#if MC_VER < MC_1_21_5
+				containsBiomes = tagSection.contains("biomes", 10);
+				#else
+					containsBiomes = tagSection.contains("biomes");
+				#endif
 					
 					if (containsBiomes)
 					{
-						#if MC_VER < MC_1_20_6 
-						biomeContainer = biomeCodec.parse(NbtOps.INSTANCE, tagGetCompoundTag(tagSection, "biomes"))
-							.promotePartial(string -> logBiomeDeserializationWarning(chunkPos, sectionYIndex, (String) string))
-							.getOrThrow(false, (message) -> logParsingWarningOnce(message));
-						#else
+					#if MC_VER < MC_1_20_6 
+					biomeContainer = biomeCodec.parse(NbtOps.INSTANCE, tagGetCompoundTag(tagSection, "biomes"))
+						.promotePartial(string -> logBiomeDeserializationWarning(chunkPos, sectionYIndex, (String) string))
+						.getOrThrow(false, (message) -> logParsingWarningOnce(message));
+					#else
 						biomeContainer = biomeCodec.parse(NbtOps.INSTANCE, tagGetCompoundTag(tagSection, "biomes"))
 								.promotePartial(string -> logBiomeDeserializationWarning(chunkPos, sectionYIndex, (String) string))
 								.getOrThrow((message) -> logErrorAndReturnException(message));
-						#endif
+					#endif
 					}
 					else
 					{
-						#if MC_VER < MC_1_21_3
-						biomeContainer = new PalettedContainer<Holder<Biome>>(
-								biomes.asHolderIdMap(), 
-								biomes.getHolderOrThrow(Biomes.PLAINS), PalettedContainer.Strategy.SECTION_BIOMES);
-						#elif MC_VER < MC_1_21_9
-						biomeContainer = new PalettedContainer<Holder<Biome>>(biomes.asHolderIdMap(),
+						biomeContainer = new PalettedContainer<Holder<Biome>>(biomes.asHolderIdMap(), 
+							#if MC_VER < MC_1_21_3
+							biomes.getHolderOrThrow(Biomes.PLAINS), 
+							#else
 								biomes.getOrThrow(Biomes.PLAINS),
+							#endif
 								PalettedContainer.Strategy.SECTION_BIOMES);
-						#else
-						biomeContainer = PalettedContainerFactory.create(level.registryAccess()).createForBiomes();
-						#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
 				
+				#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;
@@ -434,14 +391,10 @@ public class ChunkFileReader
 		#else ChunkType #endif 
 	readChunkType(CompoundTag tagLevel)
 	{
-		String statusString = tagGetString(tagLevel,"Status");
-		if (statusString != null)
+		ChunkStatus chunkStatus = ChunkStatus.byName(tagGetString(tagLevel,"Status"));
+		if (chunkStatus != null)
 		{
-			ChunkStatus chunkStatus = ChunkStatus.byName(statusString);
-			if (chunkStatus != null)
-			{
-				return chunkStatus.getChunkType();
-			}
+			return chunkStatus.getChunkType();
 		}
 		
 		#if MC_VER <= MC_1_20_4
@@ -453,52 +406,43 @@ public class ChunkFileReader
 	private static void readHeightmaps(LevelChunk chunk, CompoundTag chunkData)
 	{
 		CompoundTag tagHeightmaps = tagGetCompoundTag(chunkData, "Heightmaps");
-		if (tagHeightmaps != null)
+		for (Heightmap.Types type : ChunkStatus.FULL.heightmapsAfter())
 		{
-			for (Heightmap.Types type : ChunkStatus.FULL.heightmapsAfter())
+			String heightmap = type.getSerializationKey();
+			#if MC_VER < MC_1_21_5
+			if (tagHeightmaps.contains(heightmap, 12))
 			{
-				String heightmap = type.getSerializationKey();
-				#if MC_VER < MC_1_21_5
-				if (tagHeightmaps.contains(heightmap, 12))
+				chunk.setHeightmap(type, tagHeightmaps.getLongArray(heightmap));
+			}
+			#else
+			if (tagHeightmaps.contains(heightmap))
+			{
+				Optional<long[]> optionalHeightmap = tagHeightmaps.getLongArray(heightmap);
+				if (optionalHeightmap.isPresent())
 				{
-					chunk.setHeightmap(type, tagHeightmaps.getLongArray(heightmap));
+					chunk.setHeightmap(type, optionalHeightmap.get());
 				}
+			}
+			#endif
+		}
+		Heightmap.primeHeightmaps(chunk, ChunkStatus.FULL.heightmapsAfter());
+	}
+	private static void readPostPocessings(LevelChunk chunk, CompoundTag chunkData)
+	{
+		ListTag tagPostProcessings = tagGetListTag(chunkData,"PostProcessing", 9);
+		for (int i = 0; i < tagPostProcessings.size(); ++i)
+		{
+			ListTag listTag3 = tagGetListTag(tagPostProcessings, i);
+			for (int j = 0; j < listTag3.size(); ++j)
+			{
+				#if MC_VER < MC_1_21_3
+				chunk.addPackedPostProcess(listTag3.getShort(j), i);
 				#else
-				if (tagHeightmaps.contains(heightmap))
-				{
-					Optional<long[]> optionalHeightmap = tagHeightmaps.getLongArray(heightmap);
-					if (optionalHeightmap.isPresent())
-					{
-						chunk.setHeightmap(type, optionalHeightmap.get());
-					}
-				}
+				chunk.addPackedPostProcess(ShortList.of(tagGetShort(listTag3, j)), i);
 				#endif
 			}
-			
-			Heightmap.primeHeightmaps(chunk, ChunkStatus.FULL.heightmapsAfter());
 		}
 	}
-	// commented out as a test as of 2025-06-04 to see if this is actually necessary for DH
-	// DH probably doesn't need any chunk post-processing data
-	//private static void readPostPocessings(LevelChunk chunk, CompoundTag chunkData)
-	//{
-	//	ListTag tagPostProcessings = tagGetListTag(chunkData,"PostProcessing", 9);
-	//	if (tagPostProcessings != null)
-	//	{
-	//		for (int i = 0; i < tagPostProcessings.size(); ++i)
-	//		{
-	//			ListTag listTag3 = tagGetListTag(tagPostProcessings, i);
-	//			for (int j = 0; j < listTag3.size(); ++j)
-	//			{
-	//			#if MC_VER < MC_1_21_3
-	//				chunk.addPackedPostProcess(listTag3.getShort(j), i);
-	//			#else
-	//			chunk.addPackedPostProcess(ShortList.of(tagGetShort(listTag3, j)), i);
-	//			#endif
-	//			}
-	//		}
-	//	}
-	//}
 	#if MC_VER >= MC_1_18_2
 	private static BlendingData readBlendingData(CompoundTag chunkData)
 	{
@@ -522,7 +466,6 @@ public class ChunkFileReader
 				#if MC_VER < MC_1_21_3
 				blendingData = BlendingData.CODEC.parse(blendingDataTag).resultOrPartial((message) -> logParsingWarningOnce(message)).orElse(null);
 				#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
 			}
@@ -785,7 +728,6 @@ public class ChunkFileReader
 	
 	
 	/** 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
@@ -796,7 +738,6 @@ public class ChunkFileReader
 	}
 	
 	/** 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

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

@@ -28,7 +28,7 @@ import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.util.LodUtil;
 import net.minecraft.world.level.block.EntityBlock;
 import net.minecraft.world.level.block.SpawnerBlock;
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -78,7 +78,7 @@ import net.minecraft.world.ticks.LevelTickAccess;
 
 public class DhLitWorldGenRegion extends WorldGenRegion
 {
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger(MethodHandles.lookup().lookupClass().getSimpleName());
 	
 	private static ChunkStatus debugTriggeredForStatus = null;
 	
@@ -352,7 +352,7 @@ public class DhLitWorldGenRegion extends WorldGenRegion
 		ChunkAccess chunk = this.getChunkAccess(chunkX, chunkZ, chunkStatus, returnNonNull);
 		if (chunk instanceof LevelChunk)
 		{
-			chunk = new ImposterProtoChunk((LevelChunk) chunk #if MC_VER >= MC_1_18_2 ,/* allow writes */ false #endif );
+			chunk = new ImposterProtoChunk((LevelChunk) chunk #if MC_VER >= MC_1_18_2 , true #endif );
 		}
 		return chunk;
 	}
@@ -392,11 +392,10 @@ public class DhLitWorldGenRegion extends WorldGenRegion
 			}
 		}
 		
-		if (chunkStatus != ChunkStatus.EMPTY 
-			&& chunkStatus != debugTriggeredForStatus)
+		if (chunkStatus != ChunkStatus.EMPTY && chunkStatus != debugTriggeredForStatus)
 		{
-			LOGGER.info("WorldGen requiring [" + chunkStatus + "]"
-					+ " is outside the expected range. Returning EMPTY chunk.");
+			LOGGER.info("WorldGen requiring " + chunkStatus
+					+ " outside expected range detected. Force passing EMPTY chunk and seeing if it works.");
 			debugTriggeredForStatus = chunkStatus;
 		}
 		

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

@@ -7,7 +7,7 @@ import net.minecraft.nbt.NbtIo;
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.storage.RegionFile;
 import net.minecraft.world.level.chunk.storage.RegionFileStorage;
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.Logger;
 
 import org.jetbrains.annotations.Nullable;
 import java.io.DataInputStream;
@@ -29,7 +29,7 @@ import net.minecraft.world.level.chunk.storage.RegionStorageInfo;
  */
 public class RegionFileStorageExternalCache implements AutoCloseable
 {
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
 	/** Can be null due to the C2ME mod */
 	@Nullable
@@ -139,7 +139,7 @@ public class RegionFileStorageExternalCache implements AutoCloseable
 		
 		if (retryCount >= maxRetryCount)
 		{
-			BatchGenerationEnvironment.CHUNK_LOAD_LOGGER.warn("Concurrency issue detected when getting region file for chunk at [" + pos + "].");
+			BatchGenerationEnvironment.LOAD_LOGGER.warn("Concurrency issue detected when getting region file for chunk at [" + pos + "].");
 		}
 		
 		

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/AbstractWorldGenStep.java

@@ -1,54 +0,0 @@
-package com.seibel.distanthorizons.common.wrappers.worldGeneration.step;
-
-import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.ThreadedParameters;
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject.DhLitWorldGenRegion;
-import com.seibel.distanthorizons.core.util.gridList.ArrayGridList;
-import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.ProtoChunk;
-
-import java.util.ArrayList;
-import java.util.List;
-
-#if MC_VER <= MC_1_20_4
-import net.minecraft.world.level.chunk.ChunkStatus;
-#else
-import net.minecraft.world.level.chunk.status.ChunkStatus;
-#endif
-
-public abstract class AbstractWorldGenStep
-{
-	public abstract void generateGroup(
-			ThreadedParameters tParams, DhLitWorldGenRegion worldGenRegion,
-			ArrayGridList<ChunkWrapper> chunkWrappers);
-	
-	public abstract ChunkStatus getChunkStatus();
-	
-	
-	
-	/** @return the list of chunks that have an earlier status and can be generated */
-	protected ArrayList<ChunkAccess> getChunksToGenerate(List<ChunkWrapper> chunkWrappers)
-	{
-		ArrayList<ChunkAccess> chunksToGenerate = new ArrayList<>();
-		
-		for (ChunkWrapper chunkWrapper : chunkWrappers)
-		{
-			ChunkAccess chunk = chunkWrapper.getChunk();
-			if (chunkWrapper.getStatus().isOrAfter(this.getChunkStatus()))
-			{
-				// this chunk has already generated this step
-				continue;
-			}
-			else if (chunk instanceof ProtoChunk)
-			{
-				chunkWrapper.trySetStatus(this.getChunkStatus());
-				chunksToGenerate.add(chunk);
-			}
-		}
-		
-		return chunksToGenerate;
-	}
-	
-	
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepBiomes.java

@@ -20,13 +20,12 @@
 package com.seibel.distanthorizons.common.wrappers.worldGeneration.step;
 
 import java.util.ArrayList;
+import java.util.List;
 
 import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.ThreadedParameters;
 
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject.DhLitWorldGenRegion;
-import com.seibel.distanthorizons.core.util.gridList.ArrayGridList;
 import net.minecraft.server.level.WorldGenRegion;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ProtoChunk;
@@ -41,35 +40,39 @@ import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.status.ChunkStatus;
 #endif
 
-public final class StepBiomes extends AbstractWorldGenStep
+public final class StepBiomes
 {
-	private final BatchGenerationEnvironment environment;
-	
 	public static final ChunkStatus STATUS = ChunkStatus.BIOMES;
 	
+	private final BatchGenerationEnvironment environment;
 	
 	
-	//=============//
-	// constructor //
-	//=============//
-	
 	public StepBiomes(BatchGenerationEnvironment batchGenerationEnvironment) { this.environment = batchGenerationEnvironment; }
 	
 	
 	
-	//==================//
-	// abstract methods //
-	//==================//
-	
-	@Override
-	public ChunkStatus getChunkStatus() { return STATUS; }
-	
-	@Override 
 	public void generateGroup(
-			ThreadedParameters tParams, DhLitWorldGenRegion worldGenRegion, 
-			ArrayGridList<ChunkWrapper> chunkWrappers)
+			ThreadedParameters tParams, WorldGenRegion worldGenRegion,
+			List<ChunkWrapper> chunkWrappers)
 	{
-		ArrayList<ChunkAccess> chunksToDo = this.getChunksToGenerate(chunkWrappers);
+		
+		ArrayList<ChunkAccess> chunksToDo = new ArrayList<>();
+		
+		for (ChunkWrapper chunkWrapper : chunkWrappers)
+		{
+			ChunkAccess chunk = chunkWrapper.getChunk();
+			if (chunkWrapper.getStatus().isOrAfter(STATUS))
+			{
+				// this chunk has already generated this step
+				continue;
+			}
+			else if (chunk instanceof ProtoChunk)
+			{
+				chunkWrapper.trySetStatus(STATUS);
+				chunksToDo.add(chunk);
+			}
+		}
+		
 		for (ChunkAccess chunk : chunksToDo)
 		{
 			#if MC_VER < MC_1_18_2

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepFeatures.java

@@ -29,7 +29,7 @@ import com.seibel.distanthorizons.core.util.gridList.ArrayGridList;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ProtoChunk;
 import net.minecraft.world.level.levelgen.Heightmap;
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.Logger;
 
 #if MC_VER <= MC_1_20_4
 import net.minecraft.world.level.chunk.ChunkStatus;
@@ -37,12 +37,10 @@ import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.status.ChunkStatus;
 #endif
 
-import java.util.ConcurrentModificationException;
 
-
-public final class StepFeatures extends AbstractWorldGenStep
+public final class StepFeatures
 {
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
 	public static final ChunkStatus STATUS = ChunkStatus.FEATURES;
 	
@@ -50,22 +48,10 @@ public final class StepFeatures extends AbstractWorldGenStep
 	
 	
 	
-	//=============//
-	// constructor //
-	//=============//
-	
 	public StepFeatures(BatchGenerationEnvironment batchGenerationEnvironment) { this.environment = batchGenerationEnvironment; }
 	
 	
 	
-	//==================//
-	// abstract methods //
-	//==================//
-	
-	@Override
-	public ChunkStatus getChunkStatus() { return STATUS; }
-	
-	@Override
 	public void generateGroup(
 			ThreadedParameters tParams, DhLitWorldGenRegion worldGenRegion,
 			ArrayGridList<ChunkWrapper> chunkWrappers)
@@ -102,10 +88,6 @@ public final class StepFeatures extends AbstractWorldGenStep
 				
 				Heightmap.primeHeightmaps(chunk, STATUS.heightmapsAfter());
 			}
-			catch (ConcurrentModificationException e) // ReportedException
-			{
-				// TODO
-			}
 			catch (Exception e)
 			{
 				LOGGER.warn("Unexpected issue when generating features for chunk at pos ["+chunkWrapper.getChunkPos()+"], error: ["+e.getMessage()+"].", e);

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepNoise.java

@@ -26,8 +26,6 @@ import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.ThreadedParameters;
 
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject.DhLitWorldGenRegion;
-import com.seibel.distanthorizons.core.util.gridList.ArrayGridList;
 import com.seibel.distanthorizons.core.util.objects.UncheckedInterruptedException;
 import net.minecraft.server.level.WorldGenRegion;
 import net.minecraft.world.level.chunk.ChunkAccess;
@@ -43,7 +41,7 @@ import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.status.ChunkStatus;
 #endif
 
-public final class StepNoise extends AbstractWorldGenStep
+public final class StepNoise
 {
 	private static final ChunkStatus STATUS = ChunkStatus.NOISE;
 	
@@ -51,26 +49,15 @@ public final class StepNoise extends AbstractWorldGenStep
 	
 	
 	
-	//=============//
-	// constructor //
-	//=============//
-	
 	public StepNoise(BatchGenerationEnvironment batchGenerationEnvironment) { this.environment = batchGenerationEnvironment; }
 	
 	
 	
-	//==================//
-	// abstract methods //
-	//==================//
-	
-	@Override
-	public ChunkStatus getChunkStatus() { return STATUS; }
-	
-	@Override
 	public void generateGroup(
-			ThreadedParameters tParams, DhLitWorldGenRegion worldGenRegion,
-			ArrayGridList<ChunkWrapper> chunkWrappers)
+			ThreadedParameters tParams, WorldGenRegion worldGenRegion,
+			List<ChunkWrapper> chunkWrappers)
 	{
+		
 		ArrayList<ChunkAccess> chunksToDo = new ArrayList<>();
 		
 		for (ChunkWrapper chunkWrapper : chunkWrappers)

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureReference.java

@@ -26,8 +26,6 @@ import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.ThreadedParameters;
 
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject.DhLitWorldGenRegion;
-import com.seibel.distanthorizons.core.util.gridList.ArrayGridList;
 import net.minecraft.server.level.WorldGenRegion;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ProtoChunk;
@@ -39,7 +37,7 @@ import net.minecraft.world.level.chunk.status.ChunkStatus;
 #endif
 
 
-public final class StepStructureReference extends AbstractWorldGenStep
+public final class StepStructureReference
 {
 	private static final ChunkStatus STATUS = ChunkStatus.STRUCTURE_REFERENCES;
 	
@@ -47,26 +45,15 @@ public final class StepStructureReference extends AbstractWorldGenStep
 	
 	
 	
-	//=============//
-	// constructor //
-	//=============//
-	
 	public StepStructureReference(BatchGenerationEnvironment batchGenerationEnvironment) { this.environment = batchGenerationEnvironment; }
 	
 	
 	
-	//==================//
-	// abstract methods //
-	//==================//
-	
-	@Override
-	public ChunkStatus getChunkStatus() { return STATUS; }
-	
-	@Override
 	public void generateGroup(
-			ThreadedParameters tParams, DhLitWorldGenRegion worldGenRegion,
-			ArrayGridList<ChunkWrapper> chunkWrappers)
+			ThreadedParameters tParams, WorldGenRegion worldGenRegion,
+			List<ChunkWrapper> chunkWrappers)
 	{
+		
 		ArrayList<ChunkAccess> chunksToDo = new ArrayList<ChunkAccess>();
 		
 		for (ChunkWrapper chunkWrapper : chunkWrappers)
@@ -80,7 +67,6 @@ public final class StepStructureReference extends AbstractWorldGenStep
 			else if (chunk instanceof ProtoChunk)
 			{
 				chunkWrapper.trySetStatus(STATUS);
-				chunksToDo.add(chunk);
 			}
 		}
 		

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureStart.java

@@ -27,15 +27,13 @@ import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.ThreadedParameters;
 
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject.DhLitWorldGenRegion;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.util.gridList.ArrayGridList;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.level.WorldGenRegion;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ProtoChunk;
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.Logger;
 
 #if MC_VER <= MC_1_20_4
 import net.minecraft.world.level.chunk.ChunkStatus;
@@ -44,9 +42,9 @@ import net.minecraft.world.level.chunk.status.ChunkStatus;
 #endif
 
 
-public final class StepStructureStart extends AbstractWorldGenStep
+public final class StepStructureStart
 {
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	private static final ChunkStatus STATUS = ChunkStatus.STRUCTURE_STARTS;
 	private static final ReentrantLock STRUCTURE_PLACEMENT_LOCK = new ReentrantLock();
 	
@@ -54,27 +52,42 @@ public final class StepStructureStart extends AbstractWorldGenStep
 	
 	
 	
-	//=============//
-	// constructor //
-	//=============//
-	
 	public StepStructureStart(BatchGenerationEnvironment batchGenerationEnvironment) { this.environment = batchGenerationEnvironment; }
 	
 	
 	
-	//==================//
-	// abstract methods //
-	//==================//
-	
-	@Override
-	public ChunkStatus getChunkStatus() { return STATUS; }
-	
-	@Override
-	public void generateGroup(
-			ThreadedParameters tParams, DhLitWorldGenRegion worldGenRegion,
-			ArrayGridList<ChunkWrapper> chunkWrappers)
+	public static class StructStartCorruptedException extends RuntimeException
 	{
-		ArrayList<ChunkAccess> chunksToDo = this.getChunksToGenerate(chunkWrappers);
+		private static final long serialVersionUID = -8987434342051563358L;
+		
+		public StructStartCorruptedException(ArrayIndexOutOfBoundsException e)
+		{
+			super("StructStartCorruptedException");
+			super.initCause(e);
+			fillInStackTrace();
+		}
+		
+	}
+	
+	public void generateGroup(
+			ThreadedParameters tParams, WorldGenRegion worldGenRegion,
+			List<ChunkWrapper> chunkWrappers) throws InterruptedException
+	{
+		ArrayList<ChunkAccess> chunksToDo = new ArrayList<>();
+		
+		for (ChunkWrapper chunkWrapper : chunkWrappers)
+		{
+			ChunkAccess chunk = chunkWrapper.getChunk();
+			if (chunkWrapper.getStatus().isOrAfter(STATUS))
+			{
+				// this chunk has already generated this step
+				continue;
+			}
+			else if (chunk instanceof ProtoChunk)
+			{
+				chunkWrapper.trySetStatus(STATUS);
+			}
+		}
 		
 		#if MC_VER < MC_1_19_2
 		if (this.environment.params.worldGenSettings.generateFeatures())
@@ -88,6 +101,12 @@ public final class StepStructureStart extends AbstractWorldGenStep
 		#endif
 			for (ChunkAccess chunk : chunksToDo)
 			{
+				// System.out.println("StepStructureStart: "+chunk.getPos());
+				
+				// there are a few cases where the structure generator call may lock up (either due to teleporting or leaving the world).
+				// hopefully allowing interrupts here will prevent that from happening.
+				BatchGenerationEnvironment.throwIfThreadInterrupted();
+				
 				// hopefully this shouldn't cause any performance issues (this step is generally quite quick so hopefully it should be fine)
 				// and should prevent some concurrency issues
 				STRUCTURE_PLACEMENT_LOCK.lock();
@@ -132,6 +151,8 @@ public final class StepStructureStart extends AbstractWorldGenStep
 					{
 						// the structure logic failed again, log it and move on
 						LOGGER.error("Unable to create structure starts for " + chunk.getPos() + ". This is an error with MC's world generation. Ignoring and continuing generation. Error: " + secondEx.getMessage()); // don't log the full stack trace since it is long and will generally end up in MC's code
+						
+						//throw new StepStructureStart.StructStartCorruptedException(secondEx);
 					}
 				}
 				

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepSurface.java

@@ -26,8 +26,6 @@ import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.ThreadedParameters;
 
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject.DhLitWorldGenRegion;
-import com.seibel.distanthorizons.core.util.gridList.ArrayGridList;
 import net.minecraft.server.level.WorldGenRegion;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ProtoChunk;
@@ -39,7 +37,7 @@ import net.minecraft.world.level.chunk.status.ChunkStatus;
 #endif
 
 
-public final class StepSurface extends AbstractWorldGenStep
+public final class StepSurface
 {
 	private static final ChunkStatus STATUS = ChunkStatus.SURFACE;
 	
@@ -47,25 +45,13 @@ public final class StepSurface extends AbstractWorldGenStep
 	
 	
 	
-	//=============//
-	// constructor //
-	//=============//
-	
 	public StepSurface(BatchGenerationEnvironment batchGenerationEnvironment) { this.environment = batchGenerationEnvironment; }
 	
 	
 	
-	//==================//
-	// abstract methods //
-	//==================//
-	
-	@Override
-	public ChunkStatus getChunkStatus() { return STATUS; }
-	
-	@Override
 	public void generateGroup(
-			ThreadedParameters tParams, DhLitWorldGenRegion worldGenRegion,
-			ArrayGridList<ChunkWrapper> chunkWrappers)
+			ThreadedParameters tParams, WorldGenRegion worldGenRegion,
+			List<ChunkWrapper> chunkWrappers)
 	{
 		ArrayList<ChunkAccess> chunksToDo = new ArrayList<>();
 		

common/src/main/resources/1_21_10.distanthorizons.accesswidener

@@ -1,54 +0,0 @@
-accessWidener v1 named
-
-# used when determining where to save files to
-accessible field net/minecraft/world/level/storage/DimensionDataStorage dataFolder Ljava/nio/file/Path;
-# used to help determine what folder a clientLevel is
-accessible field net/minecraft/world/level/biome/BiomeManager biomeZoomSeed J
-
-# used when rendering
-accessible method net/minecraft/client/renderer/GameRenderer getFov (Lnet/minecraft/client/Camera;FZ)F
-accessible field net/minecraft/client/Minecraft deltaTracker Lnet/minecraft/client/DeltaTracker$Timer;
-accessible field net/minecraft/client/renderer/LevelRenderer level Lnet/minecraft/client/multiplayer/ClientLevel;
-
-
-# used for grabbing vanilla rendered chunks
-accessible field net/minecraft/client/renderer/LevelRenderer visibleSections Lit/unimi/dsi/fastutil/objects/ObjectArrayList;
-
-# world generation
-# accessible method net/minecraft/world/level/lighting/LayerLightEngine queueSectionData (JLnet/minecraft/world/level/chunk/DataLayer;Z)V
-accessible field net/minecraft/world/level/chunk/LevelChunk loaded Z
-accessible field net/minecraft/world/level/lighting/LightEngine storage Lnet/minecraft/world/level/lighting/LayerLightSectionStorage;
-accessible method net/minecraft/world/level/lighting/LayerLightSectionStorage lightOnInSection (J)Z
-accessible field net/minecraft/server/level/ServerChunkCache distanceManager Lnet/minecraft/server/level/DistanceManager;
-accessible method net/minecraft/server/level/ChunkMap getUpdatingChunkIfPresent (J)Lnet/minecraft/server/level/ChunkHolder;
-accessible method net/minecraft/server/level/ChunkMap tick (Ljava/util/function/BooleanSupplier;)V
-accessible field net/minecraft/server/level/ServerLevel entityManager Lnet/minecraft/world/level/entity/PersistentEntitySectionManager;
-accessible field net/minecraft/server/level/ChunkMap mainThreadExecutor Lnet/minecraft/util/thread/BlockableEventLoop;
-
-# lod generation from save file
-accessible field net/minecraft/world/level/chunk/storage/ChunkStorage worker Lnet/minecraft/world/level/chunk/storage/IOWorker;
-accessible field net/minecraft/world/level/chunk/storage/IOWorker storage Lnet/minecraft/world/level/chunk/storage/RegionFileStorage;
-accessible field net/minecraft/world/level/chunk/storage/RegionFileStorage regionCache Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap;
-accessible field net/minecraft/world/level/chunk/storage/RegionFileStorage folder Ljava/nio/file/Path;
-
-# grabbing textures
-accessible class net/minecraft/client/renderer/texture/SpriteContents$AnimatedTexture
-accessible method net/minecraft/client/renderer/texture/SpriteContents$AnimatedTexture getFrameX (I)I
-accessible method net/minecraft/client/renderer/texture/SpriteContents$AnimatedTexture getFrameY (I)I
-accessible field net/minecraft/client/renderer/texture/SpriteContents animatedTexture Lnet/minecraft/client/renderer/texture/SpriteContents$AnimatedTexture;
-accessible field net/minecraft/client/renderer/texture/SpriteContents originalImage Lcom/mojang/blaze3d/platform/NativeImage;
-
-# UI stuff
-accessible field net/minecraft/client/gui/components/AbstractButton SPRITES Lnet/minecraft/client/gui/components/WidgetSprites;
-# Handles inserting the config button
-accessible field net/minecraft/client/gui/layouts/HeaderAndFooterLayout headerFrame Lnet/minecraft/client/gui/layouts/FrameLayout;
-accessible field net/minecraft/client/gui/layouts/FrameLayout children Ljava/util/List;
-accessible class net/minecraft/client/gui/layouts/FrameLayout$ChildContainer
-accessible field net/minecraft/client/gui/layouts/LinearLayout wrapped Lnet/minecraft/client/gui/layouts/GridLayout;
-accessible method net/minecraft/client/gui/components/debug/DebugScreenEntries register (Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/client/gui/components/debug/DebugScreenEntry;)Lnet/minecraft/resources/ResourceLocation;
-
-# hacky stuff
-accessible field net/minecraft/util/ThreadingDetector lock Ljava/util/concurrent/Semaphore;
-mutable field net/minecraft/util/ThreadingDetector lock Ljava/util/concurrent/Semaphore;
-
-

fabric/build.gradle

@@ -19,9 +19,7 @@ loom {
                     "-Dminecraft.api.session.host=https://nope.invalid",
                     "-Dminecraft.api.services.host=https://nope.invalid",
                     // https://netty.io/wiki/reference-counted-objects.html#leak-detection-levels
-                    "-Dio.netty.leakDetection.level=advanced",
-                    "-XX:+UseZGC",
-                    "-XX:+ZGenerational"
+                    "-Dio.netty.leakDetection.level=advanced"
             )
             programArgs("--username", "Dev")
         }
@@ -74,27 +72,19 @@ dependencies {
 //    runtimeOnly "javax.annotation:javax.annotation-api:1.3.2"
 //    compileOnly "javax.annotation:javax.annotation-api:1.3.2"
 //    modImplementation "javax.annotation:javax.annotation-api:1.3.2"
-
+    
     // Fabric API
     addModJar(fabricApi.module("fabric-api-base", rootProject.fabric_api_version))
     addModJar(fabricApi.module("fabric-lifecycle-events-v1", rootProject.fabric_api_version))
-    if (buildVersionBefore(minecraft_version, "1.21.9")) 
-    {
-        addModJar(fabricApi.module("fabric-resource-loader-v0", rootProject.fabric_api_version))
-    }
-    else // > 1.21.9
-    {
-        addModJar(fabricApi.module("fabric-resource-loader-v0", rootProject.fabric_api_version))
-        addModJar(fabricApi.module("fabric-resource-loader-v1", rootProject.fabric_api_version))
-    }
+    addModJar(fabricApi.module("fabric-resource-loader-v0", rootProject.fabric_api_version))
     addModJar(fabricApi.module("fabric-events-interaction-v0", rootProject.fabric_api_version))
-    addModJar(fabricApi.module("fabric-rendering-v1", rootProject.fabric_api_version))
+    addModJar(fabricApi.module("fabric-rendering-v1", rootProject.fabric_api_version)) // TODO: Remove this as it is only needed in 1 line (FabricClientProxy)
     addModJar(fabricApi.module("fabric-networking-api-v1", rootProject.fabric_api_version))
     addModJar(fabricApi.module("fabric-entity-events-v1", rootProject.fabric_api_version))
-    if (buildVersionBefore(minecraft_version, "1.19.2"))
-        addModJar(fabricApi.module("fabric-command-api-v1", rootProject.fabric_api_version))
-    else
+    if (minecraft_version >= "1.19.2")
         addModJar(fabricApi.module("fabric-command-api-v2", rootProject.fabric_api_version))
+    else // < 1.19.2
+        addModJar(fabricApi.module("fabric-command-api-v1", rootProject.fabric_api_version))
     
     // used by mod menu in MC 1.20.6+
     addModJar(fabricApi.module("fabric-screen-api-v1", rootProject.fabric_api_version))
@@ -153,40 +143,6 @@ dependencies {
     }
 }
 
-private static boolean buildVersionBefore(String minecraft_version, String compareVersion)
-{
-    int sortValue = sortSemanticVersionOldestToNewest(minecraft_version, compareVersion);
-    return sortValue == -1;
-}
-/**
- * input format: "major.minor.patch"
- * needed so we can sort versions with different length strings
- * IE: 1.21.1 should come before 1.21.10
- */
-private static int sortSemanticVersionOldestToNewest(String version1, String version2)
-{
-    String[] parts1 = version1.split("\\.");
-    String[] parts2 = version2.split("\\.");
-
-    int major1 = Integer.parseInt(parts1[0]);
-    int major2 = Integer.parseInt(parts2[0]);
-    if (major1 != major2)
-    {
-        return Integer.compare(major1, major2);
-    }
-
-    int minor1 = Integer.parseInt(parts1[1]);
-    int minor2 = Integer.parseInt(parts2[1]);
-    if (minor1 != minor2)
-    {
-        return Integer.compare(minor1, minor2);
-    }
-
-    int patch1 = Integer.parseInt(parts1[2]);
-    int patch2 = Integer.parseInt(parts2[2]);
-    return Integer.compare(patch1, patch2);
-}
-
 
 task deleteResources(type: Delete) {
     delete file("build/resources/main")

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

@@ -24,24 +24,26 @@ import com.seibel.distanthorizons.common.AbstractPluginPacketSender;
 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.mojang.blaze3d.platform.InputConstants;
 import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
 
 import com.seibel.distanthorizons.core.api.internal.SharedApi;
 import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.util.math.Mat4f;
 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;
 import com.seibel.distanthorizons.fabric.wrappers.modAccessor.SodiumAccessor;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientChunkEvents;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
+import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
 import net.fabricmc.fabric.api.event.player.AttackBlockCallback;
 import net.fabricmc.fabric.api.event.player.UseBlockCallback;
 import net.minecraft.client.Minecraft;
@@ -59,16 +61,13 @@ import java.nio.FloatBuffer;
 #endif
 import java.util.HashSet;
 import java.util.concurrent.AbstractExecutorService;
-
-#if MC_VER < MC_1_21_9
-import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
-#endif
+import java.util.concurrent.ThreadPoolExecutor;
 
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.world.InteractionResult;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.phys.HitResult;
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.Logger;
 import org.lwjgl.glfw.GLFW;
 
 /**
@@ -85,7 +84,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 DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
 	// TODO we shouldn't be filtering keys on the Forge/Fabric side, only in ClientApi
 	private static final int[] KEY_TO_CHECK_FOR = { GLFW.GLFW_KEY_F6, GLFW.GLFW_KEY_F8, GLFW.GLFW_KEY_P};
@@ -104,7 +103,6 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 		LOGGER.info("Registering Fabric Client Events");
 		
 		
-		
 		//========================//
 		// register mod accessors //
 		//========================//
@@ -130,16 +128,8 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 		{
 			if (MC.clientConnectedToDedicatedServer())
 			{
-				// executor to prevent locking up the render/event thread
-				AbstractExecutorService executor = ThreadPoolUtil.getFileHandlerExecutor();
-				if (executor != null)
-				{
-					executor.execute(() ->
-					{
-						IClientLevelWrapper wrappedLevel = ClientLevelWrapper.getWrapper(level);
-						SharedApi.INSTANCE.chunkLoadEvent(new ChunkWrapper(chunk, wrappedLevel), wrappedLevel);
-					});
-				}
+				IClientLevelWrapper wrappedLevel = ClientLevelWrapper.getWrapper(level);
+				SharedApi.INSTANCE.chunkLoadEvent(new ChunkWrapper(chunk, wrappedLevel), wrappedLevel);
 			}
 		});
 		
@@ -153,6 +143,8 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 				if (SharedApi.isChunkAtBlockPosAlreadyUpdating(blockPos.getX(), blockPos.getZ()))
 				{
 					// executor to prevent locking up the render/event thread
+					// if the getChunk() takes longer than expected 
+					// (which can be caused by certain mods) 
 					AbstractExecutorService executor = ThreadPoolUtil.getFileHandlerExecutor();
 					if (executor != null)
 					{
@@ -191,6 +183,8 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 					if (SharedApi.isChunkAtBlockPosAlreadyUpdating(hitResult.getBlockPos().getX(), hitResult.getBlockPos().getZ()))
 					{
 						// executor to prevent locking up the render/event thread
+						// if the getChunk() takes longer than expected 
+						// (which can be caused by certain mods) 
 						AbstractExecutorService executor = ThreadPoolUtil.getFileHandlerExecutor();
 						if (executor != null)
 						{
@@ -223,83 +217,76 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 		// render event //
 		//==============//
 
-		// TODO wait for fabric to re-add their rendering API
-		#if MC_VER < MC_1_21_9
 		WorldRenderEvents.AFTER_SETUP.register((renderContext) ->
 		{
-			ClientApi.RENDER_STATE.mcProjectionMatrix = McObjectConverter.Convert(renderContext.projectionMatrix());
+			Mat4f projectionMatrix = McObjectConverter.Convert(renderContext.projectionMatrix());
 			
+			Mat4f modelViewMatrix;
 			#if MC_VER < MC_1_20_6
-			ClientApi.RENDER_STATE.mcModelViewMatrix = McObjectConverter.Convert(renderContext.matrixStack().last().pose());
+			modelViewMatrix = McObjectConverter.Convert(renderContext.matrixStack().last().pose());
 			#else
-			ClientApi.RENDER_STATE.mcModelViewMatrix = McObjectConverter.Convert(renderContext.positionMatrix());
+			modelViewMatrix = McObjectConverter.Convert(renderContext.positionMatrix());
 			#endif
 			
-			#if MC_VER < MC_1_21_1
-			ClientApi.RENDER_STATE.frameTime = renderContext.tickDelta();
-			#else
-			ClientApi.RENDER_STATE.frameTime = renderContext.tickCounter().getGameTimeDeltaTicks();
-			#endif
-			
-			ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, renderContext.world());
-			
-			
-			this.clientApi.renderLods();
+			this.clientApi.renderLods(ClientLevelWrapper.getWrapper(renderContext.world()),
+					modelViewMatrix,
+					projectionMatrix,
+					#if MC_VER < MC_1_21_1
+					renderContext.tickDelta()
+					#else
+					renderContext.tickCounter().getGameTimeDeltaTicks()
+					#endif
+					);
 		});
 		
 		
+		// TODO add to forge and neo
 		WorldRenderEvents.AFTER_ENTITIES.register((renderContext) ->
 		{
-			ClientApi.RENDER_STATE.mcProjectionMatrix = McObjectConverter.Convert(renderContext.projectionMatrix());
+			Mat4f projectionMatrix = McObjectConverter.Convert(renderContext.projectionMatrix());
 			
+			Mat4f modelViewMatrix;
 			#if MC_VER < MC_1_20_6
-			ClientApi.RENDER_STATE.mcModelViewMatrix = McObjectConverter.Convert(renderContext.matrixStack().last().pose());
+			modelViewMatrix = McObjectConverter.Convert(renderContext.matrixStack().last().pose());
 			#else
-			ClientApi.RENDER_STATE.mcModelViewMatrix = McObjectConverter.Convert(renderContext.positionMatrix());
+			modelViewMatrix = McObjectConverter.Convert(renderContext.positionMatrix());
 			#endif
 			
-			#if MC_VER < MC_1_21_1
-			ClientApi.RENDER_STATE.frameTime = renderContext.tickDelta();
-			#else
-			ClientApi.RENDER_STATE.frameTime = renderContext.tickCounter().getGameTimeDeltaTicks();
-			#endif
-			
-			ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, renderContext.world());
-			
-			
-			this.clientApi.renderFadeOpaque();
+			this.clientApi.renderFadeOpaque(
+					modelViewMatrix,
+					projectionMatrix,
+					#if MC_VER < MC_1_21_1
+					renderContext.tickDelta(),
+					#else
+					renderContext.tickCounter().getGameTimeDeltaTicks(),
+					#endif
+					ClientLevelWrapper.getWrapper(renderContext.world())
+			);
 		});
 		
+		// TODO add to forge and neo
 		WorldRenderEvents.AFTER_TRANSLUCENT.register((renderContext) ->
 		{
-			ClientApi.RENDER_STATE.mcProjectionMatrix = McObjectConverter.Convert(renderContext.projectionMatrix());
+			Mat4f projectionMatrix = McObjectConverter.Convert(renderContext.projectionMatrix());
 			
+			Mat4f modelViewMatrix;
 			#if MC_VER < MC_1_20_6
-			ClientApi.RENDER_STATE.mcModelViewMatrix = McObjectConverter.Convert(renderContext.matrixStack().last().pose());
+			modelViewMatrix = McObjectConverter.Convert(renderContext.matrixStack().last().pose());
 			#else
-			ClientApi.RENDER_STATE.mcModelViewMatrix = McObjectConverter.Convert(renderContext.positionMatrix());
+			modelViewMatrix = McObjectConverter.Convert(renderContext.positionMatrix());
 			#endif
 			
-			#if MC_VER < MC_1_21_1
-			ClientApi.RENDER_STATE.frameTime = renderContext.tickDelta();
-			#else
-			ClientApi.RENDER_STATE.frameTime = renderContext.tickCounter().getGameTimeDeltaTicks();
-			#endif
-			
-			ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, renderContext.world());
-			
-			
-			
-			
-			#if MC_VER < MC_1_21_6
-			// rendered in MixinLevelRenderer
-			#else
-			ClientApi.INSTANCE.renderDeferredLodsForShaders();
-			#endif
-			
-			this.clientApi.renderFadeTransparent();
+			this.clientApi.renderFade(
+					modelViewMatrix,
+					projectionMatrix,
+					#if MC_VER < MC_1_21_1
+					renderContext.tickDelta(),
+					#else
+					renderContext.tickCounter().getGameTimeDeltaTicks(),
+					#endif
+					ClientLevelWrapper.getWrapper(renderContext.world())
+			);
 		});
-		#endif
 		
 		
 		// Debug keyboard event
@@ -349,18 +336,18 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 		// Check all keys we need
 		for (int keyCode = GLFW.GLFW_KEY_A; keyCode <= GLFW.GLFW_KEY_Z; keyCode++)
 		{
-			//if (InputConstants.isKeyDown(Minecraft.getInstance().getWindow().getWindow(), keyCode))
-			//{
-			//	currentKeyDown.add(keyCode);
-			//}
+			if (InputConstants.isKeyDown(Minecraft.getInstance().getWindow().getWindow(), keyCode))
+			{
+				currentKeyDown.add(keyCode);
+			}
 		}
 		
 		for (int keyCode : KEY_TO_CHECK_FOR)
 		{
-			//if (InputConstants.isKeyDown(Minecraft.getInstance().getWindow().getWindow(), keyCode))
-			//{
-			//	currentKeyDown.add(keyCode);
-			//}
+			if (InputConstants.isKeyDown(Minecraft.getInstance().getWindow().getWindow(), keyCode))
+			{
+				currentKeyDown.add(keyCode);
+			}
 		}
 		
 		// Diff and trigger events

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

@@ -22,6 +22,7 @@ package com.seibel.distanthorizons.fabric;
 import com.mojang.brigadier.CommandDispatcher;
 import com.seibel.distanthorizons.common.AbstractModInitializer;
 import com.seibel.distanthorizons.core.config.Config;
+import com.seibel.distanthorizons.core.config.ConfigBase;
 import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
@@ -38,7 +39,7 @@ import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.MinecraftServer;
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.Logger;
 import org.lwjgl.util.tinyfd.TinyFileDialogs;
 
 #if MC_VER >= MC_1_19_2
@@ -64,19 +65,16 @@ public class FabricMain extends AbstractModInitializer implements ClientModIniti
 	private static final ResourceLocation INITIAL_PHASE = new ResourceLocation(ModInfo.RESOURCE_NAMESPACE, ModInfo.DEDICATED_SERVER_INITIAL_PATH);
 	#endif
 	
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
 	
 	
 	@Override
-	protected void createInitialSharedBindings()
+	protected void createInitialBindings()
 	{
 		SingletonInjector.INSTANCE.bind(IModChecker.class, ModChecker.INSTANCE);
 		SingletonInjector.INSTANCE.bind(IPluginPacketSender.class, new FabricPluginPacketSender());
 	}
-	@Override
-	protected void createInitialClientBindings() { /* no additional setup needed currently */ }
-	
 	
 	@Override
 	protected IEventProxy createClientProxy() { return new FabricClientProxy(); }
@@ -128,8 +126,7 @@ 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)
@@ -154,6 +151,11 @@ public class FabricMain extends AbstractModInitializer implements ClientModIniti
 			ModAccessorInjector.INSTANCE.get(ISodiumAccessor.class).setFogOcclusion(false);
 		}
 		#endif
+		
+		if (ConfigBase.INSTANCE == null)
+		{
+			throw new IllegalStateException("Config was not initialized. Make sure to call LodCommonMain.initConfig() before calling this method.");
+		}
 	}
 	
 }

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

@@ -1,7 +1,5 @@
 package com.seibel.distanthorizons.fabric;
 
-import com.seibel.distanthorizons.api.DhApi;
-import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiChunkProcessingEvent;
 import com.seibel.distanthorizons.api.methods.events.DhApiEventRegister;
 import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiLevelLoadEvent;
 import com.seibel.distanthorizons.common.AbstractModInitializer;
@@ -9,6 +7,7 @@ import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.distanthorizons.common.wrappers.misc.ServerPlayerWrapper;
 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;
@@ -16,7 +15,6 @@ 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.TestChunkInputReplacerEvent;
 import com.seibel.distanthorizons.fabric.testing.TestWorldGenBindingEvent;
 import net.fabricmc.fabric.api.entity.event.v1.ServerEntityWorldChangeEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerChunkEvents;
@@ -30,7 +28,7 @@ import net.minecraft.client.gui.screens.TitleScreen;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ServerPlayer;
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.Logger;
 
 #if MC_VER >= MC_1_20_6
 import com.seibel.distanthorizons.common.CommonPacketPayload;
@@ -39,6 +37,8 @@ import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
 import com.seibel.distanthorizons.core.network.messages.AbstractNetworkMessage;
 #endif
 
+import java.util.function.Supplier;
+
 /**
  * This handles all events sent to the server,
  * and is the starting point for most of the mod.
@@ -52,7 +52,7 @@ 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 DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
 	private final boolean isDedicatedServer;
 	
@@ -97,11 +97,10 @@ public class FabricServerProxy implements AbstractModInitializer.IEventProxy
 		ServerTickEvents.END_SERVER_TICK.register((server) -> SERVER_API.serverTickEvent());
 		
 		
-		// can be enabled to test overrides/events without having to build a separate API project 
+		// can be enabled to test world gen overrides without having to build a separate API project 
 		if (false)
 		{
 			DhApiEventRegister.on(DhApiLevelLoadEvent.class, new TestWorldGenBindingEvent());
-			DhApi.events.bind(DhApiChunkProcessingEvent.class, new TestChunkInputReplacerEvent());
 		}
 		
 		

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

@@ -1,70 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.fabric.mixins.client;
-
-#if MC_VER < MC_1_21_9
-import net.minecraft.world.entity.Entity;
-import org.spongepowered.asm.mixin.Mixin;
-
-@Mixin(Entity.class)
-public class MixinChunkSectionsToRender
-{ /* rendering before was handled via Fabric API events */ }
-#else
-
-import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
-import com.seibel.distanthorizons.core.api.internal.ClientApi;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.chunk.ChunkSectionLayerGroup;
-import net.minecraft.client.renderer.chunk.ChunkSectionsToRender;
-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(ChunkSectionsToRender.class)
-public class MixinChunkSectionsToRender
-{
-	
-	
-	// needs to fire at HEAD with a lower than normal order (less than 1000)
-	// otherwise it will be canceled by Sodium
-	@Inject(at = @At("HEAD"), method = "renderGroup", order = 800)
-	private void renderDeferredLayer(ChunkSectionLayerGroup chunkSectionLayerGroup, CallbackInfo ci)
-	{
-		ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, Minecraft.getInstance().levelRenderer.level);
-		
-		
-		if (chunkSectionLayerGroup == ChunkSectionLayerGroup.TRANSLUCENT)
-		{
-			ClientApi.INSTANCE.renderFadeTransparent();
-			ClientApi.INSTANCE.renderDeferredLodsForShaders();
-		}
-		else if (chunkSectionLayerGroup == ChunkSectionLayerGroup.TRIPWIRE)
-		{
-			ClientApi.INSTANCE.renderFadeOpaque();
-		}
-	}
-	
-	
-	
-}
-
-#endif
-

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

@@ -3,10 +3,8 @@ package com.seibel.distanthorizons.fabric.mixins.client;
 import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
 import com.seibel.distanthorizons.core.api.internal.ClientApi;
 import com.seibel.distanthorizons.core.api.internal.SharedApi;
-import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.multiplayer.ClientPacketListener;
-import net.minecraft.world.level.chunk.ChunkAccess;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
@@ -18,8 +16,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import net.minecraft.world.level.chunk.LevelChunk;
 import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
-
-import java.util.concurrent.AbstractExecutorService;
 #endif
 
 @Mixin(ClientPacketListener.class)
@@ -49,24 +45,8 @@ public class MixinClientPacketListener
 	@Inject(method = "enableChunkLight", at = @At("TAIL"))
 	void onEnableChunkLight(LevelChunk chunk, int x, int z, CallbackInfo ci)
 	{
-		if (chunk == null)
-		{
-			return;
-		}
-		
-		// executor to prevent locking up the render thread
-		AbstractExecutorService executor = ThreadPoolUtil.getFileHandlerExecutor();
-		if (executor == null)
-		{
-			return;
-		}
-		
-		
-		executor.execute(() ->
-		{
-			IClientLevelWrapper clientLevel = ClientLevelWrapper.getWrapper((ClientLevel) this.level);
-			SharedApi.INSTANCE.chunkLoadEvent(new ChunkWrapper(chunk, clientLevel), clientLevel);
-		});
+		IClientLevelWrapper clientLevel = ClientLevelWrapper.getWrapper((ClientLevel) chunk.getLevel());
+		SharedApi.INSTANCE.chunkLoadEvent(new ChunkWrapper(chunk, clientLevel), clientLevel);
 	}
 
 	#endif

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

@@ -12,15 +12,12 @@ import java.util.List;
 @Mixin(DebugScreenOverlay.class)
 public class MixinDebugScreenOverlay
 {
-	#if MC_VER < MC_1_21_9
+	
 	@Inject(method = "getSystemInformation", at = @At("RETURN"))
 	private void addCustomF3(CallbackInfoReturnable<List<String>> cir)
 	{
 		List<String> messages = cir.getReturnValue();
 		F3Screen.addStringToDisplay(messages);
 	}
-	#else
-	// handled by DhDebugScreenEntry for MC versions after 1.21.10
-	#endif
 	
 }

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

@@ -22,51 +22,31 @@ 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;
-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
+#else
 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)
@@ -86,23 +66,18 @@ 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)
-	#elif MC_VER < MC_1_21_6
+	#else
 	@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
 	{
-		#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
+		boolean cameraNotInFluid = cameraNotInFluid(camera);
 		
-		if (cancelFog)
+		Entity entity = camera.getEntity();
+		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);
@@ -110,74 +85,10 @@ public class MixinFogRenderer
 			#elif MC_VER < MC_1_21_3
 			RenderSystem.setShaderFogStart(A_REALLY_REALLY_BIG_VALUE);
 			RenderSystem.setShaderFogEnd(A_EVEN_LARGER_VALUE);
-			#elif MC_VER < MC_1_21_6
-			callback.setReturnValue(FogParameters.NO_FOG);
 			#else
+			callback.setReturnValue(FogParameters.NO_FOG);
 			#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
@@ -194,6 +105,4 @@ public class MixinFogRenderer
 		return cameraNotInFluid;
 	}
 	
-	
-	
 }

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

@@ -19,78 +19,51 @@
 
 package com.seibel.distanthorizons.fabric.mixins.client;
 
-#if MC_VER < MC_1_19_4
-import net.minecraft.client.renderer.RenderType;
 import com.mojang.blaze3d.vertex.PoseStack;
+#if MC_VER < MC_1_19_4
 import com.mojang.math.Matrix4f;
 import org.lwjgl.opengl.GL32;
-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;
-#elif MC_VER < MC_1_21_9
-import com.mojang.blaze3d.buffers.GpuBufferSlice;
-import com.mojang.blaze3d.framegraph.FrameGraphBuilder;
-import com.mojang.blaze3d.resource.GraphicsResourceAllocator;
-import net.minecraft.client.Camera;
-import net.minecraft.client.DeltaTracker;
-import net.minecraft.client.renderer.chunk.ChunkSectionsToRender;
-import net.minecraft.client.renderer.culling.Frustum;
-import net.minecraft.util.profiling.ProfilerFiller;
-import org.joml.Matrix4f;
-import org.joml.Matrix4fc;
-import org.joml.Vector4f;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 #else
-import com.mojang.blaze3d.buffers.GpuBufferSlice;
-import com.mojang.blaze3d.framegraph.FrameGraphBuilder;
-import com.mojang.blaze3d.resource.GraphicsResourceAllocator;
-import net.minecraft.client.Camera;
-import net.minecraft.client.DeltaTracker;
-import net.minecraft.client.renderer.chunk.ChunkSectionsToRender;
-import net.minecraft.client.renderer.culling.Frustum;
-import net.minecraft.client.renderer.state.LevelRenderState;
-import net.minecraft.util.profiling.ProfilerFiller;
 import org.joml.Matrix4f;
-import org.joml.Matrix4fc;
-import org.joml.Vector4f;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-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.core.util.math.Mat4f;
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import net.minecraft.client.Camera;
 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 com.seibel.distanthorizons.core.logging.DhLogger;
-
-
-
+/**
+ * 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 DhLogger LOGGER = new DhLoggerBuilder().build();
-	
-	
+
 	#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",
@@ -111,94 +84,57 @@ 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)
-	#elif MC_VER < MC_1_21_6
+	#else
 	@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)
-	#elif MC_VER < MC_1_21_9
-	@Inject(at = @At("HEAD"), method = "prepareChunkRenders", cancellable = true)
-	private void prepareChunkRenders(Matrix4fc projectionMatrix, double d, double e, double f, CallbackInfoReturnable<ChunkSectionsToRender> callback)
-	#else
-	@Inject(at = @At("HEAD"), method = "renderLevel")
-	private void renderLevel(
-			GraphicsResourceAllocator resourceAllocator, DeltaTracker deltaTracker,
-			boolean renderBlockOutline, Camera camera,
-			Matrix4f positionMatrix, Matrix4f projectionMatrix, Matrix4f idkMatrix, GpuBufferSlice gpuBufferSlice,
-			Vector4f skyColor, boolean thinFog, CallbackInfo 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);
-	    ClientApi.RENDER_STATE.mcProjectionMatrix = new Mat4f(mcProjMatrixRaw);
-	    ClientApi.RENDER_STATE.mcProjectionMatrix.transpose();
+	    Mat4f mcProjectionMatrix = new Mat4f(mcProjMatrixRaw);
+	    mcProjectionMatrix.transpose();
 	    
-	    ClientApi.RENDER_STATE.mcModelViewMatrix = McObjectConverter.Convert(matrixStackIn.last().pose());
+	    Mat4f mcModelViewMatrix = McObjectConverter.Convert(matrixStackIn.last().pose());
 		
 		#elif MC_VER <= MC_1_20_4
 		// get the matrices directly from MC
-		ClientApi.RENDER_STATE.mcModelViewMatrix = McObjectConverter.Convert(modelViewMatrixStack.last().pose());
-		ClientApi.RENDER_STATE.mcProjectionMatrix = McObjectConverter.Convert(projectionMatrix);
-		#elif MC_VER < MC_1_21_9
-		// MC combined the model view and projection matricies
-	    ClientApi.RENDER_STATE.mcModelViewMatrix = McObjectConverter.Convert(projectionMatrix);
-	    ClientApi.RENDER_STATE.mcProjectionMatrix = new Mat4f();
-	    ClientApi.RENDER_STATE.mcProjectionMatrix.setIdentity();
+		Mat4f mcModelViewMatrix = McObjectConverter.Convert(modelViewMatrixStack.last().pose());
+		Mat4f mcProjectionMatrix = McObjectConverter.Convert(projectionMatrix);
 		#else
-	    ClientApi.RENDER_STATE.mcModelViewMatrix = McObjectConverter.Convert(positionMatrix);
-	    ClientApi.RENDER_STATE.mcProjectionMatrix = McObjectConverter.Convert(projectionMatrix);
+	    // MC combined the model view and projection matricies
+	    Mat4f mcModelViewMatrix = McObjectConverter.Convert(projectionMatrix);
+	    Mat4f mcProjectionMatrix = new Mat4f();
+	    mcProjectionMatrix.setIdentity();
 		#endif
 	    
 		// TODO move this into a common place
+		float frameTime;
 		#if MC_VER < MC_1_21_1
-		ClientApi.RENDER_STATE.frameTime = Minecraft.getInstance().getFrameTime();
+		frameTime = Minecraft.getInstance().getFrameTime();
 		#elif MC_VER < MC_1_21_3
-		ClientApi.RENDER_STATE.frameTime = Minecraft.getInstance().getTimer().getRealtimeDeltaTicks();
+		frameTime = Minecraft.getInstance().getTimer().getRealtimeDeltaTicks();
 		#else
-	    ClientApi.RENDER_STATE.frameTime = Minecraft.getInstance().deltaTracker.getRealtimeDeltaTicks();
+		frameTime = Minecraft.getInstance().deltaTracker.getRealtimeDeltaTicks();
 		#endif
 	    
-	    ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, this.level);
-	    
-	    
-	    
-	    #if MC_VER < MC_1_21_6
 	    if (renderType.equals(RenderType.translucent())) 
 		{
-		    ClientApi.INSTANCE.renderDeferredLodsForShaders();
+		    ClientApi.INSTANCE.renderDeferredLods(ClientLevelWrapper.getWrapper(this.level),
+				    mcModelViewMatrix,
+				    mcProjectionMatrix,
+				    frameTime
+				    );
 	    }
-		#elif MC_VER < MC_1_21_9
-	    // rendering handled via Fabric Api render event
-		#else
-		// handled here and in MixinChunkSectionsToRender
-	    #endif
+		
+		// FIXME completely disables rendering when sodium is installed
+		if (Config.Client.Advanced.Debugging.lodOnlyMode.get())
+		{
+		    callback.cancel();
+		}
     }
 	
-	
-	
-	#if MC_VER < MC_1_21_9
-	// rendering handled via Fabric Api render event
-	#else
-	@Inject(at = @At("HEAD"), method = "prepareChunkRenders")
-	private void prepareChunkRenders(Matrix4fc modelViewMatrix, double d, double e, double f, CallbackInfoReturnable<ChunkSectionsToRender> callback)
-	{
-		ClientApi.RENDER_STATE.mcModelViewMatrix = McObjectConverter.Convert(modelViewMatrix);
-		ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, this.level);
-		
-		// only crash during development
-		if (ModInfo.IS_DEV_BUILD)
-		{
-			ClientApi.RENDER_STATE.canRenderOrThrow();
-		}
-		
-		ClientApi.INSTANCE.renderLods();
-		
-	}
-	
-	#endif
-	
-	
-	
 }

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

@@ -22,14 +22,12 @@ package com.seibel.distanthorizons.fabric.mixins.client;
 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.minecraft.IMinecraftRenderWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import net.minecraft.client.renderer.LightTexture;
 
 import org.spongepowered.asm.mixin.Final;
 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;
@@ -62,40 +60,27 @@ public class MixinLightTexture
 	private GpuTexture texture;
 	#endif
 	
-	@Unique
-	private MinecraftRenderWrapper renderWrapper = null;
-	
 	
 	
 	@Inject(method = "updateLightTexture(F)V", at = @At("RETURN"))
 	public void updateLightTexture(float partialTicks, CallbackInfo ci)
 	{
 		IMinecraftClientWrapper mc = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
-		if (mc == null)
+		if (mc == null || mc.getWrappedClientLevel() == null)
 		{
 			return;
 		}
 		
+		
 		IClientLevelWrapper clientLevel = mc.getWrappedClientLevel();
-		if (clientLevel == null)
-		{
-			return;
-		}
-		
-		// lazy initialization to make sure we don't call this too early
-		if (this.renderWrapper == null)
-		{
-			this.renderWrapper = (MinecraftRenderWrapper)SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
-		}
-		
 		
 		#if MC_VER < MC_1_21_3
-		this.renderWrapper.updateLightmap(this.lightPixels, clientLevel);
+		MinecraftRenderWrapper.INSTANCE.updateLightmap(this.lightPixels, clientLevel);
 		#elif MC_VER < MC_1_21_5
-		this.renderWrapper.setLightmapId(this.target.getColorTextureId(), clientLevel);
+		MinecraftRenderWrapper.INSTANCE.setLightmapId(this.target.getColorTextureId(), clientLevel);
 		#else
 		GlTexture glTexture = (GlTexture) this.texture;
-		this.renderWrapper.setLightmapId(glTexture.glId(), clientLevel);
+		MinecraftRenderWrapper.INSTANCE.setLightmapId(glTexture.glId(), clientLevel);
 		#endif
 	}
 	

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

@@ -16,7 +16,7 @@ import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.TitleScreen;
 import net.minecraft.client.multiplayer.ClientLevel;
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.Logger;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
@@ -34,7 +34,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 public abstract class MixinMinecraft
 {
 	@Unique
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger(MixinMinecraft.class.getSimpleName());
 	
 	
 	@Shadow

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

@@ -1,48 +0,0 @@
-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/testing/TestChunkInputReplacerEvent.java

@@ -1,64 +0,0 @@
-package com.seibel.distanthorizons.fabric.testing;
-
-import com.seibel.distanthorizons.api.DhApi;
-import com.seibel.distanthorizons.api.interfaces.block.IDhApiBlockStateWrapper;
-import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiChunkProcessingEvent;
-import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiEventParam;
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.logging.DhLogger;
-
-import java.io.IOException;
-
-public class TestChunkInputReplacerEvent extends DhApiChunkProcessingEvent
-{
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
-	
-	private static final String REPLACEMENT_BLOCK_STATE_NAMESPACE = "minecraft:stone";
-	
-	private IDhApiBlockStateWrapper stoneBlockWrapper = null;
-	private boolean initialBlockSetupComplete = false;
-	
-	
-	
-	@Override
-	public void blockOrBiomeChangedDuringChunkProcessing(DhApiEventParam<EventParam> event)
-	{
-		if (!this.initialBlockSetupComplete)
-		{
-			// this method can be called on multiple threads
-			synchronized (this)
-			{
-				this.initialBlockSetupComplete = true;
-				try
-				{
-					this.stoneBlockWrapper = DhApi.Delayed.wrapperFactory.getDefaultBlockStateWrapper(REPLACEMENT_BLOCK_STATE_NAMESPACE, event.value.levelWrapper);
-				}
-				catch (IOException e)
-				{
-					LOGGER.error("Unable to get ["+REPLACEMENT_BLOCK_STATE_NAMESPACE+"] block replacement cannot continue and is now disabled, error: ["+e.getMessage()+"].", e);
-					DhApi.events.unbind(DhApiChunkProcessingEvent.class, this.getClass());
-				}
-			}
-		}
-		
-		// will happen if the initial setup fails until the unbind call is processed
-		// which likely won't happen until the current chunk has finished processing
-		if (this.stoneBlockWrapper == null)
-		{
-			return;
-		}
-		
-		
-		
-		// replace any dirt or grass block with stone
-		IDhApiBlockStateWrapper block = event.value.currentBlock;
-		if (block.getSerialString().contains("grass_block")
-			|| block.getSerialString().contains("dirt"))
-		{
-			event.value.setBlockOverride(this.stoneBlockWrapper);
-		}
-	}
-	
-	
-	
-}

fabric/src/main/java/com/seibel/distanthorizons/fabric/testing/TestChunkWorldGenerator.java

@@ -10,9 +10,11 @@ import com.seibel.distanthorizons.api.interfaces.world.IDhApiLevelWrapper;
 import com.seibel.distanthorizons.api.objects.data.DhApiChunk;
 import com.seibel.distanthorizons.api.objects.data.DhApiTerrainDataPoint;
 import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.chunk.ChunkAccess;
+import org.apache.logging.log4j.Logger;
 
 import java.util.ArrayList;
 

fabric/src/main/java/com/seibel/distanthorizons/fabric/testing/TestGenericWorldGenerator.java

@@ -13,7 +13,7 @@ import com.seibel.distanthorizons.api.objects.data.IDhApiFullDataSource;
 import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import net.minecraft.server.level.ServerLevel;
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.Logger;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -23,7 +23,7 @@ import java.util.function.Consumer;
 
 public class TestGenericWorldGenerator implements IDhApiWorldGenerator
 {
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
 	private final IDhApiLevelWrapper levelWrapper;
 	

fabric/src/main/java/com/seibel/distanthorizons/fabric/testing/TestWorldGenBindingEvent.java

@@ -6,12 +6,12 @@ import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiLevelLo
 import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiEventParam;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import net.minecraft.server.level.ServerLevel;
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.Logger;
 
 // TODO add to API example once Builderb0y has given the all-clear
 public class TestWorldGenBindingEvent extends DhApiLevelLoadEvent
 {
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
 	@Override
 	public void onLevelLoad(DhApiEventParam<DhApiLevelLoadEvent.EventParam> event)

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

@@ -8,8 +8,7 @@
     "server.MixinEntity",
     "server.MixinServerPlayer",
     "server.MixinTracingExecutor",
-    "server.MixinUtilBackgroundThread", 
-    "server.MixinLevelTicks"
+    "server.MixinUtilBackgroundThread"
   ],
   "client": [
     "client.MixinClientLevel",
@@ -17,7 +16,6 @@
     "client.MixinDebugScreenOverlay",
     "client.MixinFogRenderer",
     "client.MixinLevelRenderer",
-    "client.MixinChunkSectionsToRender",
     "client.MixinLightTexture",
     "client.MixinMinecraft",
     "client.MixinOptionsScreen",

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

@@ -55,7 +55,7 @@ import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 import net.minecraft.world.level.chunk.ChunkAccess;
 
 import net.minecraftforge.common.MinecraftForge;
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 import org.lwjgl.glfw.GLFW;
 
@@ -81,7 +81,7 @@ 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 DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
 	
 	#if MC_VER < MC_1_19_2

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

@@ -86,13 +86,11 @@ public class ForgeMain extends AbstractModInitializer
 	}
 	
 	@Override
-	protected void createInitialSharedBindings()
+	protected void createInitialBindings()
 	{
 		SingletonInjector.INSTANCE.bind(IModChecker.class, ModChecker.INSTANCE);
 		SingletonInjector.INSTANCE.bind(IPluginPacketSender.class, new ForgePluginPacketSender());
 	}
-	@Override
-	protected void createInitialClientBindings() { /* no additional setup needed currently */ }
 	
 	@Override
 	protected IEventProxy createClientProxy() { return new ForgeClientProxy(); }
@@ -120,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)
 	{
-		// Just run the event handler, since there are no proper ClientLifecycleEvent for the client 
-		// to signify readiness other than FmlClientSetupEvent
-		eventHandler.run();
+		// FIXME What event is this?
 	}
 	
 	@Override

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

@@ -47,7 +47,7 @@ import net.minecraftforge.event.server.ServerStoppingEvent;
 #endif
 
 
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.Logger;
 
 import java.util.function.Supplier;
 

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

@@ -129,35 +129,34 @@ public class MixinLevelRenderer
 		// get the matrices from the OpenGL fixed pipeline
 		float[] mcProjMatrixRaw = new float[16];
 		GL15.glGetFloatv(GL15.GL_PROJECTION_MATRIX, mcProjMatrixRaw);
-		ClientApi.RENDER_STATE.mcProjectionMatrix = new Mat4f(mcProjMatrixRaw);
-		ClientApi.RENDER_STATE.mcProjectionMatrix.transpose();
+		Mat4f mcProjectionMatrix = new Mat4f(mcProjMatrixRaw);
+		mcProjectionMatrix.transpose();
 		
-		ClientApi.RENDER_STATE.mcModelViewMatrix = McObjectConverter.Convert(matrixStackIn.last().pose());
+		Mat4f mcModelViewMatrix = McObjectConverter.Convert(matrixStackIn.last().pose());
 		
 		#else
 		// get the matrices directly from MC
-		ClientApi.RENDER_STATE.mcModelViewMatrix = McObjectConverter.Convert(modelViewMatrixStack.last().pose());
-		ClientApi.RENDER_STATE.mcProjectionMatrix = McObjectConverter.Convert(projectionMatrix);
+		Mat4f mcModelViewMatrix = McObjectConverter.Convert(modelViewMatrixStack.last().pose());
+		Mat4f mcProjectionMatrix = McObjectConverter.Convert(projectionMatrix);
 		#endif
 		
 		
+		float frameTime;
 		#if MC_VER < MC_1_21_1
-		ClientApi.RENDER_STATE.frameTime = Minecraft.getInstance().getFrameTime();
+		frameTime = Minecraft.getInstance().getFrameTime();
 		#else
-		ClientApi.RENDER_STATE.frameTime = Minecraft.getInstance().getTimer().getRealtimeDeltaTicks();
+		frameTime = Minecraft.getInstance().getTimer().getRealtimeDeltaTicks();
 		#endif
 		
-		ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, this.level);
-		
 		
 		// only render before solid blocks
 		if (renderType.equals(RenderType.solid()))
 		{
-			ClientApi.INSTANCE.renderLods();
+			ClientApi.INSTANCE.renderLods(ClientLevelWrapper.getWrapper(this.level), mcModelViewMatrix, mcProjectionMatrix, frameTime);
 		} 
 		else if (renderType.equals(RenderType.translucent())) 
 		{
-			ClientApi.INSTANCE.renderDeferredLodsForShaders();
+			ClientApi.INSTANCE.renderDeferredLods(ClientLevelWrapper.getWrapper(this.level), mcModelViewMatrix, mcProjectionMatrix, frameTime);
 		}
 		
 		// render fade
@@ -166,11 +165,27 @@ public class MixinLevelRenderer
 		// we need to trigger for the renderType after those passes are done
 		if (renderType.equals(RenderType.cutout()))
 		{
-			ClientApi.INSTANCE.renderFadeOpaque();
+			ClientApi.INSTANCE.renderFadeOpaque(
+					mcModelViewMatrix,
+					mcProjectionMatrix,
+					frameTime,
+					ClientLevelWrapper.getWrapper(this.level)
+			);
 		}
 		else if (renderType.equals(RenderType.tripwire()))
 		{
-			ClientApi.INSTANCE.renderFadeTransparent();
+			ClientApi.INSTANCE.renderFade(
+					mcModelViewMatrix,
+					mcProjectionMatrix,
+					frameTime,
+					ClientLevelWrapper.getWrapper(this.level)
+			);
+		}
+		
+		
+		if (Config.Client.Advanced.Debugging.lodOnlyMode.get())
+		{
+			callback.cancel();
 		}
 	}
 	

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

@@ -12,7 +12,7 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.IVersionConstants;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.screens.TitleScreen;
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.Logger;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
@@ -29,7 +29,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 public class MixinMinecraft
 {
 	@Unique
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger(MixinMinecraft.class.getSimpleName());
 	
 	
 	

gradle.properties

@@ -5,8 +5,8 @@ org.gradle.caching=true
 
 # Mod Info
 mod_name=DistantHorizons
-mod_version=2.3.7-b-dev
-api_version=5.0.0
+mod_version=2.3.3-b-dev
+api_version=4.0.0
 maven_group=com.seibel.distanthorizons
 mod_readable_name=Distant Horizons
 mod_description=This mod generates and renders simplified terrain beyond the normal view distance at a low performance cost. Allowing you to see much farther without turning your game into a slideshow.
@@ -18,12 +18,11 @@ mod_issues=https://gitlab.com/jeseibel/distant-horizons/-/issues
 mod_discord=https://discord.gg/xAB8G4cENx
 
 # Global Plugin Versions
-manifold_version=2025.1.27
+manifold_version=2024.1.37
 # 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
-zstd_version=1.5.7-6
 # 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 
@@ -32,10 +31,7 @@ fastutil_version=8.2.1
 
 # Minecraft related libraries (included in MC's jar)
 log4j_version=2.23.1
-# if we actually want to use LWJGL methods, this needs to be a MC version variable
-# since different MC versions have different LWJGL versions that aren't compatible
-# 3.3.3 is for MC 1.21.8
-lwjgl_version=3.3.3
+lwjgl_version=3.3.1
 joml_version=1.10.2
 
 # Architectury config
@@ -52,10 +48,11 @@ infoBuildSource=User
 
 # Internal Properties (These are set at runtime for Forgix to merge jar's)
 versionStr=
+mergeVersions=
 
 # This defines what MC version Intellij will use for the preprocessor
 # and what version is used automatically by build and run commands
-mcVer=1.21.10
+mcVer=1.21.5
 
 # Defines the maximum amount of memory Minecraft is allowed when run in a development environment
 #minecraftMemoryJavaArg="-Xmx4G"

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

@@ -21,13 +21,16 @@ package com.seibel.distanthorizons.neoforge;
 
 import com.seibel.distanthorizons.common.AbstractModInitializer;
 import com.seibel.distanthorizons.common.util.ProxyUtil;
+import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
 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.SharedApi;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.util.math.Mat4f;
 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.world.IClientLevelWrapper;
@@ -37,12 +40,13 @@ import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.neoforged.neoforge.client.event.RenderLevelStageEvent;
 import net.neoforged.neoforge.common.NeoForge;
+import net.neoforged.neoforge.event.level.ChunkEvent;
 import net.neoforged.neoforge.event.level.LevelEvent;
 
 import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent;
 import net.minecraft.world.level.chunk.ChunkAccess;
 
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.Logger;
 import org.lwjgl.glfw.GLFW;
 
 import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
@@ -58,14 +62,29 @@ import net.neoforged.neoforge.event.TickEvent;
 import net.neoforged.neoforge.client.event.ClientTickEvent;
 
 import java.util.concurrent.AbstractExecutorService;
+import java.util.concurrent.ThreadPoolExecutor;
 #endif
 
 
+/**
+ * This handles all events sent to the client,
+ * and is the starting point for most of the mod.
+ *
+ * @author James_Seibel
+ * @version 2023-7-27
+ */
 public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
 {
 	private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	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
@@ -149,6 +168,8 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
 			}
 			
 			// executor to prevent locking up the render/event thread
+			// if the getChunk() takes longer than expected 
+			// (which can be caused by certain mods) 
 			AbstractExecutorService executor = ThreadPoolUtil.getFileHandlerExecutor();
 			if (executor != null)
 			{
@@ -174,6 +195,8 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
 			}
 			
 			// executor to prevent locking up the render/event thread
+			// if the getChunk() takes longer than expected 
+			// (which can be caused by certain mods) 
 			AbstractExecutorService executor = ThreadPoolUtil.getFileHandlerExecutor();
 			if (executor != null)
 			{
@@ -221,7 +244,16 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
 	// rendering //
 	//===========//
 	
-	#if MC_VER < MC_1_21_6
+	@SubscribeEvent
+	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)
 	{
@@ -240,62 +272,14 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
 			}
 		}
 	}
-	#else
 	
 	
-	@SubscribeEvent
-	public void afterLevelEntityRenderEvent(RenderLevelStageEvent.AfterEntities event)
-	{
-		#if MC_VER < MC_1_21_9
-		ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, (ClientLevel)event.getLevel());
-		#else
-		ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, event.getLevelRenderer().level);
-		#endif
-		
-		ClientApi.INSTANCE.renderFadeTransparent();
-	}
 	
+	//================//
+	// helper methods //
+	//================//
 	
-	@SubscribeEvent
-	public void afterLevelTranslucentRenderEvent(RenderLevelStageEvent.AfterTranslucentBlocks event)
-	{
-		#if MC_VER < MC_1_21_9
-		ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, (ClientLevel)event.getLevel());
-		#else
-		ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, event.getLevelRenderer().level);
-		#endif
-		
-		ClientApi.INSTANCE.renderDeferredLodsForShaders();
-	}
-	
-	@SubscribeEvent
-	public void afterLevelRenderEvent(RenderLevelStageEvent.AfterLevel event)
-	{
-		#if MC_VER < MC_1_21_9
-		ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, (ClientLevel)event.getLevel());
-		#else
-		ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, event.getLevelRenderer().level);
-		#endif
-		
-		
-		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();
-	}
-	
-	#endif
-	
+	private static LevelAccessor GetEventLevel(LevelEvent e) { return e.getLevel(); }
 	
 	
 }

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

@@ -22,18 +22,16 @@ package com.seibel.distanthorizons.neoforge;
 import com.mojang.brigadier.CommandDispatcher;
 import com.seibel.distanthorizons.common.AbstractModInitializer;
 import com.seibel.distanthorizons.common.wrappers.gui.GetConfigScreen;
-import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftRenderWrapper;
 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.minecraft.IMinecraftRenderWrapper;
 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;
-import com.seibel.distanthorizons.neoforge.wrappers.NeoforgeMinecraftRenderWrapper;
 import com.seibel.distanthorizons.neoforge.wrappers.modAccessor.ModChecker;
 import com.seibel.distanthorizons.neoforge.wrappers.modAccessor.OptifineAccessor;
 import net.minecraft.commands.CommandSourceStack;
@@ -53,13 +51,9 @@ 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
 
 /**
@@ -78,11 +72,6 @@ public class NeoforgeMain extends AbstractModInitializer
 		{
 			this.onInitializeClient();
 			eventBus.addListener(this::registerNetworkingClientServer);
-			
-			#if MC_VER < MC_1_21_8
-			#else
-			eventBus.addListener(this::registerClientPayloadEvent);
-			#endif
 		});
 		
 		// handles dedicated servers
@@ -110,12 +99,6 @@ public class NeoforgeMain extends AbstractModInitializer
 	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
-	
 	
 	
 	
@@ -124,18 +107,11 @@ public class NeoforgeMain extends AbstractModInitializer
 	protected IEventProxy createServerProxy(boolean isDedicated) { return new NeoforgeServerProxy(isDedicated); }
 	
 	@Override
-	protected void createInitialSharedBindings()
+	protected void createInitialBindings()
 	{
 		SingletonInjector.INSTANCE.bind(IModChecker.class, ModChecker.INSTANCE);
 		SingletonInjector.INSTANCE.bind(IPluginPacketSender.class, new NeoforgePluginPacketSender());
 	}
-	@Override
-	protected void createInitialClientBindings()
-	{
-		// replace MC RenderWrapper with more specific neoforge version
-		SingletonInjector.INSTANCE.unbind(IMinecraftRenderWrapper.class, MinecraftRenderWrapper.INSTANCE); // TODO replace with a replaceOrBind for simplicity
-		SingletonInjector.INSTANCE.bind(IMinecraftRenderWrapper.class, NeoforgeMinecraftRenderWrapper.INSTANCE);
-	}
 	
 	@Override
 	protected IEventProxy createClientProxy() { return new NeoforgeClientProxy(); }
@@ -165,9 +141,7 @@ public class NeoforgeMain extends AbstractModInitializer
 	@Override
 	protected void subscribeClientStartedEvent(Runnable eventHandler)
 	{
-		// Just run the event handler, since there are no proper ClientLifecycleEvent for the client 
-		// to signify readiness other than FmlClientSetupEvent
-		eventHandler.run(); 
+		// FIXME What event is this?
 	}
 	
 	@Override

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

@@ -14,19 +14,10 @@ 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)
@@ -48,31 +39,9 @@ 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)
-	{
-		#if MC_VER < MC_1_21_8
-		PacketDistributor.sendToServer(new CommonPacketPayload(message));
-		#else
-		ClientPacketDistributor.sendToServer(new CommonPacketPayload(message));
-		#endif
-	}
+	{ PacketDistributor.sendToServer(new CommonPacketPayload(message)); }
 	
 	@Override
 	public void sendToClient(ServerPlayer serverPlayer, AbstractNetworkMessage message)

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

@@ -24,7 +24,7 @@ import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.neoforge.event.server.ServerAboutToStartEvent;
 import net.neoforged.neoforge.event.server.ServerStoppingEvent;
 
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.Logger;
 
 import java.util.function.Supplier;
 
@@ -40,7 +40,7 @@ public class NeoforgeServerProxy implements AbstractModInitializer.IEventProxy
 	private static LevelAccessor GetEventLevel(LevelEvent e) { return e.getLevel(); }
 	
 	private final ServerApi serverApi = ServerApi.INSTANCE;
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	private final boolean isDedicated;
 	public static Supplier<Boolean> isGenerationThreadChecker = null;
 	
@@ -152,12 +152,8 @@ public class NeoforgeServerProxy implements AbstractModInitializer.IEventProxy
 	private static ServerLevelWrapper getServerLevelWrapper(ServerLevel level) { return ServerLevelWrapper.getWrapper(level); }
 	private static ServerLevelWrapper getServerLevelWrapper(ResourceKey<Level> resourceKey, PlayerEvent event)
 	{
-		#if MC_VER < MC_1_21_9
 		//noinspection DataFlowIssue (possible NPE after getServer())
 		return getServerLevelWrapper(event.getEntity().getServer().getLevel(resourceKey));
-		#else
-		return getServerLevelWrapper(event.getEntity().level().getServer().getLevel(resourceKey));
-		#endif
 	}
 	
 	private static ServerPlayerWrapper getServerPlayerWrapper(PlayerEvent event) { return ServerPlayerWrapper.getWrapper((ServerPlayer) event.getEntity()); }

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

@@ -1,6 +1,5 @@
 package com.seibel.distanthorizons.neoforge.mixins.client;
 
-#if MC_VER < MC_1_21_9
 import com.seibel.distanthorizons.core.logging.f3.F3Screen;
 import net.minecraft.client.gui.components.DebugScreenOverlay;
 import org.spongepowered.asm.mixin.Mixin;
@@ -9,24 +8,16 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import java.util.List;
-#else
-import org.spongepowered.asm.mixin.Mixin;
-import net.minecraft.client.gui.components.DebugScreenOverlay;
-#endif
 
 @Mixin(DebugScreenOverlay.class)
 public class MixinDebugScreenOverlay
 {
 	
-	#if MC_VER < MC_1_21_9
 	@Inject(method = "getSystemInformation", at = @At("RETURN"))
 	private void addCustomF3(CallbackInfoReturnable<List<String>> cir)
 	{
 		List<String> messages = cir.getReturnValue();
 		F3Screen.addStringToDisplay(messages);
 	}
-	#else
-	// handled by DhDebugScreenEntry for MC versions after 1.21.10
-	#endif
 	
 }

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

@@ -22,87 +22,67 @@ 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;
-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;
+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 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;
+import org.joml.Vector4f;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 #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_19_2
-	@Inject(at = @At("RETURN"), method = "setupFog")
-	private static void disableSetupFog(Camera camera, FogMode fogMode, float f, boolean bl, CallbackInfo callback)
+	#if MC_VER == MC_1_17_1 || MC_VER == MC_1_18_2
+	@Inject(at = @At("RETURN"),
+			method = "setupFog(Lnet/minecraft/client/Camera;Lnet/minecraft/client/renderer/FogRenderer$FogMode;FZF)V",
+			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"), method = "setupFog")
-	private static void disableSetupFog(Camera camera, FogMode fogMode, float f, boolean bl, float g, CallbackInfo callback)
-	#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)
+	@Inject(at = @At("RETURN"),
+			method = "setupFog(Lnet/minecraft/client/Camera;Lnet/minecraft/client/renderer/FogRenderer$FogMode;FZF)V",
+			remap = true)
+	private static void disableSetupFog(Camera camera, FogMode fogMode, float f, boolean bl, float partTick, CallbackInfo callback)
 	#else
-	@Unique
-	private static void unused()
+	@Inject(at = @At("RETURN"),
+			method = "setupFog(Lnet/minecraft/client/Camera;Lnet/minecraft/client/renderer/FogRenderer$FogMode;Lorg/joml/Vector4f;FZF)Lnet/minecraft/client/renderer/FogParameters;",
+			remap = true, cancellable = true)
+	private static void disableSetupFog(Camera camera, FogMode fogMode, Vector4f vector4f, float f, boolean bl, float partTick, CallbackInfoReturnable<FogParameters> callback)
 	#endif
 	{
-		#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
+		boolean cameraNotInFluid = cameraNotInFluid(camera);
 		
-		if (cancelFog)
+		Entity entity = camera.getEntity();
+		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);
@@ -110,77 +90,12 @@ public class MixinFogRenderer
 			#elif MC_VER < MC_1_21_3
 			RenderSystem.setShaderFogStart(A_REALLY_REALLY_BIG_VALUE);
 			RenderSystem.setShaderFogEnd(A_EVEN_LARGER_VALUE);
-			#elif MC_VER < MC_1_21_6
-			callback.setReturnValue(FogParameters.NO_FOG);
 			#else
+			callback.setReturnValue(FogParameters.NO_FOG);
 			#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
@@ -195,5 +110,4 @@ public class MixinFogRenderer
 	}
 	
 	
-	
 }

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

@@ -19,53 +19,48 @@
 
 package com.seibel.distanthorizons.neoforge.mixins.client;
 
-#if MC_VER < MC_1_21_6
+import com.mojang.blaze3d.systems.RenderSystem;
+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 com.seibel.distanthorizons.core.logging.DhLogger;
-
-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.Inject;
 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_17_1
+import org.lwjgl.opengl.GL15;
+#endif
+
+
+/**
+ * This class is used to mix in DH's 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. <br><br>
+ *
+ * This is also the mixin for rendering the clouds
+ */
 @Mixin(LevelRenderer.class)
 public class MixinLevelRenderer
 {
@@ -75,67 +70,73 @@ public class MixinLevelRenderer
 	#endif
 	private ClientLevel level;
 	
-	@Unique
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
-	
-	
-	#if MC_VER < MC_1_21_6
-	@Inject(at = @At("HEAD"), method = "renderSectionLayer")
-	private void renderChunkLayer(RenderType renderType, double x, double y, double z, Matrix4f modelViewMatrix, Matrix4f projectionMatrix, CallbackInfo callback)
-	#elif MC_VER < MC_1_21_9
-	@Inject(at = @At("HEAD"), method = "renderLevel")
-	private void onRenderLevel(
-			GraphicsResourceAllocator resourceAllocator, DeltaTracker deltaTracker, 
-			boolean renderBlockOutline, Camera camera, 
-			Matrix4f positionMatrix, Matrix4f projectionMatrix, GpuBufferSlice gpuBufferSlice, 
-			Vector4f skyColor, boolean thinFog, CallbackInfo callback)
+	#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",
+			cancellable = true)
+	private void renderChunkLayer(RenderType renderType, PoseStack matrixStackIn, double xIn, double yIn, double zIn, 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"), method = "renderLevel")
-	private void renderLevel(
-			GraphicsResourceAllocator resourceAllocator, DeltaTracker deltaTracker, 
-			boolean renderBlockOutline, Camera camera, 
-			Matrix4f positionMatrix, Matrix4f projectionMatrix, Matrix4f idkMatrix, GpuBufferSlice gpuBufferSlice, 
-			Vector4f skyColor, boolean thinFog, CallbackInfo callback)
-    #endif
+	@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)
+	#endif
 	{
-		#if MC_VER < MC_1_21_6
-		// MC combined the model view and projection matricies
-		ClientApi.RENDER_STATE.mcModelViewMatrix = McObjectConverter.Convert(modelViewMatrix);
-		ClientApi.RENDER_STATE.mcProjectionMatrix = McObjectConverter.Convert(projectionMatrix);
+		#if MC_VER == MC_1_16_5
+		// get the matrices from the OpenGL fixed pipeline
+		float[] mcProjMatrixRaw = new float[16];
+		GL15.glGetFloatv(GL15.GL_PROJECTION_MATRIX, mcProjMatrixRaw);
+		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
-		ClientApi.RENDER_STATE.mcProjectionMatrix = McObjectConverter.Convert(projectionMatrix);
+		// get the matrices from neoForge's render event.
+		// 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
-	
 		
 		
+		float frameTime;
 		#if MC_VER < MC_1_21_1
-		ClientApi.RENDER_STATE.frameTime = Minecraft.getInstance().getFrameTime();
+		frameTime = Minecraft.getInstance().getFrameTime();
 		#elif MC_VER < MC_1_21_3
-		ClientApi.RENDER_STATE.frameTime = Minecraft.getInstance().getTimer().getRealtimeDeltaTicks();
+		frameTime = Minecraft.getInstance().getTimer().getRealtimeDeltaTicks();
 		#else
-		ClientApi.RENDER_STATE.frameTime = Minecraft.getInstance().deltaTracker.getRealtimeDeltaTicks();
+		frameTime = Minecraft.getInstance().deltaTracker.getRealtimeDeltaTicks();
 		#endif
 		
-		ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, this.level);
-		
-		
-		#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();
+			ClientApi.INSTANCE.renderLods(ClientLevelWrapper.getWrapper(this.level), mcModelViewMatrix, mcProjectionMatrix, frameTime);
 		} 
 		else if (renderType.equals(RenderType.translucent())) 
 		{
-			ClientApi.INSTANCE.renderDeferredLodsForShaders();
+			ClientApi.INSTANCE.renderDeferredLods(ClientLevelWrapper.getWrapper(this.level), mcModelViewMatrix, mcProjectionMatrix, frameTime);
 		}
 		
 		// render fade
@@ -144,38 +145,28 @@ public class MixinLevelRenderer
 		// we need to trigger for the renderType after those passes are done
 		if (renderType.equals(RenderType.cutout()))
 		{
-			ClientApi.INSTANCE.renderFadeOpaque();
+			ClientApi.INSTANCE.renderFadeOpaque(
+					mcModelViewMatrix,
+					mcProjectionMatrix,
+					frameTime,
+					ClientLevelWrapper.getWrapper(this.level)
+			);
 		}
 		else if (renderType.equals(RenderType.tripwire()))
 		{
-			ClientApi.INSTANCE.renderFadeTransparent();
+			ClientApi.INSTANCE.renderFade(
+					mcModelViewMatrix,
+					mcProjectionMatrix,
+					frameTime,
+					ClientLevelWrapper.getWrapper(this.level)
+			);
 		}
-		#endif
-	}
-	
-	
-	#if MC_VER < MC_1_21_6
-	
-	// formerly handled in renderChunkLayer()
-	
-	#else
-	@Inject(at = @At("HEAD"), method = "prepareChunkRenders")
-	private void renderChunkLayer(Matrix4fc modelViewMatrix, double d, double e, double f, CallbackInfoReturnable<ChunkSectionsToRender> callback)
-	{
-		ClientApi.RENDER_STATE.mcModelViewMatrix = McObjectConverter.Convert(modelViewMatrix);
-		ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, this.level);
 		
-		// only crash during development
-		if (ModInfo.IS_DEV_BUILD)
+		if (Config.Client.Advanced.Debugging.lodOnlyMode.get())
 		{
-			ClientApi.RENDER_STATE.canRenderOrThrow();
+			callback.cancel();
 		}
-		
-		ClientApi.INSTANCE.renderLods();
 	}
 	
-	#endif
-	
-	
 	
 }

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

@@ -22,9 +22,7 @@ package com.seibel.distanthorizons.neoforge.mixins.client;
 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.minecraft.IMinecraftRenderWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
-import com.seibel.distanthorizons.neoforge.wrappers.NeoforgeTextureUnwrapper;
 import net.minecraft.client.renderer.LightTexture;
 
 import org.spongepowered.asm.mixin.Final;
@@ -38,14 +36,10 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import com.mojang.blaze3d.platform.NativeImage;
 #elif MC_VER < MC_1_21_5
 import com.mojang.blaze3d.pipeline.TextureTarget;
-#elif MC_VER < MC_1_21_9
+#else
 import com.mojang.blaze3d.opengl.GlTexture;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.textures.GpuTexture;
-#else
-import net.neoforged.neoforge.client.blaze3d.validation.ValidationGpuTexture;
-import com.mojang.blaze3d.opengl.GlTexture;
-import com.mojang.blaze3d.textures.GpuTexture;
 #endif
 
 @Mixin(LightTexture.class)
@@ -76,18 +70,14 @@ public class MixinLightTexture
 		
 		
 		IClientLevelWrapper clientLevel = mc.getWrappedClientLevel();
-		MinecraftRenderWrapper renderWrapper = (MinecraftRenderWrapper)SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
 		
 		#if MC_VER < MC_1_21_3
-		renderWrapper.updateLightmap(this.lightPixels, clientLevel);
+		MinecraftRenderWrapper.INSTANCE.updateLightmap(this.lightPixels, clientLevel);
 		#elif MC_VER < MC_1_21_5
-		renderWrapper.setLightmapId(this.target.getColorTextureId(), clientLevel);
-		#elif MC_VER < MC_1_21_9
-		GlTexture glTexture = (GlTexture) this.texture;
-		renderWrapper.setLightmapId(glTexture.glId(), clientLevel);
+		MinecraftRenderWrapper.INSTANCE.setLightmapId(this.target.getColorTextureId(), clientLevel);
 		#else
-		int id = NeoforgeTextureUnwrapper.getGlTextureIdFromGpuTexture(this.texture);
-		renderWrapper.setLightmapId(id, clientLevel);
+		GlTexture glTexture = (GlTexture) this.texture;
+		MinecraftRenderWrapper.INSTANCE.setLightmapId(glTexture.glId(), clientLevel);
 		#endif
 	}
 	

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

@@ -12,7 +12,7 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.IVersionConstants;
 import com.seibel.distanthorizons.coreapi.ModInfo;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.TitleScreen;
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.Logger;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
@@ -29,7 +29,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 public class MixinMinecraft
 {
 	@Unique
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger(MixinMinecraft.class.getSimpleName());
 	
 	/**
 	 * Can be enabled for testing the auto updater UI. <br/>

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

@@ -1,46 +0,0 @@
-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/java/com/seibel/distanthorizons/neoforge/wrappers/NeoforgeMinecraftRenderWrapper.java

@@ -1,82 +0,0 @@
-package com.seibel.distanthorizons.neoforge.wrappers;
-
-import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftRenderWrapper;
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import net.minecraft.client.Minecraft;
-import com.seibel.distanthorizons.core.logging.DhLogger;
-
-#if MC_VER < MC_1_21_9
-#else
-import com.mojang.blaze3d.opengl.GlTexture;
-import com.mojang.blaze3d.textures.GpuTexture;
-import net.neoforged.neoforge.client.blaze3d.validation.ValidationGpuTexture;
-#endif
-
-import java.lang.invoke.MethodHandles;
-
-public class NeoforgeMinecraftRenderWrapper extends MinecraftRenderWrapper
-{
-	public static final NeoforgeMinecraftRenderWrapper INSTANCE = new NeoforgeMinecraftRenderWrapper();
-	
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
-	private static final Minecraft MC = Minecraft.getInstance();
-	
-	
-	
-	@Override
-	public int getDepthTextureId()
-	{
-		#if MC_VER < MC_1_21_9
-		// no special handling required,
-		// both neo/fabric uses the same back end objects
-		return super.getDepthTextureId();
-		#else
-		try
-		{
-			GpuTexture gpuTexture = this.getRenderTarget().getDepthTexture();
-			int id = NeoforgeTextureUnwrapper.getGlTextureIdFromGpuTexture(gpuTexture);
-			return id;
-		}
-		catch (Exception 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()
-	{
-		#if MC_VER < MC_1_21_9
-		// no special handling required,
-		// both neo/fabric uses the same back end objects
-		return super.getColorTextureId();
-		#else
-		try
-		{
-			GpuTexture gpuTexture = this.getRenderTarget().getColorTexture();
-			int id = NeoforgeTextureUnwrapper.getGlTextureIdFromGpuTexture(gpuTexture);
-			return id;
-		}
-		catch (Exception e)
-		{
-			// only log this error once per session
-			if (!this.colorTextureCastFailLogged)
-			{
-				this.colorTextureCastFailLogged = true;
-				LOGGER.error("Unable to cast render Target color texture to ValidationGpuTexture or GlTexture. MC, Neoforge, or a rendering mod may have changed the object type.", e);
-			}
-			return 0;
-		}
-		#endif
-	}
-	
-	
-	
-}

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/wrappers/NeoforgeTextureUnwrapper.java

@@ -1,39 +0,0 @@
-package com.seibel.distanthorizons.neoforge.wrappers;
-
-#if MC_VER < MC_1_21_9
-public class NeoforgeTextureUnwrapper
-{ /* not needed for older MC versions */ }
-#else
-
-import com.mojang.blaze3d.opengl.GlTexture;
-import com.mojang.blaze3d.textures.GpuTexture;
-import net.neoforged.neoforge.client.blaze3d.validation.ValidationGpuTexture;
-
-public class NeoforgeTextureUnwrapper
-{
-	/**
-	 * if Neoforge texture validation is enabled the GlTexture object will be wrapped with a
-	 * Neoforge specific ValidationGpuTexture object.
-	 * This helper allows us to get the underlying OpenGL texture ID
-	 * regardless of what Neoforge returns.
-	 */
-	public static int getGlTextureIdFromGpuTexture(GpuTexture gpuTexture) throws ClassCastException
-	{
-		GlTexture glTexture;
-		
-		if (gpuTexture instanceof ValidationGpuTexture)
-		{
-			ValidationGpuTexture validationTexture = (ValidationGpuTexture) gpuTexture;
-			glTexture = (GlTexture)validationTexture.getRealTexture();
-		}
-		else
-		{
-			glTexture = (GlTexture) gpuTexture;
-		}
-		
-		int id = glTexture.glId();
-		return id;
-	}
-	
-}
-#endif

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

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

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

@@ -3,8 +3,6 @@ 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
@@ -34,11 +32,4 @@ issueTrackerURL = "${issues}"
     type = "required"
     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"
+    side = "BOTH"

settings.gradle

@@ -58,32 +58,25 @@ If you still need help with compiling, please read the Readme.md
 
 
 
-/** Loads the VersionProperties fiel for the currently selected Minecraft version. */
-def loadProperties() 
-{
+/** Loads the VersionProperties field for the currently selected Minecraft version. */
+def loadProperties() {
     def defaultMcVersion = "1.20.1" // 1.20.1 is our current most stable version so we use that if no version was defined
 
     def mcVersion = ""
     def mcVers = fileTree("versionProperties").files.name // Get all the files in "versionProperties"
-    for (int i = 0; i < mcVers.size(); i++) 
-    {
-        String version = mcVers[i];
-        version = version.replaceAll("\\.properties", "") // As we are getting the file names, we should remove the ".properties" at the end to get the versions
-        mcVers[i] = version;
+    for (int i = 0; i < mcVers.size(); i++) {
+        mcVers[i] = mcVers[i].replaceAll("\\.properties", "") // As we are getting the file names, we should remove the ".properties" at the end to get the versions
     }
 
-    mcVers.sort((a,b) -> sortSemanticVersionOldestToNewest(a,b)) // Sort so it always goes from oldest to newest
+    mcVers.sort() // Sort so it always goes from oldest to newest
 
     int mcIndex = -1
     println "Avalible MC versions: ${mcVers}"
-    if (hasProperty("mcVer")) 
-    {
+    if (hasProperty("mcVer")) {
         mcVersion = mcVer
         mcIndex = mcVers.indexOf(mcVer)
     }
-    
-    if (mcIndex == -1) 
-    {
+    if (mcIndex == -1) {
         println "No mcVer set or the set mcVer is invalid! Defaulting to ${defaultMcVersion}."
         println "Tip: Use -PmcVer=\"${defaultMcVersion}\" in cmd arg to set mcVer."
         mcVersion = defaultMcVersion
@@ -102,35 +95,6 @@ def loadProperties()
     gradle.ext.mcVers = mcVers
     gradle.ext.mcIndex = mcIndex
 }
-/** 
- * input format: "major.minor.patch"
- * needed so we can sort versions with different length strings
- * IE: 1.21.1 should come before 1.21.10
- */
-private static int sortSemanticVersionOldestToNewest(String version1, String version2) 
-{
-    String[] parts1 = version1.split("\\.");
-    String[] parts2 = version2.split("\\.");
-    
-    int major1 = Integer.parseInt(parts1[0]);
-    int major2 = Integer.parseInt(parts2[0]);
-    if (major1 != major2) 
-    {
-        return Integer.compare(major1, major2);
-    }
-    
-    int minor1 = Integer.parseInt(parts1[1]);
-    int minor2 = Integer.parseInt(parts2[1]);
-    if (minor1 != minor2) 
-    {
-        return Integer.compare(minor1, minor2);
-    }
-    
-    int patch1 = Integer.parseInt(parts1[2]);
-    int patch2 = Integer.parseInt(parts2[2]);
-    return Integer.compare(patch1, patch2);
-}
-
 loadProperties()
 
 

versionProperties/1.16.5.properties

@@ -24,7 +24,6 @@ fabric_api_version=0.42.0+1.16
     immersive_portals_version=
     canvas_version=
 
-    # iris - needs 1.7.4+ to support the DH API
     fabric_incompatibility_list={ "iris": "*" }
     fabric_recommend_list={}
 
@@ -44,9 +43,6 @@ 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,7 +24,6 @@ fabric_api_version=0.46.1+1.17
     immersive_portals_version=
     canvas_version=
 
-    # iris - needs 1.7.4+ to support the DH API
     fabric_incompatibility_list={ "iris": "*" }
     fabric_recommend_list={}
 
@@ -43,9 +42,6 @@ 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,7 +25,6 @@ fabric_api_version=0.76.0+1.18.2
     immersive_portals_version=v1.4.11-1.18
     canvas_version=mc118:1.0.2616
 
-    # iris - needs 1.7.4+ to support the DH API
     fabric_incompatibility_list={ "iris": "*" }
     fabric_recommend_list={}
 
@@ -52,9 +51,6 @@ 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,7 +24,6 @@ fabric_api_version=0.76.1+1.19.2
     immersive_portals_version=
     canvas_version=mc119-1.0.2480
 
-    # iris - needs 1.7.4+ to support the DH API
     fabric_incompatibility_list={ "iris": "*" }
     fabric_recommend_list={}
 
@@ -43,9 +42,6 @@ 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

@@ -22,8 +22,7 @@ fabric_api_version=0.87.1+1.19.4
     bclib_version=2.3.3
     immersive_portals_version=
     canvas_version=
-
-    # iris - needs 1.7.4+ to support the DH API
+    
     fabric_incompatibility_list={ "iris": "*" }
     fabric_recommend_list={}
 
@@ -42,9 +41,6 @@ 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

@@ -22,8 +22,7 @@ fabric_api_version=0.90.4+1.20.1
     bclib_version=3.0.13
     immersive_portals_version=
     canvas_version=
-
-    # iris - needs 1.7.4+ to support the DH API
+    
     fabric_incompatibility_list={ "iris": "<=1.7.4" }
     fabric_recommend_list={}
     
@@ -42,9 +41,6 @@ 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

@@ -22,8 +22,7 @@ fabric_api_version=0.90.4+1.20.2
     bclib_version=3.0.13
     immersive_portals_version=
     canvas_version=
-
-    # iris - needs 1.7.4+ to support the DH API
+    
     fabric_incompatibility_list={ "iris": "<=1.7.4" }
     fabric_recommend_list={}
     
@@ -42,9 +41,6 @@ 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

@@ -23,8 +23,7 @@ fabric_api_version=0.91.2+1.20.4
     bclib_version=
     immersive_portals_version=
     canvas_version=
-
-    # iris - needs 1.7.4+ to support the DH API
+    
     fabric_incompatibility_list={ "iris": "<=1.7.4" }
     fabric_recommend_list={}
     
@@ -43,9 +42,7 @@ fabric_api_version=0.91.2+1.20.4
 
 # (Neo)Forge loader
 forge_version=49.1.13
-neoforge_version=20.4.246
-    neoforge_version_range=[*,)
-
+neoforge_version=20.4.233
     # (Neo)Forge mod versions
     starlight_version_forge=
     terraforged_version=