Add isLocalChunkUseAllowed config value

.editorconfig

@@ -11,7 +11,7 @@ insert_final_newline = false
 max_line_length = 1000
 tab_width = 4
 trim_trailing_whitespace = false
-ij_continuation_indent_size = 4
+ij_continuation_indent_size = 8
 ij_formatter_off_tag = @formatter:off
 ij_formatter_on_tag = @formatter:on
 ij_formatter_tags_enabled = true

.gitlab-ci.yml

@@ -35,14 +35,7 @@ build:
   stage: build
   parallel:
     matrix:
-      - MC_VER: [
+      - MC_VER: ["1.16.5", "1.17.1", "1.18.2", "1.19.2", "1.19.4", "1.20.1", "1.20.2", "1.20.4", "1.20.6", "1.21.1", "1.21.3", "1.21.4", "1.21.5", "1.21.6", "1.21.8"]
-      "1.21.11", "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"
-      ]
   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/;

.gitlab/issue_templates/Default.md

@@ -1,37 +1,3 @@
-## Check off each item in this list before submitting:
+Before creating an issue, please select the appropriate template from the dropdown above.
-
-<!-- 
-To mark a section as complete either put an "x" in between the square brackets, example: "[x]" 
-Or click the checkbox once the issue has been created.
--->
-
-1. [ ] Check the FAQ to see if your issue has already been reported and has a solution:
-    [Problems-and-solutions](https://gitlab.com/distant-horizons-team/distant-horizons/-/wikis/1-user-guide/1-frequently-asked-questions/2-problems-and-solutions/Problems-and-Solutions)
-
-2. [ ] Make sure you are not using any mods on the incompatible list:
-    [Mod support FAQ](https://gitlab.com/distant-horizons-team/distant-horizons/-/wikis/1-user-guide/1-frequently-asked-questions/4-mod-support/Mod-Support)
-
-3. [ ] Check the existing issues to verify that your bug hasn't already been submitted: 
-    [Issues](https://gitlab.com/distant-horizons-team/distant-horizons/-/issues)
-
-4. [ ] Upload Minecraft's crash report and/or log. \
-   Minecraft crash reports are located in: `.minecraft/crash-reports` \
-   Minecraft logs are located in: `.minecraft/logs`
-
-5. [ ] Upload your Distant Horizons Config. \
-     The config is found in: `.minecraft/configs/DistantHorizons.toml`
-
- 6. [ ] Fill out the information below:
-
- * **minecraft version**:
-
- * **Distant Horizons version**:
-
- * **Mod loader**:
-
- * **Installed mods (list the smallest number of mods that you can use to re-create the bug)**:
- 
- * **Describe the bug**:
-
- * **Steps to reproduce the bug**:
 
+The template will walk you through submitting a bug, feature, or improvement request.

build.gradle

@@ -5,9 +5,6 @@ import org.apache.tools.zip.ZipEntry
 import javax.annotation.Nonnull
 import org.apache.tools.zip.ZipOutputStream
 
-import java.util.function.Function
-import java.util.function.Predicate
-
 
 plugins {
     id "java"
@@ -22,7 +19,7 @@ plugins {
     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.13-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.10-SNAPSHOT" apply false
 }
 
 
@@ -45,10 +42,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");
-        }
     }
     
 
@@ -76,23 +71,12 @@ writeBuildGradlePredefine(rootProject.mcVers, rootProject.mcIndex)
 rootProject.versionStr = rootProject.mod_version + "-" + rootProject.minecraft_version // + "-" + new Date().format("yyyy_MM_dd_HH_mm")
 
 class NativeTransformer implements Transformer {
-    private Predicate<String> fileMatcher
-    private Function<String, String> filePathMapper
-
     private final HashMap<String, String> replacements = new HashMap()
     private final HashMap<String, byte[]> rewrittenFiles = new HashMap()
     private var nativeRelocator
 
     public File rootDir
 
-    void matchFiles(Predicate<String> matcher) {
-        fileMatcher = matcher
-    }
-
-    void mapPaths(Function<String, String> mapper) {
-        filePathMapper = mapper
-    }
-
     void relocateNative(String target, String replacement) {
         if (replacement.length() > target.length()) {
             throw new GradleException("Length of value \"${replacement}\" exceeds the length of \"${target}\": ${replacement.length()} > ${target.length()}")
@@ -103,7 +87,9 @@ class NativeTransformer implements Transformer {
 
     @Override
     boolean canTransformResource(@Nonnull FileTreeElement element) {
-        return fileMatcher.test(element.name)
+        return replacements.keySet().stream().anyMatch {
+            element.name.startsWith(it as String)
+        }
     }
 
     @Override
@@ -115,9 +101,11 @@ class NativeTransformer implements Transformer {
         }
 
         try {
-            String path = filePathMapper != null
+            Map.Entry<String, String> pathReplacement = replacements.entrySet().stream().filter {
-                ? filePathMapper.apply(context.path)
+                context.path.startsWith(it.key as String)
-                : context.path
+            }.findFirst().orElseThrow()
+
+            String path = context.path.replace(pathReplacement.key as String, pathReplacement.value as String)
             content = nativeRelocator.processBinary(path, content, replacements)
 
             rewrittenFiles.put(path, content)
@@ -258,7 +246,8 @@ subprojects { p ->
         // We cannot relocate this library since we call some MC classes that reference it
         implementation("it.unimi.dsi:fastutil:${rootProject.fastutil_version}")
 
-        forgeShadowMe("com.github.luben:zstd-jni:${rootProject.zstd_version}")
+        //forgeShadowMe("com.github.luben:zstd-jni:1.5.7-3")
+        //forgeShadowMe("org.apache.commons:commons-compress:1.27.1")
         
         // Compression
         forgeShadowMe("org.lz4:lz4-java:${rootProject.lz4_version}") // LZ4
@@ -361,30 +350,9 @@ subprojects { p ->
 
         transform(NativeTransformer) {
             rootDir = project.rootDir
-
-            matchFiles { it.startsWith("org/sqlite") }
-            mapPaths { it.replace("org/sqlite", "dh_sqlite") }
-
             relocateNative "org/sqlite", "dh_sqlite"
             relocateNative "org_sqlite", "dh_1sqlite"
         }
-
-        // ZStd
-        // librariesLocation isn't used because it's too long for replacing paths in native libraries
-        // Allowing strings larger than the original string would require shifting the entire binary's contents
-        relocate "com.github.luben", "dhcomgithubluben"
-        relocate "libzstd-jni", "libzstd-jni_dh"
-        relocate "zstd-jni", "zstd-jni_dh"
-
-        transform(NativeTransformer) {
-            rootDir = project.rootDir
-
-            matchFiles { it.contains("libzstd-jni") && !it.contains("aix/ppc64") }
-            mapPaths { it.replace("libzstd-jni", "libzstd-jni_dh") }
-
-            relocateNative "com/github/luben", "dhcomgithubluben"
-            relocateNative "com_github_luben", "dhcomgithubluben"
-        }
         
         
         // JOML

buildSrc/src/main/java/NativeRelocator.java

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

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

@@ -5,16 +5,14 @@ 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;
-import com.seibel.distanthorizons.core.enums.MinecraftTextFormat;
 import com.seibel.distanthorizons.core.jar.ModJarInfo;
 import com.seibel.distanthorizons.core.jar.updater.SelfUpdater;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
@@ -25,8 +23,9 @@ 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;
 import java.util.function.Supplier;
 
@@ -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 createInitialBindings();
-	protected abstract void createInitialClientBindings();
 	protected abstract IEventProxy createClientProxy();
 	protected abstract IEventProxy createServerProxy(boolean isDedicated);
 	protected abstract void initializeModCompat();
@@ -67,7 +65,6 @@ public abstract class AbstractModInitializer
 	public void onInitializeClient()
 	{
 		DependencySetup.createClientBindings();
-		this.createInitialClientBindings();
 		
 		LOGGER.info("Initializing " + ModInfo.READABLE_NAME + " client, firing DhApiBeforeDhInitEvent...");
 		ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeDhInitEvent.class, null);
@@ -86,12 +83,6 @@ public abstract class AbstractModInitializer
 		
 		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);
 	}
 	
@@ -115,8 +106,8 @@ public abstract class AbstractModInitializer
 		this.initializeModCompat();
 		
 		LOGGER.info(ModInfo.READABLE_NAME + " server Initialized, adding event subscribers...");
-		this.commandInitializer = new CommandInitializer();
+		
-		this.subscribeRegisterCommandsEvent(dispatcher -> { this.commandInitializer.initCommands(dispatcher); });
+		this.subscribeRegisterCommandsEvent(dispatcher -> { this.commandInitializer = new CommandInitializer(dispatcher); });
 		
 		this.subscribeServerStartingEvent(server -> 
 		{
@@ -124,7 +115,7 @@ public abstract class AbstractModInitializer
 			
 			this.initConfig();
 			this.postInit();
-			this.commandInitializer.onServerReady();
+			this.commandInitializer.initCommands();
 			
 			this.checkForUpdates();
 			
@@ -142,7 +133,7 @@ public abstract class AbstractModInitializer
 	{
 		DependencySetup.createSharedBindings();
 		SharedApi.init();
-		this.createInitialSharedBindings();
+		this.createInitialBindings();
 	}
 	
 	private void logBuildInfo()
@@ -166,17 +157,12 @@ public abstract class AbstractModInitializer
 			//noinspection unchecked
 			ModAccessorInjector.INSTANCE.bind((Class<? extends IModAccessor>) accessorClass, accessorConstructor.get());
 		}
-		else
-		{
-			LOGGER.debug("Skipping mod compatibility accessor for: ["+modId+"]");
-		}
 	}
 	
 	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()
@@ -197,12 +183,6 @@ public abstract class AbstractModInitializer
 	{
 		LOGGER.info("Running Delayed setup...");
 		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
@@ -240,7 +220,8 @@ public abstract class AbstractModInitializer
 			if (showChatWarnings)
 			{
 				String message =
-					MinecraftTextFormat.ORANGE + "Distant Horizons: Alex's Cave detected." + MinecraftTextFormat.CLEAR_FORMATTING +
+						// orange text
+						"\u00A76" + "Distant Horizons: Alex's Cave detected." + "\u00A7r\n" +
 								"You may have to change Alex's config for DH to render. ";
 				ClientApi.INSTANCE.showChatMessageNextFrame(message);
 			}
@@ -262,7 +243,8 @@ public abstract class AbstractModInitializer
 			if (showChatWarnings)
 			{
 				String message =
-					MinecraftTextFormat.ORANGE + "Distant Horizons: WWOO detected." + MinecraftTextFormat.CLEAR_FORMATTING + "\n" +
+						// orange text
+						"\u00A76" + "Distant Horizons: WWOO detected." + "\u00A7r\n" +
 								wwooWarning;
 				ClientApi.INSTANCE.showChatMessageNextFrame(message);
 			}
@@ -292,7 +274,8 @@ public abstract class AbstractModInitializer
 			if (showChatWarnings)
 			{
 				String message =
-					MinecraftTextFormat.ORANGE + "Distant Horizons: Chunky detected." + MinecraftTextFormat.CLEAR_FORMATTING + "\n" +
+						// orange text
+						"\u00A76" + "Distant Horizons: Chunky detected." + "\u00A7r\n" +
 								chunkyWarning;
 				ClientApi.INSTANCE.showChatMessageNextFrame(message);
 			}

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.dependencyInjection.SingletonInjector;
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+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;
@@ -13,29 +13,22 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IServerPlayerWrapp
 import com.seibel.distanthorizons.coreapi.ModInfo;
 import io.netty.buffer.ByteBufUtil;
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.server.level.ServerPlayer;
-
-#if MC_VER <= MC_1_21_10
 import net.minecraft.resources.ResourceLocation;
-#else
+import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.resources.Identifier;
+import org.apache.logging.log4j.LogManager;
-#endif
 
 import java.io.IOException;
 import java.util.Objects;
 
 public abstract class AbstractPluginPacketSender implements IPluginPacketSender
 {
-	private static final DhLogger LOGGER = new DhLoggerBuilder()
+	private static final ConfigBasedLogger LOGGER = new ConfigBasedLogger(LogManager.getLogger(),
-			.fileLevelConfig(Config.Common.Logging.logNetworkEventToFile)
+			() -> Config.Common.Logging.logNetworkEvent.get());
-			.build();
 	
-	#if MC_VER <= MC_1_20_6
+	#if MC_VER >= MC_1_21_1
-	public static final ResourceLocation WRAPPER_PACKET_RESOURCE = new ResourceLocation(ModInfo.RESOURCE_NAMESPACE, ModInfo.WRAPPER_PACKET_PATH);
-	#elif  MC_VER <= MC_1_21_10
 	public static final ResourceLocation WRAPPER_PACKET_RESOURCE = ResourceLocation.fromNamespaceAndPath(ModInfo.RESOURCE_NAMESPACE, ModInfo.WRAPPER_PACKET_PATH);
 	#else
-	public static final Identifier WRAPPER_PACKET_RESOURCE = Identifier.fromNamespaceAndPath(ModInfo.RESOURCE_NAMESPACE, ModInfo.WRAPPER_PACKET_PATH);
+	public static final ResourceLocation WRAPPER_PACKET_RESOURCE = new ResourceLocation(ModInfo.RESOURCE_NAMESPACE, ModInfo.WRAPPER_PACKET_PATH);
 	#endif
 	
 	// "Forge byte" is an unused packet ID. We have our own system which works with all mod loaders,

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

@@ -3,71 +3,36 @@ package com.seibel.distanthorizons.common.commands;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import net.minecraft.commands.CommandSourceStack;
-import org.jetbrains.annotations.Nullable;
 
 import static com.seibel.distanthorizons.core.network.messages.MessageRegistry.DEBUG_CODEC_CRASH_MESSAGE;
 import static net.minecraft.commands.Commands.literal;
 
-#if MC_VER <= MC_1_21_10
+/**
-#else
+ * Initializes commands of the mod.
-import net.minecraft.server.permissions.PermissionCheck;
+ */
-import net.minecraft.server.permissions.Permissions;
-#endif
-
 public class CommandInitializer
 {
-	private boolean serverReady = false;
+	private final CommandDispatcher<CommandSourceStack> commandDispatcher;
-	
-	#if MC_VER <= MC_1_21_10
-	private static final int REQUIRED_PERMISSION_LEVEL = 4;
-	#else
-	private static final PermissionCheck COMMAND_PERMISSION_CHECK = new PermissionCheck.Require(Permissions.COMMANDS_OWNER);
-	#endif
-	
 	
 	/**
-	 * A received command dispatcher, which is held until the server is ready to initialize the commands.
+	 * Constructs a new instance of this class.
+	 *
+	 * @param commandDispatcher The dispatcher to use for registering commands.
 	 */
-	@Nullable
+	public CommandInitializer(CommandDispatcher<CommandSourceStack> commandDispatcher)
-	private CommandDispatcher<CommandSourceStack> commandDispatcher;
-	
-	/**
-	 * Notify the command initializer that the game is ready to accept commands.
-	 * If {@link CommandInitializer#initCommands(CommandDispatcher)} has been fired before it was ready, it will also initialize the commands.
-	 */
-	public void onServerReady()
 	{
-		this.serverReady = true;
+		this.commandDispatcher = commandDispatcher;
-		if (this.commandDispatcher != null)
-		{
-			this.initCommands(this.commandDispatcher);
-			this.commandDispatcher = null;
-		}
 	}
 	
+	
+	
 	/**
 	 * Initializes all available commands.
-	 * If the game is not ready yet, it stores the dispatcher to initialize the commands later.
-	 *
-	 * @param commandDispatcher The command dispatcher to register commands to.
 	 */
-	public void initCommands(CommandDispatcher<CommandSourceStack> commandDispatcher)
+	public void initCommands()
 	{
-		if (!this.serverReady)
-		{
-			this.commandDispatcher = commandDispatcher;
-			return;
-		}
-		
 		LiteralArgumentBuilder<CommandSourceStack> builder = literal("dh")
-				.requires((source) ->
+				.requires(source -> source.hasPermission(4));
-				{
-					#if MC_VER <= MC_1_21_10
-					return source.hasPermission(REQUIRED_PERMISSION_LEVEL);
-					#else
-					return COMMAND_PERMISSION_CHECK.check(source.permissions());
-					#endif
-				});
 		
 		builder.then(new ConfigCommand().buildCommand());
 		builder.then(new DebugCommand().buildCommand());
@@ -78,7 +43,7 @@ public class CommandInitializer
 			builder.then(new CrashCommand().buildCommand());
 		}
 		
-		commandDispatcher.register(builder);
+		this.commandDispatcher.register(builder);
 	}
 	
 }

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.ConfigBase;
-import com.seibel.distanthorizons.core.config.types.AbstractConfigBase;
+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

@@ -56,11 +56,16 @@ public class DependencySetup
 		SingletonInjector.INSTANCE.bind(IVersionConstants.class, VersionConstants.INSTANCE);
 		SingletonInjector.INSTANCE.bind(IWrapperFactory.class, WrapperFactory.INSTANCE);
 		SingletonInjector.INSTANCE.bind(IKeyedClientLevelManager.class, KeyedClientLevelManager.INSTANCE);
+		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/DependencySetupDoneCheck.java

@@ -17,16 +17,20 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.distanthorizons.neoforge.wrappers.modAccessor;
+package com.seibel.distanthorizons.common.wrappers;
 
-import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IC2meAccessor;
+import java.util.function.Supplier;
 
-public class C2meAccessor implements IC2meAccessor
+public class DependencySetupDoneCheck
 {
-	@Override
+	// TODO move to DependencySetup
-	public String getModName()
+	public static boolean isDone = false;
-	{
+	/** 
-		return "c2me";
+	 * This is used so we can override some MC logic when running
-	}
+	 * in DH's world generator.
+	 * Specifically so we can redirect threads to run on DH threads instead
+	 * of MC threads.
+	 */
+	public static Supplier<Boolean> getIsCurrentThreadDistantGeneratorThread = (() -> { return false; });
 	
 }

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

@@ -78,13 +78,6 @@ public class VersionConstants implements IVersionConstants
 			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";
-		#elif MC_VER == MC_1_21_11
-			return "1.21.11";
 		#else
 			ERROR MC version constant missing
 		#endif

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

@@ -38,7 +38,7 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrappe
 import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.worldGeneration.IBatchGeneratorEnvironmentWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.worldGeneration.AbstractBatchGenerationEnvironmentWrapper;
 import net.minecraft.client.multiplayer.ClientLevel;
 #if MC_VER > MC_1_17_1
 import net.minecraft.core.Holder;
@@ -67,7 +67,7 @@ public class WrapperFactory implements IWrapperFactory
 	//==============//
 	
 	@Override
-	public IBatchGeneratorEnvironmentWrapper createBatchGenerator(IDhLevel targetLevel)
+	public AbstractBatchGenerationEnvironmentWrapper createBatchGenerator(IDhLevel targetLevel)
 	{
 		if (targetLevel instanceof IDhServerLevel)
 		{

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

@@ -1,337 +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 + 1; // +1 to account for the center block
-		
-		int zMin = mutableBlockPos.getZ() - this.smoothingRadiusInBlocks;
-		int zMax = mutableBlockPos.getZ() + this.smoothingRadiusInBlocks + 1;
-		
-		int levelMinY = this.clientLevelWrapper.getMinHeight();
-		
-		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.getX(), mutableBlockPos.getY(), mutableBlockPos.getZ(), levelMinY);
-				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,10 +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 com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper;
 
@@ -45,12 +45,7 @@ import net.minecraft.core.Holder;
 import net.minecraft.core.registries.Registries;
 #endif
 
-#if MC_VER <= MC_1_21_10
 import net.minecraft.resources.ResourceLocation;
-#else
-import net.minecraft.resources.Identifier;
-#endif
-
 import net.minecraft.world.level.biome.Biome;
 
 #if MC_VER >= MC_1_18_2
@@ -62,7 +57,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
@@ -108,7 +103,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)
 		{
@@ -116,10 +111,9 @@ public class BiomeWrapper implements IBiomeWrapper
 		}
 		
 		
-		BiomeWrapper biomeWrapper = WRAPPER_BY_BIOME.get(biome);
+		if (WRAPPER_BY_BIOME.containsKey(biome))
-		if (biomeWrapper != null)
 		{
-			return biomeWrapper;
+			return WRAPPER_BY_BIOME.get(biome);
 		}
 		else
 		{
@@ -221,12 +215,7 @@ public class BiomeWrapper implements IBiomeWrapper
 		Level level = (Level)levelWrapper.getWrappedMcObject();
 		net.minecraft.core.RegistryAccess registryAccess = level.registryAccess();
 		
-		#if MC_VER < MC_1_21_11
 		ResourceLocation resourceLocation;
-		#else
-		Identifier resourceLocation;
-		#endif
-		
 		#if MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1
 		resourceLocation = registryAccess.registryOrThrow(Registry.BIOME_REGISTRY).getKey(this.biome);
 		#elif MC_VER == MC_1_18_2 || MC_VER == MC_1_19_2
@@ -310,7 +299,7 @@ public class BiomeWrapper implements IBiomeWrapper
 				}
 				
 				
-				foundWrapper = getBiomeWrapper(deserializeResult.biome, levelWrapper);
+				foundWrapper = (BiomeWrapper) getBiomeWrapper(deserializeResult.biome, levelWrapper);
 				return foundWrapper;
 			}
 			catch (Exception e)
@@ -333,19 +322,13 @@ public class BiomeWrapper implements IBiomeWrapper
 			throw new IOException("Unable to parse resource location string: [" + resourceLocationString + "].");
 		}
 		
-		#if MC_VER < MC_1_21_11
 		ResourceLocation resourceLocation;
-		#else
-		Identifier resourceLocation;
-		#endif
 		try
 		{
-			#if MC_VER <= MC_1_20_6
+			#if MC_VER < MC_1_21_1
 			resourceLocation = new ResourceLocation(resourceLocationString.substring(0, separatorIndex), resourceLocationString.substring(separatorIndex + 1));
-			#elif MC_VER <= MC_1_21_10
-			resourceLocation = ResourceLocation.fromNamespaceAndPath(resourceLocationString.substring(0, separatorIndex), resourceLocationString.substring(separatorIndex + 1));
 			#else
-			resourceLocation = Identifier.fromNamespaceAndPath(resourceLocationString.substring(0, separatorIndex), resourceLocationString.substring(separatorIndex + 1));
+			resourceLocation = ResourceLocation.fromNamespaceAndPath(resourceLocationString.substring(0, separatorIndex), resourceLocationString.substring(separatorIndex + 1));
 			#endif
 		}
 		catch (Exception e)

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

@@ -28,20 +28,20 @@ import com.seibel.distanthorizons.core.util.LodUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper;
 
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.tags.BlockTags;
 import net.minecraft.world.level.block.BeaconBeamBlock;
 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;
 import java.util.*;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.stream.Stream;
 
 import org.jetbrains.annotations.Nullable;
 
@@ -50,14 +50,12 @@ import net.minecraft.core.Registry;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.EmptyBlockGetter;
 #elif MC_VER == MC_1_18_2 || MC_VER == MC_1_19_2
-import net.minecraft.tags.TagKey;
 import net.minecraft.client.Minecraft;
 import net.minecraft.world.level.Level;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Registry;
 import net.minecraft.world.level.EmptyBlockGetter;
 #else
-import net.minecraft.tags.TagKey;
 import net.minecraft.world.level.Level;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.registries.Registries;
@@ -65,12 +63,6 @@ import net.minecraft.world.level.EmptyBlockGetter;
 import net.minecraft.core.Holder;
 #endif
 
-#if MC_VER <= MC_1_21_10
-import net.minecraft.resources.ResourceLocation;
-#else
-import net.minecraft.resources.Identifier;
-#endif
-
 public class BlockStateWrapper implements IBlockStateWrapper
 {
 	/** example "minecraft:water" */
@@ -80,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<>();
@@ -89,26 +81,12 @@ 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";
-	
-	/** Used to handle older MC versions that don't have an simple way of getting the block's tags */
-	public static final List<String> OLD_BEACON_BASE_BLOCK_NAME_LIST = Arrays.asList(
-		"iron_block",
-		"gold_block",
-		"diamond_block",
-		"emerald_block",
-		"netherite_block"
-	);
 	
 	public static HashSet<IBlockStateWrapper> rendererIgnoredBlocks = null;
 	public static HashSet<IBlockStateWrapper> rendererIgnoredCaveBlocks = null;
 	
 	/** keep track of broken blocks so we don't log every time */
-	#if MC_VER <= MC_1_21_10
 	private static final HashSet<ResourceLocation> BROKEN_RESOURCE_LOCATIONS = new HashSet<>();
-	#else
-	private static final HashSet<Identifier> BROKEN_RESOURCE_LOCATIONS = new HashSet<>();
-	#endif
 	
 	
 	
@@ -188,14 +166,11 @@ public class BlockStateWrapper implements IBlockStateWrapper
 		String lowercaseSerial = this.serialString.toLowerCase();
 		
 		
-		
+		// beacon blocks
-		// beacon base blocks
-		#if MC_VER <= MC_1_18_2
-		// Older MC versions are harder to get block tags, so just use a static list to determine beacon blocks
 		boolean isBeaconBaseBlock = false;
-		for (int i = 0; i < OLD_BEACON_BASE_BLOCK_NAME_LIST.size(); i++)
+		for (int i = 0; i < LodUtil.BEACON_BASE_BLOCK_NAME_LIST.size(); i++)
 		{
-			String baseBlockName = OLD_BEACON_BASE_BLOCK_NAME_LIST.get(i);
+			String baseBlockName = LodUtil.BEACON_BASE_BLOCK_NAME_LIST.get(i);
 			if (lowercaseSerial.contains(baseBlockName))
 			{
 				isBeaconBaseBlock = true;
@@ -203,23 +178,8 @@ public class BlockStateWrapper implements IBlockStateWrapper
 			}
 		}
 		this.isBeaconBaseBlock = isBeaconBaseBlock;
-		#else
-		if (blockState != null)
-		{
-			// check if this block has any tags 
-			Stream<TagKey<Block>> tags = blockState.getTags();
-			this.isBeaconBaseBlock = tags.anyMatch((TagKey<Block> tag) -> tag.location().getPath().toLowerCase().contains("beacon_base_blocks"));
-		}
-		else
-		{
-			this.isBeaconBaseBlock = false;
-		}
-		#endif
-		
-		// beacon block
 		this.isBeaconBlock = lowercaseSerial.contains("minecraft:beacon");
 		
-		
 		// beacon tint color
 		Color beaconTintColor = null;
 		if (this.blockState != null
@@ -255,12 +215,6 @@ public class BlockStateWrapper implements IBlockStateWrapper
 				// bedrock is a special case fully opaque block that does allow beacons through
 				allowsBeaconBeamPassage = true;
 			}
-			else if (lowercaseSerial.contains("minecraft:tinted_glass"))
-			{
-				// tinted glass is a special case where it isn't fully opaque,
-				// but should block beacons
-				allowsBeaconBeamPassage = false;
-			}
 			else if (propagatesSkyLightDown || !canOcclude)
 			{
 				// stairs, cake, fences, etc.
@@ -319,7 +273,7 @@ public class BlockStateWrapper implements IBlockStateWrapper
 		
 		HashSet<String> baseIgnoredBlock = new HashSet<>();
 		baseIgnoredBlock.add(AIR_STRING);
-		rendererIgnoredBlocks = getAllBlockWrappers(Config.Client.Advanced.Graphics.Culling.ignoredRenderBlockCsv, baseIgnoredBlock, levelWrapper);
+		rendererIgnoredBlocks = getBlockWrappers(Config.Client.Advanced.Graphics.Culling.ignoredRenderBlockCsv, baseIgnoredBlock, levelWrapper);
 		return rendererIgnoredBlocks;
 	}
 	/**
@@ -336,7 +290,7 @@ public class BlockStateWrapper implements IBlockStateWrapper
 		
 		HashSet<String> baseIgnoredBlock = new HashSet<>();
 		baseIgnoredBlock.add(AIR_STRING);
-		rendererIgnoredCaveBlocks = getAllBlockWrappers(Config.Client.Advanced.Graphics.Culling.ignoredRenderCaveBlockCsv, baseIgnoredBlock, levelWrapper);
+		rendererIgnoredCaveBlocks = getBlockWrappers(Config.Client.Advanced.Graphics.Culling.ignoredRenderCaveBlockCsv, baseIgnoredBlock, levelWrapper);
 		return rendererIgnoredCaveBlocks;
 	}
 	
@@ -347,7 +301,7 @@ public class BlockStateWrapper implements IBlockStateWrapper
 	
 	// lod builder helpers //
 	
-	private static HashSet<IBlockStateWrapper> getAllBlockWrappers(ConfigEntry<String> config, HashSet<String> baseResourceLocations, ILevelWrapper levelWrapper)
+	private static HashSet<IBlockStateWrapper> getBlockWrappers(ConfigEntry<String> config, HashSet<String> baseResourceLocations, ILevelWrapper levelWrapper)
 	{
 		// get the base blocks 
 		HashSet<String> blockStringList = new HashSet<>();
@@ -363,9 +317,9 @@ public class BlockStateWrapper implements IBlockStateWrapper
 			blockStringList.addAll(Arrays.asList(ignoreBlockCsv.split(",")));
 		}
 		
-		return getAllBlockWrappers(blockStringList, levelWrapper);
+		return getBlockWrappers(blockStringList, levelWrapper);
 	}
-	private static HashSet<IBlockStateWrapper> getAllBlockWrappers(HashSet<String> blockResourceLocationSet, ILevelWrapper levelWrapper)
+	private static HashSet<IBlockStateWrapper> getBlockWrappers(HashSet<String> blockResourceLocationSet, ILevelWrapper levelWrapper)
 	{
 		// deserialize each of the given resource locations
 		HashSet<IBlockStateWrapper> blockStateWrappers = new HashSet<>();
@@ -600,12 +554,7 @@ public class BlockStateWrapper implements IBlockStateWrapper
 		net.minecraft.core.RegistryAccess registryAccess = level.registryAccess();
 		#endif
 		
-		#if MC_VER < MC_1_21_11
 		ResourceLocation resourceLocation;
-		#else
-		Identifier resourceLocation;
-		#endif
-		
 		#if MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1
 		resourceLocation = Registry.BLOCK.getKey(this.blockState.getBlock());
 		#elif MC_VER == MC_1_18_2 || MC_VER == MC_1_19_2
@@ -637,8 +586,7 @@ public class BlockStateWrapper implements IBlockStateWrapper
 		// we need the final string for the concurrent hash map later
 		final String finalResourceStateString = resourceStateString;
 		
-		if (finalResourceStateString.equals(AIR_STRING) 
+		if (finalResourceStateString.equals(AIR_STRING) || finalResourceStateString.equals("")) // the empty string shouldn't normally happen, but just in case
-			|| finalResourceStateString.equals("")) // the empty string shouldn't normally happen, but just in case
 		{
 			return AIR;
 		}
@@ -672,20 +620,13 @@ public class BlockStateWrapper implements IBlockStateWrapper
 				throw new IOException("Unable to parse Resource Location out of string: [" + resourceStateString + "].");
 			}
 			
-			#if MC_VER < MC_1_21_11
 			ResourceLocation resourceLocation;
-			#else
-			Identifier resourceLocation;
-			#endif
-			
 			try
 			{
 				#if MC_VER < MC_1_21_1
 				resourceLocation = new ResourceLocation(resourceStateString.substring(0, separatorIndex), resourceStateString.substring(separatorIndex + 1));
-				#elif MC_VER <= MC_1_21_10
-				resourceLocation = ResourceLocation.fromNamespaceAndPath(resourceStateString.substring(0, separatorIndex), resourceStateString.substring(separatorIndex + 1));
 				#else
-				resourceLocation = Identifier.fromNamespaceAndPath(resourceStateString.substring(0, separatorIndex), resourceStateString.substring(separatorIndex + 1));
+				resourceLocation = ResourceLocation.fromNamespaceAndPath(resourceStateString.substring(0, separatorIndex), resourceStateString.substring(separatorIndex + 1));
 				#endif
 			}
 			catch (Exception e)

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

@@ -20,25 +20,26 @@
 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.block.*;
+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;
+import net.minecraft.world.level.block.RotatedPillarBlock;
 #if MC_VER >= MC_1_19_2
 import net.minecraft.util.RandomSource;
 #else
 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 net.minecraft.world.level.block.state.properties.SlabType;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
@@ -60,9 +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 Minecraft MC = Minecraft.getInstance();
 	
 	private static final HashSet<BlockState> BLOCK_STATES_THAT_NEED_LEVEL = new HashSet<>();
 	private static final HashSet<BlockState> BROKEN_BLOCK_STATES = new HashSet<>();
@@ -79,16 +78,7 @@ public class ClientBlockStateColorCache
 	
 	
 	/** This is the order each direction on a block is processed when attempting to get the texture/color */
-	private static final @Nullable Direction[] COLOR_RESOLUTION_DIRECTION_ORDER = 
+	private static final Direction[] COLOR_RESOLUTION_DIRECTION_ORDER = { Direction.UP, Direction.NORTH, Direction.EAST, Direction.WEST, Direction.SOUTH, Direction.DOWN };
-		{ 
-			Direction.UP,
-			null, // null represents "unculled" faces, IE the top of farmland
-			Direction.NORTH, 
-			Direction.EAST, 
-			Direction.WEST, 
-			Direction.SOUTH, 
-			Direction.DOWN 
-		};
 	
 	private static final int FLOWER_COLOR_SCALE = 5;
 	
@@ -103,10 +93,11 @@ public class ClientBlockStateColorCache
 	
 	private final IClientLevelWrapper clientLevelWrapper;
 	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;
 	
@@ -174,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 = samplingLevel;
-		this.clientLevelWrapper = clientLevelWrapper;
+		this.level = (LevelReader) samplingLevel.getWrappedMcObject();
-		
 		this.resolveColors();
 	}
 	
@@ -241,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();
 				}
@@ -272,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
@@ -290,23 +280,14 @@ public class ClientBlockStateColorCache
 	@Nullable
 	private List<BakedQuad> getQuadsForDirection(@Nullable Direction direction)
 	{
-		BlockState effectiveBlockState = this.blockState;
+		List<BakedQuad> quads = null;
-		
-		// if this block is a slab, use it's double variant so we can get the top face,
-		// otherwise the color will use the side, which isn't as accurate
-		if (this.blockState.getBlock() instanceof SlabBlock)
-		{
-			effectiveBlockState = this.blockState.setValue( SlabBlock.TYPE, SlabType.DOUBLE );
-		}
-		
-		List<BakedQuad> quads;
 		
 		#if MC_VER < MC_1_21_5
-		quads = MC.getModelManager().getBlockModelShaper().
+		quads = Minecraft.getInstance().getModelManager().getBlockModelShaper().
-			getBlockModel(effectiveBlockState).getQuads(effectiveBlockState, direction, RANDOM);
+				getBlockModel(this.blockState).getQuads(this.blockState, direction, RANDOM);
 		#else
-		List<BlockModelPart> blockModelPartList = MC.getModelManager().getBlockModelShaper().
+		List<BlockModelPart> blockModelPartList = Minecraft.getInstance().getModelManager().getBlockModelShaper().
-			getBlockModel(effectiveBlockState).collectParts(RANDOM);
+				getBlockModel(this.blockState).collectParts(RANDOM);
 		
 		quads = new ArrayList<>();
 		if (blockModelPartList != null)
@@ -323,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;
@@ -333,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.
+		// Since ColorMode is set per block, you only need to check this once.
-		if (colorMode != EColorMode.Chisel)
+		if (colorMode != ColorMode.Chisel)
 		{
 			// textures normally use u and v instead of x and y
 			for (int v = 0; v < getTextureHeight(texture); v++)
@@ -352,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:
@@ -371,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;
 					}
@@ -433,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)) 
+		if (!(c > MIN_SRGB_BOUND)) {
-		{
+			c = MIN_SRGB_BOUND;
-			color = MIN_SRGB_BOUND;
 		}
 		
-		if (color > MAX_SRGB_BOUND) 
+		if (c > MAX_SRGB_BOUND) {
-		{
+			c = MAX_SRGB_BOUND;
-			color = 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;
@@ -458,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()));
 	}
 	
 	
@@ -467,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)
@@ -491,27 +470,13 @@ public class ClientBlockStateColorCache
 			{
 				try
 				{
-					TintWithoutLevelOverrider tintOverride = TintWithoutLevelOverrideGetter.get();
+					tintColor = Minecraft.getInstance().getBlockColors()
-					tintOverride.update(biomeWrapper, this.blockStateWrapper, fullDataSource, this.clientLevelWrapper);
+							.getColor(this.blockState, new TintWithoutLevelOverrider(biome, this.clientLevelWrapper), McObjectConverter.Convert(pos), this.tintIndex);
-					
-					// 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);
-					}
 				}
 				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);
 				}
 			}
@@ -519,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
-				
+				tintColor = Minecraft.getInstance().getBlockColors()
-				TintGetterOverride tintOverride = TintOverrideGetter.get();
+						.getColor(this.blockState, new TintGetterOverrideFast(this.level), McObjectConverter.Convert(pos), this.tintIndex);
-				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);
-				}
 			}
 		}
 		catch (Exception e)
@@ -542,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);
 			}
 		}
@@ -566,7 +519,7 @@ public class ClientBlockStateColorCache
 	// helper classes //
 	//================//
 	
-	private enum EColorMode
+	enum ColorMode
 	{
 		Default,
 		Flower,
@@ -574,24 +527,12 @@ public class ClientBlockStateColorCache
 		Chisel,
 		Glass;
 		
-		static EColorMode getColorMode(Block block)
+		static ColorMode getColorMode(Block block)
 		{
-			if (block instanceof LeavesBlock)
+			if (block instanceof LeavesBlock) return Leaves;
-			{
+			if (block instanceof FlowerBlock) return Flower;
-				return Leaves;
+			if (block.toString().contains("glass")) return Glass;
-			}
+			if (block.toString().equals("Block{chiselsandbits:chiseled}")) return Chisel;
-			if (block instanceof FlowerBlock)
-			{
-				return Flower;
-			}
-			if (block.toString().contains("glass"))
-			{
-				return Glass;
-			}
-			if (block.toString().equals("Block{chiselsandbits:chiseled}"))
-			{
-				return Chisel;
-			}
 			return Default;
 		}
 	}

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 TintGetterOverrideFast(LevelReader parent) { this.parent = parent; }
-	
-	public void update(BiomeWrapper biomeWrapper, BlockStateWrapper blockStateWrapper, FullDataSourceV2 fullDataSource, IClientLevelWrapper clientLevelWrapper)
-	{
-		super.update(biomeWrapper, blockStateWrapper, fullDataSource, clientLevelWrapper);
-		this.parent = (LevelReader)this.clientLevelWrapper.getWrappedMcObject();
-	}
 	
 	
 	
@@ -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,26 +19,52 @@
 
 package com.seibel.distanthorizons.common.wrappers.block;
 
-import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
-import net.minecraft.world.level.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.apache.logging.log4j.Logger;
+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
+
+import java.io.IOException;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+public class TintWithoutLevelOverrider implements BlockAndTintGetter
 {
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	
+	#if MC_VER < MC_1_18_2
+	public static final ConcurrentMap<String, Biome> BIOME_BY_RESOURCE_STRING = new ConcurrentHashMap<>();
+	#else
+	public static final ConcurrentMap<String, Holder<Biome>> BIOME_BY_RESOURCE_STRING = new ConcurrentHashMap<>();
+    #endif
+	
+	
+	@NotNull
+	private final BiomeWrapper biomeWrapper;
+	
+	
 	
 	//=============//
 	// constructor //
 	//=============//
 	
-	public TintWithoutLevelOverrider()
+	public TintWithoutLevelOverrider(@NotNull BiomeWrapper biomeWrapper, IClientLevelWrapper clientLevelWrapper)
-	{ }
+	{ this.biomeWrapper = biomeWrapper; }
 	
 	
 	
@@ -47,22 +73,145 @@ public class TintWithoutLevelOverrider extends AbstractDhTintGetter
 	//=========//
 	
 	@Override
-	public float getShade(Direction direction, boolean shade)
+	public int getBlockTint(@NotNull BlockPos blockPos, @NotNull ColorResolver colorResolver)
-	{ throw new UnsupportedOperationException("ERROR: getShade() called on TintWithoutLevelOverrider. Object is for tinting only."); }
+	{
-	@Override
+		String biomeString = this.biomeWrapper.getSerialString();
-	public LevelLightEngine getLightEngine()
+		if (biomeString == null 
-	{ throw new UnsupportedOperationException("ERROR: getLightEngine() called on TintWithoutLevelOverrider. Object is for tinting only."); }
+			|| biomeString.isEmpty() 
-	@Nullable
+			|| biomeString.equals(BiomeWrapper.EMPTY_BIOME_STRING))
-	@Override
+		{
-	public BlockEntity getBlockEntity(BlockPos pos)
+			// default to "plains" for empty/invalid biomes
-	{ throw new UnsupportedOperationException("ERROR: getBlockEntity() called on TintWithoutLevelOverrider. Object is for tinting only."); }
+			biomeString = "minecraft:plains";
+		}
+		
+		
+		return colorResolver.getColor(unwrap(getClientBiome(biomeString)), blockPos.getX(), blockPos.getZ());
+	}
+	private static Biome unwrap(#if MC_VER >= MC_1_18_2 Holder<Biome> #else Biome #endif biome)
+	{
+		#if MC_VER >= MC_1_18_2
+		return biome.value();
+		#else
+		return biome;
+		#endif
+	}
+	
+	/**
+	 * <p>Previously, this class might have immediately unwrapped the Holder like this:</p>
+	 * <pre>{@code
+	 * // Inside constructor (OLD WAY - PROBLEMATIC):
+	 * Holder<Biome> biomeHolder = getTheHolderFromSomewhere();
+	 * this.biome = biomeHolder.value(); // <-- PROBLEM HERE
+	 * }</pre>
+	 *
+	 * <p>This approach is problematic because the {@link net.minecraft.core.Holder} system,
+	 * particularly {@code Holder.Reference}, is designed for <strong>late binding</strong>. Here's why storing
+	 * the Holder itself is now necessary:</p>
+	 * <ol>
+	 *   <li>A {@code Holder.Reference<Biome>} might be created initially just with a
+	 *       {@link net.minecraft.resources.ResourceKey} (like {@code minecraft:plains}), but its actual
+	 *       {@link net.minecraft.core.Holder#value() value()} (the {@code Biome} object itself) might be {@code null}
+	 *       at construction time.</li>
+	 *   <li>Later, during game loading, registry population, or potentially due to modifications by other mods
+	 *       (e.g., Polytone), the system calls internal binding methods (like {@code bindValue(Biome)})
+	 *       on the {@code Holder} instance. This sets or <strong>updates</strong> the internal reference to the
+	 *       actual {@code Biome} object.</li>
+	 *   <li>Crucially, the binding process might assign a completely <strong>new</strong> {@code Biome} object
+	 *       instance to the {@code Holder} reference, replacing any previous one.</li>
+	 * </ol>
+	 *
+	 * <p>If we unwrapped the {@code Holder} using {@code .value()} within the constructor (the old way),
+	 * our class's internal {@code biome} field would permanently store a reference to whatever {@code Biome}
+	 * object the {@code Holder} pointed to *at that exact moment*. It would have no link back to the
+	 * {@code Holder} and would be unaware if the {@code Holder} was later updated to point to a different
+	 * (or the initially missing) {@code Biome} object. This would lead to using stale or even {@code null} data.</p>
+	 *
+	 * <p>By storing the {@code Holder<Biome>} itself, this class can call {@link net.minecraft.core.Holder#value()}
+	 * whenever the biome information is needed, ensuring it always retrieves the most current {@code Biome}
+	 * instance associated with the holder at that time.</p>
+	 */
+	private static #if MC_VER < MC_1_18_2 Biome #else Holder<Biome> #endif getClientBiome(String biomeResourceString)
+	{
+		// cache the client biomes so we don't have to re-parse the resource location every time
+		return BIOME_BY_RESOURCE_STRING.compute(biomeResourceString, 
+			(resourceString, existingBiome) -> 
+			{ 
+				if (existingBiome != null)
+				{
+					return existingBiome;
+				}
+				
+				ClientLevel clientLevel = Minecraft.getInstance().level;
+				if (clientLevel == null)
+				{
+					// shouldn't happen, but just in case
+					throw new IllegalStateException("Attempted to get client biome when no client level was loaded.");
+				}
+				
+				BiomeWrapper.BiomeDeserializeResult result;
+				try
+				{
+					result = BiomeWrapper.deserializeBiome(resourceString, clientLevel.registryAccess());
+				}
+				catch (Exception e)
+				{
+					LOGGER.warn("Unable to deserialize client biome ["+resourceString+"], using fallback...");
+					
+					try
+					{
+						result = BiomeWrapper.deserializeBiome("minecraft:plains", clientLevel.registryAccess());
+					}
+					catch (IOException ex)
+					{
+						// should never happen, if it does this log will explode, but just in case
+						LOGGER.error("Unable to deserialize fallback client biome [minecraft:plains], returning NULL.");
+						return null;
+					}
+				}
+				
+				if (result.success)
+				{
+					existingBiome = result.biome;
+				}
+				
+				return existingBiome;
+			});
+	}
+	
+	
+	
+	//================//
+	// unused methods //
+	//================//
 	
 	@Override
-	public BlockState getBlockState(BlockPos pos)
+	public float getShade(@NotNull Direction direction, boolean shade)
-	{ throw new UnsupportedOperationException("ERROR: getBlockState() called on TintWithoutLevelOverrider. Object is for tinting only."); }
+	{
+		throw new UnsupportedOperationException("ERROR: getShade() called on TintWithoutLevelOverrider. Object is for tinting only.");
+	}
 	@Override
-	public FluidState getFluidState(BlockPos pos)
+	public @NotNull LevelLightEngine getLightEngine()
-	{ throw new UnsupportedOperationException("ERROR: getFluidState() called on TintWithoutLevelOverrider. Object is for tinting only."); }
+	{
+		throw new UnsupportedOperationException("ERROR: getLightEngine() called on TintWithoutLevelOverrider. Object is for tinting only.");
+	}
+	@Nullable
+	@Override
+	public BlockEntity getBlockEntity(@NotNull BlockPos pos)
+	{
+		throw new UnsupportedOperationException("ERROR: getBlockEntity() called on TintWithoutLevelOverrider. Object is for tinting only.");
+	}
+	
+	@Override
+	public @NotNull BlockState getBlockState(@NotNull BlockPos pos)
+	{
+		throw new UnsupportedOperationException("ERROR: getBlockState() called on TintWithoutLevelOverrider. Object is for tinting only.");
+	}
+	@Override
+	public @NotNull FluidState getFluidState(@NotNull BlockPos pos)
+	{
+		throw new UnsupportedOperationException("ERROR: getFluidState() called on TintWithoutLevelOverrider. Object is for tinting only.");
+	}
+	
 	
 	
 	//==============//
@@ -78,7 +227,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

@@ -18,10 +18,10 @@
  */
 package com.seibel.distanthorizons.common.wrappers.chunk;
 
-import com.seibel.distanthorizons.api.DhApi;
 import com.seibel.distanthorizons.common.wrappers.block.BiomeWrapper;
 import com.seibel.distanthorizons.common.wrappers.block.BlockStateWrapper;
 import com.seibel.distanthorizons.common.wrappers.misc.MutableBlockPosWrapper;
+import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos;
 import com.seibel.distanthorizons.core.pos.DhChunkPos;
@@ -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,14 +75,12 @@ 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());
 	private static final ThreadLocal<MutableBlockPosWrapper> MUTABLE_BLOCK_POS_WRAPPER_REF = ThreadLocal.withInitial(() -> new MutableBlockPosWrapper());
 	
-	private static boolean heightmapThreadWarningLogged = false;
-	
 	
 	private final ChunkAccess chunk;
 	private final DhChunkPos chunkPos;
@@ -100,9 +98,9 @@ public class ChunkWrapper implements IChunkWrapper
 	private int maxNonEmptyHeight = Integer.MAX_VALUE;
 	
 	/** will be null if we are using MC heightmaps */
-	private int[][] solidHeightMap = null;
+	private final int[][] solidHeightMap;
 	/** will be null if we are using MC heightmaps */
-	private int[][] lightBlockingHeightMap = null;
+	private final int[][] lightBlockingHeightMap;
 	
 	
 	
@@ -110,21 +108,27 @@ public class ChunkWrapper implements IChunkWrapper
 	// constructor //
 	//=============//
 	
-	/**
-	 * Note: this constructor should be very
-	 * fast since it will be called frequently on the MC
-	 * server thread and a slow method will cause server lag.
-	 */
 	public ChunkWrapper(ChunkAccess chunk, ILevelWrapper wrappedLevel)
 	{
 		this.chunk = chunk;
 		this.wrappedLevel = wrappedLevel;
 		this.chunkPos = new DhChunkPos(chunk.getPos().x, chunk.getPos().z);
+		
+		// use DH heightmaps if requested
+		if (Config.Common.LodBuilding.recalculateChunkHeightmaps.get())
+		{
+			this.solidHeightMap = new int[LodUtil.CHUNK_WIDTH][LodUtil.CHUNK_WIDTH];
+			this.lightBlockingHeightMap = new int[LodUtil.CHUNK_WIDTH][LodUtil.CHUNK_WIDTH];
+			
+			this.recalculateDhHeightMapsIfNeeded();
+		}
+		else
+		{
+			this.solidHeightMap = null;
+			this.lightBlockingHeightMap = null;
+		}
 	}
 	
-	@Override
-	public ChunkWrapper copy() { return new ChunkWrapper(this.chunk, this.wrappedLevel); }
-	
 	
 	
 	//=========//
@@ -244,63 +248,56 @@ public class ChunkWrapper implements IChunkWrapper
 	}
 	private int getChunkSectionMinHeight(int index) { return (index * 16) + this.getInclusiveMinBuildHeight(); }
 	
-	@Override
+	/** Will only run if the config says the MC heightmaps shouldn't be trusted. */
-	public void createDhHeightMaps()
+	public void recalculateDhHeightMapsIfNeeded()
 	{
-		if (heightmapThreadWarningLogged 
+		// re-calculate the min/max heights for consistency (during world gen these may be wrong)
-			&& !DhApi.isDhThread())
+		this.minNonEmptyHeight = Integer.MIN_VALUE;
+		this.maxNonEmptyHeight = Integer.MAX_VALUE;
+		
+		
+		// recalculate heightmaps if needed
+		if (this.solidHeightMap != null)
 		{
-			LOGGER.warn("ChunkWrapper Height maps created on non-DH thread ["+Thread.currentThread().getName()+"]. This may cause stuttering.");
+			for (int x = 0; x < LodUtil.CHUNK_WIDTH; x++)
-		}
-		
-		
-		
-		this.solidHeightMap = new int[LodUtil.CHUNK_WIDTH][LodUtil.CHUNK_WIDTH];
-		this.lightBlockingHeightMap = new int[LodUtil.CHUNK_WIDTH][LodUtil.CHUNK_WIDTH];
-		
-		for (int x = 0; x < LodUtil.CHUNK_WIDTH; x++)
-		{
-			for (int z = 0; z < LodUtil.CHUNK_WIDTH; z++)
 			{
-				int minInclusiveBuildHeight = this.getMinNonEmptyHeight();
+				for (int z = 0; z < LodUtil.CHUNK_WIDTH; z++)
-				// if no blocks are found the height map will be at the bottom of the world
-				int solidHeight = minInclusiveBuildHeight;
-				int lightBlockingHeight = minInclusiveBuildHeight;
-				
-				
-				int y = this.getMaxNonEmptyHeight(); //this.getExclusiveMaxBuildHeight();
-				IBlockStateWrapper block = this.getBlockState(x, y, z);
-				while (// go down until we reach the minimum build height
-						y > minInclusiveBuildHeight
-						// keep going until we find both height map values
-						&& 
-						(
-							solidHeight == minInclusiveBuildHeight 
-							|| lightBlockingHeight == minInclusiveBuildHeight
-						)
-					)
 				{
-					// is this block solid?
+					int minInclusiveBuildHeight = this.getMinNonEmptyHeight();
-					if (solidHeight == minInclusiveBuildHeight
+					// if no blocks are found the height map will be at the bottom of the world
-						&& block.isSolid())
+					int solidHeight = minInclusiveBuildHeight;
+					int lightBlockingHeight = minInclusiveBuildHeight;
+					
+					
+					int y = this.getMaxNonEmptyHeight(); //this.getExclusiveMaxBuildHeight();
+					IBlockStateWrapper block = this.getBlockState(x, y, z);
+					while (// go down until we reach the minimum build height
+							y > minInclusiveBuildHeight
+							// keep going until we find both height map values
+							&& (solidHeight == minInclusiveBuildHeight || lightBlockingHeight == minInclusiveBuildHeight))
 					{
-						solidHeight = y;
+						// is this block solid?
+						if (solidHeight == minInclusiveBuildHeight
+							&& block.isSolid())
+						{
+							solidHeight = y;
+						}
+						
+						// is this block light blocking?
+						if (lightBlockingHeight == minInclusiveBuildHeight
+							&& block.getOpacity() != LodUtil.BLOCK_FULLY_TRANSPARENT)
+						{
+							lightBlockingHeight = y;
+						}
+						
+						// get the next block down
+						y--;
+						block = this.getBlockState(x, y, z);
 					}
 					
-					// is this block light blocking?
+					this.solidHeightMap[x][z] = solidHeight;
-					if (lightBlockingHeight == minInclusiveBuildHeight
+					this.lightBlockingHeightMap[x][z] = lightBlockingHeight;
-						&& block.getOpacity() != LodUtil.BLOCK_FULLY_TRANSPARENT)
-					{
-						lightBlockingHeight = y;
-					}
-					
-					// get the next block down
-					y--;
-					block = this.getBlockState(x, y, z);
 				}
-				
-				this.solidHeightMap[x][z] = solidHeight;
-				this.lightBlockingHeightMap[x][z] = lightBlockingHeight;
 			}
 		}
 	}
@@ -620,6 +617,15 @@ public class ChunkWrapper implements IChunkWrapper
 	
 	
 	
+	//===============//
+	// other methods //
+	//===============//
+	
+	@Override
+	public boolean isStillValid() { return this.wrappedLevel.tryGetChunk(this.chunkPos) == this; }
+	
+	
+	
 	//================//
 	// base overrides //
 	//================//

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

@@ -1,98 +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.world.level.Level;
-import net.minecraft.world.level.chunk.LevelChunk;
-
-#if MC_VER <= MC_1_21_10
-import net.minecraft.resources.ResourceLocation;
-#endif
-
-#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
-				#if MC_VER <= MC_1_21_10
-				ResourceLocation.fromNamespaceAndPath(ModInfo.RESOURCE_NAMESPACE, "distant_horizons"),
-				#else
-				"distant_horizons",
-				#endif	
-				
-				// 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/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 type
-	
-	public enum EType
 	{
 		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
+		// Generate the language
-		//  but this will only work once MC has added our lang file,
+		// This shouldn't be here, but I need a way to test it after Minecraft inits its assets
-		//  which won't be for sure added until we request a GUI
+		//System.out.println(ConfigBase.INSTANCE.generateLang(false, true));
-		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);
-			}
-		}
-		
 		
 		switch (useScreen)
 		{
 			case Classic:
-				return ClassicConfigGUI.getScreen(parent, "client");
+				return ClassicConfigGUI.getScreen(ConfigBase.INSTANCE, parent, "client");
-			case JavaSwing:
+			case OpenGL:
-				//return MinecraftScreen.getScreen(parent, new JavaScreenHandlerScreen(new ConfigScreen()), ModInfo.ID + ".title");
+				MinecraftScreen.getScreen(parent, new OpenGLConfigScreen(), ModInfo.ID + ".title");
-				return MinecraftScreen.getScreen(parent, new JavaScreenHandlerScreen(new JavaScreenHandlerScreen.ExampleScreen()), 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();
+			screen.width = mcWindow.getWidth();
-			this.screen.height = mcWindow.getHeight();
+			screen.height = mcWindow.getHeight();
-			this.screen.scaledWidth = this.width;
+			screen.scaledWidth = this.width;
-			this.screen.scaledHeight = this.height;
+			screen.scaledHeight = this.height;
-			this.screen.init(); // Init our own config screen
+			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.list.setRenderBackground(false); // Disable from rendering
-				this.configListWidget.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,71 +78,58 @@ 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)
+			screen.mouseX = mouseX;
-			
+			screen.mouseY = mouseY;
-			this.screen.mouseX = mouseX;
+			screen.render(delta); // Render everything on the main screen
-			this.screen.mouseY = mouseY;
-			this.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)
 		}
 		
-		#if MC_VER <= MC_1_21_10
 		@Override
 		public void resize(Minecraft mc, int width, int height)
-		#else
-		@Override
-		public void resize(int width, int height)
-		#endif
 		{
-			// Resize Minecraft's screen
+			super.resize(mc, width, height); // Resize Minecraft's screen
-			#if MC_VER <= MC_1_21_10
-			super.resize(mc, width, height);
-			#else
-			super.resize(width, height);
-			#endif
-			
-			
 			Window mcWindow = this.minecraft.getWindow();
-			this.screen.width = mcWindow.getWidth();
+			screen.width = mcWindow.getWidth();
-			this.screen.height = mcWindow.getHeight();
+			screen.height = mcWindow.getHeight();
-			this.screen.scaledWidth = this.width;
+			screen.scaledWidth = this.width;
-			this.screen.scaledHeight = this.height;
+			screen.scaledHeight = this.height;
-			this.screen.onResize(); // Resize our screen
+			screen.onResize(); // Resize our screen
 		}
 		
 		@Override
 		public void tick()
 		{
 			super.tick(); // Tick Minecraft's screen
-			this.screen.tick(); // Tick our screen
+			screen.tick(); // Tick our screen
-			if (this.screen.close) // If we decide to close the screen, then actually close the screen
+			if (screen.close) // If we decide to close the screen, then actually close the screen
-			{
+				onClose();
-				this.onClose();
-			}
 		}
 		
 		@Override
 		public void onClose()
 		{
-			this.screen.onClose(); // Close our screen
+			screen.onClose(); // Close our screen
-			Objects.requireNonNull(this.minecraft).setScreen(this.parent); // Goto the parent 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

@@ -20,6 +20,7 @@
 package com.seibel.distanthorizons.common.wrappers.gui;
 
 import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
 
 #if MC_VER >= MC_1_17_1
 import net.minecraft.client.gui.components.Button;
@@ -41,19 +42,10 @@ 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;
-#elif MC_VER <= MC_1_21_10
+#else
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.RenderPipelines;
-#else
-import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.client.renderer.RenderPipelines;
-#endif
-
-#if MC_VER <= MC_1_21_10
-import net.minecraft.resources.ResourceLocation;
-#else
-import net.minecraft.resources.Identifier;
 #endif
 
 /**
@@ -75,33 +67,18 @@ public class TexturedButtonWidget extends Button
 	private final int v;
 	private final int hoveredVOffset;
 	
-	#if MC_VER <= MC_1_21_10 
 	private final ResourceLocation textureResourceLocation;
-	#else
-	private final Identifier textureResourceLocation;
-	#endif
 	
 	private final int textureWidth;
 	private final int textureHeight;
 	#endif
 	
 	
-	public TexturedButtonWidget(
+	public TexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, ResourceLocation textureResourceLocation, int textureWidth, int textureHeight, OnPress pressAction, Component text) 
-		int x, int y, int width, int height, int u, int v, int hoveredVOffset, 
-		#if MC_VER <= MC_1_21_10 ResourceLocation textureResourceLocation, 
-		#else Identifier textureResourceLocation, 
-		#endif 
-		int textureWidth, int textureHeight, OnPress pressAction, Component text) 
 	{
 		this(x, y, width, height, u, v, hoveredVOffset, textureResourceLocation, textureWidth, textureHeight, pressAction, text, true);
 	}
-	public TexturedButtonWidget(
+	public TexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, ResourceLocation textureResourceLocation, int textureWidth, int textureHeight, OnPress pressAction, Component text, boolean renderBackground)
-		int x, int y, int width, int height, int u, int v, int hoveredVOffset, 
-		#if MC_VER <= MC_1_21_10 ResourceLocation textureResourceLocation, 
-		#else Identifier textureResourceLocation, 
-		#endif
-		int textureWidth, int textureHeight, OnPress pressAction, Component text, 
-		boolean renderBackground)
 	{
 		#if MC_VER < MC_1_20_2
 		super(x, y, width, height, u, v, hoveredVOffset, textureResourceLocation, textureWidth, textureHeight, pressAction, text);
@@ -192,13 +169,8 @@ public class TexturedButtonWidget extends Button
 	#endif
 	
 	#else
-		#if MC_VER < MC_1_21_11
 	@Override
 	public void renderWidget(GuiGraphics matrices, int mouseX, int mouseY, float delta)
-		#else
-	@Override 
-	protected void renderContents(GuiGraphics matrices, int mouseX, int mouseY, float delta)
-		#endif
 	{
 		if (this.renderBackground)
 		{

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
+			matrices.drawString(textRenderer, this.text, 12, y + 5, 0xFFFFFF);
-		@Override 
+		}
-		public void renderContent(GuiGraphics matrices, int y, int x, boolean hovered, float tickDelta)
-		{ 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

@@ -9,21 +9,14 @@ import com.seibel.distanthorizons.coreapi.ModInfo;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.jar.installer.ModrinthGetter;
 import com.seibel.distanthorizons.core.jar.updater.SelfUpdater;
-import com.seibel.distanthorizons.core.logging.DhLogger;
-
-import net.minecraft.client.gui.screens.Screen;
-
 #if MC_VER >= MC_1_20_1
 import net.minecraft.client.gui.GuiGraphics;
 #else
 import com.mojang.blaze3d.vertex.PoseStack;
 #endif
-
+import net.minecraft.client.gui.screens.Screen;
-#if MC_VER <= MC_1_21_10
 import net.minecraft.resources.ResourceLocation;
-#else
+import org.apache.logging.log4j.Logger;
-import net.minecraft.resources.Identifier;
-#endif
 
 import static com.seibel.distanthorizons.common.wrappers.gui.GuiHelper.*;
 
@@ -38,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;
@@ -95,12 +88,10 @@ public class UpdateModScreen extends DhScreen
 					0, 0,
 					// Some textuary stuff
 					0, 
-					#if MC_VER <= MC_1_20_6
+					#if MC_VER < MC_1_21_1
 					new ResourceLocation(ModInfo.ID, "logo.png"),
-					#elif MC_VER <= MC_1_21_10
-					ResourceLocation.fromNamespaceAndPath(ModInfo.ID, "logo.png"),
 					#else
-					Identifier.fromNamespaceAndPath(ModInfo.ID, "logo.png"),
+					ResourceLocation.fromNamespaceAndPath(ModInfo.ID, "logo.png"),
 					#endif
 					195, 65,
 					// Create the button and tell it where to go
@@ -120,26 +111,24 @@ public class UpdateModScreen extends DhScreen
 		if (!ModInfo.IS_DEV_BUILD)
 		{
 			this.addBtn(new TexturedButtonWidget(
-				// Where the button is on the screen
+					// Where the button is on the screen
-				this.width / 2 - 97, this.height / 2 + 8,
+					this.width / 2 - 97, this.height / 2 + 8,
-				// Width and height of the button
+					// Width and height of the button
-				20, 20,
+					20, 20,
-				// Offset
+					// Offset
-				0, 0,
+					0, 0,
-				// Some textuary stuff
+					// Some textuary stuff
-				0, 
+					0, 
-				#if MC_VER < MC_1_21_1
+					#if MC_VER < MC_1_21_1
-				new ResourceLocation(ModInfo.ID, "textures/gui/changelog.png"),
+					new ResourceLocation(ModInfo.ID, "textures/gui/changelog.png"),
-				#elif MC_VER <= MC_1_21_10
+					#else
-				ResourceLocation.fromNamespaceAndPath(ModInfo.ID, "textures/gui/changelog.png"),
+					ResourceLocation.fromNamespaceAndPath(ModInfo.ID, "textures/gui/changelog.png"),
-				#else
+					#endif
-				Identifier.fromNamespaceAndPath(ModInfo.ID, "textures/gui/changelog.png"),
+					20, 20,
-				#endif
+					// Create the button and tell it where to go
-				20, 20,
+					(buttonWidget) -> Objects.requireNonNull(minecraft).setScreen(new ChangelogScreen(this, this.newVersionID)), // TODO: Add a proper easter egg to pressing the logo (maybe with confetti)
-				// Create the button and tell it where to go
+					// Add a title to the button
-				(buttonWidget) -> Objects.requireNonNull(this.minecraft).setScreen(new ChangelogScreen(this, this.newVersionID)),
+					Translatable(ModInfo.ID + ".updater.title")
-				// Add a title to the button
-				Translatable(ModInfo.ID + ".updater.title")
 			));
 		}
 		

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;
 	
 	
 	
-	//=============//
+	public ServerKeyedClientLevel(ClientLevel level, String serverLevelKey)
-	// constructor //
-	//=============//
-	
-	public ServerKeyedClientLevelWrapper(ClientLevel level, String serverKey, 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

@@ -20,36 +20,44 @@
 package com.seibel.distanthorizons.common.wrappers.minecraft;
 
 import java.io.File;
+import java.lang.invoke.MethodHandles;
+import java.util.ArrayList;
+import java.util.Objects;
+import java.util.UUID;
 
-import com.mojang.blaze3d.platform.Window;
+import com.mojang.blaze3d.platform.NativeImage;
+import com.seibel.distanthorizons.api.enums.config.EDhApiLodShading;
+import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
 import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
+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;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IProfilerWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
 import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos;
 import com.seibel.distanthorizons.core.pos.DhChunkPos;
-import com.seibel.distanthorizons.core.logging.DhLogger;
 
 import net.minecraft.CrashReport;
-import net.minecraft.client.CloudStatus;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.multiplayer.ServerData;
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.core.BlockPos;
-import net.minecraft.util.profiling.ProfilerFiller;
+import net.minecraft.core.Direction;
-import net.minecraft.world.level.ChunkPos;
-
-import org.jetbrains.annotations.Nullable;
-
 #if MC_VER < MC_1_19_2
 import net.minecraft.network.chat.TextComponent;
 #endif
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.util.profiling.ProfilerFiller;
+import net.minecraft.world.level.ChunkPos;
+import org.apache.logging.log4j.Logger;
+import org.jetbrains.annotations.Nullable;
 
 #if MC_VER < MC_1_21_3
 #else
@@ -63,34 +71,95 @@ 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();
 	
 	
+	
+	/**
+	 * The lightmap for the current:
+	 * Time, dimension, brightness setting, etc.
+	 */
+	private NativeImage lightMap = null;
+	
 	private ProfilerWrapper profilerWrapper;
 	
 	
+	private MinecraftClientWrapper()
+	{
+		
+	}
 	
-	//======================//
+	
-	// multiplayer handling //
+	
-	//======================//
+	//================//
+	// helper methods //
+	//================//
+	
+	/**
+	 * This should be called at the beginning of every frame to
+	 * clear any Minecraft data that becomes out of date after a frame. <br> <br>
+	 * <p>
+	 * LightMaps and other time sensitive objects fall in this category. <br> <br>
+	 * <p>
+	 * This doesn't affect OpenGL objects in any way.
+	 */
+	@Override
+	public void clearFrameObjectCache() { this.lightMap = null; }
+	
+	
+	
+	//=================//
+	// method wrappers //
+	//=================//
+	
+	@Override
+	public float getShade(EDhDirection lodDirection)
+	{
+		EDhApiLodShading lodShading = Config.Client.Advanced.Graphics.Quality.lodShading.get();
+		switch (lodShading)
+		{
+			default:
+			case AUTO:
+				if (MINECRAFT.level != null)
+				{
+					Direction mcDir = McObjectConverter.Convert(lodDirection);
+					return MINECRAFT.level.getShade(mcDir, true);
+				}
+				else
+				{
+					return 0.0f;
+				}
+			
+			case ENABLED:
+				switch (lodDirection)
+				{
+					case DOWN:
+						return 0.5F;
+					default:
+					case UP:
+						return 1.0F;
+					case NORTH:
+					case SOUTH:
+						return 0.8F;
+					case WEST:
+					case EAST:
+						return 0.6F;
+				}
+			
+			case DISABLED:
+				return 1.0F;
+		}
+	}
 	
 	@Override
 	public boolean hasSinglePlayerServer() { return MINECRAFT.hasSingleplayerServer(); }
 	@Override
-	public boolean clientConnectedToDedicatedServer() 
+	public boolean clientConnectedToDedicatedServer() { return MINECRAFT.getCurrentServer() != null && !this.hasSinglePlayerServer(); }
-	{ 
-		return MINECRAFT.getCurrentServer() != null 
-				&& !this.hasSinglePlayerServer(); 
-	}
 	@Override
-	public boolean connectedToReplay() 
+	public boolean connectedToReplay() { return !MINECRAFT.hasSingleplayerServer() && MINECRAFT.getCurrentServer() == null; }
-	{ 
-		return MINECRAFT.getCurrentServer() == null
-				&& !this.hasSinglePlayerServer() ; 
-	}
 	
 	@Override
 	public String getCurrentServerName() 
@@ -105,6 +174,7 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
 			return (server != null) ? server.name : "NULL";
 		}
 	}
+	
 	@Override
 	public String getCurrentServerIp() 
 	{
@@ -118,6 +188,7 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
 			return (server != null) ? server.ip : "NA";
 		}
 	}
+	
 	@Override
 	public String getCurrentServerVersion()
 	{
@@ -125,17 +196,21 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
 		return (server != null) ? server.version.getString() : "UNKOWN";
 	}
 	
-	
+	//=============//
-	
+	// Simple gets //
-	//=================//
+	//=============//
-	// player handling //
-	//=================//
 	
 	public LocalPlayer getPlayer() { return MINECRAFT.player; }
 	
 	@Override
 	public boolean playerExists() { return MINECRAFT.player != null; }
 	
+	@Override
+	public UUID getPlayerUUID() { return this.getPlayer().getUUID(); }
+	
+	@Override
+	public String getUsername() { return MINECRAFT.getUser().getName(); }
+	
 	@Override
 	public DhBlockPos getPlayerBlockPos()
 	{
@@ -166,12 +241,6 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
 		return new DhChunkPos(playerPos.x, playerPos.z);
 	}
 	
-	
-	
-	//================//
-	// level handling //
-	//================//
-	
 	@Nullable
 	@Override
 	public IClientLevelWrapper getWrappedClientLevel() { return this.getWrappedClientLevel(false); }
@@ -189,98 +258,6 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
 		return ClientLevelWrapper.getWrapper(level, bypassLevelKeyManager);
 	}
 	
-	
-	
-	//===========//
-	// messaging //
-	//===========//
-	
-	@Override
-	public void sendChatMessage(String string)
-	{
-		LocalPlayer player = this.getPlayer();
-		if (player == null)
-		{
-			return;
-		}
-		
-        #if MC_VER < MC_1_19_2
-		player.sendMessage(new TextComponent(string), getPlayer().getUUID());
-        #elif MC_VER < MC_1_21_9
-		player.displayClientMessage(net.minecraft.network.chat.Component.translatable(string), /*isOverlay*/false);
-		#else
-		
-		GLProxy.queueRunningOnRenderThread(() -> 
-		{
-			player.displayClientMessage(net.minecraft.network.chat.Component.translatable(string), /*isOverlay*/false);
-		});
-        #endif
-	}
-	
-	@Override
-	public void sendOverlayMessage(String string)
-	{
-		LocalPlayer player = this.getPlayer();
-		if (player == null)
-		{
-			return;
-		}
-		
-        #if MC_VER < MC_1_19_2
-		player.displayClientMessage(new TextComponent(string), /*isOverlay*/true);
-        #else
-		player.displayClientMessage(net.minecraft.network.chat.Component.translatable(string), /*isOverlay*/true);
-        #endif
-	}
-	
-	
-	
-	//==========================//
-	// vanilla option overrides //
-	//==========================//
-	
-	public void disableVanillaClouds()
-	{
-		#if MC_VER <= MC_1_18_2
-		MINECRAFT.options.renderClouds = CloudStatus.OFF;
-		#else
-		MINECRAFT.options.cloudStatus().set(CloudStatus.OFF);
-		#endif
-	}
-	
-	public void disableVanillaChunkFadeIn()
-	{
-		#if MC_VER <= MC_1_21_10
-		// chunk fade in was added MC 1.21.11
-		#else
-		MINECRAFT.options.chunkSectionFadeInTime().set(0.0);
-		#endif
-	}
-	
-	
-	
-	//======//
-	// misc //
-	//======//
-	
-	/** 
-	 * no override and not included in {@link IMinecraftClientWrapper}
-	 * since this would only be used in common/client, not core.
-	 */
-	public 
-		#if MC_VER < MC_1_21_9 long
-		#else Window 
-		#endif
-		getGlfwWindowId()
-	{
-		#if MC_VER < MC_1_21_9
-		long glfwWindowId = MINECRAFT.getWindow().getWindow();
-		return glfwWindowId;
-		#else
-		return MINECRAFT.getWindow();
-		#endif
-	}
-	
 	@Override
 	public IProfilerWrapper getProfiler()
 	{
@@ -303,39 +280,87 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
 		return this.profilerWrapper;
 	}
 	
+	/** Returns all worlds available to the server */
 	@Override
-	public void crashMinecraft(String errorMessage, Throwable exception)
+	public ArrayList<ILevelWrapper> getAllServerWorlds()
 	{
-		LOGGER.fatal(ModInfo.READABLE_NAME + " had the following error: [" + errorMessage + "]. Crashing Minecraft...", exception);
+		ArrayList<ILevelWrapper> worlds = new ArrayList<ILevelWrapper>();
-		CrashReport report = new CrashReport(errorMessage, exception);
+		
-		#if MC_VER < MC_1_20_4
+		Iterable<ServerLevel> serverWorlds = MINECRAFT.getSingleplayerServer().getAllLevels();
-		Minecraft.crash(report);
+		for (ServerLevel world : serverWorlds)
-		#else
+		{
-		MINECRAFT.delayCrash(report);
+			worlds.add(ServerLevelWrapper.getWrapper(world));
-		#endif
+		}
+		
+		return worlds;
 	}
 	
 	
 	
-	//=============//
+	@Override
-	// mod support //
+	public void sendChatMessage(String string)
-	//=============//
+	{
+		LocalPlayer player = this.getPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+        #if MC_VER < MC_1_19_2
+		player.sendMessage(new TextComponent(string), getPlayer().getUUID());
+        #else
+		player.displayClientMessage(net.minecraft.network.chat.Component.translatable(string), /*isOverlay*/false);
+        #endif
+	}
+	
+	@Override
+	public void sendOverlayMessage(String string)
+	{
+		LocalPlayer player = this.getPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+        #if MC_VER < MC_1_19_2
+		player.displayClientMessage(new TextComponent(string), /*isOverlay*/true);
+        #else
+		player.displayClientMessage(net.minecraft.network.chat.Component.translatable(string), /*isOverlay*/true);
+        #endif
+	}
+	
+	/**
+	 * Crashes Minecraft, displaying the given errorMessage <br> <br>
+	 * In the following format: <br>
+	 *
+	 * The game crashed whilst <strong>errorMessage</strong>  <br>
+	 * Error: <strong>ExceptionClass: exceptionErrorMessage</strong>  <br>
+	 * Exit Code: -1  <br>
+	 */
+	@Override
+	public void crashMinecraft(String errorMessage, Throwable exception)
+	{
+		LOGGER.error(ModInfo.READABLE_NAME + " had the following error: [" + errorMessage + "]. Crashing Minecraft...", exception);
+		CrashReport report = new CrashReport(errorMessage, exception);
+		#if MC_VER < MC_1_20_4
+		Minecraft.crash(report);
+		#else
+		Minecraft.getInstance().delayCrash(report);
+		#endif
+	}
 	
 	@Override
 	public Object getOptionsObject() { return MINECRAFT.options; }
 	
-	
-	
-	//========//
-	// shared //
-	//========//
-	
 	@Override
 	public boolean isDedicatedServer() { return false; }
 	
 	@Override
 	public File getInstallationDirectory() { return MINECRAFT.gameDirectory; }
 	
+	@Override
+	public void executeOnRenderThread(Runnable runnable) { MINECRAFT.execute(runnable); }
+	
 	@Override
 	public int getPlayerCount()
 	{
@@ -350,6 +375,4 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
 		}
 	}
 	
-	
-	
 }

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

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

@@ -25,13 +25,10 @@ import java.util.concurrent.ConcurrentHashMap;
 
 import com.mojang.blaze3d.pipeline.RenderTarget;
 import com.mojang.blaze3d.platform.NativeImage;
-import com.seibel.distanthorizons.api.enums.config.EDhApiLodShading;
+import com.seibel.distanthorizons.common.wrappers.WrapperFactory;
-import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
 import com.seibel.distanthorizons.common.wrappers.misc.LightMapWrapper;
-import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector;
 
-import com.seibel.distanthorizons.core.enums.EDhDirection;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.util.ColorUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.misc.ILightMapWrapper;
@@ -56,19 +53,13 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.world.IDimensionTypeWra
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
 import com.seibel.distanthorizons.core.util.math.Vec3d;
 import com.seibel.distanthorizons.core.util.math.Vec3f;
+import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IOptifineAccessor;
 
 import net.minecraft.client.Camera;
 import net.minecraft.client.Minecraft;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
 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;
@@ -77,27 +68,31 @@ 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
-#endif
-
-#if MC_VER <= MC_1_21_10
-#else
-import net.minecraft.world.attribute.EnvironmentAttributes;
 #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);
 	
 	/** 
 	 * In the case of immersive portals multiple levels may be active at once, causing conflicting lightmaps. <br> 
@@ -128,20 +123,12 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 	@Override
 	public Vec3f getLookAtVector()
 	{
-		#if MC_VER <= MC_1_21_10
 		Camera camera = MC.gameRenderer.getMainCamera();
 		return new Vec3f(camera.getLookVector().x(), camera.getLookVector().y(), camera.getLookVector().z());
-		#else
-		Camera camera = MC.gameRenderer.getMainCamera();
-		return new Vec3f(camera.forwardVector().x(), camera.forwardVector().y(), camera.forwardVector().z());
-		#endif
 	}
 	
-	/** 
-	 * Unless you really need to know if the player is blind, 
-	 * use {@link MinecraftRenderWrapper#isFogStateSpecial()} or {@link IMinecraftRenderWrapper#isFogStateSpecial()} instead 
-	 */
 	@Override
+	/** 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)
@@ -166,11 +153,7 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 	public Vec3d getCameraExactPosition()
 	{
 		Camera camera = MC.gameRenderer.getMainCamera();
-		#if MC_VER <= MC_1_21_10
 		Vec3 projectedView = camera.getPosition();
-		#else
-		Vec3 projectedView = camera.position();
-		#endif
 		
 		return new Vec3d(projectedView.x, projectedView.y, projectedView.z);
 	}
@@ -204,7 +187,8 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 				Math.max(0f, Math.min(colorValues.z, 1f)), // b
 				Math.max(0f, Math.min(colorValues.w, 1f))  // a
 		);
-		#elif MC_VER <= MC_1_21_10
+		#else
+			
 		if (mcFogRenderer == null)
 		{
 			mcFogRenderer = new FogRenderer();
@@ -228,33 +212,9 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 				Math.max(0f, Math.min(colorValues.z, 1f)), // b
 				Math.max(0f, Math.min(colorValues.w, 1f))  // a
 		);
-		#else
-			
-		if (mcFogRenderer == null)
-		{
-			mcFogRenderer = new FogRenderer();
-		}
-		
-		if (MC.level == null)
-		{
-			// shouldn't happen, but just in case
-			return Color.white;
-		}
-		
-		Vector4f colorValues = mcFogRenderer.setupFog(
-			MC.gameRenderer.getMainCamera(),
-			MC.options.getEffectiveRenderDistance(),
-			MC.deltaTracker,
-			MC.gameRenderer.getDarkenWorldAmount(MC.deltaTracker.getGameTimeDeltaPartialTick(true)),
-			MC.level);
-		return new Color(
-				Math.max(0f, Math.min(colorValues.x, 1f)), // r
-				Math.max(0f, Math.min(colorValues.y, 1f)), // g
-				Math.max(0f, Math.min(colorValues.z, 1f)), // b
-				Math.max(0f, Math.min(colorValues.w, 1f))  // a
-		);
 		#endif
 	}
+	// getSpecialFogColor() is the same as getFogColor()
 	
 	@Override
 	public Color getSkyColor()
@@ -266,10 +226,8 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 			frameTime = MC.getFrameTime();
 			#elif MC_VER < MC_1_21_3
 			frameTime = MC.getTimer().getRealtimeDeltaTicks();
-			#elif MC_VER <= MC_1_21_10
-			frameTime = MC.deltaTracker.getGameTimeDeltaTicks();
 			#else
-			frameTime = 0f; // unused
+			frameTime = MC.deltaTracker.getGameTimeDeltaTicks();
 			#endif
 			
 			#if MC_VER < MC_1_17_1
@@ -278,12 +236,9 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 			#elif MC_VER < MC_1_21_3
 			Vec3 colorValues = MC.level.getSkyColor(MC.gameRenderer.getMainCamera().getPosition(), frameTime);
 			return new Color((float) colorValues.x, (float) colorValues.y, (float) colorValues.z);
-			#elif MC_VER <= MC_1_21_10
-			int argbColorInt = MC.level.getSkyColor(MC.gameRenderer.getMainCamera().getPosition(), frameTime);
-			return ColorUtil.toColorObjARGB(argbColorInt);
 			#else
-			int argbColor = MC.level.environmentAttributes().getValue(EnvironmentAttributes.SKY_COLOR, BlockPos.ZERO);
+			int argbColorInt = MC.level.getSkyColor(MC.gameRenderer.getMainCamera().getPosition(), frameTime);;
-			return new Color(ColorUtil.getRed(argbColor), ColorUtil.getGreen(argbColor), ColorUtil.getBlue(argbColor), 255 /* ignore alpha since DH clouds don't render correctly with transparency */);
+			return ColorUtil.toColorObjARGB(argbColorInt); // TODO MC changed color formats
 			#endif
 		}
 		else
@@ -293,7 +248,10 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 	}
 	
 	@Override
-	public double getFov(float partialTicks) { return MC.gameRenderer.getFov(MC.gameRenderer.getMainCamera(), partialTicks, true); }
+	public double getFov(float partialTicks)
+	{
+		return MC.gameRenderer.getFov(MC.gameRenderer.getMainCamera(), partialTicks, true);
+	}
 	
 	/** Measured in chunks */
 	@Override
@@ -307,7 +265,42 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 		#endif
 	}
 	
-	protected RenderTarget getRenderTarget() { return MC.getMainRenderTarget(); }
+	@Override
+	public int getScreenWidth()
+	{
+		// alternate ways of getting the window's resolution,
+		// using one of these methods may fix the optifine render resolution bug
+		// TODO: test these once we can run with Optifine again
+//		int[] heightArray = new int[1];
+//		int[] widthArray = new int[1];
+//		
+//		long window = GLProxy.getInstance().minecraftGlContext;
+//		GLFW.glfwGetWindowSize(window, widthArray, heightArray); // option 1
+//		GLFW.glfwGetFramebufferSize(window, widthArray, heightArray); // option 2
+		
+		
+		
+		int width = MC.getWindow().getWidth();
+		if (OPTIFINE_ACCESSOR != null)
+		{
+			// TODO remove comment after testing:
+			// this should fix the issue where different optifine render resolutions screw up the LOD rendering
+			width *= OPTIFINE_ACCESSOR.getRenderResolutionMultiplier();
+		}
+		return width;
+	}
+	@Override
+	public int getScreenHeight()
+	{
+		int height = MC.getWindow().getHeight();
+		if (OPTIFINE_ACCESSOR != null)
+		{
+			height *= OPTIFINE_ACCESSOR.getRenderResolutionMultiplier();
+		}
+		return height;
+	}
+	
+	private RenderTarget getRenderTarget() { return MC.getMainRenderTarget(); }
 	
 	@Override
 	public boolean mcRendersToFrameBuffer()
@@ -330,7 +323,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())
@@ -357,18 +350,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)
@@ -397,7 +389,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)
@@ -411,27 +403,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()
@@ -475,45 +459,4 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 		wrapper.setLightmapId(tetxureId);
 	}
 	
-	@Override
-	public float getShade(EDhDirection lodDirection)
-	{
-		EDhApiLodShading lodShading = Config.Client.Advanced.Graphics.Quality.lodShading.get();
-		switch (lodShading)
-		{
-			default:
-			case AUTO:
-				if (MC.level != null)
-				{
-					Direction mcDir = McObjectConverter.Convert(lodDirection);
-					return MC.level.getShade(mcDir, true);
-				}
-				else
-				{
-					return 0.0f;
-				}
-			
-			case ENABLED:
-				switch (lodDirection)
-				{
-					case DOWN:
-						return 0.5F;
-					default:
-					case UP:
-						return 1.0F;
-					case NORTH:
-					case SOUTH:
-						return 0.8F;
-					case WEST:
-					case EAST:
-						return 0.6F;
-				}
-			
-			case DISABLED:
-				return 1.0F;
-		}
-	}
-	
-	
-	
 }

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

@@ -2,20 +2,17 @@ package com.seibel.distanthorizons.common.wrappers.minecraft;
 
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper;
 import net.minecraft.server.dedicated.DedicatedServer;
-import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
 
+//@Environment(EnvType.SERVER)
 public class MinecraftServerWrapper implements IMinecraftSharedWrapper
 {
 	public static final MinecraftServerWrapper INSTANCE = new MinecraftServerWrapper();
 	
-	/** set during server startup */
-	@Nullable
 	public DedicatedServer dedicatedServer = null;
 	
 	
-	
 	//=============//
 	// constructor //
 	//=============//
@@ -36,7 +33,7 @@ public class MinecraftServerWrapper implements IMinecraftSharedWrapper
 	{
 		if (this.dedicatedServer == null)
 		{
-			throw new IllegalStateException("Trying to get Installation Direction before dedicated server completed initialization!");
+			throw new IllegalStateException("Trying to get Installation Direction before Dedicated server completed initialization!");
 		}
 		
 		#if MC_VER < MC_1_21_1
@@ -47,16 +44,9 @@ public class MinecraftServerWrapper implements IMinecraftSharedWrapper
 	}
 	
 	@Override
-	public int getPlayerCount() 
+	public int getPlayerCount()
 	{
-		if (this.dedicatedServer == null)
+		return this.dedicatedServer.getPlayerCount();
-		{
-			throw new IllegalStateException("Trying to get player count before dedicated server completed initialization!");
-		}
-		
-		return this.dedicatedServer.getPlayerCount(); 
 	}
 	
-	
-	
 }

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

@@ -71,6 +71,26 @@ public class ServerPlayerWrapper implements IServerPlayerWrapper
 		return new Vec3d(position.x, position.y, position.z);
 	}
 	
+	@Override
+	public int getViewDistance() 
+	{
+		#if MC_VER < MC_1_21_6
+		return this.getServerPlayer().server.getPlayerList().getViewDistance();
+		#else
+		return this.getServerPlayer().getServer().getPlayerList().getViewDistance();
+		#endif
+	}
+	
+	@Override
+	public SocketAddress getRemoteAddress()
+	{
+		#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;
@@ -21,11 +21,11 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.world.IDimensionTypeWra
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.core.BlockPos;
 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;
 
@@ -51,15 +51,9 @@ import net.minecraft.world.phys.Vec3;
 import com.seibel.distanthorizons.core.util.ColorUtil;
 #endif
 
-#if MC_VER <= MC_1_21_10
-#else
-import net.minecraft.world.attribute.EnvironmentAttributes;
-#endif
-
-
 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
@@ -71,16 +65,16 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 	private static final Minecraft MINECRAFT = Minecraft.getInstance();
 	
 	private final ClientLevel level;
-	private final ConcurrentHashMap<BlockState, ClientBlockStateColorCache> blockColorCacheByBlockState = new ConcurrentHashMap<>();
+	private final ConcurrentHashMap<BlockState, ClientBlockStateColorCache> blockCache = new ConcurrentHashMap<>();
 	
 	/** cached method reference to reduce GC overhead */
-	private final Function<BlockState, ClientBlockStateColorCache> createCachedBlockColorCacheFunc = (blockState) -> new ClientBlockStateColorCache(blockState, this);
+	private final Function<BlockState, ClientBlockStateColorCache> cachedBlockColorCacheFunction = (blockState) -> this.createBlockColorCache(blockState);
 	
 	
-	private boolean cloudColorFailLogged = false;
-	
 	private BlockStateWrapper dirtBlockWrapper;
-	private IDhLevel dhLevel;
+	private BiomeWrapper plainsBiomeWrapper;
+	@Deprecated // TODO circular references are bad
+	private IDhLevel parentDhLevel;
 	
 	
 	
@@ -96,29 +90,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) // TODO handle null 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
@@ -172,17 +143,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())
@@ -208,18 +175,16 @@ 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);
+		ClientBlockStateColorCache blockColorCache = this.blockCache.computeIfAbsent(
-		if (blockColorCache == null)
+				((BlockStateWrapper) blockWrapper).blockState,
-		{
+				this.cachedBlockColorCacheFunction);
-			blockColorCache = this.blockColorCacheByBlockState.computeIfAbsent(
-					((BlockStateWrapper) blockWrapper).blockState,
-					this.createCachedBlockColorCacheFunc);
-		}
 		
-		return blockColorCache.getColor((BiomeWrapper) biome, fullDataSource, blockPos);
+		return blockColorCache.getColor((BiomeWrapper) biome, pos);
 	}
+	/** used by {@link ClientLevelWrapper#cachedBlockColorCacheFunction} */
+	private ClientBlockStateColorCache createBlockColorCache(BlockState block) { return new ClientBlockStateColorCache(block, this); }
 	
 	
 	@Override
@@ -239,31 +204,38 @@ 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 IDimensionTypeWrapper getDimensionType()
+	public IBiomeWrapper getPlainsBiomeWrapper()
 	{
-		#if MC_VER <= MC_1_21_10
+		if (this.plainsBiomeWrapper == null)
-		return DimensionTypeWrapper.getDimensionTypeWrapper(this.level.dimensionType());
+		{
-		#else
+			try
-		return DimensionTypeWrapper.getDimensionTypeWrapper(this.level.dimensionType(), this.getDimensionName());
+			{
-		#endif
+				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 String getDimensionName()
+	public IDimensionTypeWrapper getDimensionType() { return DimensionTypeWrapper.getDimensionTypeWrapper(this.level.dimensionType()); }
-	{
+	
-		#if MC_VER <= MC_1_21_10
+	
-		return this.level.dimension().location().toString();
+	@Override
-		#else
+	public String getDimensionName() { return this.level.dimension().location().toString(); }
-		return this.level.dimension().identifier().toString();
-		#endif
-	}
 	
 	@Override
 	public long getHashedSeed() { return this.level.getBiomeManager().biomeZoomSeed; }
@@ -297,6 +269,37 @@ public class ClientLevelWrapper implements IClientLevelWrapper
         #endif
 	}
 	
+	@Override
+	public IChunkWrapper tryGetChunk(DhChunkPos pos)
+	{
+		if (!this.level.hasChunk(pos.getX(), pos.getZ()))
+		{
+			return null;
+		}
+		
+		ChunkAccess chunk = this.level.getChunk(pos.getX(), pos.getZ(), ChunkStatus.EMPTY, false);
+		if (chunk == null)
+		{
+			return null;
+		}
+		
+		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; }
 	
@@ -304,18 +307,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);
 	}
 	
 	
@@ -326,87 +329,28 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 	//===================//
 	
 	@Override
-	public void setDhLevel(IDhLevel dhLevel) { this.dhLevel = dhLevel; }
+	public void setParentLevel(IDhLevel parentLevel) { this.parentDhLevel = parentLevel; }
-	@Override 
-	public IDhLevel getDhLevel() { return this.dhLevel; }
 	
 	@Override 
 	public IDhApiCustomRenderRegister getRenderRegister()
 	{
-		if (this.dhLevel == null)
+		if (this.parentDhLevel == null)
 		{
 			return null;
 		}
 		
-		return this.dhLevel.getGenericRenderer();
+		return this.parentDhLevel.getGenericRenderer();
 	}
 	
 	@Override
 	public Color getCloudColor(float tickDelta)
 	{
 		#if MC_VER < MC_1_21_3
-		Vec3 colorVec3 = null;
+		Vec3 colorVec3 = this.level.getCloudColor(tickDelta);
-		try
+		return new Color((float)colorVec3.x, (float)colorVec3.y, (float)colorVec3.z);
-		{
-			colorVec3 = this.level.getCloudColor(tickDelta);
-			return new Color((float)colorVec3.x, (float)colorVec3.y, (float)colorVec3.z);
-		}
-		catch (Exception e)
-		{
-			// extra logging is due to some mods returning weird values, this way we can track down the issue better
-			if (!this.cloudColorFailLogged)
-			{
-				this.cloudColorFailLogged = true;
-				
-				String colorString = "NULL";
-				if (colorVec3 != null)
-				{
-					colorString = "r["+(float)colorVec3.x+"] g["+(float)colorVec3.y+"] b["+(float)colorVec3.z+"]";
-				}
-				LOGGER.warn("Failed to get cloud color for ["+this.getDhIdentifier()+"]. vec3 ["+colorString+"], error: ["+e.getMessage()+"].", e);
-			}
-			
-			// default to white if there's an issue
-			return Color.WHITE;
-		}
-		#elif MC_VER <= MC_1_21_10
-		int argbColor = 0;
-		try
-		{
-			argbColor = this.level.getCloudColor(tickDelta);
-			return ColorUtil.toColorObjARGB(argbColor);
-		}
-		catch (Exception e)
-		{
-			// extra logging is due to some mods returning weird values, this way we can track down the issue better
-			if (!this.cloudColorFailLogged)
-			{
-				this.cloudColorFailLogged = true;
-				LOGGER.warn("Failed to get cloud color for ["+this.getDhIdentifier()+"]. Int ["+argbColor+"], col ["+ColorUtil.toString(argbColor)+"], error: ["+e.getMessage()+"].", e);
-			}
-			
-			// default to white if there's an issue
-			return Color.WHITE;
-		}
 		#else
-		int argbColor = 0;
+		int argbColor = this.level.getCloudColor(tickDelta);
-		try
+		return ColorUtil.toColorObjARGB(argbColor);
-		{
-			argbColor = this.level.environmentAttributes().getValue(EnvironmentAttributes.CLOUD_COLOR, BlockPos.ZERO);
-			return new Color(ColorUtil.getRed(argbColor), ColorUtil.getGreen(argbColor), ColorUtil.getBlue(argbColor), 255 /* ignore alpha since DH clouds don't render correctly with transparency */);
-		}
-		catch (Exception e)
-		{
-			// extra logging is due to some mods returning weird values, this way we can track down the issue better
-			if (!this.cloudColorFailLogged)
-			{
-				this.cloudColorFailLogged = true;
-				LOGGER.warn("Failed to get cloud color for ["+this.getDhIdentifier()+"]. Int ["+argbColor+"], col ["+ColorUtil.toString(argbColor)+"], error: ["+e.getMessage()+"].", e);
-			}
-			
-			// default to white if there's an issue
-			return Color.WHITE;
-		}
 		#endif
 	}
 	

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

@@ -26,45 +26,25 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.world.IDimensionTypeWra
 
 import net.minecraft.world.level.dimension.DimensionType;
 
+/**
+ * @author James Seibel
+ */
 public class DimensionTypeWrapper implements IDimensionTypeWrapper
 {
 	private static final ConcurrentMap<String, DimensionTypeWrapper> DIMENSION_WRAPPER_BY_NAME = new ConcurrentHashMap<>();
 	private final DimensionType dimensionType;
 	
-	private final String name;
-	
 	
 	
 	//=============//
 	// Constructor //
 	//=============//
 	
-	#if MC_VER <= MC_1_21_10
+	public DimensionTypeWrapper(DimensionType dimensionType) { this.dimensionType = dimensionType; }
-	public DimensionTypeWrapper(DimensionType dimensionType)
-	#else
-	public DimensionTypeWrapper(DimensionType dimensionType, String name)
-	#endif
-	{
-		this.dimensionType = dimensionType; 
-		
-		#if MC_VER <= MC_1_21_10
-		this.name = determineName(dimensionType);
-		#else
-		this.name = name;
-		#endif
-	}
 	
-	#if MC_VER <= MC_1_21_10
 	public static DimensionTypeWrapper getDimensionTypeWrapper(DimensionType dimensionType)
-	#else
-	public static DimensionTypeWrapper getDimensionTypeWrapper(DimensionType dimensionType, String name)
-	#endif
 	{
-		#if MC_VER <= MC_1_21_10
+		String dimName = getName(dimensionType);
-		String dimName = determineName(dimensionType);
-		#else
-		String dimName = name;
-		#endif
 		
 		// check if the dimension has already been wrapped
 		if (DIMENSION_WRAPPER_BY_NAME.containsKey(dimName) 
@@ -75,26 +55,10 @@ public class DimensionTypeWrapper implements IDimensionTypeWrapper
 		
 		
 		// create the missing wrapper
-		#if MC_VER <= MC_1_21_10
 		DimensionTypeWrapper dimensionTypeWrapper = new DimensionTypeWrapper(dimensionType);
-		#else
-		DimensionTypeWrapper dimensionTypeWrapper = new DimensionTypeWrapper(dimensionType, dimName);
-		#endif
-		
 		DIMENSION_WRAPPER_BY_NAME.put(dimName, dimensionTypeWrapper);
 		return dimensionTypeWrapper;
 	}
-	private static String determineName(DimensionType dimensionType)
-	{
-		#if MC_VER <= MC_1_16_5
-		// effectsLocation() is marked as client only, so using the backing field directly
-		return dimensionType.effectsLocation.getPath();
-		#elif MC_VER <= MC_1_21_10
-		return dimensionType.effectsLocation().getPath();
-		#else
-		throw new UnsupportedOperationException("As of MC 1.21.11 the dimension type no longer stores it's name and must be determined from the level.");
-		#endif
-	}
 	
 	public static void clearMap() { DIMENSION_WRAPPER_BY_NAME.clear(); }
 	
@@ -105,7 +69,16 @@ public class DimensionTypeWrapper implements IDimensionTypeWrapper
 	//=================//
 	
 	@Override
-	public String getName() { return this.name; }
+	public String getName() { return getName(this.dimensionType); }
+	public static String getName(DimensionType dimensionType)
+	{
+		#if MC_VER <= MC_1_16_5
+		// effectsLocation() is marked as client only, so using the backing field directly
+		return dimensionType.effectsLocation.getPath();
+		#else
+		return dimensionType.effectsLocation().getPath();
+		#endif
+	}
 	
 	@Override
 	public boolean hasCeiling() { return this.dimensionType.hasCeiling(); }
@@ -116,6 +89,7 @@ public class DimensionTypeWrapper implements IDimensionTypeWrapper
 	@Override
 	public Object getWrappedMcObject() { return this.dimensionType; }
 	
+	// there's definitely a better way of doing this, but it should work well enough for now
 	@Override
 	public boolean isTheEnd() { return this.getName().equalsIgnoreCase("the_end"); }
 	
@@ -124,6 +98,7 @@ public class DimensionTypeWrapper implements IDimensionTypeWrapper
 	
 	
 	
+	
 	//================//
 	// base overrides //
 	//================//

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;
+#if MC_VER < MC_1_21_3
-import org.jetbrains.annotations.Nullable;
+#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;
+	@Deprecated // TODO circular references are bad
-	
+	private IDhLevel parentDhLevel;
-	/** 
-	 * this name is cached to prevent issues during shutdown where
-	 * the server variables needed may no longer be available.
-	 */
-	private final String KeyedLevelDimensionName;
 	
 	
 	
@@ -93,11 +95,7 @@ public class ServerLevelWrapper implements IServerLevelWrapper
 		}).get();
 	}
 	
-	public ServerLevelWrapper(ServerLevel level) 
+	public ServerLevelWrapper(ServerLevel level) { this.level = level; }
-	{ 
-		this.level = level;
-		this.KeyedLevelDimensionName = this.createKeyedLevelDimensionName();
-	}
 	
 	
 	
@@ -116,80 +114,22 @@ public class ServerLevelWrapper implements IServerLevelWrapper
 	}
 	
 	@Override
-	public String getKeyedLevelDimensionName() { return this.KeyedLevelDimensionName; }
+	public String getWorldFolderName()
-	
-	private String createKeyedLevelDimensionName()
 	{
-		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())
+		#if MC_VER >= MC_1_21_3
-		{
+		return this.level.getServer().getLevel(Level.OVERWORLD).getChunkSource().getDataStorage().dataFolder.getParent().getFileName().toString();
-			String levelKeyPrefix = Config.Server.levelKeyPrefix.get();
+		#else // <= 1.21.3
-			
+		return this.level.getServer().getLevel(Level.OVERWORLD).getChunkSource().getDataStorage().dataFolder.getParentFile().getName();
-			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;
-	}
-	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() 
-	{
-		#if MC_VER <= MC_1_21_10
-		return DimensionTypeWrapper.getDimensionTypeWrapper(this.level.dimensionType());
-		#else
-		return DimensionTypeWrapper.getDimensionTypeWrapper(this.level.dimensionType(), this.getDimensionName());
 		#endif
 	}
 	
 	@Override
-	public String getDimensionName()
+	public DimensionTypeWrapper getDimensionType() { return DimensionTypeWrapper.getDimensionTypeWrapper(this.level.dimensionType()); }
-	{
+
-		#if MC_VER <= MC_1_21_10
+	@Override
-		return this.level.dimension().location().toString();
+	public String getDimensionName() { return this.level.dimension().location().toString(); }
-		#else
-		return this.level.dimension().identifier().toString();
-		#endif
-	}
 	
 	@Override
 	public long getHashedSeed() { return this.level.getBiomeManager().biomeZoomSeed; }
@@ -223,6 +163,43 @@ public class ServerLevelWrapper implements IServerLevelWrapper
         #endif
 	}
 	
+	@Override
+	public IChunkWrapper tryGetChunk(DhChunkPos pos)
+	{
+		if (!this.level.hasChunk(pos.getX(), pos.getZ()))
+		{
+			return null;
+		}
+		
+		ChunkAccess chunk = this.level.getChunk(pos.getX(), pos.getZ(), ChunkStatus.FULL, false);
+		if (chunk == null)
+		{
+			return null;
+		}
+		
+		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; }
 	
@@ -231,31 +208,28 @@ public class ServerLevelWrapper implements IServerLevelWrapper
 	
 	
 	@Override
-	public void setDhLevel(IDhLevel dhLevel) { this.dhLevel = dhLevel; }
+	public void setParentLevel(IDhLevel parentLevel) { this.parentDhLevel = parentLevel; }
-	@Override
-	@Nullable
-	public IDhLevel getDhLevel() { return this.dhLevel; }
 	
 	@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/ChunkPosGenStream.java

@@ -1,92 +0,0 @@
-package com.seibel.distanthorizons.common.wrappers.worldGeneration;
-
-import net.minecraft.world.level.ChunkPos;
-
-import java.util.Iterator;
-import java.util.Spliterator;
-import java.util.Spliterators;
-import java.util.function.Consumer;
-import java.util.stream.Stream;
-import java.util.stream.StreamSupport;
-
-public class ChunkPosGenStream
-{
-	
-	public static Iterator<ChunkPos> getIterator(int genMinX, int genMinZ, int width, int extraRadius)
-	{ return getStream(genMinX, genMinZ, width, extraRadius).iterator(); }
-	/** @param extraRadius in both the positive and negative directions */
-	public static Stream<ChunkPos> getStream(int genMinX, int genMinZ, int width, int extraRadius)
-	{ return StreamSupport.stream(new InclusiveChunkPosIterator(genMinX, genMinZ, width, extraRadius), false); }
-	
-	private static class InclusiveChunkPosIterator extends Spliterators.AbstractSpliterator<ChunkPos>
-	{
-		private final int minX;
-		private final int minZ;
-		
-		private final int maxX;
-		private final int maxZ;
-		
-		
-		/** current X pos */
-		int x;
-		/** current Z pos */
-		private int z;
-		
-		
-		
-		//=============//
-		// constructor //
-		//=============//
-		
-		protected InclusiveChunkPosIterator(int genMinX, int genMinZ, int width, int extraRadius)
-		{
-			super(getCount(width, extraRadius), Spliterator.SIZED);
-			
-			this.minX = genMinX - extraRadius;
-			this.minZ = genMinZ - extraRadius;
-			
-			this.maxX = genMinX + (width - 1) + extraRadius;
-			this.maxZ = genMinZ + (width - 1) + extraRadius;
-			
-			// X starts at 1 minus the minX so we can immediately re-add 1 in the tryAdvance() loop
-			this.x = this.minX - 1;
-			this.z = this.minZ;
-		}
-		private static int getCount(int width, int extraRadius)
-		{
-			int widthPlusExtra = width + (extraRadius * 2);
-			return widthPlusExtra * widthPlusExtra;
-		}
-		
-		
-		
-		//=================//
-		// iterator method //
-		//=================//
-		
-		@Override
-		public boolean tryAdvance(Consumer<? super ChunkPos> consumer)
-		{
-			if (this.x == this.maxX && this.z == this.maxZ)
-			{
-				// the last returned position was the final valid position
-				return false;
-			}
-			
-			if (this.x == this.maxX)
-			{
-				// we reached the max X position, loop back around in the next Z row
-				this.x = this.minX;
-				this.z++;
-			}
-			else
-			{
-				this.x++;
-			}
-			
-			consumer.accept(new ChunkPos(this.x, this.z));
-			return true;
-		}
-	}
-	
-}

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

@@ -19,118 +19,114 @@
 
 package com.seibel.distanthorizons.common.wrappers.worldGeneration;
 
+import java.lang.invoke.MethodHandles;
 import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.Consumer;
 
 import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiDistantGeneratorMode;
 import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGenerationStep;
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.params.ThreadWorldGenParams;
+import com.seibel.distanthorizons.core.util.objects.UncheckedInterruptedException;
-import com.seibel.distanthorizons.core.util.ExceptionUtil;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.pos.DhChunkPos;
+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;
 	
-	private static final AtomicInteger DEBUG_ID_REF = new AtomicInteger(0);
-	
-	
-	/** can be used for troubleshooting */
 	public final int id;
-	
+	public final ThreadedParameters threadedParam;
-	public final ThreadWorldGenParams threadedParam;
 	public final DhChunkPos minPos;
-	public final int widthInChunks;
+	/** the number of chunks wide this event is */
+	public final int size;
 	public final EDhApiWorldGenerationStep targetGenerationStep;
 	public final EDhApiDistantGeneratorMode generatorMode;
-	public final CompletableFuture<Void> future;
+	public EventTimer timer = null;
+	public long inQueueTime;
+	public long timeoutTime = -1;
+	public CompletableFuture<Void> future = null;
 	public final Consumer<IChunkWrapper> resultConsumer;
 	
 	
 	
-	//=============//
+	public GenerationEvent(
-	// constructor //
+			DhChunkPos minPos, int size, BatchGenerationEnvironment generationGroup,
-	//=============//
-	
-	private GenerationEvent(
-			DhChunkPos minPos, int widthInChunks, BatchGenerationEnvironment generationGroup,
 			EDhApiDistantGeneratorMode generatorMode, EDhApiWorldGenerationStep targetGenerationStep, Consumer<IChunkWrapper> resultConsumer)
 	{
-		this.id = DEBUG_ID_REF.getAndIncrement();
+		this.inQueueTime = System.nanoTime();
-		
+		this.id = generationFutureDebugIDs++;
 		this.minPos = minPos;
-		this.widthInChunks = widthInChunks;
+		this.size = size;
-		this.targetGenerationStep = targetGenerationStep;
 		this.generatorMode = generatorMode;
-		this.threadedParam = ThreadWorldGenParams.getOrMake(generationGroup.globalParams);
+		this.targetGenerationStep = targetGenerationStep;
-		this.future = new CompletableFuture<>();
+		this.threadedParam = ThreadedParameters.getOrMake(generationGroup.params);
 		this.resultConsumer = resultConsumer;
 	}
 	
 	
 	
-	//=======//
+	public static GenerationEvent startEvent(
-	// start //
+			DhChunkPos minPos, int size, BatchGenerationEnvironment genEnvironment,
-	//=======//
-	
-	public static GenerationEvent start(
-			DhChunkPos minPos, int widthInChunks, BatchGenerationEnvironment genEnvironment,
 			EDhApiDistantGeneratorMode generatorMode, EDhApiWorldGenerationStep target, Consumer<IChunkWrapper> resultConsumer,
 			ExecutorService worldGeneratorThreadPool)
 	{
-		GenerationEvent genEvent = new GenerationEvent(minPos, widthInChunks, genEnvironment, generatorMode, target, resultConsumer);
+		GenerationEvent generationEvent = new GenerationEvent(minPos, size, genEnvironment, generatorMode, target, resultConsumer);
-		
+		generationEvent.future = CompletableFuture.supplyAsync(() ->
-		try
 		{
-			worldGeneratorThreadPool.execute(() ->
+			long runStartTime = System.nanoTime();
+			generationEvent.timeoutTime = runStartTime;
+			generationEvent.inQueueTime = runStartTime - generationEvent.inQueueTime;
+			generationEvent.timer = new EventTimer("setup");
+			
+			BatchGenerationEnvironment.isDistantGeneratorThread.set(true);
+			
+			try
 			{
-				try
+				genEnvironment.generateLodFromListAsync(generationEvent, (runnable) -> 
 				{
-					BatchGenerationEnvironment.isDhWorldGenThreadRef.set(true);
+					worldGeneratorThreadPool.execute(() ->
-					
-					
-					if (genEvent.generatorMode == EDhApiDistantGeneratorMode.INTERNAL_SERVER)
-					{
-						genEnvironment.internalServerGenerator.generateChunksViaInternalServer(genEvent);
-						genEvent.future.complete(null);
-					}
-					else
 					{
+						boolean alreadyMarked = BatchGenerationEnvironment.isCurrentThreadDistantGeneratorThread();
+						if (!alreadyMarked)
+						{
+							BatchGenerationEnvironment.isDistantGeneratorThread.set(true);
+						}
+						
 						try
 						{
-							genEnvironment.generateEvent(genEvent);
+							runnable.run();
 						}
 						catch (Throwable throwable)
 						{
-							handleWorldGenThrowable(genEvent, throwable);
+							handleWorldGenThrowable(generationEvent, throwable);
 						}
 						finally
 						{
-							genEvent.future.complete(null);
+							if (!alreadyMarked)
+							{
+								BatchGenerationEnvironment.isDistantGeneratorThread.set(false);
+							}
 						}
-					}
+					});
-				}
+				});
-				catch (Throwable initialThrowable)
+			}
-				{
+			catch (Throwable initialThrowable)
-					handleWorldGenThrowable(genEvent, initialThrowable);
+			{
-				}
+				handleWorldGenThrowable(generationEvent, initialThrowable);
-				finally
+			}
-				{
+			finally
-					BatchGenerationEnvironment.isDhWorldGenThreadRef.remove();
+			{
-				}
+				BatchGenerationEnvironment.isDistantGeneratorThread.remove();
-			});
+			}
-		}
+			
-		catch (RejectedExecutionException e)
+			return null;
-		{
+		}, worldGeneratorThreadPool);
-			genEvent.future.completeExceptionally(e);
+		return generationEvent;
-		}
-		
-		return genEvent;
 	}
 	/** There's probably a better way to handle this, but it'll work for now */
 	private static void handleWorldGenThrowable(GenerationEvent generationEvent, Throwable initialThrowable)
@@ -141,8 +137,9 @@ public final class GenerationEvent
 			throwable = throwable.getCause();
 		}
 		
-		boolean isShutdownException = ExceptionUtil.isShutdownException(throwable);
+		if (throwable instanceof InterruptedException
-		if (isShutdownException)
+			|| throwable instanceof UncheckedInterruptedException
+			|| throwable instanceof RejectedExecutionException)
 		{
 			// these exceptions can be ignored, generally they just mean
 			// the thread is busy so it'll need to try again later.
@@ -157,15 +154,35 @@ public final class GenerationEvent
 		}
 	}
 	
+	public boolean isComplete() { return this.future.isDone(); }
 	
+	public boolean hasTimeout(int duration, TimeUnit unit)
+	{
+		if (this.timeoutTime == -1)
+		{
+			return false;
+		}
+		
+		long currentTime = System.nanoTime();
+		long delta = currentTime - this.timeoutTime;
+		return (delta > TimeUnit.NANOSECONDS.convert(duration, unit));
+	}
 	
-	//================//
+	public boolean terminate()
-	// base overrides //
+	{
-	//================//
+		LOGGER.info("======================DUMPING ALL THREADS FOR WORLD GEN=======================");
+		ThreadPoolUtil.WORLD_GEN_THREAD_FACTORY.dumpAllThreadStacks();
+		this.future.cancel(true);
+		return this.future.isCancelled();
+	}
+	
+	public void refreshTimeout()
+	{
+		this.timeoutTime = System.nanoTime();
+		UncheckedInterruptedException.throwIfInterrupted();
+	}
 	
 	@Override
-	public String toString() { return this.id + ":" + this.widthInChunks + "@" + this.minPos + "(" + this.targetGenerationStep + ")"; }
+	public String toString() { return this.id + ":" + this.size + "@" + this.minPos + "(" + this.targetGenerationStep + ")"; }
-	
-	
 	
 }

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

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.distanthorizons.common.wrappers.worldGeneration.params;
+package com.seibel.distanthorizons.common.wrappers.worldGeneration;
 
 import com.mojang.datafixers.DataFixer;
 import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper;
@@ -27,50 +27,35 @@ import net.minecraft.core.Registry;
 import net.minecraft.core.RegistryAccess;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.server.level.ThreadedLevelLightEngine;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.biome.BiomeManager;
 import net.minecraft.world.level.chunk.ChunkGenerator;
 #if MC_VER >= MC_1_18_2
 import net.minecraft.world.level.chunk.storage.ChunkScanAccess;
 #endif
-
+import net.minecraft.world.level.levelgen.WorldGenSettings;
 #if MC_VER < MC_1_19_2
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
-#elif MC_VER < MC_1_19_2
-import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
 #else
-import net.minecraft.world.level.levelgen.RandomState;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplateManager;
+import net.minecraft.world.level.levelgen.RandomState;
+#if MC_VER >= MC_1_19_4
+import net.minecraft.world.level.levelgen.WorldOptions;
+import net.minecraft.core.registries.Registries;
+#endif
 #endif
 import net.minecraft.world.level.storage.WorldData;
 
-#if MC_VER < MC_1_19_4
+public final class GlobalParameters
-#elif MC_VER < MC_1_21_3
-import net.minecraft.core.registries.Registries;
-#else
-import net.minecraft.core.registries.Registries;
-#endif
-
-#if MC_VER < MC_1_19_4
-import net.minecraft.world.level.levelgen.WorldGenSettings;
-#else
-import net.minecraft.world.level.levelgen.WorldOptions;
-#endif
-
-/**
- * Handles parameters that are relevant for the entire MC world.
- * 
- * @see ThreadWorldGenParams
- */
-public final class GlobalWorldGenParams
 {
 	public final ChunkGenerator generator;
-	public final IDhServerLevel dhServerLevel;
+	public final IDhServerLevel lodLevel;
-	public final ServerLevel mcServerLevel;
+	public final ServerLevel level;
 	public final Registry<Biome> biomes;
 	public final RegistryAccess registry;
 	public final long worldSeed;
-	public final DataFixer dataFixer;
+	public final DataFixer fixerUpper;
 	
 	#if MC_VER < MC_1_19_2
 	public final StructureManager structures;
@@ -87,24 +72,18 @@ public final class GlobalWorldGenParams
 	
 	#if MC_VER >= MC_1_18_2
 	public final BiomeManager biomeManager;
-	public final ChunkScanAccess chunkScanner;
+	public final ChunkScanAccess chunkScanner; // FIXME: Figure out if this is actually needed
 	#endif
 	
-	
+	public GlobalParameters(IDhServerLevel lodLevel)
-	
-	//=============//
-	// constructor //
-	//=============//
-	
-	public GlobalWorldGenParams(IDhServerLevel dhServerLevel)
 	{
-		this.dhServerLevel = dhServerLevel;
+		this.lodLevel = lodLevel;
 		
-		this.mcServerLevel = ((ServerLevelWrapper) dhServerLevel.getServerLevelWrapper()).getWrappedMcObject();
+		this.level = ((ServerLevelWrapper) lodLevel.getServerLevelWrapper()).getWrappedMcObject();
-		MinecraftServer server = this.mcServerLevel.getServer();
+		MinecraftServer server = this.level.getServer();
 		WorldData worldData = server.getWorldData();
 		this.registry = server.registryAccess();
-		
+
 		#if MC_VER < MC_1_19_4
 		this.worldGenSettings = worldData.worldGenSettings();
 		this.biomes = registry.registryOrThrow(Registry.BIOME_REGISTRY);
@@ -120,19 +99,15 @@ public final class GlobalWorldGenParams
 		#endif
 		
 		#if MC_VER >= MC_1_18_2
-		this.biomeManager = new BiomeManager(this.mcServerLevel, BiomeManager.obfuscateSeed(this.worldSeed));
+		this.biomeManager = new BiomeManager(this.level, BiomeManager.obfuscateSeed(this.worldSeed));
-		this.chunkScanner = this.mcServerLevel.getChunkSource().chunkScanner();
+		this.chunkScanner = this.level.getChunkSource().chunkScanner();
 		#endif
-		
 		this.structures = server.getStructureManager();
-		this.generator = this.mcServerLevel.getChunkSource().getGenerator();
+		this.generator = this.level.getChunkSource().getGenerator();
-		this.dataFixer = server.getFixerUpper();
+		this.fixerUpper = server.getFixerUpper();
-		
 		#if MC_VER >= MC_1_19_2
-		this.randomState = this.mcServerLevel.getChunkSource().randomState();
+		this.randomState = this.level.getChunkSource().randomState();
 		#endif
 	}
 	
-	
-	
 }

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

@@ -1,311 +0,0 @@
-package com.seibel.distanthorizons.common.wrappers.worldGeneration;
-
-import com.seibel.distanthorizons.api.DhApi;
-import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.params.GlobalWorldGenParams;
-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.dependencyInjection.ModAccessorInjector;
-import com.seibel.distanthorizons.core.enums.MinecraftTextFormat;
-import com.seibel.distanthorizons.core.generation.DhLightingEngine;
-import com.seibel.distanthorizons.core.level.IDhServerLevel;
-import com.seibel.distanthorizons.core.logging.DhLogger;
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.pos.DhChunkPos;
-import com.seibel.distanthorizons.core.util.ExceptionUtil;
-import com.seibel.distanthorizons.core.util.LodUtil;
-import com.seibel.distanthorizons.core.util.TimerUtil;
-import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IC2meAccessor;
-import com.seibel.distanthorizons.coreapi.ModInfo;
-import net.minecraft.server.level.ChunkHolder;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.server.level.TicketType;
-import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.level.chunk.ChunkAccess;
-
-#if MC_VER <= MC_1_20_4
-import net.minecraft.world.level.chunk.ChunkStatus;
-#else
-import net.minecraft.world.level.chunk.status.ChunkStatus;
-#endif
-
-import java.util.*;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionException;
-import java.util.function.Function;
-
-public class InternalServerGenerator
-{
-	public static final DhLogger LOGGER = new DhLoggerBuilder()
-			.name("LOD World Gen - Internal Server")
-			.fileLevelConfig(Config.Common.Logging.logWorldGenEventToFile)
-			.build();
-	
-	public static final DhLogger CHUNK_LOAD_LOGGER = new DhLoggerBuilder()
-			.name("LOD Chunk Loading")
-			.fileLevelConfig(Config.Common.Logging.logWorldGenChunkLoadEventToFile)
-			.build();
-	
-	private static final IC2meAccessor C2ME_ACCESSOR = ModAccessorInjector.INSTANCE.get(IC2meAccessor.class);
-	
-	/**
-	 * Used to revert the ignore logic in {@link SharedApi} so
-	 * that a given chunk pos can be handled again.
-	 * A timer is used so we don't have to inject into MC's code and it works sell enough
-	 * most of the time.
-	 * If a chunk does get through due the timeout not being long enough that isn't the end of the world.
-	 */
-	private static final int MS_TO_IGNORE_CHUNK_AFTER_COMPLETION = 5_000;
-	
-	#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);
-	#endif
-	
-	private static boolean c2meMissingWarningLogged = false;
-	
-	
-	private final GlobalWorldGenParams params;
-	private final IDhServerLevel dhServerLevel;
-	private final Timer chunkSaveIgnoreTimer = TimerUtil.CreateTimer("ChunkSaveIgnoreTimer");
-	
-	
-	
-	//=============//
-	// constructor //
-	//=============//
-	
-	public InternalServerGenerator(GlobalWorldGenParams params, IDhServerLevel dhServerLevel)
-	{
-		this.params = params;
-		this.dhServerLevel = dhServerLevel;
-	}
-	
-	
-	
-	//============//
-	// generation //
-	//============//
-	
-	public void generateChunksViaInternalServer(GenerationEvent genEvent)
-	{
-		this.runValidation();
-		
-		try
-		{
-			//=====================//
-			// create gen requests //
-			//=====================//
-			
-			ArrayList<CompletableFuture<ChunkAccess>> getChunkFutureList = new ArrayList<>();
-			{
-				Iterator<ChunkPos> chunkPosIterator = ChunkPosGenStream.getIterator(genEvent.minPos.getX(), genEvent.minPos.getZ(), genEvent.widthInChunks, 0);
-				while (chunkPosIterator.hasNext())
-				{
-					ChunkPos chunkPos = chunkPosIterator.next();
-					
-					CompletableFuture<ChunkAccess> requestChunkFuture =
-						this.requestChunkFromServerAsync(chunkPos)
-							// log errors if necessary
-							.whenCompleteAsync(
-								(chunk, throwable) ->
-								{
-									// unwrap the CompletionException if necessary
-									Throwable actualThrowable = throwable;
-									while (actualThrowable instanceof CompletionException)
-									{
-										actualThrowable = actualThrowable.getCause();
-									}
-									
-									if (actualThrowable != null)
-									{
-										// ignore expected shutdown exceptions
-										boolean isShutdownException = 
-											ExceptionUtil.isShutdownException(actualThrowable)
-											|| actualThrowable.getMessage().contains("Unloaded chunk"); 
-										if (!isShutdownException)
-										{
-											CHUNK_LOAD_LOGGER.warn("DistantHorizons: Couldn't load chunk [" + chunkPos + "] from server, error: [" + actualThrowable.getMessage() + "].", actualThrowable);
-										}
-									}
-								});
-					
-					getChunkFutureList.add(requestChunkFuture);
-				}
-			}
-			
-			
-			
-			//==============================//
-			// wait for generation requests //
-			//==============================//
-			
-			// Join-ing each thread will prevent DH from working on anything else
-			// but will also prevent over-queuing world gen tasks.
-			// If C2ME is present the CPU will still be well utilized.
-			
-			ArrayList<IChunkWrapper> chunkWrappers = new ArrayList<>();
-			for (int i = 0; i < getChunkFutureList.size(); i++)
-			{
-				CompletableFuture<ChunkAccess> getChunkFuture = getChunkFutureList.get(i);
-				ChunkAccess chunk = getChunkFuture.join();
-				if (chunk != null)
-				{
-					ChunkWrapper chunkWrapper = new ChunkWrapper(chunk, this.dhServerLevel.getLevelWrapper());
-					chunkWrapper.createDhHeightMaps();
-					chunkWrappers.add(chunkWrapper);
-				}
-			}
-			
-			
-			
-			//==========================//
-			// process generated chunks //
-			//==========================//
-			
-			int maxSkyLight = this.dhServerLevel.getServerLevelWrapper().hasSkyLight() ? LodUtil.MAX_MC_LIGHT : LodUtil.MIN_MC_LIGHT;
-			for (int i = 0; i < chunkWrappers.size(); i++)
-			{
-				ChunkWrapper chunkWrapper = (ChunkWrapper)chunkWrappers.get(i);
-				
-				// pre-generated chunks should have lighting but new ones won't
-				if (!chunkWrapper.isDhBlockLightingCorrect())
-				{
-					DhLightingEngine.INSTANCE.bakeChunkBlockLighting(chunkWrapper, chunkWrappers, maxSkyLight);
-				}
-				
-				this.dhServerLevel.updateBeaconBeamsForChunk(chunkWrapper, chunkWrappers);
-				genEvent.resultConsumer.accept(chunkWrapper);
-			}
-		}
-		finally
-		{
-			// release all chunks from the server to prevent out of memory issues
-			Iterator<ChunkPos> chunkPosIterator = ChunkPosGenStream.getIterator(genEvent.minPos.getX(), genEvent.minPos.getZ(), genEvent.widthInChunks, 0);
-			while (chunkPosIterator.hasNext())
-			{
-				ChunkPos chunkPos = chunkPosIterator.next();
-				this.releaseChunkFromServer(this.params.mcServerLevel, chunkPos);
-			}
-		}
-	}
-	private void runValidation()
-	{
-		// DH thread check
-		if (!DhApi.isDhThread()
-			&& ModInfo.IS_DEV_BUILD)
-		{
-			throw new IllegalStateException("Internal server generation should be called from one of DH's world gen thread. Current thread: ["+Thread.currentThread().getName()+"]");
-		}
-		
-		
-		// C2ME present?
-		if (C2ME_ACCESSOR == null
-			&& !c2meMissingWarningLogged)
-		{
-			c2meMissingWarningLogged = true;
-			
-			String c2meWarning = "C2ME missing, \n" +
-				"low CPU usage and slow world gen speeds expected. \n" +
-				"DH is set to use MC's internal server for world gen \n" +
-				"this mode is less efficient unless a mod like C2ME is present."
-				;
-			
-			if (Config.Common.Logging.Warning.showSlowWorldGenSettingWarnings.get())
-			{
-				String message =
-					MinecraftTextFormat.ORANGE + "Distant Horizons: slow world gen." + MinecraftTextFormat.CLEAR_FORMATTING + "\n" +
-						c2meWarning;
-				ClientApi.INSTANCE.showChatMessageNextFrame(message);
-			}
-			
-			LOGGER.warn(c2meWarning);
-		}
-	}
-	private CompletableFuture<ChunkAccess> requestChunkFromServerAsync(ChunkPos chunkPos)
-	{
-		return CompletableFuture.supplyAsync(() ->
-		{
-			ServerLevel level = this.params.mcServerLevel;
-			
-			// ignore chunk update events for this position
-			SharedApi.CHUNK_UPDATE_QUEUE_MANAGER.addPosToIgnore(new DhChunkPos(chunkPos.x, chunkPos.z));
-			
-			#if MC_VER < MC_1_21_5
-			int chunkLevel = 33; // 33 is equivalent to FULL Chunk
-			level.getChunkSource().distanceManager.addTicket(DH_SERVER_GEN_TICKET, chunkPos, chunkLevel, chunkPos);
-			#else
-			level.getChunkSource().addTicketWithRadius(DH_SERVER_GEN_TICKET, chunkPos, 0);
-			#endif
-			
-			// probably not the most optimal to run updates here, but fast enough
-			level.getChunkSource().distanceManager.runAllUpdates(level.getChunkSource().chunkMap);
-			
-			ChunkHolder chunkHolder = level.getChunkSource().chunkMap.getUpdatingChunkIfPresent(chunkPos.toLong());
-			if (chunkHolder == null)
-			{
-				throw new IllegalStateException("No chunk chunkHolder for pos ["+chunkPos+"] after ticket has been added.");
-			}
-			
-			#if MC_VER <= MC_1_20_4
-			return chunkHolder.getOrScheduleFuture(ChunkStatus.FEATURES, level.getChunkSource().chunkMap)
-					.thenApply(result -> result.left().orElseThrow(() -> new RuntimeException(result.right().get().toString()))); // can throw if the server is shutting down
-			#elif MC_VER <= MC_1_20_6
-			return chunkHolder.getOrScheduleFuture(ChunkStatus.FEATURES, level.getChunkSource().chunkMap)
-					.thenApply(result -> result.orElseThrow(() -> new RuntimeException(result.toString()))); // can throw if the server is shutting down
-			#else
-			return chunkHolder.scheduleChunkGenerationTask(ChunkStatus.FEATURES, level.getChunkSource().chunkMap)
-					.thenApply(result -> result.orElseThrow(() -> new RuntimeException(result.getError()))); // can throw if the server is shutting down
-			#endif
-			
-		}, this.params.mcServerLevel.getChunkSource().chunkMap.mainThreadExecutor)
-		.thenCompose(Function.identity());
-	}
-	/**
-	 * mitigates out of memory issues in the vanilla chunk system. <br>
-	 * See: https://github.com/pop4959/Chunky/pull/383
-	 */
-	private void releaseChunkFromServer(ServerLevel level, ChunkPos chunkPos)
-	{
-		level.getChunkSource().chunkMap.mainThreadExecutor.execute(() ->
-		{
-			try
-			{
-				#if MC_VER < MC_1_21_5
-				int chunkLevel = 33; // 33 is equivalent to FULL Chunk
-				level.getChunkSource().distanceManager.removeTicket(DH_SERVER_GEN_TICKET, chunkPos, chunkLevel, chunkPos);
-				#else
-				level.getChunkSource().removeTicketWithRadius(DH_SERVER_GEN_TICKET, chunkPos, 0);
-				#endif
-				
-				level.getChunkSource().chunkMap.tick(() -> false);
-				
-				#if MC_VER > MC_1_16_5
-				level.entityManager.tick();
-				#endif
-				
-				
-				// give MC a few seconds to save the chunk before
-				// we can process update events there again
-				this.chunkSaveIgnoreTimer.schedule(new TimerTask()
-				{
-					@Override
-					public void run() { SharedApi.CHUNK_UPDATE_QUEUE_MANAGER.removePosToIgnore(new DhChunkPos(chunkPos.x, chunkPos.z)); }
-				}, MS_TO_IGNORE_CHUNK_AFTER_COMPLETION);
-				
-			}
-			catch (Exception e)
-			{
-				LOGGER.warn("Failed to release chunk back to internal server. Error: ["+e.getMessage()+"]", e);
-			}
-		});
-	}
-	
-	
-	
-}

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

@@ -17,16 +17,40 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.distanthorizons.fabric.wrappers.modAccessor;
 
-import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IC2meAccessor;
+package com.seibel.distanthorizons.common.wrappers.worldGeneration;
 
-public class C2meAccessor implements IC2meAccessor
+//FIXME: Move this outside the WorldGenerationStep thingy
+public class Rolling
 {
-	@Override
+	
-	public String getModName()
+	private final int size;
+	private double total = 0d;
+	private int index = 0;
+	private final double[] samples;
+	
+	public Rolling(int size)
 	{
-		return "c2me";
+		this.size = size;
+		samples = new double[size];
+		for (int i = 0; i < size; i++)
+		{
+			samples[i] = 0d;
+		}
 	}
 	
-}
+	public void add(double x)
+	{
+		total -= samples[index];
+		samples[index] = x;
+		total += x;
+		if (++index == size)
+			index = 0; // cheaper than modulus
+	}
+	
+	public double getAverage()
+	{
+		return size == 0 ? 0 : total / size;
+	}
+	
+}

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

@@ -0,0 +1,109 @@
+/*
+ *    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.worldGeneration;
+
+import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment.PerfCalculator;
+import com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject.WorldGenStructFeatManager;
+
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.WorldGenLevel;
+#if MC_VER >= MC_1_18_2
+import net.minecraft.world.level.levelgen.structure.StructureCheck;
+#endif
+
+public final class ThreadedParameters
+{
+	private static final ThreadLocal<ThreadedParameters> LOCAL_PARAM = new ThreadLocal<>();
+	
+	final ServerLevel level;
+	public WorldGenStructFeatManager structFeat = null;
+	#if MC_VER >= MC_1_18_2
+	public StructureCheck structCheck;
+	#endif
+	boolean isValid = true;
+	public final PerfCalculator perf = new PerfCalculator();
+	
+	private static GlobalParameters previousGlobalParameters = null;
+	
+	
+	
+	public static ThreadedParameters getOrMake(GlobalParameters param)
+	{
+		ThreadedParameters tParam = LOCAL_PARAM.get();
+		if (tParam != null && tParam.isValid && tParam.level == param.level)
+		{
+			return tParam;
+		}
+		
+		tParam = new ThreadedParameters(param);
+		LOCAL_PARAM.set(tParam);
+		return tParam;
+	}
+	
+	private ThreadedParameters(GlobalParameters param)
+	{
+		previousGlobalParameters = param;
+		
+		this.level = param.level;
+		#if MC_VER < MC_1_18_2
+		this.structFeat = new WorldGenStructFeatManager(param.worldGenSettings, level);
+		#elif MC_VER < MC_1_19_2
+		this.structCheck = this.createStructureCheck(param);
+		#else
+		this.structCheck = new StructureCheck(param.chunkScanner, param.registry, param.structures,
+				param.level.dimension(), param.generator, param.randomState, level, param.generator.getBiomeSource(), param.worldSeed,
+				param.fixerUpper);
+		#endif
+	}
+	
+	
+	
+	public void markAsInvalid() { isValid = false; }
+	
+	public void makeStructFeat(WorldGenLevel genLevel, GlobalParameters param)
+	{
+		#if MC_VER < MC_1_19_4
+		structFeat = new WorldGenStructFeatManager(param.worldGenSettings, genLevel #if MC_VER >= MC_1_18_2 , structCheck #endif );
+		#else
+		structFeat = new WorldGenStructFeatManager(param.worldOptions, genLevel, structCheck);
+		#endif
+	}
+	
+	
+	#if MC_VER >= MC_1_18_2 && MC_VER < MC_1_19_2
+	public void recreateStructureCheck()
+	{
+		if (previousGlobalParameters != null)
+		{
+			this.structCheck = createStructureCheck(previousGlobalParameters);
+		}
+	}
+	private StructureCheck createStructureCheck(GlobalParameters param)
+	{
+		return new StructureCheck(param.chunkScanner, param.registry, param.structures,
+				param.level.dimension(), param.generator, this.level, param.generator.getBiomeSource(), param.worldSeed,
+				param.fixerUpper);
+	}
+	#else
+	public void recreateStructureCheck() { /* do nothing */ }	
+	#endif
+	
+}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/chunkFileHandling/ChunkCompoundTagParser.java

@@ -1,745 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU GPL 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 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 General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.common.wrappers.worldGeneration.chunkFileHandling;
-
-import com.mojang.serialization.Codec;
-import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
-
-import com.seibel.distanthorizons.core.config.Config;
-import com.seibel.distanthorizons.core.level.IDhServerLevel;
-import com.seibel.distanthorizons.core.logging.DhLogger;
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.util.LodUtil;
-import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.ChunkLightStorage;
-
-import java.util.Objects;
-import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper;
-import net.minecraft.core.Registry;
-#if MC_VER >= MC_1_19_4
-import net.minecraft.core.registries.Registries;
-#endif
-
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.ListTag;
-import net.minecraft.nbt.NbtOps;
-import net.minecraft.nbt.Tag;
-import net.minecraft.world.level.*;
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.biome.Biomes;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.chunk.*;
-
-#if MC_VER < MC_1_21_3
-import net.minecraft.world.level.chunk.storage.ChunkSerializer;
-#else
-#endif
-
-#if MC_VER < MC_1_21_9
-import net.minecraft.world.level.block.Blocks;
-#else
-#endif
-
-import net.minecraft.world.level.levelgen.Heightmap;
-#if MC_VER >= MC_1_18_2
-#if MC_VER < MC_1_19_2
-import net.minecraft.world.level.levelgen.feature.StructureFeature;
-#endif
-import net.minecraft.world.ticks.LevelChunkTicks;
-#endif
-#if MC_VER >= MC_1_18_2
-import net.minecraft.core.Holder;
-#if MC_VER < MC_1_19_2
-import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
-#endif
-#endif
-
-#if MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1
-import net.minecraft.world.level.material.Fluids;
-#endif
-
-#if MC_VER == MC_1_20_6
-import net.minecraft.world.level.chunk.status.ChunkStatus;
-import net.minecraft.world.level.chunk.status.ChunkType;
-#elif MC_VER >= MC_1_21_1
-import net.minecraft.world.level.chunk.status.ChunkStatus;
-#endif
-
-import net.minecraft.world.level.material.Fluid;
-
-
-public class ChunkCompoundTagParser
-{
-	public static final DhLogger LOGGER = new DhLoggerBuilder()
-		.name("LOD Chunk Reader")
-		.fileLevelConfig(Config.Common.Logging.logWorldGenChunkLoadEventToFile)
-		.build();
-	
-	private static final AtomicBoolean ZERO_CHUNK_POS_ERROR_LOGGED_REF = new AtomicBoolean(false);
-	private static final ConcurrentHashMap<String, Object> LOGGED_ERROR_MESSAGE_MAP = new ConcurrentHashMap<>();
-	
-	private static boolean lightingSectionErrorLogged = false;
-	
-	
-	
-	
-	//============//
-	// read chunk //
-	//============//
-	
-	public static ChunkWrapper createFromTag(
-		WorldGenLevel mcWorldGenLevel, IDhServerLevel dhServerLevel, 
-		ChunkPos chunkPos, CompoundTag chunkData)
-	{
-		#if MC_VER < MC_1_18_2
-		CompoundTag tagLevel = chunkData.getCompound("Level");
-		#else
-		CompoundTag tagLevel = chunkData;
-		#endif
-		
-		
-		
-		//=======================//
-		// validate the chunkPos //
-		//=======================//
-		
-		int chunkX = CompoundTagUtil.getInt(tagLevel,"xPos");
-		int chunkZ = CompoundTagUtil.getInt(tagLevel, "zPos");
-		ChunkPos actualChunkPos = new ChunkPos(chunkX, chunkZ);
-		
-		// confirm chunk pos is correct
-		if (!Objects.equals(chunkPos, actualChunkPos))
-		{
-			if (chunkX == 0 && chunkZ == 0)
-			{
-				if (!ZERO_CHUNK_POS_ERROR_LOGGED_REF.getAndSet(true))
-				{
-					// explicit chunkPos toString is necessary otherwise the JDK 17 compiler breaks
-					LOGGER.warn("Chunk file at ["+chunkPos.toString()+"] doesn't have a chunk pos. \n" +
-						"This might happen if the world was created using an external program. \n" +
-						"DH will attempt to parse the chunk anyway and won't log this message again.\n" +
-						"If issues arise please try optimizing your world to fix this issue. \n" +
-						"World optimization can be done from the singleplayer world selection screen." +
-						" ");
-				}
-			}
-			else
-			{
-				LOGGER.error("Chunk file at ["+chunkPos.toString()+"] is in the wrong location. \n" +
-					"Please try optimizing your world to fix this issue. \n" +
-					"World optimization can be done from the singleplayer world selection screen. \n" +
-					"(Expected pos: ["+chunkPos.toString()+"], actual ["+actualChunkPos.toString()+"])" +
-					" ");
-				return null;
-			}
-		}
-		
-		
-		
-		//===========//
-		// get ticks //
-		//===========//
-		
-		#if MC_VER < MC_1_18_2
-		ChunkBiomeContainer chunkBiomeContainer = new ChunkBiomeContainer(
-				mcWorldGenLevel.getLevel().registryAccess().registryOrThrow(Registry.BIOME_REGISTRY), #if MC_VER >= MC_1_17_1 mcWorldGenLevel, #endif
-				chunkPos, mcWorldGenLevel.getLevel().getChunkSource().getGenerator().getBiomeSource(),
-				tagLevel.contains("Biomes", 11) ? tagLevel.getIntArray("Biomes") : null);
-		
-		String BLOCK_TICKS_TAG_PRE18 = "TileTicks";
-		TickList<Block> blockTicks = tagLevel.contains(BLOCK_TICKS_TAG_PRE18, 9)
-				? ChunkTickList.create(tagLevel.getList(BLOCK_TICKS_TAG_PRE18, 10), Registry.BLOCK::getKey, Registry.BLOCK::get)
-				: new ProtoTickList<Block>(block -> (block == null || block.defaultBlockState().isAir()), chunkPos,
-				tagLevel.getList("ToBeTicked", 9) #if MC_VER >= MC_1_17_1 , mcWorldGenLevel #endif );
-		
-		String FLUID_TICKS_TAG_PRE18 = "LiquidTicks";
-		TickList<Fluid> fluidTicks = tagLevel.contains(FLUID_TICKS_TAG_PRE18, 9)
-				? ChunkTickList.create(tagLevel.getList(FLUID_TICKS_TAG_PRE18, 10), Registry.FLUID::getKey, Registry.FLUID::get)
-				: new ProtoTickList<Fluid>(fluid -> (fluid == null || fluid == Fluids.EMPTY), chunkPos,
-				tagLevel.getList("LiquidsToBeTicked", 9) #if MC_VER >= MC_1_17_1 , mcWorldGenLevel #endif );
-		#else
-		// ticks shouldn't be needed so ignore them for MC versions after 1.18.2
-		LevelChunkTicks<Block> blockTicks = new LevelChunkTicks<>();
-		LevelChunkTicks<Fluid> fluidTicks = new LevelChunkTicks<>();
-		#endif
-		
-		
-		
-		//=====================//
-		// get misc properties //
-		//=====================//
-		
-		int sectionYCount = #if MC_VER < MC_1_17_1 16; #else mcWorldGenLevel.getSectionsCount(); #endif
-		LevelChunkSection[] chunkSections = new LevelChunkSection[sectionYCount];
-		boolean hasBlocks = readAndPopulateSections(mcWorldGenLevel, chunkPos, tagLevel, chunkSections);
-		if (!hasBlocks)
-		{
-			return null;
-		}
-		
-		
-		long inhabitedTime = CompoundTagUtil.getLong(tagLevel, "InhabitedTime");
-		boolean isLightOn = CompoundTagUtil.getBoolean(tagLevel, "isLightOn");
-		
-		
-		
-		//============//
-		// make chunk //
-		//============//
-		
-		#if MC_VER < MC_1_18_2
-		LevelChunk chunk = new LevelChunk((Level) mcWorldGenLevel.getLevel(), chunkPos, chunkBiomeContainer, UpgradeData.EMPTY, blockTicks,
-				fluidTicks, inhabitedTime, chunkSections, null);
-		#else
-		LevelChunk chunk = new LevelChunk((Level) mcWorldGenLevel, chunkPos, UpgradeData.EMPTY, blockTicks,
-				fluidTicks, inhabitedTime, chunkSections, null, null);
-		#endif
-		
-		// Set some states after object creation
-		chunk.setLightCorrect(isLightOn);
-		boolean hasHeightmapData = readHeightmaps(chunk, chunkData);
-		
-		// chunk wrapper so we can pass along extra data more easily
-		ChunkWrapper chunkWrapper = new ChunkWrapper(chunk, dhServerLevel.getServerLevelWrapper());
-		chunkWrapper.createDhHeightMaps();
-		
-		
-		
-		//===========================//
-		// check if chunk has blocks //
-		//===========================//
-		
-		// in some MC versions all the NBT data will be there
-		// but the chunk will be totally empty,
-		// usually this means the chunk was only partially generated.
-		// If that happens we should try to generate the chunk from scratch
-		// otherwise we can end up with large empty holes in the world.
-		
-		// walking through the heightmap (recreated by DH if missing)
-		// is a fast way to check if there are any blocks in the chunk
-		boolean chunkHasBlocks = false;
-		int serverMinHeight = dhServerLevel.getServerLevelWrapper().getMinHeight();
-		for (int x = 0; x < 16 && !chunkHasBlocks; x++)
-		{
-			for (int z = 0; z < 16 && !chunkHasBlocks; z++)
-			{
-				int heightMap = Math.max(
-					// max between both heightmaps just in case there's a discrepancy
-					chunkWrapper.getLightBlockingHeightMapValue(x, z),
-					chunkWrapper.getSolidHeightMapValue(x, z)
-				);
-				if (heightMap != serverMinHeight)
-				{
-					chunkHasBlocks = true;
-				}
-			}
-		}
-		
-		
-		if (chunkHasBlocks)
-		{
-			return chunkWrapper;
-		}
-		else
-		{
-			// no blocks detected, this chunk should be generated from scratch
-			return null;
-		}
-	}
-	
-	
-	
-	//=================//
-	// chunk sections  //
-	// (Blocks/biomes) //
-	//=================//
-	
-	/** handles both blocks and biomes */
-	private static boolean readAndPopulateSections(
-		LevelAccessor level, ChunkPos chunkPos, CompoundTag chunkData,
-		LevelChunkSection[] chunkSections)
-	{
-		int sectionYCount = #if MC_VER < MC_1_17_1 16; #else level.getSectionsCount(); #endif
-		
-		ListTag tagSections = CompoundTagUtil.getListTag(chunkData, "Sections", 10);
-		// try lower-case "sections" if capital "Sections" is missing
-		if (tagSections == null 
-			|| tagSections.isEmpty())
-		{
-			tagSections = CompoundTagUtil.getListTag(chunkData, "sections", 10);
-		}
-		
-		
-		boolean blocksFound = false;
-		if (tagSections != null)
-		{
-			for (int i = 0; i < tagSections.size(); ++i)
-			{
-				CompoundTag tagSection = CompoundTagUtil.getCompoundTag(tagSections, i);
-				if (tagSection == null)
-				{
-					continue;
-				}
-				
-				final int sectionYPos = CompoundTagUtil.getByte(tagSection, "Y");
-				
-				
-				
-				//===================//
-				// get blocks/biomes //
-				//===================//
-				
-				#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())
-					{
-						int sectionIndex;
-						#if MC_VER < MC_1_17_1 
-						sectionIndex = sectionYPos;
-						#else 
-						sectionIndex = level.getSectionIndexFromSectionY(sectionYPos); 
-						#endif
-						
-						chunkSections[sectionIndex] = levelChunkSection;
-					}
-				}
-				
-				#else
-				
-				int sectionId = level.getSectionIndexFromSectionY(sectionYPos);
-				if (sectionId >= 0 
-					&& sectionId < chunkSections.length)
-				{
-					//========//
-					// blocks //
-					//========//
-					
-					PalettedContainer<BlockState> blockStateContainer;
-					
-					boolean containsBlockStates = CompoundTagUtil.contains(tagSection, "block_states", 10);
-					if (containsBlockStates)
-					{
-						Codec<PalettedContainer<BlockState>> blockStateCodec = getBlockStateCodec(level);
-						
-						#if MC_VER < MC_1_20_6 
-						blockStateContainer = blockStateCodec
-							.parse(NbtOps.INSTANCE, CompoundTagUtil.getCompoundTag(tagSection, "block_states"))
-							.promotePartial(string -> logBlockDeserializationWarning(chunkPos, sectionYPos, string))
-							.getOrThrow(false, (message) -> logParsingWarningOnce(message));
-						#else
-						blockStateContainer = blockStateCodec
-							.parse(NbtOps.INSTANCE, CompoundTagUtil.getCompoundTag(tagSection, "block_states"))
-							.promotePartial(string -> logBlockDeserializationWarning(chunkPos, sectionYPos, string))
-							.getOrThrow((message) -> logErrorAndReturnException(message));
-						#endif
-						
-						blocksFound = true;
-					}
-					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
-					}
-					
-					
-					
-					//========//
-					// biomes //
-					//========//
-					
-					Registry<Biome> biomeRegistry = getBiomeRegistry(level);
-					
-					#if MC_VER < MC_1_19_2
-					Codec<PalettedContainer<Biome>> biomeCodec;
-					#else 
-					Codec<PalettedContainer<Holder<Biome>>> biomeCodec;
-					#endif
-					biomeCodec = getBiomeCodec(level, biomeRegistry);
-					
-					#if MC_VER < MC_1_18_2
-					PalettedContainer<Biome> biomeContainer;
-					#else
-					PalettedContainer<Holder<Biome>> biomeContainer;
-					#endif
-					
-					#if MC_VER < MC_1_18_2
-					biomeContainer = tagSection.contains("biomeRegistry", 10)
-							? biomeCodec.parse(NbtOps.INSTANCE, tagSection.getCompound("biomeRegistry")).promotePartial(string -> logErrors(chunkPos, sectionYPos, string)).getOrThrow(false, (message) -> logWarningOnce(message))
-							: new PalettedContainer<Biome>(biomeRegistry, biomeRegistry.getOrThrow(Biomes.PLAINS), PalettedContainer.Strategy.SECTION_BIOMES);
-					#else
-					{
-						CompoundTag biomeTag = CompoundTagUtil.getCompoundTag(tagSection, "biomeRegistry");
-						if (biomeTag == null)
-						{
-							biomeTag = CompoundTagUtil.getCompoundTag(tagSection, "biomes");
-						}
-						
-						if (biomeTag != null
-							&& !biomeTag.isEmpty())
-						{
-							#if MC_VER < MC_1_20_6
-							biomeContainer = new PalettedContainer<Holder<Biome>>(
-								biomeRegistry.asHolderIdMap(),
-								biomeRegistry.getHolderOrThrow(Biomes.PLAINS), PalettedContainer.Strategy.SECTION_BIOMES);
-							#else
-							biomeContainer = biomeCodec.parse(NbtOps.INSTANCE, biomeTag)
-								.promotePartial(string -> logBiomeDeserializationWarning(chunkPos, sectionYCount, (String) string))
-								.getOrThrow((message) -> logErrorAndReturnException(message));
-							#endif
-						}
-						else
-						{
-							// no biomes found, use the default (probably plains)
-							
-							#if MC_VER < MC_1_21_3
-							biomeContainer = new PalettedContainer<Holder<Biome>>(
-									biomeRegistry.asHolderIdMap(), 
-									biomeRegistry.getHolderOrThrow(Biomes.PLAINS), PalettedContainer.Strategy.SECTION_BIOMES);
-							#elif MC_VER < MC_1_21_9
-							biomeContainer = new PalettedContainer<Holder<Biome>>(biomeRegistry.asHolderIdMap(),
-									biomeRegistry.getOrThrow(Biomes.PLAINS),
-									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
-				
-			}	
-		}
-		
-		return blocksFound;
-	}
-	
-	private static Codec<PalettedContainer<BlockState>> getBlockStateCodec(LevelAccessor level)
-	{
-		#if MC_VER < MC_1_18_2
-		return null; // unused for older MC versions
-		#elif MC_VER < MC_1_19_2
-		return PalettedContainer.codec(Block.BLOCK_STATE_REGISTRY, BlockState.CODEC, PalettedContainer.Strategy.SECTION_STATES, Blocks.AIR.defaultBlockState());
-		#elif MC_VER <= MC_1_21_8
-		return PalettedContainer.codecRW(Block.BLOCK_STATE_REGISTRY, BlockState.CODEC, PalettedContainer.Strategy.SECTION_STATES, Blocks.AIR.defaultBlockState());
-		#else
-		return PalettedContainerFactory.create(level.registryAccess()).blockStatesContainerCodec();
-		#endif
-	}
-	
-	private static Registry<Biome> getBiomeRegistry(LevelAccessor level)
-	{
-		#if MC_VER < MC_1_18_2
-		// not needed
-		return null;
-		#elif MC_VER < MC_1_19_4
-		return level.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY);
-		#elif MC_VER < MC_1_21_3
-		return level.registryAccess().registryOrThrow(Registries.BIOME);
-		#else
-		return level.registryAccess().lookupOrThrow(Registries.BIOME);
-		#endif	
-	}
-	private static 
-		#if MC_VER < MC_1_19_2 Codec<PalettedContainer<Biome>>
-		#else Codec<PalettedContainer<Holder<Biome>>>
-		#endif
-		getBiomeCodec(LevelAccessor level, Registry<Biome> biomeRegistry)
-	{
-		#if MC_VER < MC_1_18_2
-		return null; // unused for older MC versions
-		#elif MC_VER < MC_1_19_2
-		return PalettedContainer.codec(
-				biomeRegistry, biomeRegistry.byNameCodec(), PalettedContainer.Strategy.SECTION_BIOMES, biomeRegistry.getOrThrow(Biomes.PLAINS));
-		#elif MC_VER < MC_1_19_2
-		return PalettedContainer.codec(
-			biomeRegistry.asHolderIdMap(), biomeRegistry.holderByNameCodec(), PalettedContainer.Strategy.SECTION_BIOMES, biomeRegistry.getHolderOrThrow(Biomes.PLAINS));
-		#elif MC_VER < MC_1_21_3
-		return PalettedContainer.codecRW(
-			biomeRegistry.asHolderIdMap(), biomeRegistry.holderByNameCodec(), PalettedContainer.Strategy.SECTION_BIOMES, biomeRegistry.getHolderOrThrow(Biomes.PLAINS));
-		#elif MC_VER < MC_1_21_9
-		return PalettedContainer.codecRW(
-			biomeRegistry.asHolderIdMap(), biomeRegistry.holderByNameCodec(), PalettedContainer.Strategy.SECTION_BIOMES, biomeRegistry.getOrThrow(Biomes.PLAINS));
-		#else
-		return PalettedContainer.codecRW(
-			biomeRegistry.holderByNameCodec(), PalettedContainerFactory.create(level.registryAccess()).biomeStrategy(), biomeRegistry.getOrThrow(Biomes.PLAINS));
-		#endif
-	}
-	
-	
-	
-	//============//
-	// heightmaps //
-	//============//
-	
-	private static boolean readHeightmaps(LevelChunk chunk, CompoundTag chunkData)
-	{
-		CompoundTag tagHeightmaps = CompoundTagUtil.getCompoundTag(chunkData, "Heightmaps");
-		if (tagHeightmaps == null)
-		{
-			return false;
-		}
-		
-		
-		for (Heightmap.Types type : ChunkStatus.FULL.heightmapsAfter())
-		{
-			String heightmapKey = type.getSerializationKey();
-			
-			#if MC_VER < MC_1_21_5
-			if (tagHeightmaps.contains(heightmapKey, 12))
-			{
-				chunk.setHeightmap(type, tagHeightmaps.getLongArray(heightmapKey));
-			}
-			#else
-			if (tagHeightmaps.contains(heightmapKey))
-			{
-				Optional<long[]> optionalHeightmap = tagHeightmaps.getLongArray(heightmapKey);
-				if (optionalHeightmap.isPresent())
-				{
-					chunk.setHeightmap(type, optionalHeightmap.get());
-				}
-			}
-			#endif
-		}
-		
-		Heightmap.primeHeightmaps(chunk, ChunkStatus.FULL.heightmapsAfter());
-		return true;
-	}
-	
-	
-	
-	//================//
-	// chunk lighting //
-	//================//
-	
-	/** source: https://minecraft.wiki/w/Chunk_format */
-	public static CombinedChunkLightStorage readLight(ChunkAccess chunk, CompoundTag chunkData)
-	{
-		#if MC_VER <= MC_1_17_1
-		// MC 1.16 and 1.17 doesn't have the necessary NBT info
-		return null;
-		#else
-		
-		CombinedChunkLightStorage combinedStorage = new CombinedChunkLightStorage(ChunkWrapper.getInclusiveMinBuildHeight(chunk), ChunkWrapper.getExclusiveMaxBuildHeight(chunk));
-		ChunkLightStorage blockLightStorage = combinedStorage.blockLightStorage;
-		ChunkLightStorage skyLightStorage = combinedStorage.skyLightStorage;
-		
-		boolean foundSkyLight = false;
-		
-		
-		
-		//===================//
-		// get NBT tags info //
-		//===================//
-		
-		Tag chunkSectionTags = chunkData.get("sections");
-		if (chunkSectionTags == null)
-		{
-			if (!lightingSectionErrorLogged)
-			{
-				lightingSectionErrorLogged = true;
-				LOGGER.error("No sections found for chunk at pos ["+chunk.getPos()+"] chunk data may be out of date.");
-			}
-			return null;
-		}
-		else if (!(chunkSectionTags instanceof ListTag))
-		{
-			if (!lightingSectionErrorLogged)
-			{
-				lightingSectionErrorLogged = true;
-				LOGGER.error("Chunk section tag list have unexpected type ["+chunkSectionTags.getClass().getName()+"], expected ["+ListTag.class.getName()+"].");
-			}
-			return null;
-		}
-		ListTag chunkSectionListTag = (ListTag) chunkSectionTags;
-		
-		
-		
-		//===================//
-		// get lighting info //
-		//===================//
-		
-		for (int sectionIndex = 0; sectionIndex < chunkSectionListTag.size(); sectionIndex++)
-		{
-			Tag chunkSectionTag = chunkSectionListTag.get(sectionIndex);
-			if (!(chunkSectionTag instanceof CompoundTag))
-			{
-				if (!lightingSectionErrorLogged)
-				{
-					lightingSectionErrorLogged = true;
-					LOGGER.error("Chunk section tag has an unexpected type ["+chunkSectionTag.getClass().getName()+"], expected ["+CompoundTag.class.getName()+"].");
-				}
-				return null;
-			}
-			CompoundTag chunkSectionCompoundTag = (CompoundTag) chunkSectionTag;
-			
-			
-			// if null all lights = 0
-			byte[] blockLightNibbleArray = CompoundTagUtil.getByteArray(chunkSectionCompoundTag, "BlockLight");
-			byte[] skyLightNibbleArray = CompoundTagUtil.getByteArray(chunkSectionCompoundTag, "SkyLight");
-			
-			if (blockLightNibbleArray != null 
-				&& skyLightNibbleArray != null)
-			{
-				// if any sky light was found then all lights above will be max brightness
-				if (skyLightNibbleArray.length != 0)
-				{
-					foundSkyLight = true;
-				}
-				
-				for (int relX = 0; relX < LodUtil.CHUNK_WIDTH; relX++)
-				{
-					for (int relZ = 0; relZ < LodUtil.CHUNK_WIDTH; relZ++)
-					{
-						// chunk sections are also 16 blocks tall
-						for (int relY = 0; relY < LodUtil.CHUNK_WIDTH; relY++)
-						{
-							int blockPosIndex = relY*16*16 + relZ*16 + relX;
-							byte blockLight = (blockLightNibbleArray.length == 0) ? 0 : getNibbleAtIndex(blockLightNibbleArray, blockPosIndex);
-							byte skyLight = (skyLightNibbleArray.length == 0) ? 0 : getNibbleAtIndex(skyLightNibbleArray, blockPosIndex);
-							if (skyLightNibbleArray.length == 0 && foundSkyLight)
-							{
-								skyLight = LodUtil.MAX_MC_LIGHT;
-							}
-							
-							int y = relY + (sectionIndex * LodUtil.CHUNK_WIDTH) + ChunkWrapper.getInclusiveMinBuildHeight(chunk);
-							blockLightStorage.set(relX, y, relZ, blockLight);
-							skyLightStorage.set(relX, y, relZ, skyLight);
-						}
-					}
-				}
-			}
-		}
-		
-		return combinedStorage;
-		#endif
-	}
-	/** source: https://minecraft.wiki/w/Chunk_format#Block_Format */
-	private static byte getNibbleAtIndex(byte[] arr, int index)
-	{
-		if (index % 2 == 0)
-		{
-			return (byte)(arr[index/2] & 0x0F);
-		}
-		else
-		{
-			return (byte)((arr[index/2]>>4) & 0x0F);
-		}
-	}
-	
-	
-	
-	//=========//
-	// logging //
-	//=========//
-	
-	private static void logBlockDeserializationWarning(ChunkPos chunkPos, int sectionYIndex, String message)
-	{
-		LOGGED_ERROR_MESSAGE_MAP.computeIfAbsent(message, (newMessage) ->
-		{
-			LOGGER.warn("Unable to deserialize blocks for chunk section [" + chunkPos.x + ", " + sectionYIndex + ", " + chunkPos.z + "], error: ["+newMessage+"]. " +
-					"This can probably be ignored, although if your world looks wrong, optimizing it via the single player menu then deleting your DH database(s) should fix the problem.");
-			
-			return newMessage;
-		});
-	}
-	private static void logBiomeDeserializationWarning(ChunkPos chunkPos, int sectionYIndex, String message)
-	{
-		LOGGED_ERROR_MESSAGE_MAP.computeIfAbsent(message, (newMessage) -> 
-		{
-			LOGGER.warn("Unable to deserialize biomes for chunk section [" + chunkPos.x + ", " + sectionYIndex + ", " + chunkPos.z + "], error: ["+newMessage+"]. " +
-					"This can probably be ignored, although if your world looks wrong, optimizing it via the single player menu then deleting your DH database(s) should fix the problem.");
-			
-			return newMessage;
-		});
-	}
-	
-	private static void logParsingWarningOnce(String message) { logParsingWarningOnce(message, null); }
-	private static void logParsingWarningOnce(String message, Exception e)
-	{
-		if (message == null)
-		{
-			return;
-		}
-		
-		LOGGED_ERROR_MESSAGE_MAP.computeIfAbsent(message, (newMessage) ->
-		{
-			LOGGER.warn("Parsing error: ["+newMessage+"]. " +
-					"This can probably be ignored, although if your world looks wrong, optimizing it via the single player menu then deleting your DH database(s) should fix the problem.",
-					e);
-			
-			return newMessage;
-		});
-	}
-	
-	private static RuntimeException logErrorAndReturnException(String message)
-	{
-		LOGGED_ERROR_MESSAGE_MAP.computeIfAbsent(message, (newMessage) ->
-		{
-			LOGGER.warn("Parsing error: ["+newMessage+"]. " +
-					"This can probably be ignored, although if your world looks wrong, optimizing it via the single player menu then deleting your DH database(s) should fix the problem.");
-			
-			return newMessage;
-		});
-		
-		// Currently we want to ignore these errors, if returning null is a problem, we can change this later
-		return null; //new RuntimeException(message);
-	}
-	
-	
-	
-	//================//
-	// helper classes //
-	//================//
-	
-	public static class CombinedChunkLightStorage
-	{
-		public ChunkLightStorage blockLightStorage;
-		public ChunkLightStorage skyLightStorage;
-		
-		public CombinedChunkLightStorage(int minY, int maxY)
-		{
-			this.blockLightStorage = ChunkLightStorage.createBlockLightStorage(minY, maxY);
-			this.skyLightStorage = ChunkLightStorage.createSkyLightStorage(minY, maxY);
-		}
-	}
-	
-	
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/chunkFileHandling/ChunkFileReader.java

@@ -1,343 +0,0 @@
-package com.seibel.distanthorizons.common.wrappers.worldGeneration.chunkFileHandling;
-
-import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.params.GlobalWorldGenParams;
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject.RegionFileStorageExternalCache;
-import com.seibel.distanthorizons.core.config.Config;
-import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
-import com.seibel.distanthorizons.core.logging.DhLogger;
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.pos.DhChunkPos;
-import com.seibel.distanthorizons.core.util.ExceptionUtil;
-import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.ChunkLightStorage;
-import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IModChecker;
-
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.level.ChunkPos;
-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 java.io.IOException;
-import java.nio.channels.ClosedByInterruptException;
-import java.nio.channels.ClosedChannelException;
-import java.util.Map;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.CompletionException;
-import java.util.concurrent.atomic.AtomicReference;
-
-#if MC_VER <= MC_1_17_1
-import net.minecraft.world.level.chunk.ChunkStatus;
-#elif MC_VER <= MC_1_19_2
-import net.minecraft.world.level.chunk.ChunkStatus;
-import net.minecraft.core.Registry;
-#elif MC_VER <= MC_1_19_4
-import net.minecraft.core.registries.Registries;
-import net.minecraft.world.level.chunk.ChunkStatus;
-#elif MC_VER <= MC_1_20_6
-import net.minecraft.core.registries.Registries;
-#elif MC_VER <= MC_1_21_3
-import net.minecraft.core.registries.Registries;
-import net.minecraft.world.level.chunk.status.ChunkStatus;
-#elif MC_VER <= MC_1_21_8
-import net.minecraft.core.registries.Registries;
-import net.minecraft.world.level.chunk.status.ChunkStatus;
-#elif MC_VER <= MC_1_21_9
-import net.minecraft.world.level.chunk.PalettedContainerFactory;
-#else
-import net.minecraft.world.level.chunk.PalettedContainerFactory;
-#endif
-
-public class ChunkFileReader implements AutoCloseable
-{
-	
-	public static final DhLogger LOGGER = new DhLoggerBuilder()
-		.name("LOD World Gen")
-		.fileLevelConfig(Config.Common.Logging.logWorldGenEventToFile)
-		.build();
-	
-	public static final DhLogger CHUNK_LOAD_LOGGER = new DhLoggerBuilder()
-		.name("LOD Chunk Loading")
-		.fileLevelConfig(Config.Common.Logging.logWorldGenChunkLoadEventToFile)
-		.build();
-	
-	private static final IModChecker MOD_CHECKER = SingletonInjector.INSTANCE.get(IModChecker.class);
-	
-	public final GlobalWorldGenParams params;
-	
-	/**
-	 * will be true if C2ME is installed (since they require us to
-	 * pull chunks using their async method), or if there
-	 * was an issue with the sync pulling method.
-	 */
-	private boolean pullExistingChunkUsingMcAsyncMethod = false;
-	
-	private final AtomicReference<RegionFileStorageExternalCache> regionFileStorageCacheRef = new AtomicReference<>();
-	public RegionFileStorageExternalCache getOrCreateRegionFileCache(RegionFileStorage storage)
-	{
-		RegionFileStorageExternalCache cache = this.regionFileStorageCacheRef.get();
-		if (cache == null)
-		{
-			cache = new RegionFileStorageExternalCache(storage);
-			if (!this.regionFileStorageCacheRef.compareAndSet(null, cache))
-			{
-				cache = this.regionFileStorageCacheRef.get();
-			}
-		}
-		return cache;
-	}
-	
-	
-	
-	//=============//
-	// constructor //
-	//=============//
-	
-	public ChunkFileReader(GlobalWorldGenParams params)
-	{
-		this.params = params;
-		
-		if (MOD_CHECKER.isModLoaded("c2me"))
-		{
-			LOGGER.info("C2ME detected: DH's pre-existing chunk accessing will use methods handled by C2ME.");
-			this.pullExistingChunkUsingMcAsyncMethod = true;
-		}
-		
-	}
-	
-	
-	
-	//=============//
-	// constructor //
-	//=============//
-	
-	/**
-	 * If the given chunk pos already exists in the world, that chunk will be returned,
-	 * otherwise this will return an empty chunk.
-	 */
-	public CompletableFuture<ChunkWrapper> createEmptyOrPreExistingChunkWrapperAsync(
-		int chunkX, int chunkZ,
-		Map<DhChunkPos, ChunkLightStorage> chunkSkyLightingByDhPos,
-		Map<DhChunkPos, ChunkLightStorage> chunkBlockLightingByDhPos,
-		Map<DhChunkPos, ChunkWrapper> generatedChunkWrapperByDhPos)
-	{
-		ChunkPos chunkPos = new ChunkPos(chunkX, chunkZ);
-		DhChunkPos dhChunkPos = new DhChunkPos(chunkX, chunkZ);
-		
-		if (generatedChunkWrapperByDhPos.containsKey(dhChunkPos))
-		{
-			return CompletableFuture.completedFuture(generatedChunkWrapperByDhPos.get(dhChunkPos));
-		}
-		
-		return this.getChunkNbtDataAsync(chunkPos)
-			.thenApply((CompoundTag chunkData) ->
-			{
-				ChunkWrapper newChunkWrapper = this.loadOrMakeChunkWrapper(chunkPos, chunkData);
-				
-				// attempt to get chunk lighting
-				ChunkCompoundTagParser.CombinedChunkLightStorage combinedLights = ChunkCompoundTagParser.readLight(newChunkWrapper.getChunk(), chunkData);
-				if (combinedLights != null)
-				{
-					// may be empty, empty checks are handled later
-					chunkSkyLightingByDhPos.put(dhChunkPos, combinedLights.skyLightStorage);
-					chunkBlockLightingByDhPos.put(dhChunkPos, combinedLights.blockLightStorage);
-				}
-				
-				return newChunkWrapper;
-			})
-			// separate handle so we can cleanly handle missing chunks and/or thrown errors 
-			.handle((ChunkWrapper newChunkWrapper, Throwable throwable) ->
-			{
-				if (newChunkWrapper != null)
-				{
-					return newChunkWrapper;
-				}
-				else
-				{
-					return this.CreateProtoChunkWrapper(this.params.mcServerLevel, chunkPos);
-				}
-			})
-			.thenApply((ChunkWrapper newChunkWrapper) ->
-			{
-				generatedChunkWrapperByDhPos.put(dhChunkPos, newChunkWrapper);
-				return newChunkWrapper;
-			});
-	}
-	private CompletableFuture<CompoundTag> getChunkNbtDataAsync(ChunkPos chunkPos)
-	{
-		ServerLevel level = this.params.mcServerLevel;
-		
-		try
-		{
-			IOWorker ioWorker = level.getChunkSource().chunkMap.worker;
-			
-			#if MC_VER <= MC_1_18_2
-			return CompletableFuture.completedFuture(ioWorker.load(chunkPos));
-			#else
-			
-			// storage will be null if C2ME is installed
-			if (!this.pullExistingChunkUsingMcAsyncMethod 
-				&& ioWorker.storage != null)
-			{
-				try
-				{
-					RegionFileStorage storage = this.params.mcServerLevel.getChunkSource().chunkMap.worker.storage;
-					RegionFileStorageExternalCache cache = this.getOrCreateRegionFileCache(storage);
-					return CompletableFuture.completedFuture(cache.read(chunkPos));
-				}
-				catch (NullPointerException e)
-				{
-					// this shouldn't happen, if anything is null it should be
-					// ioWorker.storage
-					// but just in case
-					LOGGER.error("Unexpected issue pulling pre-existing chunk ["+chunkPos+"], falling back to async chunk pulling. This may cause server-tick lag.", e);
-					this.pullExistingChunkUsingMcAsyncMethod = true;
-					
-					// try again now using the async method
-					return this.getChunkNbtDataAsync(chunkPos);
-				}
-			}
-			else
-			{
-				// log if we unexpectedly weren't able to run the sync chunk pulling
-				if (!this.pullExistingChunkUsingMcAsyncMethod)
-				{
-					// this shouldn't happen, but just in case
-					LOGGER.info("Unable to pull pre-existing chunk using synchronous method. Falling back to async method. this may cause server-tick lag.");
-					this.pullExistingChunkUsingMcAsyncMethod = true;
-				}
-				
-				//GET_CHUNK_COUNT_REF.incrementAndGet();
-				
-				// When running in vanilla MC on versions before 1.21.4,  
-				// DH would attempt to run loadAsync on this same thread via a threading mixin,
-				// to prevent causing lag on the server thread.
-				// However, if a mod like C2ME is installed this will run on a C2ME thread instead.
-				return ioWorker.loadAsync(chunkPos)
-					.thenApply(optional ->
-					{
-						// Debugging note:
-						// If there are reports of extreme memory use when C2ME is installed, that probably means
-						// this method is queuing a lot of tasks (1,000+), which causes C2ME to explode.
-						
-						//GET_CHUNK_COUNT_REF.decrementAndGet();
-						//PREF_LOGGER.info("chunk getter count ["+F3Screen.NUMBER_FORMAT.format(GET_CHUNK_COUNT_REF.get())+"]");
-						return optional.orElse(null);
-					})
-					.exceptionally((throwable) ->
-					{
-						// unwrap the CompletionException if necessary
-						Throwable actualThrowable = throwable;
-						while (actualThrowable instanceof CompletionException completionException)
-						{
-							actualThrowable = completionException.getCause();
-						}
-						
-						boolean isShutdownException = ExceptionUtil.isShutdownException(actualThrowable);
-						if (!isShutdownException)
-						{
-							CHUNK_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("Couldn't load or make chunk [" + chunkPos + "]. Error: [" + e.getMessage() + "].", e);
-			return CompletableFuture.completedFuture(null);
-		}
-	}
-	private ChunkWrapper loadOrMakeChunkWrapper(ChunkPos chunkPos, CompoundTag chunkTagData)
-	{
-		ServerLevel mcServerLevel = this.params.mcServerLevel;
-		
-		if (chunkTagData == null)
-		{
-			return this.CreateProtoChunkWrapper(mcServerLevel, chunkPos);
-		}
-		else
-		{
-			try
-			{
-				ChunkWrapper chunkWrapper = ChunkCompoundTagParser.createFromTag(mcServerLevel, this.params.dhServerLevel, chunkPos, chunkTagData);
-				if (chunkWrapper == null)
-				{
-					chunkWrapper = this.CreateProtoChunkWrapper(mcServerLevel, chunkPos);
-				}
-				return chunkWrapper;
-			}
-			catch (Exception e)
-			{
-				CHUNK_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" +
-						"Error: [" + e.getMessage() + "]."
-					, e);
-				
-				return this.CreateProtoChunkWrapper(mcServerLevel, chunkPos);
-			}
-		}
-	}
-	
-	public ChunkWrapper CreateProtoChunkWrapper(ServerLevel level, ChunkPos chunkPos)
-	{
-		ProtoChunk chunk = CreateProtoChunk(level, chunkPos);
-		return new ChunkWrapper(chunk, this.params.dhServerLevel.getLevelWrapper());
-	}
-	public static ProtoChunk CreateProtoChunk(ServerLevel level, ChunkPos chunkPos)
-	{
-		#if MC_VER <= MC_1_16_5
-		return new ProtoChunk(chunkPos, UpgradeData.EMPTY);
-		#elif MC_VER <= MC_1_17_1
-		return new ProtoChunk(chunkPos, UpgradeData.EMPTY, level);
-		#elif MC_VER <= MC_1_19_2
-		return new ProtoChunk(chunkPos, UpgradeData.EMPTY, level, level.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY), null);
-		#elif MC_VER <= MC_1_19_4
-		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);
-		#endif
-	}
-	
-	
-	
-	//================//
-	// base overrides //
-	//================//
-	
-	@Override
-	public void close() 
-	{
-		RegionFileStorageExternalCache regionStorage = this.regionFileStorageCacheRef.get();
-		if (regionStorage != null)
-		{
-			try
-			{
-				regionStorage.close();
-			}
-			catch (ClosedChannelException ignore) { /* world generator is being shut down */ }
-			catch (IOException e)
-			{
-				LOGGER.error("Failed to close region file storage cache, error: ["+e.getMessage()+"].", e);
-			}
-		}
-	}
-	
-	
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/chunkFileHandling/CompoundTagUtil.java

@@ -1,148 +0,0 @@
-package com.seibel.distanthorizons.common.wrappers.worldGeneration.chunkFileHandling;
-
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.ListTag;
-import org.jetbrains.annotations.Nullable;
-
-/**
- * these tag helpers are usedd to simplify tag accessing between MC versions
- */
-public class CompoundTagUtil
-{
-	
-	/** defaults to "false" if the tag isn't present */
-	public static boolean getBoolean(CompoundTag tag, String key)
-	{
-		#if MC_VER < MC_1_21_5
-		return tag.getBoolean(key);
-		#else
-		return tag.getBoolean(key).orElse(false);
-		#endif
-	}
-	
-	/** defaults to "0" if the tag isn't present */
-	public static byte getByte(CompoundTag tag, String key)
-	{
-		#if MC_VER < MC_1_21_5
-		return tag.getByte(key);
-		#else
-		return tag.getByte(key).orElse((byte)0);
-		#endif
-	}
-	
-	/** defaults to "0" if the tag isn't present */
-	public static short getShort(ListTag tag, int index)
-	{
-		#if MC_VER < MC_1_21_5
-		return tag.getShort(index);
-		#else
-		return tag.getShort(index).orElse((short)0);
-		#endif
-	}
-	
-	/** defaults to "0" if the tag isn't present */
-	public static int getInt(CompoundTag tag, String key)
-	{
-		#if MC_VER < MC_1_21_5
-		return tag.getInt(key);
-		#else
-		return tag.getInt(key).orElse(0);
-		#endif
-	}
-	
-	/** defaults to "0" if the tag isn't present */
-	public static long getLong(CompoundTag tag, String key)
-	{
-		#if MC_VER < MC_1_21_5
-		return tag.getInt(key);
-		#else
-		return tag.getLong(key).orElse(0L);
-		#endif
-	}
-	
-	
-	
-	/** defaults to null if the tag isn't present */
-	@Nullable
-	public static String getString(CompoundTag tag, String key)
-	{
-		#if MC_VER < MC_1_21_5
-		return tag.getString(key);
-		#else
-		return tag.getString(key).orElse(null);
-		#endif
-	}
-	
-	/** defaults to null if the tag isn't present */
-	@Nullable
-	public static byte[] getByteArray(CompoundTag tag, String key)
-	{
-		#if MC_VER < MC_1_21_5
-		return tag.getByteArray(key);
-		#else
-		return tag.getByteArray(key).orElse(null);
-		#endif
-	}
-	
-	
-	
-	/** defaults to null if the tag isn't present */
-	@Nullable
-	public static CompoundTag getCompoundTag(CompoundTag tag, String key)
-	{
-		#if MC_VER < MC_1_21_5
-		return tag.getCompound(key);
-		#else
-		return tag.getCompound(key).orElse(null);
-		#endif
-	}
-	/** defaults to null if the tag isn't present */
-	@Nullable
-	public static CompoundTag getCompoundTag(ListTag tag, int index)
-	{
-		#if MC_VER < MC_1_21_5
-		return tag.getCompound(index);
-		#else
-		return tag.getCompound(index).orElse(null);
-		#endif
-	}
-	
-	/**
-	 * defaults to null if the tag isn't present
-	 * @param elementType unused after MC 1.21.5
-	 */
-	@Nullable
-	public static ListTag getListTag(CompoundTag tag, String key, int elementType)
-	{
-		#if MC_VER < MC_1_21_5
-		return tag.getList(key, elementType);
-		#else
-		return tag.getList(key).orElse(null);
-		#endif
-	}
-	
-	/** defaults to null if the tag isn't present */
-	@Nullable
-	public static ListTag getListTag(ListTag tag, int index)
-	{
-		#if MC_VER < MC_1_21_5
-		return tag.getList(index);
-		#else
-		return tag.getList(index).orElse(null);
-		#endif
-	}
-	
-	
-	
-	public static boolean contains(CompoundTag tag, String key, int index)
-	{
-		#if MC_VER < MC_1_21_5
-		return tag.contains(key, index);
-		#else
-		return tag.contains(key);
-		#endif
-	}
-	
-	
-	
-}

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

@@ -0,0 +1,851 @@
+/*
+ *    This file is part of the Distant Horizons mod
+ *    licensed under the GNU GPL 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 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 General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject;
+
+import com.mojang.serialization.Codec;
+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.ConfigBasedLogger;
+import com.seibel.distanthorizons.core.util.LodUtil;
+import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.ChunkLightStorage;
+
+import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+
+import it.unimi.dsi.fastutil.shorts.ShortList;
+import net.minecraft.core.Registry;
+#if MC_VER >= MC_1_19_4
+import net.minecraft.core.registries.BuiltInRegistries;
+import net.minecraft.core.registries.Registries;
+#endif
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.ListTag;
+import net.minecraft.nbt.NbtOps;
+import net.minecraft.nbt.Tag;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.*;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.biome.Biomes;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.chunk.*;
+
+#if MC_VER < MC_1_21_3
+import net.minecraft.world.level.chunk.storage.ChunkSerializer;
+#else
+#endif
+
+import net.minecraft.world.level.levelgen.Heightmap;
+#if MC_VER >= MC_1_18_2
+import net.minecraft.world.level.levelgen.blending.BlendingData;
+#if MC_VER < MC_1_19_2
+import net.minecraft.world.level.levelgen.feature.StructureFeature;
+#endif
+import net.minecraft.world.ticks.LevelChunkTicks;
+#endif
+#if MC_VER >= MC_1_18_2
+import net.minecraft.core.Holder;
+#if MC_VER < MC_1_19_2
+import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
+#endif
+#endif
+
+#if MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1
+import net.minecraft.world.level.material.Fluids;
+#endif
+
+#if MC_VER == MC_1_20_6
+import net.minecraft.world.level.chunk.status.ChunkStatus;
+import net.minecraft.world.level.chunk.status.ChunkType;
+#elif MC_VER >= MC_1_21_1
+import net.minecraft.world.level.chunk.status.ChunkStatus;
+import net.minecraft.world.level.chunk.status.ChunkType;
+#endif
+
+import net.minecraft.world.level.material.Fluid;
+import org.jetbrains.annotations.Nullable;
+
+
+public class ChunkLoader
+{
+	private static final AtomicBoolean ZERO_CHUNK_POS_ERROR_LOGGED_REF = new AtomicBoolean(false);
+	
+	
+	#if MC_VER >= MC_1_19_2
+	private static final Codec<PalettedContainer<BlockState>> BLOCK_STATE_CODEC = PalettedContainer.codecRW(Block.BLOCK_STATE_REGISTRY, BlockState.CODEC, PalettedContainer.Strategy.SECTION_STATES, Blocks.AIR.defaultBlockState());
+	#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;
+	
+	private static final ConcurrentHashMap<String, Object> LOGGED_ERROR_MESSAGE_MAP = new ConcurrentHashMap<>();
+	
+	
+	
+	//============//
+	// read chunk //
+	//============//
+	
+	public static LevelChunk read(WorldGenLevel level, ChunkPos chunkPos, CompoundTag chunkData)
+	{
+		#if MC_VER < MC_1_18_2
+		CompoundTag tagLevel = chunkData.getCompound("Level");
+		#else
+		CompoundTag tagLevel = chunkData;
+		#endif
+		
+		int chunkX = tagGetInt(tagLevel,"xPos");
+		int chunkZ = tagGetInt(tagLevel, "zPos");
+		ChunkPos actualPos = new ChunkPos(chunkX, chunkZ);
+		
+		if (!Objects.equals(chunkPos, actualPos))
+		{
+			if (chunkX == 0 && chunkZ == 0)
+			{
+				if (!ZERO_CHUNK_POS_ERROR_LOGGED_REF.getAndSet(true))
+				{
+					// explicit chunkPos toString is necessary otherwise the JDK 17 compiler breaks
+					LOGGER.warn("Chunk file at ["+chunkPos.toString()+"] doesn't have a chunk pos. \n" +
+						"This might happen if the world was created using an external program. \n" +
+						"DH will attempt to parse the chunk anyway and won't log this message again.\n" +
+						"If issues arise please try optimizing your world to fix this issue. \n" +
+						"World optimization can be done from the singleplayer world selection screen."+
+						"");
+				}
+			}
+			else
+			{
+				// everything is on one line to fix a JDK 17 compiler issue
+				// if the issue is ever resolved, feel free to make this multi-line for readability
+				LOGGER.error("Chunk file at ["+chunkPos.toString()+"] is in the wrong location. \nPlease try optimizing your world to fix this issue. \nWorld optimization can be done from the singleplayer world selection screen. \n(Expected pos: ["+chunkPos.toString()+"], actual ["+actualPos.toString()+"])");
+				return null;
+			}
+		}
+		
+		#if MC_VER < MC_1_20_6
+		ChunkStatus.ChunkType chunkType;
+		#else
+		ChunkType chunkType;
+		#endif
+		chunkType = readChunkType(tagLevel);
+		
+		#if MC_VER < MC_1_18_2
+			if (chunkType != ChunkStatus.ChunkType.LEVELCHUNK)
+				return null;
+		#elif MC_VER < MC_1_21_6
+			
+			BlendingData blendingData = readBlendingData(tagLevel);
+			#if MC_VER < MC_1_19_2
+			if (chunkType == ChunkStatus.ChunkType.PROTOCHUNK && (blendingData == null || !blendingData.oldNoise()))
+				return null;
+			#else
+			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
+		
+		
+		boolean isLightOn = tagGetBoolean(tagLevel, "isLightOn");
+		#if MC_VER < MC_1_18_2
+		ChunkBiomeContainer chunkBiomeContainer = new ChunkBiomeContainer(
+				level.getLevel().registryAccess().registryOrThrow(Registry.BIOME_REGISTRY)#if MC_VER >= MC_1_17_1 , level #endif ,
+				chunkPos, level.getLevel().getChunkSource().getGenerator().getBiomeSource(),
+				tagLevel.contains("Biomes", 11) ? tagLevel.getIntArray("Biomes") : null);
+		
+		TickList<Block> blockTicks = tagLevel.contains(BLOCK_TICKS_TAG_PRE18, 9)
+				? ChunkTickList.create(tagLevel.getList(BLOCK_TICKS_TAG_PRE18, 10), Registry.BLOCK::getKey, Registry.BLOCK::get)
+				: new ProtoTickList<Block>(block -> (block == null || block.defaultBlockState().isAir()), chunkPos,
+				tagLevel.getList("ToBeTicked", 9)#if MC_VER >= MC_1_17_1 , level #endif );
+		
+		TickList<Fluid> fluidTicks = tagLevel.contains(FLUID_TICKS_TAG_PRE18, 9)
+				? ChunkTickList.create(tagLevel.getList(FLUID_TICKS_TAG_PRE18, 10), Registry.FLUID::getKey, Registry.FLUID::get)
+				: new ProtoTickList<Fluid>(fluid -> (fluid == null || fluid == Fluids.EMPTY), chunkPos,
+				tagLevel.getList("LiquidsToBeTicked", 9)#if MC_VER >= MC_1_17_1 , level #endif );
+		#else
+			#if MC_VER < MC_1_19_4
+				LevelChunkTicks<Block> blockTicks = LevelChunkTicks.load(tagLevel.getList(BLOCK_TICKS_TAG_18, 10),
+						string -> Registry.BLOCK.getOptional(ResourceLocation.tryParse(string)), chunkPos);
+				LevelChunkTicks<Fluid> fluidTicks = LevelChunkTicks.load(tagLevel.getList(FLUID_TICKS_TAG_18, 10),
+						string -> Registry.FLUID.getOptional(ResourceLocation.tryParse(string)), chunkPos);
+			#elif MC_VER < MC_1_21_4
+				LevelChunkTicks<Block> blockTicks = LevelChunkTicks.load(tagLevel.getList(BLOCK_TICKS_TAG_18, 10),
+						(string -> BuiltInRegistries.BLOCK.getOptional(ResourceLocation.tryParse(string))), chunkPos);
+				LevelChunkTicks<Fluid> fluidTicks = LevelChunkTicks.load(tagLevel.getList(FLUID_TICKS_TAG_18, 10),
+						string -> BuiltInRegistries.FLUID.getOptional(ResourceLocation.tryParse(string)), chunkPos);
+			#else
+				// do we need the ticks for what we're doing?
+				LevelChunkTicks<Block> blockTicks = new LevelChunkTicks<>();
+				LevelChunkTicks<Fluid> fluidTicks = new LevelChunkTicks<>();
+			#endif
+		#endif
+		
+		LevelChunkSection[] levelChunkSections = readSections(level, chunkPos, tagLevel);
+		
+		// ====================== Make the chunk =========================
+		#if MC_VER < MC_1_18_2
+		LevelChunk chunk = new LevelChunk((Level) level.getLevel(), chunkPos, chunkBiomeContainer, upgradeData, blockTicks,
+				fluidTicks, inhabitedTime, levelChunkSections, null);
+		#else
+		LevelChunk chunk = new LevelChunk((Level) level, chunkPos, upgradeData, blockTicks,
+				fluidTicks, inhabitedTime, levelChunkSections, null, blendingData);
+		#endif
+		// Set some states after object creation
+		chunk.setLightCorrect(isLightOn);
+		readHeightmaps(chunk, chunkData);
+		//readPostPocessings(chunk, chunkData);
+		return chunk;
+	}
+	private static LevelChunkSection[] readSections(LevelAccessor level, ChunkPos chunkPos, CompoundTag chunkData)
+	{
+		#if MC_VER >= MC_1_18_2
+		#if MC_VER < MC_1_19_4
+		Registry<Biome> biomes = level.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY);
+		#elif MC_VER < MC_1_21_3
+		Registry<Biome> biomes = level.registryAccess().registryOrThrow(Registries.BIOME);
+		#else
+		Registry<Biome> biomes = level.registryAccess().lookupOrThrow(Registries.BIOME);
+		#endif
+			#if MC_VER < MC_1_18_2
+			Codec<PalettedContainer<Biome>> biomeCodec = PalettedContainer.codec(
+					biomes, biomes.byNameCodec(), PalettedContainer.Strategy.SECTION_BIOMES, biomes.getOrThrow(Biomes.PLAINS));
+			#elif MC_VER < MC_1_19_2
+			Codec<PalettedContainer<Holder<Biome>>> biomeCodec = PalettedContainer.codec(
+				biomes.asHolderIdMap(), biomes.holderByNameCodec(), PalettedContainer.Strategy.SECTION_BIOMES, biomes.getHolderOrThrow(Biomes.PLAINS));
+			#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));
+			#else
+			Codec<PalettedContainer<Holder<Biome>>> biomeCodec = PalettedContainer.codecRW(
+				biomes.asHolderIdMap(), biomes.holderByNameCodec(), PalettedContainer.Strategy.SECTION_BIOMES, biomes.getOrThrow(Biomes.PLAINS));
+			#endif
+		#endif
+		
+		int sectionYIndex = #if MC_VER < MC_1_17_1 16; #else level.getSectionsCount(); #endif
+		LevelChunkSection[] chunkSections = new LevelChunkSection[sectionYIndex];
+		
+		ListTag tagSections = tagGetListTag(chunkData, "Sections", 10);
+		if (tagSections == null || tagSections.isEmpty())
+		{
+			tagSections = tagGetListTag(chunkData, "sections", 10);
+		}
+		
+		
+		if (tagSections != null)
+		{
+			for (int j = 0; j < tagSections.size(); ++j)
+			{
+				CompoundTag tagSection = tagGetCompoundTag(tagSections, j);
+				if (tagSection == null)
+				{
+					continue;
+				}
+				
+				final 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
+				int sectionId = level.getSectionIndexFromSectionY(sectionYPos);
+				if (sectionId >= 0 && sectionId < chunkSections.length)
+				{
+					PalettedContainer<BlockState> blockStateContainer;
+					#if MC_VER < MC_1_18_2
+					PalettedContainer<Biome> biomeContainer;
+					#else
+					PalettedContainer<Holder<Biome>> biomeContainer;
+					#endif
+					
+					
+					boolean containsBlockStates;
+					#if MC_VER < MC_1_21_5
+					containsBlockStates = tagSection.contains("block_states", 10);
+					#else
+						containsBlockStates = tagSection.contains("block_states");
+					#endif
+					
+					if (containsBlockStates)
+					{
+						#if MC_VER < MC_1_20_6 
+						blockStateContainer = BLOCK_STATE_CODEC.parse(NbtOps.INSTANCE, tagGetCompoundTag(tagSection, "block_states"))
+							.promotePartial(string -> logBlockDeserializationWarning(chunkPos, sectionYPos, string))
+							.getOrThrow(false, (message) -> logParsingWarningOnce(message));
+						#else
+						blockStateContainer = BLOCK_STATE_CODEC.parse(NbtOps.INSTANCE, tagGetCompoundTag(tagSection, "block_states"))
+								.promotePartial(string -> logBlockDeserializationWarning(chunkPos, sectionYPos, string))
+								.getOrThrow((message) -> logErrorAndReturnException(message));
+						#endif
+					}
+					else
+					{
+						blockStateContainer = new PalettedContainer<BlockState>(Block.BLOCK_STATE_REGISTRY, Blocks.AIR.defaultBlockState(), PalettedContainer.Strategy.SECTION_STATES);
+					}
+				
+				
+					#if MC_VER < MC_1_18_2
+					biomeContainer = tagSection.contains("biomes", 10)
+							? biomeCodec.parse(NbtOps.INSTANCE, tagSection.getCompound("biomes")).promotePartial(string -> logErrors(chunkPos, sectionYPos, string)).getOrThrow(false, (message) -> logWarningOnce(message))
+							: new PalettedContainer<Biome>(biomes, biomes.getOrThrow(Biomes.PLAINS), PalettedContainer.Strategy.SECTION_BIOMES);
+					#else
+					
+					
+					boolean containsBiomes;
+					#if MC_VER < MC_1_21_5
+					containsBiomes = tagSection.contains("biomes", 10);
+					#else
+						containsBiomes = tagSection.contains("biomes");
+					#endif
+					
+					if (containsBiomes)
+					{
+						#if MC_VER < MC_1_20_6 
+						biomeContainer = biomeCodec.parse(NbtOps.INSTANCE, tagGetCompoundTag(tagSection, "biomes"))
+							.promotePartial(string -> logBiomeDeserializationWarning(chunkPos, sectionYIndex, (String) string))
+							.getOrThrow(false, (message) -> logParsingWarningOnce(message));
+						#else
+						biomeContainer = biomeCodec.parse(NbtOps.INSTANCE, tagGetCompoundTag(tagSection, "biomes"))
+								.promotePartial(string -> logBiomeDeserializationWarning(chunkPos, sectionYIndex, (String) string))
+								.getOrThrow((message) -> logErrorAndReturnException(message));
+						#endif
+					}
+					else
+					{
+						biomeContainer = new PalettedContainer<Holder<Biome>>(biomes.asHolderIdMap(), 
+							#if MC_VER < MC_1_21_3
+							biomes.getHolderOrThrow(Biomes.PLAINS), 
+							#else
+								biomes.getOrThrow(Biomes.PLAINS),
+							#endif
+								PalettedContainer.Strategy.SECTION_BIOMES);
+					}
+				
+					#endif
+					
+					#if MC_VER < MC_1_20_1
+					chunkSections[sectionId] = new LevelChunkSection(sectionYPos, blockStateContainer, biomeContainer);
+					#else
+					chunkSections[sectionId] = new LevelChunkSection(blockStateContainer, biomeContainer);
+					#endif
+				}
+				#endif
+				
+			}	
+		}
+		return chunkSections;
+	}
+	private static 
+		#if MC_VER < MC_1_20_6 ChunkStatus.ChunkType
+		#elif MC_VER < MC_1_21_1 ChunkType
+		#else ChunkType #endif 
+	readChunkType(CompoundTag tagLevel)
+	{
+		String statusString = tagGetString(tagLevel,"Status");
+		if (statusString != null)
+		{
+			ChunkStatus chunkStatus = ChunkStatus.byName(statusString);
+			if (chunkStatus != null)
+			{
+				return chunkStatus.getChunkType();
+			}
+		}
+		
+		#if MC_VER <= MC_1_20_4
+		return ChunkStatus.ChunkType.PROTOCHUNK;
+		#else
+		return ChunkType.PROTOCHUNK;
+		#endif
+	}
+	private static void readHeightmaps(LevelChunk chunk, CompoundTag chunkData)
+	{
+		CompoundTag tagHeightmaps = tagGetCompoundTag(chunkData, "Heightmaps");
+		if (tagHeightmaps != null)
+		{
+			for (Heightmap.Types type : ChunkStatus.FULL.heightmapsAfter())
+			{
+				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, optionalHeightmap.get());
+					}
+				}
+				#endif
+			}
+			
+			Heightmap.primeHeightmaps(chunk, ChunkStatus.FULL.heightmapsAfter());
+		}
+	}
+	// commented out as a test as of 2025-06-04 to see if this is actually necessary for DH
+	// DH probably doesn't need any chunk post-processing data
+	//private static void readPostPocessings(LevelChunk chunk, CompoundTag chunkData)
+	//{
+	//	ListTag tagPostProcessings = tagGetListTag(chunkData,"PostProcessing", 9);
+	//	if (tagPostProcessings != null)
+	//	{
+	//		for (int i = 0; i < tagPostProcessings.size(); ++i)
+	//		{
+	//			ListTag listTag3 = tagGetListTag(tagPostProcessings, i);
+	//			for (int j = 0; j < listTag3.size(); ++j)
+	//			{
+	//			#if MC_VER < MC_1_21_3
+	//				chunk.addPackedPostProcess(listTag3.getShort(j), i);
+	//			#else
+	//			chunk.addPackedPostProcess(ShortList.of(tagGetShort(listTag3, j)), i);
+	//			#endif
+	//			}
+	//		}
+	//	}
+	//}
+	#if MC_VER >= MC_1_18_2
+	private static BlendingData readBlendingData(CompoundTag chunkData)
+	{
+		BlendingData blendingData = null;
+		
+		
+		boolean containsBlendingData;
+		#if MC_VER < MC_1_21_5
+		containsBlendingData = chunkData.contains("blending_data", 10);
+		#else
+		containsBlendingData = chunkData.contains("blending_data");
+		#endif
+		
+		if (containsBlendingData)
+		{
+			@SuppressWarnings({"unchecked", "rawtypes"})
+			Dynamic<CompoundTag> blendingDataTag = new Dynamic(NbtOps.INSTANCE, chunkData.getCompound("blending_data"));
+			
+			try
+			{
+				#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
+			}
+			catch (Exception e)
+			{
+				String message = e.getMessage();
+				if (message == null || message.trim().isEmpty())
+				{
+					message = "Failed to parse blending data";
+				}
+				
+				logParsingWarningOnce(message, e);
+			}
+		}
+		return blendingData;
+	}
+	#endif
+	
+	
+	
+	//=====================//
+	// read chunk lighting //
+	//=====================//
+	
+	/**
+	 * https://minecraft.wiki/w/Chunk_format
+	 */
+	public static CombinedChunkLightStorage readLight(ChunkAccess chunk, CompoundTag chunkData)
+	{
+		#if MC_VER <= MC_1_17_1
+		// MC 1.16 and 1.17 doesn't have the necessary NBT info
+		return null;
+		#else
+		
+		CombinedChunkLightStorage combinedStorage = new CombinedChunkLightStorage(ChunkWrapper.getInclusiveMinBuildHeight(chunk), ChunkWrapper.getExclusiveMaxBuildHeight(chunk));
+		ChunkLightStorage blockLightStorage = combinedStorage.blockLightStorage;
+		ChunkLightStorage skyLightStorage = combinedStorage.skyLightStorage;
+		
+		boolean foundSkyLight = false;
+		
+		
+		
+		//===================//
+		// get NBT tags info //
+		//===================//
+		
+		Tag chunkSectionTags = chunkData.get("sections");
+		if (chunkSectionTags == null)
+		{
+			if (!lightingSectionErrorLogged)
+			{
+				lightingSectionErrorLogged = true;
+				LOGGER.error("No sections found for chunk at pos ["+chunk.getPos()+"] chunk data may be out of date.");
+			}
+			return null;
+		}
+		else if (!(chunkSectionTags instanceof ListTag))
+		{
+			if (!lightingSectionErrorLogged)
+			{
+				lightingSectionErrorLogged = true;
+				LOGGER.error("Chunk section tag list have unexpected type ["+chunkSectionTags.getClass().getName()+"], expected ["+ListTag.class.getName()+"].");
+			}
+			return null;
+		}
+		ListTag chunkSectionListTag = (ListTag) chunkSectionTags;
+		
+		
+		
+		//===================//
+		// get lighting info //
+		//===================//
+		
+		for (int sectionIndex = 0; sectionIndex < chunkSectionListTag.size(); sectionIndex++)
+		{
+			Tag chunkSectionTag = chunkSectionListTag.get(sectionIndex);
+			if (!(chunkSectionTag instanceof CompoundTag))
+			{
+				if (!lightingSectionErrorLogged)
+				{
+					lightingSectionErrorLogged = true;
+					LOGGER.error("Chunk section tag has an unexpected type ["+chunkSectionTag.getClass().getName()+"], expected ["+CompoundTag.class.getName()+"].");
+				}
+				return null;
+			}
+			CompoundTag chunkSectionCompoundTag = (CompoundTag) chunkSectionTag;
+			
+			
+			// if null all lights = 0
+			byte[] blockLightNibbleArray = tagGetByteArray(chunkSectionCompoundTag, "BlockLight");
+			byte[] skyLightNibbleArray = tagGetByteArray(chunkSectionCompoundTag, "SkyLight");
+			
+			if (blockLightNibbleArray != null 
+				&& skyLightNibbleArray != null)
+			{
+				// if any sky light was found then all lights above will be max brightness
+				if (skyLightNibbleArray.length != 0)
+				{
+					foundSkyLight = true;
+				}
+				
+				for (int relX = 0; relX < LodUtil.CHUNK_WIDTH; relX++)
+				{
+					for (int relZ = 0; relZ < LodUtil.CHUNK_WIDTH; relZ++)
+					{
+						// chunk sections are also 16 blocks tall
+						for (int relY = 0; relY < LodUtil.CHUNK_WIDTH; relY++)
+						{
+							int blockPosIndex = relY*16*16 + relZ*16 + relX;
+							byte blockLight = (blockLightNibbleArray.length == 0) ? 0 : getNibbleAtIndex(blockLightNibbleArray, blockPosIndex);
+							byte skyLight = (skyLightNibbleArray.length == 0) ? 0 : getNibbleAtIndex(skyLightNibbleArray, blockPosIndex);
+							if (skyLightNibbleArray.length == 0 && foundSkyLight)
+							{
+								skyLight = LodUtil.MAX_MC_LIGHT;
+							}
+							
+							int y = relY + (sectionIndex * LodUtil.CHUNK_WIDTH) + ChunkWrapper.getInclusiveMinBuildHeight(chunk);
+							blockLightStorage.set(relX, y, relZ, blockLight);
+							skyLightStorage.set(relX, y, relZ, skyLight);
+						}
+					}
+				}
+			}
+		}
+		
+		return combinedStorage;
+		#endif
+	}
+	/** source: https://minecraft.wiki/w/Chunk_format#Block_Format */
+	private static byte getNibbleAtIndex(byte[] arr, int index)
+	{
+		if (index % 2 == 0)
+		{
+			return (byte)(arr[index/2] & 0x0F);
+		}
+		else
+		{
+			return (byte)((arr[index/2]>>4) & 0x0F);
+		}
+	}
+	
+	
+	
+	//=========//
+	// logging //
+	//=========//
+	
+	private static void logBlockDeserializationWarning(ChunkPos chunkPos, int sectionYIndex, String message)
+	{
+		LOGGED_ERROR_MESSAGE_MAP.computeIfAbsent(message, (newMessage) ->
+		{
+			LOGGER.warn("Unable to deserialize blocks for chunk section [" + chunkPos.x + ", " + sectionYIndex + ", " + chunkPos.z + "], error: ["+newMessage+"]. " +
+					"This can probably be ignored, although if your world looks wrong, optimizing it via the single player menu then deleting your DH database(s) should fix the problem.");
+			
+			return newMessage;
+		});
+	}
+	private static void logBiomeDeserializationWarning(ChunkPos chunkPos, int sectionYIndex, String message)
+	{
+		LOGGED_ERROR_MESSAGE_MAP.computeIfAbsent(message, (newMessage) -> 
+		{
+			LOGGER.warn("Unable to deserialize biomes for chunk section [" + chunkPos.x + ", " + sectionYIndex + ", " + chunkPos.z + "], error: ["+newMessage+"]. " +
+					"This can probably be ignored, although if your world looks wrong, optimizing it via the single player menu then deleting your DH database(s) should fix the problem.");
+			
+			return newMessage;
+		});
+	}
+	
+	private static void logParsingWarningOnce(String message) { logParsingWarningOnce(message, null); }
+	private static void logParsingWarningOnce(String message, Exception e)
+	{
+		if (message == null)
+		{
+			return;
+		}
+		
+		LOGGED_ERROR_MESSAGE_MAP.computeIfAbsent(message, (newMessage) ->
+		{
+			LOGGER.warn("Parsing error: ["+newMessage+"]. " +
+					"This can probably be ignored, although if your world looks wrong, optimizing it via the single player menu then deleting your DH database(s) should fix the problem.",
+					e);
+			
+			return newMessage;
+		});
+	}
+	
+	private static RuntimeException logErrorAndReturnException(String message)
+	{
+		LOGGED_ERROR_MESSAGE_MAP.computeIfAbsent(message, (newMessage) ->
+		{
+			LOGGER.warn("Parsing error: ["+newMessage+"]. " +
+					"This can probably be ignored, although if your world looks wrong, optimizing it via the single player menu then deleting your DH database(s) should fix the problem.");
+			
+			return newMessage;
+		});
+		
+		// Currently we want to ignore these errors, if returning null is a problem, we can change this later
+		return null; //new RuntimeException(message);
+	}
+	
+	
+	
+	//====================//
+	// tag helper methods //
+	//====================//
+	
+	// TODO move into separate file (this file is getting long)
+	// these tag helpers are to simplify tag accessing between MC versions
+	
+	/** defaults to "false" if the tag isn't present */
+	private static boolean tagGetBoolean(CompoundTag tag, String key)
+	{
+		#if MC_VER < MC_1_21_5
+		return tag.getBoolean(key);
+		#else
+		return tag.getBoolean(key).orElse(false);
+		#endif
+	}
+	
+	/** defaults to "0" if the tag isn't present */
+	private static byte tagGetByte(CompoundTag tag, String key)
+	{
+		#if MC_VER < MC_1_21_5
+		return tag.getByte(key);
+		#else
+		return tag.getByte(key).orElse((byte)0);
+		#endif
+	}
+	
+	/** defaults to "0" if the tag isn't present */
+	private static short tagGetShort(ListTag tag, int index)
+	{
+		#if MC_VER < MC_1_21_5
+		return tag.getShort(index);
+		#else
+		return tag.getShort(index).orElse((short)0);
+		#endif
+	}
+	
+	/** defaults to "0" if the tag isn't present */
+	private static int tagGetInt(CompoundTag tag, String key)
+	{
+		#if MC_VER < MC_1_21_5
+		return tag.getInt(key);
+		#else
+		return tag.getInt(key).orElse(0);
+		#endif
+	}
+	
+	/** defaults to "0" if the tag isn't present */
+	private static long tagGetLong(CompoundTag tag, String key)
+	{
+		#if MC_VER < MC_1_21_5
+		return tag.getInt(key);
+		#else
+		return tag.getLong(key).orElse(0L);
+		#endif
+	}
+	
+	
+	
+	/** defaults to null if the tag isn't present */
+	@Nullable
+	private static String tagGetString(CompoundTag tag, String key)
+	{
+		#if MC_VER < MC_1_21_5
+		return tag.getString(key);
+		#else
+		return tag.getString(key).orElse(null);
+		#endif
+	}
+	
+	/** defaults to null if the tag isn't present */
+	@Nullable
+	private static byte[] tagGetByteArray(CompoundTag tag, String key)
+	{
+		#if MC_VER < MC_1_21_5
+		return tag.getByteArray(key);
+		#else
+		return tag.getByteArray(key).orElse(null);
+		#endif
+	}
+	
+	
+	
+	/** defaults to null if the tag isn't present */
+	@Nullable
+	private static CompoundTag tagGetCompoundTag(CompoundTag tag, String key)
+	{
+		#if MC_VER < MC_1_21_5
+		return tag.getCompound(key);
+		#else
+		return tag.getCompound(key).orElse(null);
+		#endif
+	}
+	/** defaults to null if the tag isn't present */
+	@Nullable
+	private static CompoundTag tagGetCompoundTag(ListTag tag, int index)
+	{
+		#if MC_VER < MC_1_21_5
+		return tag.getCompound(index);
+		#else
+		return tag.getCompound(index).orElse(null);
+		#endif
+	}
+	
+	/** 
+	 * defaults to null if the tag isn't present
+	 * @param elementType unused after MC 1.21.5
+	 */
+	@Nullable
+	private static ListTag tagGetListTag(CompoundTag tag, String key, int elementType)
+	{
+		#if MC_VER < MC_1_21_5
+		return tag.getList(key, elementType);
+		#else
+		return tag.getList(key).orElse(null);
+		#endif
+	}
+	
+	/** defaults to null if the tag isn't present */
+	@Nullable
+	private static ListTag tagGetListTag(ListTag tag, int index)
+	{
+		#if MC_VER < MC_1_21_5
+		return tag.getList(index);
+		#else
+		return tag.getList(index).orElse(null);
+		#endif
+	}
+	
+	
+	
+	//================//
+	// helper classes //
+	//================//
+	
+	public static class CombinedChunkLightStorage
+	{
+		public ChunkLightStorage blockLightStorage;
+		public ChunkLightStorage skyLightStorage;
+		
+		public CombinedChunkLightStorage(int minY, int maxY)
+		{
+			this.blockLightStorage = ChunkLightStorage.createBlockLightStorage(minY, maxY);
+			this.skyLightStorage = ChunkLightStorage.createSkyLightStorage(minY, maxY);
+		}
+	}
+	
+}
+

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 
+		if (chunkStatus != ChunkStatus.EMPTY && chunkStatus != debugTriggeredForStatus)
-			&& chunkStatus != debugTriggeredForStatus)
 		{
-			LOGGER.info("WorldGen requiring [" + chunkStatus + "]"
+			LOGGER.info("WorldGen requiring " + chunkStatus
-					+ " is outside the expected range. Returning EMPTY chunk.");
+					+ " 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

@@ -1,13 +1,13 @@
 package com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject;
 
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.chunkFileHandling.ChunkFileReader;
+import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import net.minecraft.nbt.CompoundTag;
 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
@@ -55,7 +55,7 @@ public class RegionFileStorageExternalCache implements AutoCloseable
 	public RegionFileStorageExternalCache(RegionFileStorage storage) { this.storage = storage; }
 	
 	@Nullable
-	public RegionFile getRegionFile(ChunkPos chunkPos) throws IOException
+	public RegionFile getRegionFile(ChunkPos pos) throws IOException
 	{
 		if (this.storage == null)
 		{
@@ -70,8 +70,8 @@ public class RegionFileStorageExternalCache implements AutoCloseable
 		
 		
 		
-		long chunkPosLong = ChunkPos.asLong(chunkPos.getRegionX(), chunkPos.getRegionZ());
+		long posLong = ChunkPos.asLong(pos.getRegionX(), pos.getRegionZ());
-		RegionFile regionFile = null;
+		RegionFile rFile = null;
 		
 		// Check vanilla cache
 		int retryCount = 0;
@@ -85,7 +85,7 @@ public class RegionFileStorageExternalCache implements AutoCloseable
 				this.getRegionFileLock.lock();
 				
 				#if MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1
-				regionFile = this.storage.getRegionFile(chunkPos);
+				rFile = this.storage.getRegionFile(pos);
 				
 				// keeping the region cache size low helps prevent concurrency issues
 				if (this.storage.regionCache.size() > 150) // max 256
@@ -97,7 +97,7 @@ public class RegionFileStorageExternalCache implements AutoCloseable
 					}
 				}
 				#else
-				regionFile = this.storage.regionCache.getOrDefault(chunkPosLong, null);	
+				rFile = this.storage.regionCache.getOrDefault(posLong, null);	
 				#endif
 				
 				break;
@@ -139,19 +139,19 @@ public class RegionFileStorageExternalCache implements AutoCloseable
 		
 		if (retryCount >= maxRetryCount)
 		{
-			ChunkFileReader.CHUNK_LOAD_LOGGER.warn("Concurrency issue detected when getting region file for chunk at [" + chunkPos + "].");
+			BatchGenerationEnvironment.LOAD_LOGGER.warn("Concurrency issue detected when getting region file for chunk at [" + pos + "].");
 		}
 		
 		
-		if (regionFile != null)
+		if (rFile != null)
 		{
-			return regionFile;
+			return rFile;
 		}
 		
 		// Then check our custom cache
 		for (RegionFileCache cache : this.regionFileCache)
 		{
-			if (cache.pos == chunkPosLong)
+			if (cache.pos == posLong)
 			{
 				return cache.file;
 			}
@@ -170,22 +170,22 @@ public class RegionFileStorageExternalCache implements AutoCloseable
 			return null;
 		}
 		
-		Path regionFilePath = storageFolderPath.resolve("r." + chunkPos.getRegionX() + "." + chunkPos.getRegionZ() + ".mca");
+		Path regionFilePath = storageFolderPath.resolve("r." + pos.getRegionX() + "." + pos.getRegionZ() + ".mca");
 		#if MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1
-		regionFile = new RegionFile(regionFilePath.toFile(), storageFolderPath.toFile(), false);
+		rFile = new RegionFile(regionFilePath.toFile(), storageFolderPath.toFile(), false);
 		#elif MC_VER <= MC_1_20_4
-		regionFile = new RegionFile(regionFilePath, storageFolderPath, false);
+		rFile = new RegionFile(regionFilePath, storageFolderPath, false);
 		#else
-		regionFile = new RegionFile(new RegionStorageInfo("level", null, "level type"), regionFilePath, storageFolderPath, false);
+		rFile = new RegionFile(new RegionStorageInfo("level", null, "level type"), regionFilePath, storageFolderPath, false);
 		#endif
 		
-		this.regionFileCache.add(new RegionFileCache(ChunkPos.asLong(chunkPos.getRegionX(), chunkPos.getRegionZ()), regionFile));
+		this.regionFileCache.add(new RegionFileCache(ChunkPos.asLong(pos.getRegionX(), pos.getRegionZ()), rFile));
 		while (this.regionFileCache.size() > MAX_CACHE_SIZE)
 		{
 			this.regionFileCache.poll().file.close();
 		}
 		
-		return regionFile;
+		return rFile;
 	}
 	
 	

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/params/ThreadWorldGenParams.java

@@ -1,124 +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.common.wrappers.worldGeneration.params;
-
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject.WorldGenStructFeatManager;
-
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.level.WorldGenLevel;
-#if MC_VER >= MC_1_18_2
-import net.minecraft.world.level.levelgen.structure.StructureCheck;
-#endif
-
-public final class ThreadWorldGenParams
-{
-	private static final ThreadLocal<ThreadWorldGenParams> LOCAL_PARAM_REF = new ThreadLocal<>();
-	
-	
-	final ServerLevel level;
-	public WorldGenStructFeatManager structFeatManager = null;
-	
-	#if MC_VER >= MC_1_18_2
-	public StructureCheck structCheck;
-	#endif
-	
-	boolean isValid = true;
-	
-	// used for some older MC versions
-	private static GlobalWorldGenParams previousGlobalWorldGenParams = null;
-	
-	
-	
-	//=============//
-	// constructor //
-	//=============//
-	
-	public static ThreadWorldGenParams getOrMake(GlobalWorldGenParams globalParams)
-	{
-		ThreadWorldGenParams threadParam = LOCAL_PARAM_REF.get();
-		if (threadParam != null
-			&& threadParam.isValid 
-			&& threadParam.level == globalParams.mcServerLevel)
-		{
-			return threadParam;
-		}
-		
-		threadParam = new ThreadWorldGenParams(globalParams);
-		LOCAL_PARAM_REF.set(threadParam);
-		return threadParam;
-	}
-	
-	private ThreadWorldGenParams(GlobalWorldGenParams param)
-	{
-		previousGlobalWorldGenParams = param;
-		
-		this.level = param.mcServerLevel;
-		
-		#if MC_VER < MC_1_18_2
-		this.structFeatManager = new WorldGenStructFeatManager(param.worldGenSettings, this.level);
-		#elif MC_VER < MC_1_19_2
-		this.structCheck = this.createStructureCheck(param);
-		#else
-		this.structCheck = new StructureCheck(param.chunkScanner, param.registry, param.structures,
-				param.mcServerLevel.dimension(), param.generator, param.randomState, this.level, param.generator.getBiomeSource(), param.worldSeed,
-				param.dataFixer);
-		#endif
-	}
-	
-	
-	
-	//==========//
-	// builders //
-	//==========//
-	
-	public void makeStructFeatManager(WorldGenLevel genLevel, GlobalWorldGenParams param)
-	{
-		#if MC_VER < MC_1_18_2
-		this.structFeatManager = new WorldGenStructFeatManager(param.worldGenSettings, genLevel);
-		#elif MC_VER < MC_1_19_4
-		this.structFeatManager = new WorldGenStructFeatManager(param.worldGenSettings, genLevel, this.structCheck);
-		#else
-		this.structFeatManager = new WorldGenStructFeatManager(param.worldOptions, genLevel, this.structCheck);
-		#endif
-	}
-	
-	#if MC_VER < MC_1_18_2
-	#elif MC_VER < MC_1_19_2
-	public void recreateStructureCheck()
-	{
-		if (previousGlobalWorldGenParams != null)
-		{
-			this.structCheck = this.createStructureCheck(previousGlobalWorldGenParams);
-		}
-	}
-	private StructureCheck createStructureCheck(GlobalWorldGenParams param)
-	{
-		return new StructureCheck(param.chunkScanner, param.registry, param.structures,
-				param.mcServerLevel.dimension(), param.generator, this.level, param.generator.getBiomeSource(), param.worldSeed,
-				param.dataFixer);
-	}
-	#else
-	public void recreateStructureCheck() { /* do nothing */ }	
-	#endif
-	
-	
-	
-}

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.params.ThreadWorldGenParams;
-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(
-			ThreadWorldGenParams 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<ChunkWrapper> getChunkWrappersToGenerate(List<ChunkWrapper> chunkWrappers)
-	{
-		ArrayList<ChunkWrapper> chunkWrappersToGenerate = new ArrayList<>(chunkWrappers.size());
-		
-		for (ChunkWrapper chunkWrapper : chunkWrappers)
-		{
-			ChunkAccess chunk = chunkWrapper.getChunk();
-			if (chunkWrapper.getStatus().isOrAfter(this.getChunkStatus()))
-			{
-				// this chunk has already been generated up to this step
-				continue;
-			}
-			else if (chunk instanceof ProtoChunk)
-			{
-				chunkWrapper.trySetStatus(this.getChunkStatus());
-				chunkWrappersToGenerate.add(chunkWrapper);
-			}
-		}
-		
-		return chunkWrappersToGenerate;
-	}
-	
-	
-	
-}

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

@@ -20,14 +20,15 @@
 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.params.ThreadWorldGenParams;
+import com.seibel.distanthorizons.common.wrappers.worldGeneration.ThreadedParameters;
 
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject.DhLitWorldGenRegion;
+import net.minecraft.server.level.WorldGenRegion;
-import com.seibel.distanthorizons.core.util.gridList.ArrayGridList;
 import net.minecraft.world.level.chunk.ChunkAccess;
+import net.minecraft.world.level.chunk.ProtoChunk;
 
 #if MC_VER >= MC_1_18_2
 import net.minecraft.world.level.levelgen.blending.Blender;
@@ -39,75 +40,76 @@ 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(
-			ThreadWorldGenParams tParams, DhLitWorldGenRegion worldGenRegion, 
+			ThreadedParameters tParams, WorldGenRegion worldGenRegion,
-			ArrayGridList<ChunkWrapper> chunkWrappers)
+			List<ChunkWrapper> chunkWrappers)
 	{
-		ArrayList<ChunkWrapper> chunksToDo = this.getChunkWrappersToGenerate(chunkWrappers);
+		
-		for (ChunkWrapper chunkWrapper : chunksToDo)
+		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
-			this.environment.globalParams.generator.createBiomes(this.environment.globalParams.biomes, chunk);
+			this.environment.params.generator.createBiomes(this.environment.params.biomes, chunk);
 			#elif MC_VER < MC_1_19_2
 			chunk = this.environment.confirmFutureWasRunSynchronously(
-						this.environment.globalParams.generator.createBiomes(
+						this.environment.params.generator.createBiomes(
-							this.environment.globalParams.biomes, 
+							this.environment.params.biomes, 
 							Runnable::run, 
 							Blender.of(worldGenRegion),
-							tParams.structFeatManager.forWorldGenRegion(worldGenRegion), 
+							tParams.structFeat.forWorldGenRegion(worldGenRegion), 
 							chunk)
 					);
 			#elif MC_VER < MC_1_19_4
 			chunk = this.environment.confirmFutureWasRunSynchronously(
-						this.environment.globalParams.generator.createBiomes(
+						this.environment.params.generator.createBiomes(
-							this.environment.globalParams.biomes, 
+							this.environment.params.biomes, 
 							Runnable::run, 
-							this.environment.globalParams.randomState, Blender.of(worldGenRegion),
+							this.environment.params.randomState, Blender.of(worldGenRegion),
-							tParams.structFeatManager.forWorldGenRegion(worldGenRegion), 
+							tParams.structFeat.forWorldGenRegion(worldGenRegion), 
 							chunk)
 					);
 			#elif MC_VER < MC_1_21_1
 			chunk = this.environment.confirmFutureWasRunSynchronously(
-						this.environment.globalParams.generator.createBiomes(
+						this.environment.params.generator.createBiomes(
 							Runnable::run, 
-							this.environment.globalParams.randomState, 
+							this.environment.params.randomState, 
 							Blender.of(worldGenRegion),
-							tParams.structFeatManager.forWorldGenRegion(worldGenRegion), 
+							tParams.structFeat.forWorldGenRegion(worldGenRegion), 
 							chunk)
 					);
 			#else
 			chunk = this.environment.confirmFutureWasRunSynchronously(
-						this.environment.globalParams.generator.createBiomes(
+						this.environment.params.generator.createBiomes(
-							this.environment.globalParams.randomState, 
+							this.environment.params.randomState, 
 							Blender.of(worldGenRegion),
-							tParams.structFeatManager.forWorldGenRegion(worldGenRegion), 
+							tParams.structFeat.forWorldGenRegion(worldGenRegion), 
 							chunk)
 					);
 			#endif

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

@@ -21,14 +21,15 @@ package com.seibel.distanthorizons.common.wrappers.worldGeneration.step;
 
 import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.params.ThreadWorldGenParams;
+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.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;
@@ -36,13 +37,10 @@ import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.status.ChunkStatus;
 #endif
 
-import java.util.ArrayList;
-import java.util.ConcurrentModificationException;
 
-
+public final class StepFeatures
-public final class StepFeatures extends AbstractWorldGenStep
 {
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
 	public static final ChunkStatus STATUS = ChunkStatus.FEATURES;
 	
@@ -50,41 +48,37 @@ 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(
-			ThreadWorldGenParams tParams, DhLitWorldGenRegion worldGenRegion,
+			ThreadedParameters tParams, DhLitWorldGenRegion worldGenRegion,
 			ArrayGridList<ChunkWrapper> chunkWrappers)
 	{
-		ArrayList<ChunkWrapper> chunksToDo = this.getChunkWrappersToGenerate(chunkWrappers);
+		for (ChunkWrapper chunkWrapper : chunkWrappers)
-		for (ChunkWrapper chunkWrapper : chunksToDo)
 		{
 			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);
+			}
 			
 			
 			try
 			{
 				#if MC_VER < MC_1_18_2
 				worldGenRegion.setOverrideCenter(chunk.getPos());
-				environment.globalParams.generator.applyBiomeDecoration(worldGenRegion, tParams.structFeatManager);
+				environment.params.generator.applyBiomeDecoration(worldGenRegion, tParams.structFeat);
 				#else
 				if (worldGenRegion.hasChunk(chunkWrapper.getChunkPos().getX(), chunkWrapper.getChunkPos().getZ()))
 				{
-					this.environment.globalParams.generator.applyBiomeDecoration(worldGenRegion, chunk, tParams.structFeatManager.forWorldGenRegion(worldGenRegion));
+					this.environment.params.generator.applyBiomeDecoration(worldGenRegion, chunk, tParams.structFeat.forWorldGenRegion(worldGenRegion));
 				}
 				else
 				{
@@ -94,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

@@ -20,14 +20,16 @@
 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.params.ThreadWorldGenParams;
+import com.seibel.distanthorizons.common.wrappers.worldGeneration.ThreadedParameters;
 
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject.DhLitWorldGenRegion;
+import com.seibel.distanthorizons.core.util.objects.UncheckedInterruptedException;
-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;
 
 #if MC_VER >= MC_1_18_2
 import net.minecraft.world.level.levelgen.blending.Blender;
@@ -39,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;
 	
@@ -47,62 +49,62 @@ 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(
-			ThreadWorldGenParams tParams, DhLitWorldGenRegion worldGenRegion,
+			ThreadedParameters tParams, WorldGenRegion worldGenRegion,
-			ArrayGridList<ChunkWrapper> chunkWrappers)
+			List<ChunkWrapper> chunkWrappers)
 	{
-		ArrayList<ChunkWrapper> chunksToDo = this.getChunkWrappersToGenerate(chunkWrappers);
+		
-		for (ChunkWrapper chunkWrapper : chunksToDo)
+		ArrayList<ChunkAccess> chunksToDo = new ArrayList<>();
+		
+		for (ChunkWrapper chunkWrapper : chunkWrappers)
 		{
 			ChunkAccess chunk = chunkWrapper.getChunk();
-			
+			if (chunkWrapper.getStatus().isOrAfter(STATUS))
+			{
+				continue;
+			}
+			chunkWrapper.trySetStatus(STATUS);
+			chunksToDo.add(chunk);
+		}
+		
+		for (ChunkAccess chunk : chunksToDo)
+		{
 			#if MC_VER < MC_1_17_1
-			this.environment.globalParams.generator.fillFromNoise(worldGenRegion, tParams.structFeatManager, chunk);
+			this.environment.params.generator.fillFromNoise(worldGenRegion, tParams.structFeat, chunk);
 			#elif MC_VER < MC_1_18_2
 			chunk = this.environment.confirmFutureWasRunSynchronously(
-						this.environment.globalParams.generator.fillFromNoise(
+						this.environment.params.generator.fillFromNoise(
 							Runnable::run,
-							tParams.structFeatManager.forWorldGenRegion(worldGenRegion), 
+							tParams.structFeat.forWorldGenRegion(worldGenRegion), 
 							chunk));
 			#elif MC_VER < MC_1_19_2
 			chunk = this.environment.confirmFutureWasRunSynchronously(
-						this.environment.globalParams.generator.fillFromNoise(
+						this.environment.params.generator.fillFromNoise(
 							Runnable::run, 
 							Blender.of(worldGenRegion),
-							tParams.structFeatManager.forWorldGenRegion(worldGenRegion), 
+							tParams.structFeat.forWorldGenRegion(worldGenRegion), 
 							chunk));
 			#elif MC_VER < MC_1_21_1
 			chunk = this.environment.confirmFutureWasRunSynchronously(
-						this.environment.globalParams.generator.fillFromNoise(
+						this.environment.params.generator.fillFromNoise(
 							Runnable::run, 
 							Blender.of(worldGenRegion), 
-							this.environment.globalParams.randomState,
+							this.environment.params.randomState,
-							tParams.structFeatManager.forWorldGenRegion(worldGenRegion), 
+							tParams.structFeat.forWorldGenRegion(worldGenRegion), 
 							chunk));
 			#else
 			chunk = this.environment.confirmFutureWasRunSynchronously(
-						this.environment.globalParams.generator.fillFromNoise(
+						this.environment.params.generator.fillFromNoise(
 							Blender.of(worldGenRegion), 
-							this.environment.globalParams.randomState,
+							this.environment.params.randomState,
-							tParams.structFeatManager.forWorldGenRegion(worldGenRegion), 
+							tParams.structFeat.forWorldGenRegion(worldGenRegion), 
 							chunk));
 			#endif
+			UncheckedInterruptedException.throwIfInterrupted();
 		}
 	}
 	

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

@@ -20,14 +20,15 @@
 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.params.ThreadWorldGenParams;
+import com.seibel.distanthorizons.common.wrappers.worldGeneration.ThreadedParameters;
 
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject.DhLitWorldGenRegion;
+import net.minecraft.server.level.WorldGenRegion;
-import com.seibel.distanthorizons.core.util.gridList.ArrayGridList;
 import net.minecraft.world.level.chunk.ChunkAccess;
+import net.minecraft.world.level.chunk.ProtoChunk;
 
 #if MC_VER <= MC_1_20_4
 import net.minecraft.world.level.chunk.ChunkStatus;
@@ -36,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;
 	
@@ -44,31 +45,35 @@ 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(
-			ThreadWorldGenParams tParams, DhLitWorldGenRegion worldGenRegion,
+			ThreadedParameters tParams, WorldGenRegion worldGenRegion,
-			ArrayGridList<ChunkWrapper> chunkWrappers)
+			List<ChunkWrapper> chunkWrappers)
 	{
-		ArrayList<ChunkWrapper> chunksToDo = this.getChunkWrappersToGenerate(chunkWrappers);
+		
-		for (ChunkWrapper chunkWrapper : chunksToDo)
+		ArrayList<ChunkAccess> chunksToDo = new ArrayList<ChunkAccess>();
+		
+		for (ChunkWrapper chunkWrapper : chunkWrappers)
 		{
 			ChunkAccess chunk = chunkWrapper.getChunk();
-			this.environment.globalParams.generator.createReferences(worldGenRegion, tParams.structFeatManager.forWorldGenRegion(worldGenRegion), chunk);
+			if (chunkWrapper.getStatus().isOrAfter(STATUS))
+			{
+				// this chunk has already generated this step
+				continue;
+			}
+			else if (chunk instanceof ProtoChunk)
+			{
+				chunkWrapper.trySetStatus(STATUS);
+			}
+		}
+		
+		for (ChunkAccess chunk : chunksToDo)
+		{
+			// System.out.println("StepStructureReference: "+chunk.getPos());
+			this.environment.params.generator.createReferences(worldGenRegion, tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk);
 		}
 	}
 	

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

@@ -20,17 +20,20 @@
 package com.seibel.distanthorizons.common.wrappers.worldGeneration.step;
 
 import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.locks.ReentrantLock;
 
 import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.params.ThreadWorldGenParams;
+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 com.seibel.distanthorizons.core.logging.DhLogger;
+import net.minecraft.world.level.chunk.ProtoChunk;
+import org.apache.logging.log4j.Logger;
 
 #if MC_VER <= MC_1_20_4
 import net.minecraft.world.level.chunk.ChunkStatus;
@@ -39,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();
 	
@@ -49,97 +52,114 @@ public final class StepStructureStart extends AbstractWorldGenStep
 	
 	
 	
-	//=============//
-	// constructor //
-	//=============//
-	
 	public StepStructureStart(BatchGenerationEnvironment batchGenerationEnvironment) { this.environment = batchGenerationEnvironment; }
 	
 	
 	
-	//==================//
+	public static class StructStartCorruptedException extends RuntimeException
-	// abstract methods //
-	//==================//
-	
-	@Override
-	public ChunkStatus getChunkStatus() { return STATUS; }
-	
-	@Override
-	public void generateGroup(
-			ThreadWorldGenParams tParams, DhLitWorldGenRegion worldGenRegion,
-			ArrayGridList<ChunkWrapper> chunkWrappers)
 	{
-		ArrayList<ChunkWrapper> chunksToDo = this.getChunkWrappersToGenerate(chunkWrappers);
+		private static final long serialVersionUID = -8987434342051563358L;
 		
-		// TODO should be put in wrapped environment so we can skip some other world gen steps
+		public StructStartCorruptedException(ArrayIndexOutOfBoundsException e)
-		//  SURFACE wouldn't need structure generation either
-		#if MC_VER < MC_1_19_2
-		if (!this.environment.globalParams.worldGenSettings.generateFeatures())
-		#elif MC_VER < MC_1_19_4
-		if (!this.environment.globalParams.worldGenSettings.generateStructures()) 
-		#else
-		if (!this.environment.globalParams.worldOptions.generateStructures())
-		#endif
 		{
-			return;
+			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)
-		for (ChunkWrapper chunkWrapper : chunksToDo)
 		{
 			ChunkAccess chunk = chunkWrapper.getChunk();
-			
+			if (chunkWrapper.getStatus().isOrAfter(STATUS))
-			// 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();
-			
-			#if MC_VER < MC_1_19_2
-			this.environment.globalParams.generator.createStructures(this.environment.globalParams.registry, tParams.structFeatManager, chunk, this.environment.globalParams.structures,
-					this.environment.globalParams.worldSeed);
-			#elif MC_VER < MC_1_19_4
-			this.environment.globalParams.generator.createStructures(this.environment.globalParams.registry, this.environment.globalParams.randomState, tParams.structFeatManager, chunk, this.environment.globalParams.structures,
-					this.environment.globalParams.worldSeed);
-			#elif MC_VER <= MC_1_21_3
-			this.environment.globalParams.generator.createStructures(this.environment.globalParams.registry,
-					this.environment.globalParams.mcServerLevel.getChunkSource().getGeneratorState(),
-					tParams.structFeatManager, chunk, this.environment.globalParams.structures);
-			#else
-			this.environment.globalParams.generator.createStructures(this.environment.globalParams.registry,
-					this.environment.globalParams.mcServerLevel.getChunkSource().getGeneratorState(),
-					tParams.structFeatManager, chunk, this.environment.globalParams.structures, 
-					this.environment.globalParams.mcServerLevel.dimension());
-			#endif
-			
-			#if MC_VER >= MC_1_18_2
-			try
 			{
-				tParams.structCheck.onStructureLoad(chunk.getPos(), chunk.getAllStarts());
+				// this chunk has already generated this step
+				continue;
 			}
-			catch (ArrayIndexOutOfBoundsException firstEx)
+			else if (chunk instanceof ProtoChunk)
 			{
-				// There's a rare issue with StructStart where it throws ArrayIndexOutOfBounds
+				chunkWrapper.trySetStatus(STATUS);
-				// This means the structFeat is corrupted (For some reason) and I need to reset it.
+			}
-				// TODO: Figure out in the future why this happens even though I am using new structFeat - OLD
+		}
+		
+		#if MC_VER < MC_1_19_2
+		if (this.environment.params.worldGenSettings.generateFeatures())
+		{
+		#elif MC_VER < MC_1_19_4
+		if (this.environment.params.worldGenSettings.generateStructures()) 
+		{
+		#else
+		if (this.environment.params.worldOptions.generateStructures())
+		{
+		#endif
+			for (ChunkAccess chunk : chunksToDo)
+			{
+				// System.out.println("StepStructureStart: "+chunk.getPos());
 				
-				// reset the structureStart
+				// there are a few cases where the structure generator call may lock up (either due to teleporting or leaving the world).
-				tParams.recreateStructureCheck();
+				// 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();
+				
+				#if MC_VER < MC_1_19_2
+				this.environment.params.generator.createStructures(this.environment.params.registry, tParams.structFeat, chunk, this.environment.params.structures,
+						this.environment.params.worldSeed);
+				#elif MC_VER < MC_1_19_4
+				this.environment.params.generator.createStructures(this.environment.params.registry, this.environment.params.randomState, tParams.structFeat, chunk, this.environment.params.structures,
+						this.environment.params.worldSeed);
+				#elif MC_VER <= MC_1_21_3
+				this.environment.params.generator.createStructures(this.environment.params.registry,
+						this.environment.params.level.getChunkSource().getGeneratorState(),
+						tParams.structFeat, chunk, this.environment.params.structures);
+				#else
+				this.environment.params.generator.createStructures(this.environment.params.registry,
+						this.environment.params.level.getChunkSource().getGeneratorState(),
+						tParams.structFeat, chunk, this.environment.params.structures, 
+						this.environment.params.level.dimension());
+				#endif
+				
+				#if MC_VER >= MC_1_18_2
 				try
 				{
-					// try running the structure logic again
 					tParams.structCheck.onStructureLoad(chunk.getPos(), chunk.getAllStarts());
 				}
-				catch (ArrayIndexOutOfBoundsException secondEx)
+				catch (ArrayIndexOutOfBoundsException firstEx)
 				{
-					// the structure logic failed again, log it and move on
+					// There's a rare issue with StructStart where it throws ArrayIndexOutOfBounds
-					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
+					// This means the structFeat is corrupted (For some reason) and I need to reset it.
+					// TODO: Figure out in the future why this happens even though I am using new structFeat - OLD
+					
+					// reset the structureStart
+					tParams.recreateStructureCheck();
+					
+					try
+					{
+						// try running the structure logic again
+						tParams.structCheck.onStructureLoad(chunk.getPos(), chunk.getAllStarts());
+					}
+					catch (ArrayIndexOutOfBoundsException secondEx)
+					{
+						// 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);
+					}
 				}
+				
+				#endif
+				
+				STRUCTURE_PLACEMENT_LOCK.unlock();
 			}
-			
-			#endif
-			
-			STRUCTURE_PLACEMENT_LOCK.unlock();
 		}
 	}
 	

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

@@ -20,14 +20,15 @@
 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.params.ThreadWorldGenParams;
+import com.seibel.distanthorizons.common.wrappers.worldGeneration.ThreadedParameters;
 
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject.DhLitWorldGenRegion;
+import net.minecraft.server.level.WorldGenRegion;
-import com.seibel.distanthorizons.core.util.gridList.ArrayGridList;
 import net.minecraft.world.level.chunk.ChunkAccess;
+import net.minecraft.world.level.chunk.ProtoChunk;
 
 #if MC_VER <= MC_1_20_4
 import net.minecraft.world.level.chunk.ChunkStatus;
@@ -36,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;
 	
@@ -44,41 +45,42 @@ 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(
-			ThreadWorldGenParams tParams, DhLitWorldGenRegion worldGenRegion,
+			ThreadedParameters tParams, WorldGenRegion worldGenRegion,
-			ArrayGridList<ChunkWrapper> chunkWrappers)
+			List<ChunkWrapper> chunkWrappers)
 	{
-		ArrayList<ChunkWrapper> chunksToDo = this.getChunkWrappersToGenerate(chunkWrappers);
+		ArrayList<ChunkAccess> chunksToDo = new ArrayList<>();
-		for (ChunkWrapper chunkWrapper : chunksToDo)
+		
+		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)
+		{
+			// System.out.println("StepSurface: "+chunk.getPos());
 			#if MC_VER < MC_1_18_2
-			this.environment.globalParams.generator.buildSurfaceAndBedrock(worldGenRegion, chunk);
+			environment.params.generator.buildSurfaceAndBedrock(worldGenRegion, chunk);
 			#elif MC_VER < MC_1_19_2
-			this.environment.globalParams.generator.buildSurface(worldGenRegion, tParams.structFeatManager.forWorldGenRegion(worldGenRegion), chunk);
+			environment.params.generator.buildSurface(worldGenRegion, tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk);
 			#else
-			this.environment.globalParams.generator.buildSurface(worldGenRegion, tParams.structFeatManager.forWorldGenRegion(worldGenRegion), this.environment.globalParams.randomState, chunk);
+			environment.params.generator.buildSurface(worldGenRegion, tParams.structFeat.forWorldGenRegion(worldGenRegion), environment.params.randomState, chunk);
 			#endif
 		}
 	}
 	
-	
-	
 }

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

@@ -18,6 +18,7 @@ accessible field net/minecraft/client/renderer/LevelRenderer$RenderChunkInfo chu
 # used for grabbing vanilla rendered chunks
 accessible class net/minecraft/client/renderer/LevelRenderer$RenderChunkInfo
 accessible field net/minecraft/client/renderer/LevelRenderer$RenderChunkInfo chunk Lnet/minecraft/client/renderer/chunk/ChunkRenderDispatcher$RenderChunk;
+#accessible field net/minecraft/world/entity/Entity blockPosition Lnet/minecraft/core/BlockPos;
 
 # lighting
 accessible field net/minecraft/client/renderer/LightTexture lightPixels Lcom/mojang/blaze3d/platform/NativeImage;
@@ -29,6 +30,8 @@ accessible field net/minecraft/world/level/lighting/LevelLightEngine skyEngine L
 accessible method net/minecraft/world/level/levelgen/Heightmap setHeight (III)V
 accessible field net/minecraft/world/level/biome/Biome generationSettings Lnet/minecraft/world/level/biome/BiomeGenerationSettings;
 accessible field net/minecraft/world/level/biome/Biome biomeCategory Lnet/minecraft/world/level/biome/Biome$BiomeCategory;
+#accessible field net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator settings Lnet/minecraft/core/Holder;
+#accessible method net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator doCreateBiomes (Lnet/minecraft/core/Registry;Lnet/minecraft/world/level/levelgen/blending/Blender;Lnet/minecraft/world/level/StructureFeatureManager;Lnet/minecraft/world/level/chunk/ChunkAccess;)V
 accessible method net/minecraft/world/level/lighting/LayerLightEngine queueSectionData (JLnet/minecraft/world/level/chunk/DataLayer;Z)V
 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;

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

@@ -29,6 +29,8 @@ accessible field net/minecraft/world/level/lighting/LevelLightEngine skyEngine L
 accessible method net/minecraft/world/level/levelgen/Heightmap setHeight (III)V
 accessible field net/minecraft/world/level/biome/Biome generationSettings Lnet/minecraft/world/level/biome/BiomeGenerationSettings;
 accessible field net/minecraft/world/level/biome/Biome biomeCategory Lnet/minecraft/world/level/biome/Biome$BiomeCategory;
+# accessible field net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator settings Lnet/minecraft/core/Holder;
+#accessible method net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator doCreateBiomes (Lnet/minecraft/core/Registry;Lnet/minecraft/world/level/levelgen/blending/Blender;Lnet/minecraft/world/level/StructureFeatureManager;Lnet/minecraft/world/level/chunk/ChunkAccess;)V
 accessible method net/minecraft/world/level/lighting/LayerLightEngine queueSectionData (JLnet/minecraft/world/level/chunk/DataLayer;Z)V
 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;

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

@@ -15,6 +15,7 @@ accessible class net/minecraft/client/renderer/LevelRenderer$RenderChunkInfo
 accessible field net/minecraft/client/renderer/LevelRenderer$RenderChunkInfo chunk Lnet/minecraft/client/renderer/chunk/ChunkRenderDispatcher$RenderChunk;
 
 # 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

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

@@ -11,7 +11,10 @@ accessible method net/minecraft/client/renderer/GameRenderer getFov (Lnet/minecr
 # used for grabbing vanilla rendered chunks
 accessible field net/minecraft/client/renderer/LevelRenderer visibleSections Lit/unimi/dsi/fastutil/objects/ObjectArrayList;
 
+#accessible method net/minecraft/client/renderer/LevelRenderer renderSectionLayer (Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDDLorg/joml/Matrix4f;)V
+
 # 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

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

@@ -11,7 +11,10 @@ accessible method net/minecraft/client/renderer/GameRenderer getFov (Lnet/minecr
 # used for grabbing vanilla rendered chunks
 accessible field net/minecraft/client/renderer/LevelRenderer visibleSections Lit/unimi/dsi/fastutil/objects/ObjectArrayList;
 
+#accessible method net/minecraft/client/renderer/LevelRenderer renderSectionLayer (Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDDLorg/joml/Matrix4f;)V
+
 # 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

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

@@ -1,53 +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 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;
-
-

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

@@ -1,56 +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 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;
-
-# getting existing chunks outside the main thread
-accessible method net/minecraft/server/level/ChunkMap getVisibleChunkIfPresent (J)Lnet/minecraft/server/level/ChunkHolder;
-
-# lod generation from save file
-accessible field net/minecraft/world/level/chunk/storage/SimpleRegionStorage 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 (Ljava/lang/String;Lnet/minecraft/client/gui/components/debug/DebugScreenEntry;)Lnet/minecraft/resources/Identifier;
-
-# hacky stuff
-accessible field net/minecraft/util/ThreadingDetector lock Ljava/util/concurrent/Semaphore;
-mutable field net/minecraft/util/ThreadingDetector lock Ljava/util/concurrent/Semaphore;
-
-

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

@@ -14,6 +14,7 @@ accessible field net/minecraft/client/Minecraft deltaTracker Lnet/minecraft/clie
 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

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

@@ -14,6 +14,7 @@ accessible field net/minecraft/client/Minecraft deltaTracker Lnet/minecraft/clie
 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

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",
+                    "-Dio.netty.leakDetection.level=advanced"
-                    "-XX:+UseZGC",
-                    "-XX:+ZGenerational"
             )
             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))
-    {
-        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-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"))
+    if (minecraft_version >= "1.19.2")
-        addModJar(fabricApi.module("fabric-command-api-v1", rootProject.fabric_api_version))
-    else
         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))
@@ -102,7 +92,7 @@ dependencies {
 
 
     // Mod Menu
-    addMod("com.terraformersmc:modmenu:${rootProject.modmenu_version}", rootProject.enable_mod_menu)
+    modImplementation("com.terraformersmc:modmenu:${rootProject.modmenu_version}")
 
     // Starlight
     addMod("curse.maven:starlight-521783:${rootProject.starlight_version_fabric}", rootProject.enable_starlight)
@@ -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

@@ -22,28 +22,28 @@ package com.seibel.distanthorizons.fabric;
 import com.seibel.distanthorizons.common.AbstractModInitializer;
 import com.seibel.distanthorizons.common.AbstractPluginPacketSender;
 import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
-import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftClientWrapper;
 import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
 import com.seibel.distanthorizons.core.api.internal.ClientApi;
-import com.seibel.distanthorizons.core.logging.DhLogger;
+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;
@@ -61,18 +61,13 @@ import java.nio.FloatBuffer;
 #endif
 import java.util.HashSet;
 import java.util.concurrent.AbstractExecutorService;
-
+import java.util.concurrent.ThreadPoolExecutor;
-#if MC_VER < MC_1_21_9
-import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
-#endif
-
-import com.mojang.blaze3d.platform.InputConstants;
 
 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 org.apache.logging.log4j.Logger;
 import org.lwjgl.glfw.GLFW;
 
 /**
@@ -86,12 +81,13 @@ import org.lwjgl.glfw.GLFW;
 @Environment(EnvType.CLIENT)
 public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 {
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private final ClientApi clientApi = ClientApi.INSTANCE;
-	
+	private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
-	private static final MinecraftClientWrapper MC = MinecraftClientWrapper.INSTANCE;
 	private static final AbstractPluginPacketSender PACKET_SENDER = (AbstractPluginPacketSender) SingletonInjector.INSTANCE.get(IPluginPacketSender.class);
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
-	private static final ClientApi clientApi = ClientApi.INSTANCE;
+	// 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};
 	
 	HashSet<Integer> previouslyPressKeyCodes = new HashSet<>();
 	
@@ -107,7 +103,6 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 		LOGGER.info("Registering Fabric Client Events");
 		
 		
-		
 		//========================//
 		// register mod accessors //
 		//========================//
@@ -116,6 +111,14 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 		
 		
 		
+		//=============//
+		// tick events //
+		//=============//
+		
+		ClientTickEvents.START_CLIENT_TICK.register((client) -> { ClientApi.INSTANCE.clientTickEvent(); });
+		
+		
+		
 		//==============//
 		// chunk events //
 		//==============//
@@ -125,16 +128,8 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 		{
 			if (MC.clientConnectedToDedicatedServer())
 			{
-				// executor to prevent locking up the render/event thread
+				IClientLevelWrapper wrappedLevel = ClientLevelWrapper.getWrapper(level);
-				AbstractExecutorService executor = ThreadPoolUtil.getFileHandlerExecutor();
+				SharedApi.INSTANCE.chunkLoadEvent(new ChunkWrapper(chunk, wrappedLevel), wrappedLevel);
-				if (executor != null)
-				{
-					executor.execute(() ->
-					{
-						IClientLevelWrapper wrappedLevel = ClientLevelWrapper.getWrapper(level);
-						SharedApi.INSTANCE.chunkLoadEvent(new ChunkWrapper(chunk, wrappedLevel), wrappedLevel);
-					});
-				}
 			}
 		});
 		
@@ -148,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)
 					{
@@ -186,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)
 						{
@@ -218,83 +217,95 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 		// render event //
 		//==============//
 
-		
-		#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());
+			//LOGGER.info("\n\n" +
+			//		"Level Render\n" +
+			//		"Mc MVM: \n" + modelViewMatrix.toString() + "\n" +
+			//		"Mc Proj: \n" + projectionMatrix.toString()
+			//);
 			
 			
-			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
+			this.clientApi.renderFadeOpaque(
-			ClientApi.RENDER_STATE.frameTime = renderContext.tickDelta();
+					modelViewMatrix,
-			#else
+					projectionMatrix,
-			ClientApi.RENDER_STATE.frameTime = renderContext.tickCounter().getGameTimeDeltaTicks();
+					#if MC_VER < MC_1_21_1
-			#endif
+					renderContext.tickDelta(),
-			
+					#else
-			ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, renderContext.world());
+					renderContext.tickCounter().getGameTimeDeltaTicks(),
-			
+					#endif
-			
+					ClientLevelWrapper.getWrapper(renderContext.world())
-			this.clientApi.renderFadeOpaque();
+			);
 		});
 		
+		// 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();
+			ClientApi.INSTANCE.renderDeferredLodsForShaders(ClientLevelWrapper.getWrapper(renderContext.world()),
+					ClientApi.RENDER_STATE.mcModelViewMatrix,
+					ClientApi.RENDER_STATE.mcProjectionMatrix,
+					ClientApi.RENDER_STATE.frameTime
+			);
 			#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
@@ -339,10 +350,20 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 	{
 		HashSet<Integer> currentKeyDown = new HashSet<>();
 		
-		// Note: Minecraft's InputConstants are the same as GLFW Key values
+		// Note: Minecraft's InputConstants is same as GLFW Key values
-		for (int keyCode = GLFW.GLFW_KEY_0; keyCode <= GLFW.GLFW_KEY_LAST; keyCode++)
+		//TODO: Use mixin to hook directly into the GLFW Keyboard event in minecraft KeyboardHandler
+		// Check all keys we need
+		for (int keyCode = GLFW.GLFW_KEY_A; keyCode <= GLFW.GLFW_KEY_Z; keyCode++)
 		{
-			if (InputConstants.isKeyDown(MC.getGlfwWindowId(), 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);
 			}

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

@@ -20,12 +20,13 @@
 package com.seibel.distanthorizons.fabric;
 
 import com.mojang.brigadier.CommandDispatcher;
+import com.seibel.distanthorizons.api.enums.config.EDhApiMcRenderingFadeMode;
 import com.seibel.distanthorizons.common.AbstractModInitializer;
 import com.seibel.distanthorizons.core.config.Config;
+import com.seibel.distanthorizons.core.config.ConfigBase;
 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.NativeDialogUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IPluginPacketSender;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.*;
@@ -37,8 +38,10 @@ import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
 import net.fabricmc.fabric.api.event.Event;
 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
 import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
@@ -46,12 +49,8 @@ import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
 import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback;
 #endif
 
-#if MC_VER <= MC_1_21_10
+import javax.swing.*;
-import net.minecraft.resources.ResourceLocation;
+import java.awt.*;
-#else
-import net.minecraft.resources.Identifier;
-#endif
-
 import java.util.function.Consumer;
 
 /**
@@ -61,27 +60,22 @@ import java.util.function.Consumer;
  */
 public class FabricMain extends AbstractModInitializer implements ClientModInitializer, DedicatedServerModInitializer
 {
-	#if MC_VER <= MC_1_20_6
+	#if MC_VER >= MC_1_21_1
-	private static final ResourceLocation INITIAL_PHASE = new ResourceLocation(ModInfo.RESOURCE_NAMESPACE, ModInfo.DEDICATED_SERVER_INITIAL_PATH);
-	#elif MC_VER <= MC_1_21_10
 	private static final ResourceLocation INITIAL_PHASE = ResourceLocation.fromNamespaceAndPath(ModInfo.RESOURCE_NAMESPACE, ModInfo.DEDICATED_SERVER_INITIAL_PATH);
 	#else
-	private static final Identifier INITIAL_PHASE = Identifier.fromNamespaceAndPath(ModInfo.RESOURCE_NAMESPACE, ModInfo.DEDICATED_SERVER_INITIAL_PATH);
+	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(); }
@@ -103,7 +97,7 @@ public class FabricMain extends AbstractModInitializer implements ClientModIniti
 				String indiumMissingMessage = ModInfo.READABLE_NAME + " needs Indium to work with Sodium.\nPlease download Indium from https://modrinth.com/mod/indium";
 				LOGGER.fatal(indiumMissingMessage);
 				
-				NativeDialogUtil.showDialog(ModInfo.READABLE_NAME, indiumMissingMessage, "ok", "error");
+				TinyFileDialogs.tinyfd_messageBox(ModInfo.READABLE_NAME, indiumMissingMessage, "ok", "error", false);
 				
 				IMinecraftClientWrapper mc = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
 				String errorMessage = "loading Distant Horizons. Distant Horizons requires Indium in order to run with Sodium.";
@@ -115,7 +109,6 @@ public class FabricMain extends AbstractModInitializer implements ClientModIniti
 		this.tryCreateModCompatAccessor("starlight", IStarlightAccessor.class, StarlightAccessor::new);
 		this.tryCreateModCompatAccessor("optifine", IOptifineAccessor.class, OptifineAccessor::new);
 		this.tryCreateModCompatAccessor("bclib", IBCLibAccessor.class, BCLibAccessor::new);
-		this.tryCreateModCompatAccessor("c2me", IC2meAccessor.class, C2meAccessor::new);
 		#if MC_VER >= MC_1_19_4
 		// 1.19.4 is the lowest version Iris supports DH
 		this.tryCreateModCompatAccessor("iris", IIrisAccessor.class, IrisAccessor::new);
@@ -160,6 +153,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;
 	
@@ -93,11 +93,14 @@ public class FabricServerProxy implements AbstractModInitializer.IEventProxy
 		
 		/* Register the mod needed event callbacks */
 		
-		// can be enabled to test overrides/events without having to build a separate API project 
+		// ServerTickEvent
+		ServerTickEvents.END_SERVER_TICK.register((server) -> SERVER_API.serverTickEvent());
+		
+		
+		// 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,82 +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;
-
-#if MC_VER <= MC_1_21_10
-#else
-import com.mojang.blaze3d.textures.GpuSampler;
-#endif
-
-@Mixin(ChunkSectionsToRender.class)
-public class MixinChunkSectionsToRender
-{
-	
-	
-	#if MC_VER <= MC_1_21_10
-	// 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)
-	#else
-	// 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, GpuSampler gpuSampler, CallbackInfo ci)
-	#endif
-	{
-		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)
+		IClientLevelWrapper clientLevel = ClientLevelWrapper.getWrapper((ClientLevel) chunk.getLevel());
-		{
+		SharedApi.INSTANCE.chunkLoadEvent(new ChunkWrapper(chunk, clientLevel), clientLevel);
-			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);
-		});
 	}
 
 	#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

@@ -160,12 +160,9 @@ public class MixinFogRenderer
 	{
 		#if MC_VER < MC_1_21_6
 		Entity entity = camera.getEntity();
-		#elif MC_VER <= MC_1_21_10
-		Camera camera = Minecraft.getInstance().gameRenderer.getMainCamera();
-		Entity entity = camera.getEntity();
 		#else
 		Camera camera = Minecraft.getInstance().gameRenderer.getMainCamera();
-		Entity entity = camera.entity();	
+		Entity entity = camera.getEntity();	
 		#endif
 		
 		

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

@@ -30,34 +30,9 @@ 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
 
@@ -66,9 +41,11 @@ import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
 import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
 import com.seibel.distanthorizons.core.api.internal.ClientApi;
 import com.seibel.distanthorizons.coreapi.ModInfo;
+import com.seibel.distanthorizons.fabric.FabricClientProxy;
 import com.seibel.distanthorizons.core.util.math.Mat4f;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import net.minecraft.client.Minecraft;
+import com.seibel.distanthorizons.core.config.Config;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.renderer.LevelRenderer;
 import org.spongepowered.asm.mixin.Mixin;
@@ -77,8 +54,7 @@ import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.Logger;
-
 
 
 @Mixin(LevelRenderer.class)
@@ -88,7 +64,7 @@ public class MixinLevelRenderer
     private ClientLevel level;
 	
 	@Unique
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
 	
 	#if MC_VER < MC_1_17_1
@@ -116,16 +92,9 @@ public class MixinLevelRenderer
 			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
+	#else
 	@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
@@ -141,14 +110,11 @@ public class MixinLevelRenderer
 		// 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
+		#else
-		// MC combined the model view and projection matricies
+	    // 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();
-		#else
-	    ClientApi.RENDER_STATE.mcModelViewMatrix = McObjectConverter.Convert(positionMatrix);
-	    ClientApi.RENDER_STATE.mcProjectionMatrix = McObjectConverter.Convert(projectionMatrix);
 		#endif
 	    
 		// TODO move this into a common place
@@ -160,45 +126,34 @@ public class MixinLevelRenderer
 	    ClientApi.RENDER_STATE.frameTime = Minecraft.getInstance().deltaTracker.getRealtimeDeltaTicks();
 		#endif
 	    
-	    ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, this.level);
 	    
+	    //LOGGER.info("\n\n" +
+		//	    "Level Mixin\n" +
+		//	    "Mc MVM: \n" + mcModelViewMatrix.toString() + "\n" +
+		//	    "Mc Proj: \n" + mcProjectionMatrix.toString()
+	    //);
 	    
 	    
 	    #if MC_VER < MC_1_21_6
 	    if (renderType.equals(RenderType.translucent())) 
 		{
-		    ClientApi.INSTANCE.renderDeferredLodsForShaders();
+		    ClientApi.INSTANCE.renderDeferredLodsForShaders(ClientLevelWrapper.getWrapper(this.level),
+				    ClientApi.RENDER_STATE.mcModelViewMatrix,
+				    ClientApi.RENDER_STATE.mcProjectionMatrix,
+				    ClientApi.RENDER_STATE.frameTime
+				    );
 	    }
-		#elif MC_VER < MC_1_21_9
-	    // rendering handled via Fabric Api render event
 		#else
-		// handled here and in MixinChunkSectionsToRender
+		// rendering handled via Fabric Api render event
 	    #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/client/MixinOptionsScreen.java

@@ -28,6 +28,7 @@ import net.minecraft.network.chat.Component;
 #if MC_VER < MC_1_19_2
 import net.minecraft.network.chat.TranslatableComponent;
 #endif
+import net.minecraft.resources.ResourceLocation;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
@@ -50,11 +51,6 @@ import net.minecraft.client.gui.screens.OptionsScreen;
 import net.minecraft.client.gui.screens.options.OptionsScreen;
 #endif
 
-#if MC_VER <= MC_1_21_10
-import net.minecraft.resources.ResourceLocation;
-#else
-import net.minecraft.resources.Identifier;
-#endif
 
 /**
  * Adds a button to the menu to goto the config
@@ -66,16 +62,13 @@ import net.minecraft.resources.Identifier;
 public class MixinOptionsScreen extends Screen
 {
 	/** Texture used for the config opening button */
-	#if MC_VER <= MC_1_20_6
 	@Unique
-	private static final ResourceLocation ICON_TEXTURE = new ResourceLocation(ModInfo.ID, "textures/gui/button.png");
+	private static final ResourceLocation ICON_TEXTURE =
-	#elif MC_VER <= MC_1_21_10
+		#if MC_VER < MC_1_21_1
-	@Unique
+		new ResourceLocation(ModInfo.ID, "textures/gui/button.png");
-	private static final ResourceLocation ICON_TEXTURE = ResourceLocation.fromNamespaceAndPath(ModInfo.ID, "textures/gui/button.png");
+		#else
-	#else
+		ResourceLocation.fromNamespaceAndPath(ModInfo.ID, "textures/gui/button.png");
-	@Unique
+		#endif 
-	private static final Identifier ICON_TEXTURE = Identifier.fromNamespaceAndPath(ModInfo.ID, "textures/gui/button.png");
-	#endif 
 	
 	
 	@Unique
@@ -137,24 +130,24 @@ public class MixinOptionsScreen extends Screen
 		if (this.optionsButton == null)
 		{
 			this.optionsButton
-				= new TexturedButtonWidget(
+					= new TexturedButtonWidget(
-				// Where the button is on the screen
+					// Where the button is on the screen
-				this.width / 2 - 180, this.height / 6 - 12,
+					this.width / 2 - 180, this.height / 6 - 12,
-				// Width and height of the button
+					// Width and height of the button
-				20, 20,
+					20, 20,
-				// texture UV Offset
+					// texture UV Offset
-				0, 0,
+					0, 0,
-				// Some textuary stuff
+					// Some textuary stuff
-				20, ICON_TEXTURE, 20, 40,
+					20, ICON_TEXTURE, 20, 40,
-				// Create the button and tell it where to go
+					// Create the button and tell it where to go
-				// For now it goes to the client option by default
+					// For now it goes to the client option by default
-				(buttonWidget) -> Objects.requireNonNull(this.minecraft).setScreen(GetConfigScreen.getScreen(this)),
+					(buttonWidget) -> Objects.requireNonNull(this.minecraft).setScreen(GetConfigScreen.getScreen(this)),
-				// Add a title to the button
+					// Add a title to the button
-                #if MC_VER < MC_1_19_2
+	                #if MC_VER < MC_1_19_2
-				new TranslatableComponent(ModInfo.ID + ".title"));
+					new TranslatableComponent(ModInfo.ID + ".title"));
-                #else
+	                #else
-				Component.translatable(ModInfo.ID + ".title"));
+					Component.translatable(ModInfo.ID + ".title"));
-				#endif
+					#endif
 		}
 		
 		return this.optionsButton;

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

@@ -13,7 +13,8 @@ public class MixinLevelTicks<T>
 
 #else
 
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
+import com.seibel.distanthorizons.common.wrappers.DependencySetupDoneCheck;
+
 import net.minecraft.world.ticks.LevelTicks;
 import net.minecraft.world.ticks.ScheduledTick;
 
@@ -25,12 +26,18 @@ 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 (BatchGenerationEnvironment.isThisDhWorldGenThread())
+		if (isWorldGenThread())
 		{
 			ci.cancel();
 		}

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

@@ -19,7 +19,6 @@
 
 package com.seibel.distanthorizons.fabric.mixins.server;
 
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
 import org.spongepowered.asm.mixin.Mixin;
 
 #if MC_VER < MC_1_21_3
@@ -36,8 +35,10 @@ public class MixinTracingExecutor
 }
 #else
 
+import com.seibel.distanthorizons.common.wrappers.DependencySetupDoneCheck;
 import com.seibel.distanthorizons.core.util.objects.RunOnThisThreadExecutorService;
 import net.minecraft.TracingExecutor;
+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.CallbackInfoReturnable;
@@ -54,11 +55,16 @@ import java.util.concurrent.Executor;
 @Mixin(TracingExecutor.class)
 public class MixinTracingExecutor
 {
+	// TODO put in a common location
+	private static boolean isWorldGenThread()
+	{ return DependencySetupDoneCheck.isDone && DependencySetupDoneCheck.getIsCurrentThreadDistantGeneratorThread.get(); }
+	
+	
 	// replaced with TracingExecutor in MC 1.21.3+
 	@Inject(method = "forName(Ljava/lang/String;)Ljava/util/concurrent/Executor;", at = @At("HEAD"), cancellable = true)
 	private void forName(String executorName, CallbackInfoReturnable<Executor> ci)
 	{
-		if (BatchGenerationEnvironment.isThisDhWorldGenThread())
+		if (isWorldGenThread())
 		{
 			// run this task on the current DH thread instead of a new MC thread
 			ci.setReturnValue(new RunOnThisThreadExecutorService());

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

@@ -19,23 +19,19 @@
 
 package com.seibel.distanthorizons.fabric.mixins.server;
 
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
+import com.seibel.distanthorizons.common.wrappers.DependencySetupDoneCheck;
 import com.seibel.distanthorizons.core.util.objects.RunOnThisThreadExecutorService;
 import org.spongepowered.asm.mixin.Mixin;
-
-#if MC_VER <= MC_1_21_10
-import net.minecraft.Util;
-#else
-import net.minecraft.util.Util;
-#endif
-
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
+import net.minecraft.Util;
+
+import java.util.concurrent.ExecutorService;
+
 #if MC_VER < MC_1_16_5
 #elif MC_VER < MC_1_21_3
-import java.util.concurrent.ExecutorService;
 import java.util.function.Supplier;
 #else
 #endif
@@ -50,11 +46,15 @@ import java.util.function.Supplier;
 @Mixin(Util.class)
 public class MixinUtilBackgroundThread
 {
+	private static boolean isWorldGenThread()
+	{ return DependencySetupDoneCheck.isDone && DependencySetupDoneCheck.getIsCurrentThreadDistantGeneratorThread.get(); }
+	
+	
 	#if MC_VER < MC_1_21_3
 	@Inject(method = "backgroundExecutor", at = @At("HEAD"), cancellable = true)
 	private static void overrideUtil$backgroundExecutor(CallbackInfoReturnable<ExecutorService> ci)
 	{
-		if (BatchGenerationEnvironment.isThisDhWorldGenThread())
+		if (isWorldGenThread())
 		{
 			// run this task on the current DH thread instead of a new MC thread
 			ci.setReturnValue(new RunOnThisThreadExecutorService());
@@ -70,7 +70,7 @@ public class MixinUtilBackgroundThread
 			at = @At("HEAD"), cancellable = true)
 	private static void overrideUtil$wrapThreadWithTaskName(String string, Runnable r, CallbackInfoReturnable<Runnable> ci)
 	{
-		if (BatchGenerationEnvironment.isThisDhWorldGenThread())
+		if (isWorldGenThread())
 		{
 			//ApiShared.LOGGER.info("util wrapThreadWithTaskName(Runnable) triggered");
 			ci.setReturnValue(r);
@@ -86,7 +86,7 @@ public class MixinUtilBackgroundThread
 			at = @At("HEAD"), cancellable = true)
 	private static void overrideUtil$wrapThreadWithTaskNameForSupplier(String string, Supplier<?> r, CallbackInfoReturnable<Supplier<?>> ci)
 	{
-		if (BatchGenerationEnvironment.isThisDhWorldGenThread())
+		if (isWorldGenThread())
 		{
 			//ApiShared.LOGGER.info("util wrapThreadWithTaskName(Supplier) triggered");
 			ci.setReturnValue(r);

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/java/com/seibel/distanthorizons/fabric/wrappers/config/ModMenuIntegration.java

@@ -23,7 +23,9 @@ import com.seibel.distanthorizons.common.wrappers.gui.GetConfigScreen;
 import com.terraformersmc.modmenu.api.ConfigScreenFactory;
 import com.terraformersmc.modmenu.api.ModMenuApi;
 
-/** For making the config show up in modmenu */
+/**
+ * For making the config show up in modmenu
+ */
 public class ModMenuIntegration implements ModMenuApi
 {
 	// For the custom config code

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

@@ -34,14 +34,22 @@ import net.irisshaders.iris.api.v0.IrisApi;
 public class IrisAccessor implements IIrisAccessor
 {
 	@Override
-	public String getModName() { return Iris.MODID; }
+	public String getModName()
+	{
+		return Iris.MODID;
+	}
 	
 	@Override
-	public boolean isShaderPackInUse() { return IrisApi.getInstance().isShaderPackInUse(); }
+	public boolean isShaderPackInUse()
+	{
+		return IrisApi.getInstance().isShaderPackInUse();
+	}
 	
 	@Override
-	public boolean isRenderingShadowPass() { return IrisApi.getInstance().isRenderingShadowPass(); }
+	public boolean isRenderingShadowPass()
-	
+	{
+		return IrisApi.getInstance().isRenderingShadowPass();
+	}
 }
 
 #endif

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

@@ -28,6 +28,9 @@ public class OptifineAccessor extends AbstractOptifineAccessor
 {
 	
 	@Override
-	public String getModName() { return "Optifine-Fabric"; }
+	public String getModName()
+	{
+		return "Optifine-Fabric-1.18.X";
+	}
 	
 }

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

@@ -26,7 +26,6 @@ import java.lang.invoke.MethodType;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.ISodiumAccessor;
-import net.minecraft.client.Minecraft;
 
 
 #if MC_VER < MC_1_20_1
@@ -51,11 +50,9 @@ public class SodiumAccessor implements ISodiumAccessor
 	 */
 	public static final boolean isSodiumV5OrLess;
 	
-	#if MC_VER <= MC_1_19_4
+	#if MC_VER >= MC_1_20_1
-	#elif MC_VER <= MC_1_21_10
 	private static MethodHandle setFogOcclusionMethod;
 	private static Object sodiumPerformanceOptions;
-	#else
 	#endif
 	
 	static {
@@ -81,8 +78,7 @@ public class SodiumAccessor implements ISodiumAccessor
 	@Override
 	public void setFogOcclusion(boolean occlusionEnabled)
 	{
-		#if MC_VER <= MC_1_19_4
+		#if MC_VER >= MC_1_20_1
-		#elif MC_VER <= MC_1_21_10
 		try
 		{
 			if (sodiumPerformanceOptions == null)
@@ -126,8 +122,6 @@ public class SodiumAccessor implements ISodiumAccessor
 		{
 			throw new RuntimeException(e);
 		}
-		#else
-		// in newer versions of Sodium this doesn't appear to be an issue so it can probably just be ignored
 		#endif
 	}
 

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

@@ -17,7 +17,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
@@ -107,6 +107,21 @@ public class ForgeClientProxy implements AbstractModInitializer.IEventProxy
 	
 	
 	
+	//=============//
+	// tick events //
+	//=============//
+	
+	@SubscribeEvent
+	public void clientTickEvent(TickEvent.ClientTickEvent event)
+	{
+		if (event.phase == TickEvent.Phase.START)
+		{
+			ClientApi.INSTANCE.clientTickEvent();
+		}
+	}
+	
+	
+	
 	//==============//
 	// world events //
 	//==============//

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

@@ -22,16 +22,17 @@ package com.seibel.distanthorizons.forge;
 import com.mojang.brigadier.CommandDispatcher;
 import com.seibel.distanthorizons.common.AbstractModInitializer;
 import com.seibel.distanthorizons.common.wrappers.gui.GetConfigScreen;
+import com.seibel.distanthorizons.core.api.internal.ClientApi;
+import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
+import com.seibel.distanthorizons.common.wrappers.gui.GetConfigScreen;
 import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IPluginPacketSender;
-import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IIrisAccessor;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IModChecker;
 import com.seibel.distanthorizons.coreapi.ModInfo;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IOptifineAccessor;
 
 import com.seibel.distanthorizons.forge.wrappers.modAccessor.ModChecker;
 import com.seibel.distanthorizons.forge.wrappers.modAccessor.OptifineAccessor;
-import com.seibel.distanthorizons.forge.wrappers.modAccessor.OculusAccessor;
 
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.server.MinecraftServer;
@@ -85,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(); }
@@ -103,7 +102,6 @@ public class ForgeMain extends AbstractModInitializer
 	protected void initializeModCompat()
 	{
 		this.tryCreateModCompatAccessor("optifine", IOptifineAccessor.class, OptifineAccessor::new);
-		this.tryCreateModCompatAccessor("oculus", IIrisAccessor.class, OculusAccessor::new);
 		
 		#if MC_VER < MC_1_17_1
 		ModLoadingContext.get().registerExtensionPoint(ExtensionPoint.CONFIGGUIFACTORY,

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;
 
@@ -90,6 +90,16 @@ public class ForgeServerProxy implements AbstractModInitializer.IEventProxy
 	// events //
 	//========//
 	
+	// ServerTickEvent (at end)
+	@SubscribeEvent
+	public void serverTickEvent(TickEvent.ServerTickEvent event)
+	{
+		if (event.phase == TickEvent.Phase.END)
+		{
+			this.serverApi.serverTickEvent();
+		}
+	}
+	
 	// ServerWorldLoadEvent
 	@SubscribeEvent
 	public void dedicatedWorldLoadEvent(#if MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1 FMLServerAboutToStartEvent #else ServerAboutToStartEvent #endif event)