Add logging/messaging for corrupted DB files

This reverts commit 6a418de153.

.editorconfig

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

.gitlab-ci.yml

@@ -36,7 +36,7 @@ build:
   parallel:
     matrix:
       - MC_VER: [
-      "1.21.10", "1.21.8", "1.21.6", "1.21.5", "1.21.4", "1.21.3", "1.21.1", 
+      "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", 

build.gradle

@@ -248,7 +248,7 @@ subprojects { p ->
         // We cannot relocate this library since we call some MC classes that reference it
         implementation("it.unimi.dsi:fastutil:${rootProject.fastutil_version}")
 
-        forgeShadowMe("com.github.luben:zstd-jni:1.5.7-4")
+        forgeShadowMe("com.github.luben:zstd-jni:${rootProject.zstd_version}")
         
         // Compression
         forgeShadowMe("org.lz4:lz4-java:${rootProject.lz4_version}") // LZ4

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

@@ -10,7 +10,7 @@ import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftServerWrapp
 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.ConfigBase;
+import com.seibel.distanthorizons.core.config.ConfigHandler;
 import com.seibel.distanthorizons.core.config.eventHandlers.presets.ThreadPresetConfigEventHandler;
 import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
@@ -24,7 +24,7 @@ import com.seibel.distanthorizons.coreapi.ModInfo;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.dedicated.DedicatedServer;
-import org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 
 import java.lang.invoke.MethodHandles;
 import java.util.function.Consumer;
@@ -36,7 +36,7 @@ import java.util.function.Supplier;
  */
 public abstract class AbstractModInitializer
 {
-	protected static final Logger LOGGER = DhLoggerBuilder.getLogger(MethodHandles.lookup().lookupClass().getSimpleName());
+	protected static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	private CommandInitializer commandInitializer;
 	
@@ -46,7 +46,8 @@ public abstract class AbstractModInitializer
 	// abstract methods //
 	//==================//
 	
-	protected abstract void createInitialBindings();
+	protected abstract void createInitialSharedBindings();
+	protected abstract void createInitialClientBindings();
 	protected abstract IEventProxy createClientProxy();
 	protected abstract IEventProxy createServerProxy(boolean isDedicated);
 	protected abstract void initializeModCompat();
@@ -66,6 +67,7 @@ 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);
@@ -84,7 +86,7 @@ public abstract class AbstractModInitializer
 		
 		LOGGER.info(ModInfo.READABLE_NAME + " client Initialized.");
 		
-		#if MC_VER < MC_1_21_10
+		#if MC_VER < MC_1_21_9
 		// debug screen rendering handled via a mixin
 		#else
 		DhDebugScreenEntry.register();
@@ -113,8 +115,8 @@ public abstract class AbstractModInitializer
 		this.initializeModCompat();
 		
 		LOGGER.info(ModInfo.READABLE_NAME + " server Initialized, adding event subscribers...");
-		
-		this.subscribeRegisterCommandsEvent(dispatcher -> { this.commandInitializer = new CommandInitializer(dispatcher); });
+		this.commandInitializer = new CommandInitializer();
+		this.subscribeRegisterCommandsEvent(dispatcher -> { commandInitializer.initCommands(dispatcher); });
 		
 		this.subscribeServerStartingEvent(server -> 
 		{
@@ -122,7 +124,7 @@ public abstract class AbstractModInitializer
 			
 			this.initConfig();
 			this.postInit();
-			this.commandInitializer.initCommands();
+			this.commandInitializer.onServerReady();
 			
 			this.checkForUpdates();
 			
@@ -140,7 +142,7 @@ public abstract class AbstractModInitializer
 	{
 		DependencySetup.createSharedBindings();
 		SharedApi.init();
-		this.createInitialBindings();
+		this.createInitialSharedBindings();
 	}
 	
 	private void logBuildInfo()
@@ -168,8 +170,9 @@ public abstract class AbstractModInitializer
 	
 	private void initConfig()
 	{
-		ConfigBase.RunFirstTimeSetup();
+		ConfigHandler.tryRunFirstTimeSetup();
 		Config.completeDelayedSetup();
+		DhLogger.runDelayedConfigSetup();
 	}
 	
 	private void checkForUpdates()
@@ -190,6 +193,12 @@ 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

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

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

@@ -3,6 +3,7 @@ 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;
@@ -12,25 +13,42 @@ import static net.minecraft.commands.Commands.literal;
  */
 public class CommandInitializer
 {
-	private final CommandDispatcher<CommandSourceStack> commandDispatcher;
+	private boolean serverReady = false;
 	
 	/**
-	 * Constructs a new instance of this class.
-	 *
-	 * @param commandDispatcher The dispatcher to use for registering commands.
+	 * A received command dispatcher, which is held until the server is ready to initialize the commands.
 	 */
-	public CommandInitializer(CommandDispatcher<CommandSourceStack> commandDispatcher)
+	@Nullable
+	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.commandDispatcher = commandDispatcher;
+		this.serverReady = true;
+		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()
+	public void initCommands(CommandDispatcher<CommandSourceStack> commandDispatcher)
 	{
+		if (!this.serverReady)
+		{
+			this.commandDispatcher = commandDispatcher;
+			return;
+		}
+		
 		LiteralArgumentBuilder<CommandSourceStack> builder = literal("dh")
 				.requires(source -> source.hasPermission(4));
 		
@@ -43,7 +61,7 @@ public class CommandInitializer
 			builder.then(new CrashCommand().buildCommand());
 		}
 		
-		this.commandDispatcher.register(builder);
+		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.ConfigBase;
-import com.seibel.distanthorizons.core.config.types.AbstractConfigType;
+import com.seibel.distanthorizons.core.config.ConfigHandler;
+import com.seibel.distanthorizons.core.config.types.AbstractConfigBase;
 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 (AbstractConfigType<?, ?> type : ConfigBase.INSTANCE.entries)
+		for (AbstractConfigBase<?> type : ConfigHandler.INSTANCE.configBaseList)
 		{
 			// 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.getIDhServerWorld() != null;
+							assert SharedApi.tryGetDhServerWorld() != null;
 							
-							ServerPlayerState serverPlayerState = SharedApi.getIDhServerWorld().getServerPlayerStateManager()
+							ServerPlayerState serverPlayerState = SharedApi.tryGetDhServerWorld().getServerPlayerStateManager()
 									.getConnectedPlayer(this.getSourcePlayer(c));
 							if (serverPlayerState != null)
 							{
@@ -29,9 +29,9 @@ public class CrashCommand extends AbstractCommand
 						}))
 				.then(literal("decode")
 						.executes(c -> {
-							assert SharedApi.getIDhServerWorld() != null;
+							assert SharedApi.tryGetDhServerWorld() != null;
 							
-							ServerPlayerState serverPlayerState = SharedApi.getIDhServerWorld().getServerPlayerStateManager()
+							ServerPlayerState serverPlayerState = SharedApi.tryGetDhServerWorld().getServerPlayerStateManager()
 									.getConnectedPlayer(this.getSourcePlayer(c));
 							if (serverPlayerState != null)
 							{

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

@@ -56,7 +56,6 @@ 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;
 	}
 	
 	public static void createServerBindings()

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

@@ -79,6 +79,8 @@ public class VersionConstants implements IVersionConstants
 		#elif MC_VER == MC_1_21_8
 			return "1.21.8";
 		
+		#elif MC_VER == MC_1_21_9
+			return "1.21.9";
 		#elif MC_VER == MC_1_21_10
 			return "1.21.10";
 		#else

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.AbstractBatchGenerationEnvironmentWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.worldGeneration.IBatchGeneratorEnvironmentWrapper;
 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 AbstractBatchGenerationEnvironmentWrapper createBatchGenerator(IDhLevel targetLevel)
+	public IBatchGeneratorEnvironmentWrapper createBatchGenerator(IDhLevel targetLevel)
 	{
 		if (targetLevel instanceof IDhServerLevel)
 		{

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

@@ -1,16 +1,31 @@
 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
@@ -18,10 +33,24 @@ import net.minecraft.core.Holder;
 
 public abstract class AbstractDhTintGetter implements BlockAndTintGetter
 {
-	protected final BiomeWrapper biomeWrapper;
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
-	protected final int smoothingRadiusInBlocks;
-	protected final FullDataSourceV2 fullDataSource;
+	#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;
 	
 	
 	
@@ -29,10 +58,18 @@ public abstract class AbstractDhTintGetter implements BlockAndTintGetter
 	// constructor //
 	//=============//
 	
-	public AbstractDhTintGetter(BiomeWrapper biomeWrapper, FullDataSourceV2 fullDataSource)
+	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();
 	}
 	
@@ -42,8 +79,27 @@ public abstract class AbstractDhTintGetter implements BlockAndTintGetter
 	// shared methods //
 	//================//
 	
+	/** Called by MC's tint getter */
 	@Override
-	public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver)
+	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
@@ -57,7 +113,7 @@ public abstract class AbstractDhTintGetter implements BlockAndTintGetter
 		if (this.smoothingRadiusInBlocks == 0
 			|| dataSourceLodWidthInBlocks > this.smoothingRadiusInBlocks)
 		{
-			return colorResolver.getColor(this.unwrapBiome(this.biomeWrapper.biome), blockPos.getX(), blockPos.getZ());
+			return this.tryGetClientBiomeColor(colorResolver, this.biomeWrapper);
 		}
 		
 		
@@ -67,13 +123,14 @@ public abstract class AbstractDhTintGetter implements BlockAndTintGetter
 		int rollingGreen = 0;
 		int rollingBlue = 0;
 		
-		int xMin = blockPos.getX() - this.smoothingRadiusInBlocks;
-		int xMax = blockPos.getX() + this.smoothingRadiusInBlocks;
+		int xMin = mutableBlockPos.getX() - this.smoothingRadiusInBlocks;
+		int xMax = mutableBlockPos.getX() + this.smoothingRadiusInBlocks + 1; // +1 to account for the center block
 		
-		int zMin = blockPos.getZ() - this.smoothingRadiusInBlocks;
-		int zMax = blockPos.getZ() + this.smoothingRadiusInBlocks;
+		int zMin = mutableBlockPos.getZ() - this.smoothingRadiusInBlocks;
+		int zMax = mutableBlockPos.getZ() + this.smoothingRadiusInBlocks + 1;
+		
+		int levelMinY = this.clientLevelWrapper.getMinHeight();
 		
-		DhBlockPosMutable mutableBlockPos = new DhBlockPosMutable(0, blockPos.getY(), 0);
 		for (int x = xMin; x < xMax; x++)
 		{
 			for (int z = zMin; z < zMax; z++)
@@ -84,16 +141,21 @@ public abstract class AbstractDhTintGetter implements BlockAndTintGetter
 				// 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.getAtBlockPos(mutableBlockPos);
+				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 = colorResolver.getColor(this.unwrapBiome(biomeWrapper.biome), mutableBlockPos.getX(), mutableBlockPos.getZ());
+				int color = this.tryGetClientBiomeColor(colorResolver, biomeWrapper);
+				if (color == INVALID_COLOR)
+				{
+					return INVALID_COLOR;
+				}
 				
 				
 				// rolling average
@@ -110,7 +172,7 @@ public abstract class AbstractDhTintGetter implements BlockAndTintGetter
 		// just use the default center's color
 		if (dataPointCount == 0)
 		{
-			return colorResolver.getColor(this.unwrapBiome(this.biomeWrapper.biome), blockPos.getX(), blockPos.getZ());
+			return this.tryGetClientBiomeColor(colorResolver, this.biomeWrapper);
 		}
 		
 		int colorInt = ColorUtil.argbToInt(
@@ -121,7 +183,50 @@ public abstract class AbstractDhTintGetter implements BlockAndTintGetter
 		return colorInt;
 	}
 	
-	protected Biome unwrapBiome(#if MC_VER >= MC_1_18_2 Holder<Biome> #else Biome #endif biome)
+	/** 
+	 * 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();
@@ -130,6 +235,103 @@ public abstract class AbstractDhTintGetter implements BlockAndTintGetter
 		#endif
 	}
 	
+	/**
+	 * <p>Previously, this class might have immediately unwrapped the Holder like this:</p>
+	 * <pre>{@code
+	 * // Inside constructor (OLD WAY - PROBLEMATIC):
+	 * Holder<Biome> biomeHolder = getTheHolderFromSomewhere();
+	 * this.biome = biomeHolder.value(); // <-- PROBLEM HERE
+	 * }</pre>
+	 *
+	 * <p>This approach is problematic because the {@link net.minecraft.core.Holder} system,
+	 * particularly {@code Holder.Reference}, is designed for <strong>late binding</strong>. Here's why storing
+	 * the Holder itself is now necessary:</p>
+	 * <ol>
+	 *   <li>A {@code Holder.Reference<Biome>} might be created initially just with a
+	 *       {@link net.minecraft.resources.ResourceKey} (like {@code minecraft:plains}), but its actual
+	 *       {@link net.minecraft.core.Holder#value() value()} (the {@code Biome} object itself) might be {@code null}
+	 *       at construction time.</li>
+	 *   <li>Later, during game loading, registry population, or potentially due to modifications by other mods
+	 *       (e.g., Polytone), the system calls internal binding methods (like {@code bindValue(Biome)})
+	 *       on the {@code Holder} instance. This sets or <strong>updates</strong> the internal reference to the
+	 *       actual {@code Biome} object.</li>
+	 *   <li>Crucially, the binding process might assign a completely <strong>new</strong> {@code Biome} object
+	 *       instance to the {@code Holder} reference, replacing any previous one.</li>
+	 * </ol>
+	 *
+	 * <p>If we unwrapped the {@code Holder} using {@code .value()} within the constructor (the old way),
+	 * our class's internal {@code biome} field would permanently store a reference to whatever {@code Biome}
+	 * object the {@code Holder} pointed to *at that exact moment*. It would have no link back to the
+	 * {@code Holder} and would be unaware if the {@code Holder} was later updated to point to a different
+	 * (or the initially missing) {@code Biome} object. This would lead to using stale or even {@code null} data.</p>
+	 *
+	 * <p>By storing the {@code Holder<Biome>} itself, this class can call {@link net.minecraft.core.Holder#value()}
+	 * whenever the biome information is needed, ensuring it always retrieves the most current {@code Biome}
+	 * instance associated with the holder at that time.</p>
+	 */
+	private static #if MC_VER < MC_1_18_2 Biome #else Holder<Biome> #endif getClientBiome(String biomeResourceString)
+	{
+		#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,11 @@ import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
 import net.minecraft.world.level.Level;
 import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper;
 
@@ -57,7 +58,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 Logger LOGGER = LogManager.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	
 	#if MC_VER < MC_1_18_2
@@ -103,7 +104,7 @@ public class BiomeWrapper implements IBiomeWrapper
 	// constructors //
 	//==============//
 	
-	static public IBiomeWrapper getBiomeWrapper(#if MC_VER < MC_1_18_2 Biome #else Holder<Biome> #endif biome, ILevelWrapper levelWrapper)
+	public static BiomeWrapper getBiomeWrapper(#if MC_VER < MC_1_18_2 Biome #else Holder<Biome> #endif biome, ILevelWrapper levelWrapper)
 	{
 		if (biome == null)
 		{
@@ -111,9 +112,10 @@ public class BiomeWrapper implements IBiomeWrapper
 		}
 		
 		
-		if (WRAPPER_BY_BIOME.containsKey(biome))
+		BiomeWrapper biomeWrapper = WRAPPER_BY_BIOME.get(biome);
+		if (biomeWrapper != null)
 		{
-			return WRAPPER_BY_BIOME.get(biome);
+			return biomeWrapper;
 		}
 		else
 		{
@@ -299,7 +301,7 @@ public class BiomeWrapper implements IBiomeWrapper
 				}
 				
 				
-				foundWrapper = (BiomeWrapper) getBiomeWrapper(deserializeResult.biome, levelWrapper);
+				foundWrapper = getBiomeWrapper(deserializeResult.biome, levelWrapper);
 				return foundWrapper;
 			}
 			catch (Exception e)

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

@@ -35,7 +35,7 @@ import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.state.BlockState;
-import org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 
 import java.awt.*;
 import java.io.IOException;
@@ -72,7 +72,7 @@ public class BlockStateWrapper implements IBlockStateWrapper
 	
 	
 	// must be defined before AIR, otherwise a null pointer will be thrown
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
     public static final ConcurrentHashMap<BlockState, BlockStateWrapper> WRAPPER_BY_BLOCK_STATE = new ConcurrentHashMap<>();
     public static final ConcurrentHashMap<String, BlockStateWrapper> WRAPPER_BY_RESOURCE_LOCATION = new ConcurrentHashMap<>();
@@ -274,7 +274,7 @@ public class BlockStateWrapper implements IBlockStateWrapper
 		
 		HashSet<String> baseIgnoredBlock = new HashSet<>();
 		baseIgnoredBlock.add(AIR_STRING);
-		rendererIgnoredBlocks = getBlockWrappers(Config.Client.Advanced.Graphics.Culling.ignoredRenderBlockCsv, baseIgnoredBlock, levelWrapper);
+		rendererIgnoredBlocks = getAllBlockWrappers(Config.Client.Advanced.Graphics.Culling.ignoredRenderBlockCsv, baseIgnoredBlock, levelWrapper);
 		return rendererIgnoredBlocks;
 	}
 	/**
@@ -291,7 +291,7 @@ public class BlockStateWrapper implements IBlockStateWrapper
 		
 		HashSet<String> baseIgnoredBlock = new HashSet<>();
 		baseIgnoredBlock.add(AIR_STRING);
-		rendererIgnoredCaveBlocks = getBlockWrappers(Config.Client.Advanced.Graphics.Culling.ignoredRenderCaveBlockCsv, baseIgnoredBlock, levelWrapper);
+		rendererIgnoredCaveBlocks = getAllBlockWrappers(Config.Client.Advanced.Graphics.Culling.ignoredRenderCaveBlockCsv, baseIgnoredBlock, levelWrapper);
 		return rendererIgnoredCaveBlocks;
 	}
 	
@@ -302,7 +302,7 @@ public class BlockStateWrapper implements IBlockStateWrapper
 	
 	// lod builder helpers //
 	
-	private static HashSet<IBlockStateWrapper> getBlockWrappers(ConfigEntry<String> config, HashSet<String> baseResourceLocations, ILevelWrapper levelWrapper)
+	private static HashSet<IBlockStateWrapper> getAllBlockWrappers(ConfigEntry<String> config, HashSet<String> baseResourceLocations, ILevelWrapper levelWrapper)
 	{
 		// get the base blocks 
 		HashSet<String> blockStringList = new HashSet<>();
@@ -318,9 +318,9 @@ public class BlockStateWrapper implements IBlockStateWrapper
 			blockStringList.addAll(Arrays.asList(ignoreBlockCsv.split(",")));
 		}
 		
-		return getBlockWrappers(blockStringList, levelWrapper);
+		return getAllBlockWrappers(blockStringList, levelWrapper);
 	}
-	private static HashSet<IBlockStateWrapper> getBlockWrappers(HashSet<String> blockResourceLocationSet, ILevelWrapper levelWrapper)
+	private static HashSet<IBlockStateWrapper> getAllBlockWrappers(HashSet<String> blockResourceLocationSet, ILevelWrapper levelWrapper)
 	{
 		// deserialize each of the given resource locations
 		HashSet<IBlockStateWrapper> blockStateWrappers = new HashSet<>();
@@ -587,7 +587,8 @@ 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) || finalResourceStateString.equals("")) // the empty string shouldn't normally happen, but just in case
+		if (finalResourceStateString.equals(AIR_STRING) 
+			|| finalResourceStateString.equals("")) // the empty string shouldn't normally happen, but just in case
 		{
 			return AIR;
 		}

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

@@ -20,17 +20,16 @@
 package com.seibel.distanthorizons.common.wrappers.block;
 
 import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
-import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos;
+import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPosMutable;
 import com.seibel.distanthorizons.core.util.ColorUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.block.model.BakedQuad;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.core.Direction;
-import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.FlowerBlock;
 import net.minecraft.world.level.block.LeavesBlock;
@@ -41,7 +40,7 @@ import net.minecraft.util.RandomSource;
 import java.util.Random;
 #endif
 import net.minecraft.world.level.block.state.BlockState;
-import org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
@@ -63,10 +62,8 @@ import net.minecraft.client.renderer.block.model.BlockModelPart;
  */
 public class ClientBlockStateColorCache
 {
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
-	// TODO it isn't that we need the level, but that we need the adjacent data
-	//  maybe we can pass in the full data source?
 	private static final HashSet<BlockState> BLOCK_STATES_THAT_NEED_LEVEL = new HashSet<>();
 	private static final HashSet<BlockState> BROKEN_BLOCK_STATES = new HashSet<>();
 	
@@ -96,14 +93,11 @@ public class ClientBlockStateColorCache
 	#endif
 	
 	private final IClientLevelWrapper clientLevelWrapper;
-	private final BlockStateWrapper blockStateWrapper;
-	
 	private final BlockState blockState;
-	private final LevelReader level;
+	private final BlockStateWrapper blockStateWrapper;
 	
 	private boolean isColorResolved = false;
 	private int baseColor = 0;
-	private boolean needShade = true;
 	private boolean needPostTinting = false;
 	private int tintIndex = 0;
 	
@@ -171,18 +165,20 @@ 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 samplingLevel)
+	public ClientBlockStateColorCache(BlockState blockState, IClientLevelWrapper clientLevelWrapper)
 	{
 		this.blockState = blockState;
-		this.clientLevelWrapper = samplingLevel;
-		this.level = (LevelReader) samplingLevel.getWrappedMcObject();
-		this.blockStateWrapper = BlockStateWrapper.fromBlockState(this.blockState, this.clientLevelWrapper);
+		this.blockStateWrapper = BlockStateWrapper.fromBlockState(blockState, clientLevelWrapper);
+		this.clientLevelWrapper = clientLevelWrapper;
 		
 		this.resolveColors();
 	}
@@ -236,32 +232,29 @@ 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,
-						ColorMode.getColorMode(this.blockState.getBlock()));
+						EColorMode.getColorMode(this.blockState.getBlock()));
 					#elif MC_VER < MC_1_21_5
 					this.baseColor = calculateColorFromTexture(
                         firstQuad.getSprite(),
-						ColorMode.getColorMode(this.blockState.getBlock()));
+						EColorMode.getColorMode(this.blockState.getBlock()));
 					#else
 					this.baseColor = calculateColorFromTexture(
 						firstQuad.sprite(),
-						ColorMode.getColorMode(this.blockState.getBlock()));
+						EColorMode.getColorMode(this.blockState.getBlock()));
 					#endif
 				}
 				else
 				{
 					// Backup method.
 					this.needPostTinting = false;
-					this.needShade = false;
 					this.tintIndex = 0;
 					this.baseColor = this.getParticleIconColor();
 				}
@@ -270,19 +263,11 @@ public class ClientBlockStateColorCache
 			{
 				// Liquid Block
 				this.needPostTinting = true;
-				this.needShade = false;
 				this.tintIndex = 0;
 				this.baseColor = this.getParticleIconColor();
 			}
 			
 			
-			//String serialString = this.blockStateWrapper.getSerialString();
-			//if (serialString.contains("minecraft:water")
-			//		|| serialString.contains("grass"))
-			//{
-			//	BLOCK_STATES_THAT_NEED_LEVEL.add(this.blockState);
-			//}
-			
 			this.isColorResolved = true;
 		}
 		finally
@@ -320,7 +305,7 @@ public class ClientBlockStateColorCache
 	}
 	
 	//TODO: Perhaps make this not just use the first frame?
-	private static int calculateColorFromTexture(TextureAtlasSprite texture, ColorMode colorMode)
+	private static int calculateColorFromTexture(TextureAtlasSprite texture, EColorMode colorMode)
 	{
 		int count = 0;
 		int alpha = 0;
@@ -330,8 +315,8 @@ public class ClientBlockStateColorCache
 		int tempColor;
 		
 		// don't render Chiseled blocks.
-		// Since ColorMode is set per block, you only need to check this once.
-		if (colorMode != ColorMode.Chisel)
+		// Since EColorMode is set per block, you only need to check this once.
+		if (colorMode != EColorMode.Chisel)
 		{
 			// textures normally use u and v instead of x and y
 			for (int v = 0; v < getTextureHeight(texture); v++)
@@ -349,7 +334,7 @@ public class ClientBlockStateColorCache
 					int b = (tempColor & 0x00FF0000) >>> 16;
 					int a = (tempColor & 0xFF000000) >>> 24;
 					int scale = 1;
-					if (colorMode == ColorMode.Leaves)
+					if (colorMode == EColorMode.Leaves)
 					{
 						//switch (//FIXME add config option)
 						//	case BLACK:
@@ -368,11 +353,11 @@ public class ClientBlockStateColorCache
 						//		break; //do nothing, let it count towards transparency
 						
 					}
-					else if (a == 0 && colorMode != ColorMode.Glass)
+					else if (a == 0 && colorMode != EColorMode.Glass)
 					{
 						continue;
 					}
-					else if (colorMode == ColorMode.Flower && (g + 25 < b || g + 25 < r))
+					else if (colorMode == EColorMode.Flower && (g + 25 < b || g + 25 < r))
 					{
 						scale = FLOWER_COLOR_SCALE;
 					}
@@ -455,7 +440,7 @@ public class ClientBlockStateColorCache
 	{
 		return calculateColorFromTexture(
 				Minecraft.getInstance().getModelManager().getBlockModelShaper().getParticleIcon(this.blockState),
-				ColorMode.getColorMode(this.blockState.getBlock()));
+				EColorMode.getColorMode(this.blockState.getBlock()));
 	}
 	
 	
@@ -464,7 +449,7 @@ public class ClientBlockStateColorCache
 	// public getter //
 	//===============//
 	
-	public int getColor(BiomeWrapper biome, FullDataSourceV2 fullDataSource, DhBlockPos pos)
+	public int getColor(BiomeWrapper biomeWrapper, FullDataSourceV2 fullDataSource, DhBlockPos blockPos)
 	{
 		// only get the tint if the block needs to be tinted
 		if (!this.needPostTinting)
@@ -488,16 +473,27 @@ public class ClientBlockStateColorCache
 			{
 				try
 				{
-					tintColor = Minecraft.getInstance().getBlockColors()
-							.getColor(this.blockState, 
-									new TintWithoutLevelSmoothOverrider(biome, fullDataSource), // TODO can this object be cached?
-									McObjectConverter.Convert(pos), 
-									this.tintIndex);
+					TintWithoutLevelOverrider tintOverride = TintWithoutLevelOverrideGetter.get();
+					tintOverride.update(biomeWrapper, this.blockStateWrapper, fullDataSource, this.clientLevelWrapper);
+					
+					// try using DH's cached tint values first if possible
+					tintColor = tintOverride.tryGetBlockTint(new DhBlockPosMutable(blockPos));
+					if (tintColor == AbstractDhTintGetter.INVALID_COLOR)
+					{
+						// one or more tint values weren't calculated,
+						// we need MC's color resolver
+						tintColor = Minecraft.getInstance()
+								.getBlockColors()
+								.getColor(this.blockState,
+										tintOverride,
+										McObjectConverter.Convert(blockPos),
+										this.tintIndex);
+					}
 				}
 				catch (UnsupportedOperationException e)
 				{
 					// this exception generally occurs if the tint requires other blocks besides itself
-					LOGGER.debug("Unable to use ["+TintWithoutLevelSmoothOverrider.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);
+					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);
 					BLOCK_STATES_THAT_NEED_LEVEL.add(this.blockState);
 				}
 			}
@@ -505,13 +501,22 @@ public class ClientBlockStateColorCache
 			// use the level logic only if requested
 			if (BLOCK_STATES_THAT_NEED_LEVEL.contains(this.blockState))
 			{
-				// this logic can't be used all the time due to it breaking some blocks tinting
+				// the level shouldn't be used all the time due to it breaking some blocks tinting
 				// specifically oceans don't render correctly
-				tintColor = Minecraft.getInstance().getBlockColors()
-						.getColor(this.blockState, 
-								new TintGetterOverrideSmooth(this.level, biome, fullDataSource), // TODO can this object be cached?
-								McObjectConverter.Convert(pos), 
-								this.tintIndex);
+				
+				TintGetterOverride tintOverride = TintOverrideGetter.get();
+				tintOverride.update(biomeWrapper, this.blockStateWrapper, fullDataSource, this.clientLevelWrapper);
+				
+				tintColor = tintOverride.tryGetBlockTint(new DhBlockPosMutable(blockPos));
+				if (tintColor == AbstractDhTintGetter.INVALID_COLOR)
+				{
+					tintColor = Minecraft.getInstance()
+							.getBlockColors()
+							.getColor(this.blockState,
+									tintOverride,
+									McObjectConverter.Convert(blockPos),
+									this.tintIndex);
+				}
 			}
 		}
 		catch (Exception e)
@@ -519,7 +524,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: [" + biome + "] at pos: " + pos + ". 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: [" + biomeWrapper + "] at pos: " + blockPos + ". Error: ["+e.getMessage() + "]. Note: future errors for this block/biome will be ignored.", e);
 				BROKEN_BLOCK_STATES.add(this.blockState);
 			}
 		}
@@ -543,7 +548,7 @@ public class ClientBlockStateColorCache
 	// helper classes //
 	//================//
 	
-	enum ColorMode
+	private enum EColorMode
 	{
 		Default,
 		Flower,
@@ -551,7 +556,7 @@ public class ClientBlockStateColorCache
 		Chisel,
 		Glass;
 		
-		static ColorMode getColorMode(Block block)
+		static EColorMode getColorMode(Block block)
 		{
 			if (block instanceof LeavesBlock) return Leaves;
 			if (block instanceof FlowerBlock) return Flower;

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

@@ -20,6 +20,7 @@
 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.*;
@@ -38,9 +39,9 @@ import java.util.Optional;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
 
-public class TintGetterOverrideSmooth extends AbstractDhTintGetter
+public class TintGetterOverride extends AbstractDhTintGetter
 {
-	private final LevelReader parent;
+	private LevelReader parent;
 	
 	
 	
@@ -48,9 +49,11 @@ public class TintGetterOverrideSmooth extends AbstractDhTintGetter
 	// constructor //
 	//=============//
 	
-	public TintGetterOverrideSmooth(LevelReader parent, BiomeWrapper biomeWrapper, FullDataSourceV2 fullDataSource)
+	public TintGetterOverride() { }
+	
+	public void update(LevelReader parent, BiomeWrapper biomeWrapper, BlockStateWrapper blockStateWrapper, FullDataSourceV2 fullDataSource, IClientLevelWrapper clientLevelWrapper)
 	{
-		super(biomeWrapper, fullDataSource); 
+		super.update(biomeWrapper, blockStateWrapper, fullDataSource, clientLevelWrapper);
 		this.parent = parent;
 	}
 	

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

@@ -20,23 +20,25 @@
 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.LevelReader;
 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;
 
-public class TintWithoutLevelSmoothOverrider extends AbstractDhTintGetter
+public class TintWithoutLevelOverrider extends AbstractDhTintGetter
 {
 	
 	//=============//
 	// constructor //
 	//=============//
 	
-	public TintWithoutLevelSmoothOverrider(BiomeWrapper biomeWrapper, FullDataSourceV2 fullDataSource)
-	{ super(biomeWrapper, fullDataSource); }
+	public TintWithoutLevelOverrider()
+	{ }
 	
 	
 	
@@ -46,21 +48,21 @@ public class TintWithoutLevelSmoothOverrider extends AbstractDhTintGetter
 	
 	@Override
 	public float getShade(Direction direction, boolean shade)
-	{ throw new UnsupportedOperationException("ERROR: getShade() called on TintWithoutLevelSmoothOverrider. Object is for tinting only."); }
+	{ throw new UnsupportedOperationException("ERROR: getShade() called on TintWithoutLevelOverrider. Object is for tinting only."); }
 	@Override
 	public LevelLightEngine getLightEngine()
-	{ throw new UnsupportedOperationException("ERROR: getLightEngine() called on TintWithoutLevelSmoothOverrider. Object is for tinting only."); }
+	{ throw new UnsupportedOperationException("ERROR: getLightEngine() called on TintWithoutLevelOverrider. Object is for tinting only."); }
 	@Nullable
 	@Override
 	public BlockEntity getBlockEntity(BlockPos pos)
-	{ throw new UnsupportedOperationException("ERROR: getBlockEntity() called on TintWithoutLevelSmoothOverrider. Object is for tinting only."); }
+	{ throw new UnsupportedOperationException("ERROR: getBlockEntity() called on TintWithoutLevelOverrider. Object is for tinting only."); }
 	
 	@Override
 	public BlockState getBlockState(BlockPos pos)
-	{ throw new UnsupportedOperationException("ERROR: getBlockState() called on TintWithoutLevelSmoothOverrider. Object is for tinting only."); }
+	{ throw new UnsupportedOperationException("ERROR: getBlockState() called on TintWithoutLevelOverrider. Object is for tinting only."); }
 	@Override
 	public FluidState getFluidState(BlockPos pos)
-	{ throw new UnsupportedOperationException("ERROR: getFluidState() called on TintWithoutLevelSmoothOverrider. Object is for tinting only."); }
+	{ throw new UnsupportedOperationException("ERROR: getFluidState() called on TintWithoutLevelOverrider. Object is for tinting only."); }
 	
 	
 	//==============//
@@ -71,7 +73,7 @@ public class TintWithoutLevelSmoothOverrider extends AbstractDhTintGetter
 	
 	@Override
 	public int getHeight()
-	{ throw new UnsupportedOperationException("ERROR: getHeight() called on TintWithoutLevelSmoothOverrider. Object is for tinting only."); }
+	{ throw new UnsupportedOperationException("ERROR: getHeight() called on TintWithoutLevelOverrider. Object is for tinting only."); }
 	
 	#if MC_VER < MC_1_21_3
 	@Override
@@ -80,7 +82,7 @@ public class TintWithoutLevelSmoothOverrider extends AbstractDhTintGetter
 	#else
 	@Override
 	public int getMinY()
-	{ throw new UnsupportedOperationException("ERROR: getMinY() called on TintWithoutLevelSmoothOverrider. Object is for tinting only."); }
+	{ throw new UnsupportedOperationException("ERROR: getMinY() called on TintWithoutLevelOverrider. Object is for tinting only."); }
 	#endif
 	
 	#endif

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

@@ -21,7 +21,6 @@ package com.seibel.distanthorizons.common.wrappers.chunk;
 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 +37,7 @@ import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ProtoChunk;
 import net.minecraft.world.level.levelgen.Heightmap;
 
-import org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 
 import java.util.*;
 
@@ -75,7 +74,7 @@ import net.minecraft.world.level.chunk.status.ChunkStatus;
 
 public class ChunkWrapper implements IChunkWrapper
 {
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	/** 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());
@@ -98,9 +97,9 @@ public class ChunkWrapper implements IChunkWrapper
 	private int maxNonEmptyHeight = Integer.MAX_VALUE;
 	
 	/** will be null if we are using MC heightmaps */
-	private final int[][] solidHeightMap;
+	private int[][] solidHeightMap = null;
 	/** will be null if we are using MC heightmaps */
-	private final int[][] lightBlockingHeightMap;
+	private int[][] lightBlockingHeightMap = null;
 	
 	
 	
@@ -109,23 +108,18 @@ public class ChunkWrapper implements IChunkWrapper
 	//=============//
 	
 	public ChunkWrapper(ChunkAccess chunk, ILevelWrapper wrappedLevel)
+	{
+		this(chunk, wrappedLevel, true);
+	}
+	public ChunkWrapper(ChunkAccess chunk, ILevelWrapper wrappedLevel, boolean recreateHeightmaps)
 	{
 		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())
+		if (recreateHeightmaps)
 		{
-			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;
+			this.createDhHeightMaps();
 		}
 	}
 	
@@ -248,56 +242,59 @@ public class ChunkWrapper implements IChunkWrapper
 	}
 	private int getChunkSectionMinHeight(int index) { return (index * 16) + this.getInclusiveMinBuildHeight(); }
 	
-	/** Will only run if the config says the MC heightmaps shouldn't be trusted. */
-	public void recalculateDhHeightMapsIfNeeded()
+	public void createDhHeightMaps()
 	{
 		// re-calculate the min/max heights for consistency (during world gen these may be wrong)
 		this.minNonEmptyHeight = Integer.MIN_VALUE;
 		this.maxNonEmptyHeight = Integer.MAX_VALUE;
 		
 		
-		// recalculate heightmaps if needed
-		if (this.solidHeightMap != null)
+		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 x = 0; x < LodUtil.CHUNK_WIDTH; x++)
+			for (int z = 0; z < LodUtil.CHUNK_WIDTH; z++)
 			{
-				for (int z = 0; z < LodUtil.CHUNK_WIDTH; z++)
+				int minInclusiveBuildHeight = this.getMinNonEmptyHeight();
+				// 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
+						)
+					)
 				{
-					int minInclusiveBuildHeight = this.getMinNonEmptyHeight();
-					// 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?
+					if (solidHeight == minInclusiveBuildHeight
+						&& block.isSolid())
 					{
-						// 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);
+						solidHeight = y;
 					}
 					
-					this.solidHeightMap[x][z] = solidHeight;
-					this.lightBlockingHeightMap[x][z] = lightBlockingHeight;
+					// 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);
 				}
+				
+				this.solidHeightMap[x][z] = solidHeight;
+				this.lightBlockingHeightMap[x][z] = lightBlockingHeight;
 			}
 		}
 	}

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

@@ -7,31 +7,22 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
-import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Predicate;
 import java.util.regex.Pattern;
 
-// Logger (for debug stuff)
-
 import com.seibel.distanthorizons.api.enums.config.DisallowSelectingViaConfigGui;
+import com.seibel.distanthorizons.common.wrappers.gui.config.ConfigGuiInfo;
 import com.seibel.distanthorizons.core.config.Config;
-import com.seibel.distanthorizons.core.config.ConfigBase;
+import com.seibel.distanthorizons.core.config.ConfigHandler;
 import com.seibel.distanthorizons.core.config.types.*;
 import com.seibel.distanthorizons.common.wrappers.gui.updater.ChangelogScreen;
 
-// Uses https://github.com/TheElectronWill/night-config for toml (only for Fabric since Forge already includes this)
-
-// Gets info from our own mod
-
-// Minecraft imports
-
 import com.seibel.distanthorizons.core.config.types.enums.EConfigCommentTextPosition;
+import com.seibel.distanthorizons.core.config.types.enums.EConfigValidity;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.jar.updater.SelfUpdater;
-import com.seibel.distanthorizons.core.logging.ConfigBasedSpamLogger;
-import com.seibel.distanthorizons.core.logging.SpamReducedLogger;
-import com.seibel.distanthorizons.core.render.renderer.LodRenderer;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.util.AnnotationUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.config.IConfigGui;
 import com.seibel.distanthorizons.core.wrapperInterfaces.config.ILangWrapper;
@@ -47,9 +38,9 @@ import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 
 #if MC_VER < MC_1_20_1
@@ -81,8 +72,10 @@ import static com.seibel.distanthorizons.common.wrappers.gui.GuiHelper.Translata
 @SuppressWarnings("unchecked")
 public class ClassicConfigGUI
 {
-	private static final Logger LOGGER = LogManager.getLogger();
-	public static final SpamReducedLogger SPAM_LOGGER = new SpamReducedLogger(4);
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	public static final DhLogger RATE_LIMITED_LOGGER = new DhLoggerBuilder()
+			.maxCountPerSecond(1)
+			.build();
 	
 	public static final ConfigCoreInterface CONFIG_CORE_INTERFACE = new ConfigCoreInterface();
 	
@@ -111,16 +104,6 @@ public class ClassicConfigGUI
 		
 	}
 	
-	// TODO
-	/** The terribly coded old stuff */
-	public static class EntryInfo
-	{
-		Object widget;
-		Map.Entry<EditBox, Component> error;
-		String tempValue;
-		int index;
-	}
-	
 	
 	
 	//==============//
@@ -128,10 +111,9 @@ public class ClassicConfigGUI
 	//==============//
 	
 	/** if you want to get this config gui's screen call this */
-	public static Screen getScreen(ConfigBase configBase, Screen parent, String category)
-	{ return new ConfigScreen(configBase, parent, category); }
+	public static Screen getScreen(Screen parent, String category)
+	{ return new ConfigScreen(parent, category); }
 	
-	/** Pain */
 	private static class ConfigScreen extends DhScreen
 	{
 		private static final ILangWrapper LANG_WRAPPER = SingletonInjector.INSTANCE.get(ILangWrapper.class);
@@ -139,8 +121,6 @@ public class ClassicConfigGUI
 		private static final String TRANSLATION_PREFIX = ModInfo.ID + ".config.";
 		
 		
-		private final ConfigBase configBase;
-		
 		private final Screen parent;
 		private final String category;
 		private ConfigListWidget configListWidget;
@@ -154,14 +134,13 @@ public class ClassicConfigGUI
 		// constructor //
 		//=============//
 		
-		protected ConfigScreen(ConfigBase configBase, Screen parent, String category)
+		protected ConfigScreen(Screen parent, String category)
 		{
 			super(Translatable(
 					LANG_WRAPPER.langExists(ModInfo.ID + ".config" + (category.isEmpty() ? "." + category : "") + ".title") ?
 							ModInfo.ID + ".config.title" :
 							ModInfo.ID + ".config" + (category.isEmpty() ? "" : "." + category) + ".title")
 			);
-			this.configBase = configBase;
 			this.parent = parent;
 			this.category = category;
 		}
@@ -182,7 +161,7 @@ public class ClassicConfigGUI
 			super.init();
 			if (!this.reload)
 			{
-				ConfigBase.INSTANCE.configFileHandler.loadFromFile();
+				ConfigHandler.INSTANCE.configFileHandler.loadFromFile();
 			}
 			
 			// Changelog button
@@ -229,7 +208,7 @@ public class ClassicConfigGUI
 					ConfigScreenConfigs.OPTION_FIELD_WIDTH, ConfigScreenConfigs.OPTION_FIELD_HEIGHT,
 					(button) -> 
 					{
-						ConfigBase.INSTANCE.configFileHandler.loadFromFile();
+						ConfigHandler.INSTANCE.configFileHandler.loadFromFile();
 						Objects.requireNonNull(this.minecraft).setScreen(this.parent);
 					}));
 			
@@ -240,7 +219,7 @@ public class ClassicConfigGUI
 							ConfigScreenConfigs.OPTION_FIELD_WIDTH, ConfigScreenConfigs.OPTION_FIELD_HEIGHT, 
 					(button) -> 
 					{
-						ConfigBase.INSTANCE.configFileHandler.saveToFile();
+						ConfigHandler.INSTANCE.configFileHandler.saveToFile();
 						Objects.requireNonNull(this.minecraft).setScreen(this.parent);
 					}));
 			
@@ -255,22 +234,22 @@ public class ClassicConfigGUI
 			
 			this.addWidget(this.configListWidget);
 			
-			for (AbstractConfigType info : ConfigBase.INSTANCE.entries)
+			for (AbstractConfigBase<?> configEntry : ConfigHandler.INSTANCE.configBaseList)
 			{
 				try
 				{
-					if (info.getCategory().matches(this.category) 
-						&& info.getAppearance().showInGui)
+					if (configEntry.getCategory().matches(this.category) 
+						&& configEntry.getAppearance().showInGui)
 					{
-						this.addMenuItem(info);
+						this.addMenuItem(configEntry);
 					}
 				}
 				catch (Exception e)
 				{
-					String message = "ERROR: Failed to show [" + info.getNameWCategory() + "], error: ["+e.getMessage()+"]";
-					if (info.get() != null)
+					String message = "ERROR: Failed to show [" + configEntry.getNameAndCategory() + "], error: ["+e.getMessage()+"]";
+					if (configEntry.get() != null)
 					{
-						message += " with the value [" + info.get() + "] with type [" + info.getType() + "]";
+						message += " with the value [" + configEntry.get() + "] with type [" + configEntry.getType() + "]";
 					}
 					
 					LOGGER.error(message, e);
@@ -279,115 +258,63 @@ public class ClassicConfigGUI
 			
 			CONFIG_CORE_INTERFACE.onScreenChangeListenerList.forEach((listener) -> listener.run());
 		}
-		private void addMenuItem(AbstractConfigType configType)
+		private void addMenuItem(AbstractConfigBase<?> configEntry)
 		{
-			trySetupConfigEntry(configType);
+			trySetupConfigEntry(configEntry);
 			
-			if (this.tryCreateInputField(configType)) return;
-			if (this.tryCreateCategoryButton(configType)) return;
-			if (this.tryCreateButton(configType)) return;
-			if (this.tryCreateComment(configType)) return;
-			if (this.tryCreateSpacer(configType)) return;
-			if (this.tryCreateLinkedEntry(configType)) return;
+			if (this.tryCreateInputField(configEntry)) return;
+			if (this.tryCreateCategoryButton(configEntry)) return;
+			if (this.tryCreateButton(configEntry)) return;
+			if (this.tryCreateComment(configEntry)) return;
+			if (this.tryCreateSpacer(configEntry)) return;
+			if (this.tryCreateLinkedEntry(configEntry)) return;
 			
-			LOGGER.warn("Config [" + configType.getNameWCategory() + "] failed to show. Please try something like changing its type.");
+			LOGGER.warn("Config [" + configEntry.getNameAndCategory() + "] failed to show. Please try something like changing its type.");
 		}
 		
-		private static void trySetupConfigEntry(AbstractConfigType configType)
+		private static void trySetupConfigEntry(AbstractConfigBase<?> configMenuOption)
 		{
-			configType.guiValue = new EntryInfo();
-			Class<?> fieldClass = configType.getType();
+			configMenuOption.guiValue = new ConfigGuiInfo();
+			Class<?> configValueClass = configMenuOption.getType();
 			
-			if (configType instanceof ConfigEntry)
+			if (configMenuOption instanceof ConfigEntry)
 			{
-				ConfigEntry configEntry = (ConfigEntry) configType;
+				ConfigEntry<?> configEntry = (ConfigEntry<?>) configMenuOption;
 				
-				if (fieldClass == Integer.class)
+				if (configValueClass == Integer.class)
 				{
-					// For int
-					setupEntryInfoTextField(configEntry, Integer::parseInt, INTEGER_ONLY_REGEX, true);
+					setupTextMenuOption(configEntry, Integer::parseInt, INTEGER_ONLY_REGEX, true);
 				}
-				else if (fieldClass == Double.class)
+				else if (configValueClass == Double.class)
 				{
-					// For double
-					setupEntryInfoTextField(configEntry, Double::parseDouble, DECIMAL_ONLY_REGEX, false);
+					setupTextMenuOption(configEntry, Double::parseDouble, DECIMAL_ONLY_REGEX, false);
 				}
-				else if (fieldClass == String.class || fieldClass == List.class)
+				else if (configValueClass == String.class || configValueClass == List.class)
 				{
 					// For string or list
-					setupEntryInfoTextField(configEntry, String::length, null, true);
+					setupTextMenuOption(configEntry, String::length, null, true);
 				}
-				else if (fieldClass == Boolean.class)
+				else if (configValueClass == Boolean.class)
 				{
-					// For boolean
-					Function<Object, Component> func = value -> Translatable("distanthorizons.general."+((Boolean) value ? "true" : "false")).withStyle((Boolean) value ? ChatFormatting.GREEN : ChatFormatting.RED);
-					
-					((EntryInfo) configEntry.guiValue).widget =
-							new AbstractMap.SimpleEntry<Button.OnPress, Function<Object, Component>>(
-									(button) ->
-									{
-										button.active = !configEntry.apiIsOverriding();
-										
-										configEntry.uiSetWithoutSaving(!(Boolean) configEntry.get());
-										button.setMessage(func.apply(configEntry.get()));
-									}, func);
+					ConfigEntry<Boolean> booleanConfigEntry = (ConfigEntry<Boolean>) configEntry;
+					setupBooleanMenuOption(booleanConfigEntry);
 				}
-				else if (fieldClass.isEnum())
+				else if (configValueClass.isEnum())
 				{
-					// For enum
-					List<?> values = Arrays.asList(configEntry.getType().getEnumConstants());
-					Function<Object, Component> func = (value) -> Translatable(TRANSLATION_PREFIX + "enum." + fieldClass.getSimpleName() + "." + configEntry.get().toString());
-					((EntryInfo) configEntry.guiValue).widget = new AbstractMap.SimpleEntry<Button.OnPress, Function<Object, Component>>((button) ->
-					{
-						// get the currently selected enum and enum index
-						int startingIndex = values.indexOf(configEntry.get());
-						Enum<?> enumValue = (Enum<?>) values.get(startingIndex);
-						
-						// search for the next enum that is selectable
-						int index = startingIndex + 1;
-						index = (index >= values.size()) ? 0 : index;
-						while (index != startingIndex)
-						{
-							enumValue = (Enum<?>) values.get(index);
-							if (!AnnotationUtil.doesEnumHaveAnnotation(enumValue, DisallowSelectingViaConfigGui.class))
-							{
-								// this enum shouldn't be selectable via the UI,
-								// skip it
-								break;
-							}
-							
-							index++;
-							index = (index >= values.size()) ? 0 : index;
-						}
-						
-						if (index == startingIndex)
-						{
-							// none of the enums should be selectable, this is a programmer error
-							enumValue = (Enum<?>) values.get(startingIndex);
-							LOGGER.warn("Enum [" + enumValue.getClass() + "] doesn't contain any values that should be selectable via the UI, sticking to the currently selected value [" + enumValue + "].");
-						}
-						
-						
-						((ConfigEntry<Enum<?>>) configEntry).uiSetWithoutSaving(enumValue);
-						
-						if (configEntry.getApiValue() != null)
-						{
-							button.active = false;
-						}
-						else
-						{
-							button.active = true;
-						}
-						
-						button.setMessage(func.apply(configEntry.get()));
-					}, func);
+					ConfigEntry<Enum<?>> enumConfigEntry = (ConfigEntry<Enum<?>>) configEntry;
+					Class<? extends Enum<?>> configEnumClass = (Class<? extends Enum<?>>) configValueClass;
+					setupEnumMenuOption(enumConfigEntry, configEnumClass);
 				}
 			}
 			
 		}
-		private static void setupEntryInfoTextField(AbstractConfigType info, Function<String, Number> func, Pattern pattern, boolean cast)
+		private static void setupTextMenuOption(AbstractConfigBase<?> configMenuOption, Function<String, Number> parsingFunc, @Nullable Pattern pattern, boolean cast)
 		{
-			((EntryInfo) info.guiValue).widget = (BiFunction<EditBox, Button, Predicate<String>>) (editBox, button) -> stringValue ->
+			final ConfigGuiInfo configGuiInfo = ((ConfigGuiInfo) configMenuOption.guiValue);
+			
+			configGuiInfo.tooltipFunction =  
+					(editBox, button) -> 
+					(stringValue) ->
 			{
 				boolean isNumber = (pattern != null);
 				
@@ -398,67 +325,137 @@ public class ClassicConfigGUI
 				}
 				
 				
-				Number value = info.typeIsFloatingPointNumber() ? 0.0 : 0; // different default values are needed so implicit casting works correctly (if not done casting from 0 (an int) to a double will cause an exception)
-				((EntryInfo) info.guiValue).error = null;
-				if (isNumber && !stringValue.isEmpty() && !stringValue.equals("-") && !stringValue.equals("."))
+				Number numberValue = configMenuOption.typeIsFloatingPointNumber() ? 0.0 : 0; // different default values are needed so implicit casting works correctly (if not done casting from 0 (an int) to a double will cause an exception)
+				configGuiInfo.errorMessage = null;
+				if (isNumber 
+					&& !stringValue.isEmpty() 
+					&& !stringValue.equals("-") 
+					&& !stringValue.equals("."))
 				{
+					ConfigEntry<Number> numberConfigEntry = (ConfigEntry<Number>) configMenuOption;
+					
 					try
 					{
-						value = func.apply(stringValue);
+						numberValue = parsingFunc.apply(stringValue);
 					}
 					catch (Exception e)
 					{
-						value = null;
+						numberValue = null;
 					}
 					
-					byte isValid = ((ConfigEntry) info).isValid(value);
-					switch (isValid)
+					EConfigValidity validity = numberConfigEntry.getValidity(numberValue);
+					switch (validity)
 					{
-						case 0:
-							((EntryInfo) info.guiValue).error = null;
+						case VALID:
+							configGuiInfo.errorMessage = null;
 							break;
-						case -1:
-							((EntryInfo) info.guiValue).error = new AbstractMap.SimpleEntry<>(editBox, TextOrTranslatable("§cMinimum length is " + ((ConfigEntry) info).getMin()));
+						case NUMBER_TOO_LOW:
+							configGuiInfo.errorMessage = TextOrTranslatable("§cMinimum length is " + numberConfigEntry.getMin());
 							break;
-						case 1:
-							((EntryInfo) info.guiValue).error = new AbstractMap.SimpleEntry<>(editBox, TextOrTranslatable("§cMaximum length is " + ((ConfigEntry) info).getMax()));
+						case NUMBER_TOO_HIGH:
+							configGuiInfo.errorMessage = TextOrTranslatable("§cMaximum length is " + numberConfigEntry.getMax());
 							break;
-						case 2:
-							((EntryInfo) info.guiValue).error = new AbstractMap.SimpleEntry<>(editBox, TextOrTranslatable("§cValue is invalid"));
+						case INVALID:
+							configGuiInfo.errorMessage = TextOrTranslatable("§cValue is invalid");
 							break;
 					}
 				}
 				
-				((EntryInfo) info.guiValue).tempValue = stringValue;
-				editBox.setTextColor(((ConfigEntry) info).isValid(value) == 0 ? 0xFFFFFFFF : 0xFFFF7777); // white and red
+				editBox.setTextColor(((ConfigEntry<Number>) configMenuOption).getValidity(numberValue) == EConfigValidity.VALID ? 0xFFFFFFFF : 0xFFFF7777); // white and red
 				
 				
-				if (info.getType() == String.class
-						|| info.getType() == List.class)
+				if (configMenuOption.getType() == String.class
+					|| configMenuOption.getType() == List.class)
 				{
-					((ConfigEntry) info).uiSetWithoutSaving(stringValue);
+					((ConfigEntry<String>) configMenuOption).uiSetWithoutSaving(stringValue);
 				}
-				else if (((ConfigEntry) info).isValid(value) == 0)
+				else if (((ConfigEntry<Number>) configMenuOption).getValidity(numberValue) == EConfigValidity.VALID)
 				{
 					if (!cast)
 					{
-						((ConfigEntry) info).uiSetWithoutSaving(value);
+						((ConfigEntry<Number>) configMenuOption).uiSetWithoutSaving(numberValue);
 					}
 					else
 					{
-						((ConfigEntry) info).uiSetWithoutSaving(value != null ? value.intValue() : 0);
+						((ConfigEntry<Number>) configMenuOption).uiSetWithoutSaving(numberValue != null ? numberValue.intValue() : 0);
 					}
 				}
 				
 				return true;
 			};
 		}
-		
-		private boolean tryCreateInputField(AbstractConfigType configType)
+		private static void setupBooleanMenuOption(ConfigEntry<Boolean> booleanConfigEntry)
 		{
-			if (configType instanceof ConfigEntry)
+			// For boolean
+			Function<Object, Component> func = value -> Translatable("distanthorizons.general."+((Boolean) value ? "true" : "false")).withStyle((Boolean) value ? ChatFormatting.GREEN : ChatFormatting.RED);
+			
+			final ConfigGuiInfo configGuiInfo = ((ConfigGuiInfo) booleanConfigEntry.guiValue);
+			
+			configGuiInfo.buttonOptionMap =
+					new AbstractMap.SimpleEntry<Button.OnPress, Function<Object, Component>>(
+							(button) ->
+							{
+								button.active = !booleanConfigEntry.apiIsOverriding();
+								
+								booleanConfigEntry.uiSetWithoutSaving(!booleanConfigEntry.get());
+								button.setMessage(func.apply(booleanConfigEntry.get()));
+							}, func);
+		}
+		private static void setupEnumMenuOption(ConfigEntry<Enum<?>> enumConfigEntry, Class<? extends Enum<?>> enumClass)
+		{
+			List<Enum<?>> enumList = Arrays.asList(enumClass.getEnumConstants());
+			
+			final ConfigGuiInfo configGuiInfo = ((ConfigGuiInfo) enumConfigEntry.guiValue);
+			
+			Function<Object, Component> getEnumTranslatableFunc = (value) -> Translatable(TRANSLATION_PREFIX + "enum." + enumClass.getSimpleName() + "." + enumConfigEntry.get().toString());
+			configGuiInfo.buttonOptionMap = 
+					new AbstractMap.SimpleEntry<Button.OnPress, Function<Object, Component>>(
+					(button) ->
 			{
-				ConfigEntry configEntry = (ConfigEntry) configType;
+				// get the currently selected enum and enum index
+				int startingIndex = enumList.indexOf(enumConfigEntry.get());
+				Enum<?> enumValue = enumList.get(startingIndex);
+				
+				// search for the next enum that is selectable
+				int index = startingIndex + 1;
+				index = (index >= enumList.size()) ? 0 : index;
+				while (index != startingIndex)
+				{
+					enumValue = enumList.get(index);
+					if (!AnnotationUtil.doesEnumHaveAnnotation(enumValue, DisallowSelectingViaConfigGui.class))
+					{
+						// this enum shouldn't be selectable via the UI,
+						// skip it
+						break;
+					}
+					
+					index++;
+					index = (index >= enumList.size()) ? 0 : index;
+				}
+				
+				if (index == startingIndex)
+				{
+					// none of the enums should be selectable, this is a programmer error
+					enumValue = enumList.get(startingIndex);
+					LOGGER.warn("Enum [" + enumValue.getClass() + "] doesn't contain any values that should be selectable via the UI, sticking to the currently selected value [" + enumValue + "].");
+				}
+				
+				
+				enumConfigEntry.uiSetWithoutSaving(enumValue);
+				
+				button.active = !enumConfigEntry.apiIsOverriding();
+				
+				button.setMessage(getEnumTranslatableFunc.apply(enumConfigEntry.get()));
+			}, getEnumTranslatableFunc);
+		}
+		
+		private boolean tryCreateInputField(AbstractConfigBase<?> configBase)
+		{
+			final ConfigGuiInfo configGuiInfo = ((ConfigGuiInfo) configBase.guiValue);
+			
+			if (configBase instanceof ConfigEntry)
+			{
+				ConfigEntry configEntry = (ConfigEntry) configBase;
 				
 				
 				//==============//
@@ -468,7 +465,6 @@ public class ClassicConfigGUI
 				Button.OnPress btnAction = (button) ->
 				{
 					configEntry.uiSetWithoutSaving(configEntry.getDefaultValue());
-					((EntryInfo) configEntry.guiValue).index = 0;
 					this.reload = true;
 					Objects.requireNonNull(this.minecraft).setScreen(this);
 				};
@@ -509,11 +505,11 @@ public class ClassicConfigGUI
 						- ConfigScreenConfigs.OPTION_FIELD_WIDTH;
 				int optionFieldPosZ = 0;
 				
-				if (((EntryInfo) configEntry.guiValue).widget instanceof Map.Entry)
+				if (configGuiInfo.buttonOptionMap != null)
 				{
 					// enum/multi option input button
 					
-					Map.Entry<Button.OnPress, Function<Object, Component>> widget = (Map.Entry<Button.OnPress, Function<Object, Component>>) ((EntryInfo) configEntry.guiValue).widget;
+					Map.Entry<Button.OnPress, Function<Object, Component>> widget = configGuiInfo.buttonOptionMap;
 					if (configEntry.getType().isEnum())
 					{
 						widget.setValue((value) -> Translatable(TRANSLATION_PREFIX + "enum." + configEntry.getType().getSimpleName() + "." + configEntry.get().toString()));
@@ -537,7 +533,7 @@ public class ClassicConfigGUI
 					
 					return true;
 				}
-				else if (((EntryInfo) configEntry.guiValue).widget != null)
+				else
 				{
 					// text box input
 					
@@ -548,7 +544,7 @@ public class ClassicConfigGUI
 					widget.setMaxLength(ConfigScreenConfigs.OPTION_FIELD_WIDTH);
 					widget.insertText(String.valueOf(configEntry.get()));
 					
-					Predicate<String> processor = ((BiFunction<EditBox, Button, Predicate<String>>) ((EntryInfo) configEntry.guiValue).widget).apply(widget, this.doneButton);
+					Predicate<String> processor = configGuiInfo.tooltipFunction.apply(widget, this.doneButton);
 					widget.setFilter(processor);
 					
 					this.configListWidget.addButton(this, configEntry, widget, resetButton, null, textComponent);
@@ -559,7 +555,7 @@ public class ClassicConfigGUI
 			
 			return false;
 		}
-		private boolean tryCreateCategoryButton(AbstractConfigType configType)
+		private boolean tryCreateCategoryButton(AbstractConfigBase<?> configType)
 		{
 			if (configType instanceof ConfigCategory)
 			{
@@ -575,8 +571,8 @@ public class ClassicConfigGUI
 						ConfigScreenConfigs.CATEGORY_BUTTON_WIDTH, ConfigScreenConfigs.CATEGORY_BUTTON_HEIGHT,
 						((button) ->
 						{
-							ConfigBase.INSTANCE.configFileHandler.saveToFile();
-							Objects.requireNonNull(this.minecraft).setScreen(ClassicConfigGUI.getScreen(this.configBase, this, configCategory.getDestination()));
+							ConfigHandler.INSTANCE.configFileHandler.saveToFile();
+							Objects.requireNonNull(this.minecraft).setScreen(ClassicConfigGUI.getScreen(this, configCategory.getDestination()));
 						}));
 				this.configListWidget.addButton(this, configType, widget, null, null, null);
 				
@@ -585,7 +581,7 @@ public class ClassicConfigGUI
 			
 			return false;
 		}
-		private boolean tryCreateButton(AbstractConfigType configType)
+		private boolean tryCreateButton(AbstractConfigBase<?> configType)
 		{
 			if (configType instanceof ConfigUIButton)
 			{
@@ -606,7 +602,7 @@ public class ClassicConfigGUI
 			
 			return false;
 		}
-		private boolean tryCreateComment(AbstractConfigType configType)
+		private boolean tryCreateComment(AbstractConfigBase<?> configType)
 		{
 			if (configType instanceof ConfigUIComment)
 			{
@@ -625,7 +621,7 @@ public class ClassicConfigGUI
 			
 			return false;
 		}
-		private boolean tryCreateSpacer(AbstractConfigType configType)
+		private boolean tryCreateSpacer(AbstractConfigBase<?> configType)
 		{
 			if (configType instanceof ConfigUISpacer)
 			{
@@ -642,7 +638,7 @@ public class ClassicConfigGUI
 			
 			return false;
 		}
-		private boolean tryCreateLinkedEntry(AbstractConfigType configType)
+		private boolean tryCreateLinkedEntry(AbstractConfigBase<?> configType)
 		{
 			if (configType instanceof ConfigUiLinkedEntry)
 			{
@@ -654,8 +650,8 @@ public class ClassicConfigGUI
 			return false;
 		}
 		
-		private Component GetTranslatableTextComponentForConfig(AbstractConfigType configType)
-		{ return Translatable(TRANSLATION_PREFIX + configType.getNameWCategory());}
+		private Component GetTranslatableTextComponentForConfig(AbstractConfigBase<?> configType)
+		{ return Translatable(TRANSLATION_PREFIX + configType.getNameAndCategory());}
 		
 		
 		
@@ -729,33 +725,32 @@ public class ClassicConfigGUI
 			}
 			
 			
-			Component text = ButtonEntry.TEXT_BY_WIDGET.get(hoveredWidget);
 			ButtonEntry button = ButtonEntry.BUTTON_BY_WIDGET.get(hoveredWidget);
 			
 			
 			// A quick fix for tooltips on linked entries
-			AbstractConfigType dhConfigType = ConfigUiLinkedEntry.class.isAssignableFrom(button.dhConfigType.getClass()) ?
+			AbstractConfigBase<?> configBase = ConfigUiLinkedEntry.class.isAssignableFrom(button.dhConfigType.getClass()) ?
 					((ConfigUiLinkedEntry) button.dhConfigType).get() :
 					button.dhConfigType;
 			
 			boolean apiOverrideActive = false;
-			if (dhConfigType instanceof ConfigEntry)
+			if (configBase instanceof ConfigEntry)
 			{
-				apiOverrideActive = ((ConfigEntry)dhConfigType).apiIsOverriding();
+				apiOverrideActive = ((ConfigEntry<?>)configBase).apiIsOverriding();
 			}
 			
-			Component name = Translatable(TRANSLATION_PREFIX + (dhConfigType.category.isEmpty() ? "" : dhConfigType.category + ".") + dhConfigType.getName());
-			String key = TRANSLATION_PREFIX + (dhConfigType.category.isEmpty() ? "" : dhConfigType.category + ".") + dhConfigType.getName() + ".@tooltip";
+			String key = TRANSLATION_PREFIX + (configBase.category.isEmpty() ? "" : configBase.category + ".") + configBase.getName() + ".@tooltip";
 			
 			if (apiOverrideActive)
 			{
 				key = "distanthorizons.general.disabledByApi.@tooltip";
 			}
 			
-			// display the validation error if present
-			if (((EntryInfo) dhConfigType.guiValue).error != null)
+			// display the validation error tooltip if present
+			final ConfigGuiInfo configGuiInfo = ((ConfigGuiInfo) configBase.guiValue);
+			if (configGuiInfo.errorMessage != null)
 			{ 
-				this.DhRenderTooltip(matrices, this.font, ((EntryInfo) dhConfigType.guiValue).error.getValue(), mouseX, mouseY);
+				this.DhRenderTooltip(matrices, this.font, configGuiInfo.errorMessage, mouseX, mouseY);
 			}
 			// display the tooltip if present
 			else if (LANG_WRAPPER.langExists(key))
@@ -781,7 +776,7 @@ public class ClassicConfigGUI
 		@Override
 		public void onClose()
 		{
-			ConfigBase.INSTANCE.configFileHandler.saveToFile();
+			ConfigHandler.INSTANCE.configFileHandler.saveToFile();
 			Objects.requireNonNull(this.minecraft).setScreen(this.parent);
 			
 			CONFIG_CORE_INTERFACE.onScreenChangeListenerList.forEach((listener) -> listener.run());
@@ -792,9 +787,9 @@ public class ClassicConfigGUI
 	
 	
 	
-	
-	
-	
+	//================//
+	// helper classes //
+	//================//
 	
 	public static class ConfigListWidget extends ContainerObjectSelectionList<ButtonEntry>
 	{
@@ -812,7 +807,7 @@ public class ClassicConfigGUI
 			this.textRenderer = minecraftClient.font;
 		}
 		
-		public void addButton(ConfigScreen gui, AbstractConfigType dhConfigType, AbstractWidget button, AbstractWidget resetButton, AbstractWidget indexButton, Component text)
+		public void addButton(ConfigScreen gui, AbstractConfigBase dhConfigType, AbstractWidget button, AbstractWidget resetButton, AbstractWidget indexButton, Component text)
 		{ this.addEntry(new ButtonEntry(gui, dhConfigType, button, text, resetButton, indexButton)); }
 		
 		@Override
@@ -858,7 +853,7 @@ public class ClassicConfigGUI
 		private final AbstractWidget button;
 		
 		private final ConfigScreen gui;
-		private final AbstractConfigType dhConfigType;
+		private final AbstractConfigBase dhConfigType;
 		
 		private final AbstractWidget resetButton;
 		private final AbstractWidget indexButton;
@@ -869,12 +864,12 @@ public class ClassicConfigGUI
 		private final EConfigCommentTextPosition textPosition;
 		
 		public static final Map<AbstractWidget, Component> TEXT_BY_WIDGET = new HashMap<>();
-		// TODO we should just use a wrapper or something
+		/// TODO we should just use a wrapper or something
 		public static final Map<AbstractWidget, ButtonEntry> BUTTON_BY_WIDGET = new HashMap<>();
 		
 		
 		
-		public ButtonEntry(ConfigScreen gui, AbstractConfigType dhConfigType, 
+		public ButtonEntry(ConfigScreen gui, AbstractConfigBase dhConfigType, 
 				AbstractWidget button, Component text, AbstractWidget resetButton, AbstractWidget indexButton)
 		{
 			TEXT_BY_WIDGET.put(button, text);
@@ -920,7 +915,7 @@ public class ClassicConfigGUI
 		@Override
         #if MC_VER < MC_1_20_1
 		public void render(PoseStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta)
-        #elif MC_VER < MC_1_21_10
+        #elif MC_VER < MC_1_21_9
 		public void render(GuiGraphics matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta)
 		#else
 		public void renderContent(GuiGraphics matrices, int mouseX, int mouseY, boolean hovered, float tickDelta)
@@ -928,9 +923,9 @@ public class ClassicConfigGUI
 		{
 			try
 			{
-				#if MC_VER < MC_1_21_10
+				#if MC_VER < MC_1_21_9
 				#else
-				int y = this.getY(); // TODO why is the Y value being set during render?
+				int y = this.getY(); /// TODO why is the Y value being set during render?
 				#endif
 				
 				if (this.button != null)
@@ -1008,7 +1003,7 @@ public class ClassicConfigGUI
 			catch (Exception e)
 			{
 				// should prevent crashing the game if there's an issue
-				SPAM_LOGGER.error("Unexpected gui rendering issue: ["+e.getMessage()+"]", e);
+				RATE_LIMITED_LOGGER.error("Unexpected gui rendering issue: ["+e.getMessage()+"]", e);
 			}
 		}
 		
@@ -1028,13 +1023,11 @@ public class ClassicConfigGUI
 	
 	
 	
-	
-	
 	//================//
 	// event handling //
 	//================//
 	
-	private static class ConfigCoreInterface implements IConfigGui
+	public static class ConfigCoreInterface implements IConfigGui
 	{
 		/**
 		 * in the future it would be good to pass in the current page and other variables, 

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

@@ -1,6 +1,6 @@
 package com.seibel.distanthorizons.common.wrappers.gui;
 
-#if MC_VER < MC_1_21_10
+#if MC_VER < MC_1_21_9
 // not supported for older MC versions
 #else
 import com.seibel.distanthorizons.core.logging.f3.F3Screen;
@@ -19,7 +19,7 @@ import net.minecraft.world.level.Level;
 import net.minecraft.world.level.chunk.LevelChunk;
 #endif
 
-#if MC_VER < MC_1_21_10
+#if MC_VER < MC_1_21_9
 // not supported for older MC versions
 public class DhDebugScreenEntry
 {}

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

@@ -1,17 +1,15 @@
 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.JavaScreenHandlerScreen;
 import net.minecraft.client.gui.screens.Screen;
-import org.apache.logging.log4j.Logger;
-
-import java.lang.invoke.MethodHandles;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 
 public class GetConfigScreen
 {
-	protected static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	protected static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	public static EType useScreen = EType.Classic;
 	
@@ -28,7 +26,7 @@ public class GetConfigScreen
 		//  which won't be for sure added until we request a GUI
 		if (ModInfo.IS_DEV_BUILD)
 		{
-			String missingLangEntries = ConfigBase.INSTANCE.generateLang(true, true);
+			String missingLangEntries = ConfigHandler.INSTANCE.generateLang(true, true);
 			
 			// trim to remove any newlines/spaces
 			// that may be present when no lang entries need changing
@@ -45,7 +43,7 @@ public class GetConfigScreen
 		switch (useScreen)
 		{
 			case Classic:
-				return ClassicConfigGUI.getScreen(ConfigBase.INSTANCE, parent, "client");
+				return ClassicConfigGUI.getScreen(parent, "client");
 			case JavaSwing:
 				//return MinecraftScreen.getScreen(parent, new JavaScreenHandlerScreen(new ConfigScreen()), ModInfo.ID + ".title");
 				return MinecraftScreen.getScreen(parent, new JavaScreenHandlerScreen(new JavaScreenHandlerScreen.ExampleScreen()), ModInfo.ID + ".title");

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

@@ -39,7 +39,7 @@ public class MinecraftScreen
 		protected ConfigScreenRenderer(Screen parent, AbstractScreen screen, String translationName)
 		{
 			super(translate(translationName));
-			#if MC_VER < MC_1_21_10
+			#if MC_VER < MC_1_21_9
 			screen.minecraftWindow = Minecraft.getInstance().getWindow().getWindow();
 			#else
 			screen.minecraftWindow = Minecraft.getInstance().getWindow().handle();

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

@@ -0,0 +1,33 @@
+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 org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 
 #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 Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	
 	private Screen parent;
@@ -262,7 +262,7 @@ public class ChangelogScreen extends DhScreen
 		@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_10
+		#elif MC_VER < MC_1_21_9
 		@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); }

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

@@ -16,7 +16,7 @@ import com.mojang.blaze3d.vertex.PoseStack;
 #endif
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.resources.ResourceLocation;
-import org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 
 import static com.seibel.distanthorizons.common.wrappers.gui.GuiHelper.*;
 
@@ -31,7 +31,7 @@ import java.util.*;
 // and also maybe add this suggestion https://discord.com/channels/881614130614767666/1035863487110467625/1035949054485594192
 public class UpdateModScreen extends DhScreen
 {
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	
 	private Screen parent;

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

@@ -36,9 +36,9 @@ public class KeyedClientLevelManager implements IKeyedClientLevelManager
 	public IServerKeyedClientLevel getServerKeyedLevel() { return this.serverKeyedLevel; }
 	
 	@Override
-	public IServerKeyedClientLevel setServerKeyedLevel(IClientLevelWrapper clientLevel, String levelKey)
+	public IServerKeyedClientLevel setServerKeyedLevel(IClientLevelWrapper clientLevel, String serverKey, String levelKey)
 	{
-		IServerKeyedClientLevel keyedLevel = new ServerKeyedClientLevel((ClientLevel) clientLevel.getWrappedMcObject(), levelKey);
+		IServerKeyedClientLevel keyedLevel = new ServerKeyedClientLevelWrapper((ClientLevel) clientLevel.getWrappedMcObject(), serverKey, levelKey);
 		this.serverKeyedLevel = keyedLevel;
 		this.enabled = true;
 		return keyedLevel;

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

@@ -2,24 +2,36 @@ package com.seibel.distanthorizons.common.wrappers.level;
 
 import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
 import com.seibel.distanthorizons.core.level.IServerKeyedClientLevel;
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
-import com.seibel.distanthorizons.coreapi.util.StringUtil;
 import net.minecraft.client.multiplayer.ClientLevel;
 
-public class ServerKeyedClientLevel extends ClientLevelWrapper implements IServerKeyedClientLevel
+public class ServerKeyedClientLevelWrapper 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; }
@@ -27,4 +39,6 @@ public class ServerKeyedClientLevel extends ClientLevelWrapper implements IServe
 	@Override
 	public String getDhIdentifier() { return this.getServerLevelKey(); }
 	
+	
+	
 }

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

@@ -57,7 +57,7 @@ import net.minecraft.network.chat.TextComponent;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.util.profiling.ProfilerFiller;
 import net.minecraft.world.level.ChunkPos;
-import org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 import org.jetbrains.annotations.Nullable;
 
 #if MC_VER < MC_1_21_3
@@ -72,7 +72,7 @@ import net.minecraft.util.profiling.Profiler;
  */
 public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecraftSharedWrapper
 {
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger(MethodHandles.lookup().lookupClass().getSimpleName());
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	private static final Minecraft MINECRAFT = Minecraft.getInstance();
 	
 	public static final MinecraftClientWrapper INSTANCE = new MinecraftClientWrapper();
@@ -158,9 +158,17 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
 	@Override
 	public boolean hasSinglePlayerServer() { return MINECRAFT.hasSingleplayerServer(); }
 	@Override
-	public boolean clientConnectedToDedicatedServer() { return MINECRAFT.getCurrentServer() != null && !this.hasSinglePlayerServer(); }
+	public boolean clientConnectedToDedicatedServer() 
+	{ 
+		return MINECRAFT.getCurrentServer() != null 
+				&& !this.hasSinglePlayerServer(); 
+	}
 	@Override
-	public boolean connectedToReplay() { return !MINECRAFT.hasSingleplayerServer() && MINECRAFT.getCurrentServer() == null; }
+	public boolean connectedToReplay() 
+	{ 
+		return MINECRAFT.getCurrentServer() == null
+				&& !this.hasSinglePlayerServer() ; 
+	}
 	
 	@Override
 	public String getCurrentServerName() 
@@ -315,7 +323,7 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
 		
         #if MC_VER < MC_1_19_2
 		player.sendMessage(new TextComponent(string), getPlayer().getUUID());
-        #elif MC_VER < MC_1_21_10
+        #elif MC_VER < MC_1_21_9
 		player.displayClientMessage(net.minecraft.network.chat.Component.translatable(string), /*isOverlay*/false);
 		#else
 		
@@ -388,4 +396,10 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
 		}
 	}
 	
+	@Override
+	public void setPreventAutoPause(boolean preventAutoPause)
+	{
+		throw new UnsupportedOperationException();
+	}
+	
 }

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

@@ -28,7 +28,7 @@ import com.mojang.blaze3d.opengl.GlStateManager;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftGLWrapper;
 
-import org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 import org.lwjgl.opengl.GL32;
 
 
@@ -54,7 +54,7 @@ public class MinecraftGLWrapper implements IMinecraftGLWrapper
 {
 	public static final MinecraftGLWrapper INSTANCE = new MinecraftGLWrapper();
 	
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	
 	

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

@@ -59,6 +59,12 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IOptifineAc
 import net.minecraft.client.Camera;
 import net.minecraft.client.Minecraft;
 import net.minecraft.world.effect.MobEffects;
+
+import net.minecraft.world.phys.Vec3;
+import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.jetbrains.annotations.NotNull;
+import org.joml.Vector4f;
+
 #if MC_VER < MC_1_17_1
 import net.minecraft.tags.FluidTags;
 import net.minecraft.world.entity.Entity;
@@ -67,9 +73,6 @@ 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;
@@ -84,7 +87,7 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 {
 	public static final MinecraftRenderWrapper INSTANCE = new MinecraftRenderWrapper();
 	
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger(MethodHandles.lookup().lookupClass().getSimpleName());
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	private static final Minecraft MC = Minecraft.getInstance();
 	
 	private static final IOptifineAccessor OPTIFINE_ACCESSOR = ModAccessorInjector.INSTANCE.get(IOptifineAccessor.class);
@@ -318,7 +321,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())
@@ -399,9 +402,9 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 	}
 	
 	@Override
-	public int getTargetFrameBufferViewportWidth()
+	public int getTargetFramebufferViewportWidth()
 	{
-		#if MC_VER < MC_1_21_10
+		#if MC_VER < MC_1_21_9
 		return this.getRenderTarget().viewWidth;
 		#else
 		return this.getRenderTarget().width;
@@ -409,9 +412,9 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 	}
 	
 	@Override
-	public int getTargetFrameBufferViewportHeight()
+	public int getTargetFramebufferViewportHeight()
 	{
-		#if MC_VER < MC_1_21_10
+		#if MC_VER < MC_1_21_9
 		return this.getRenderTarget().viewHeight;
 		#else
 		return this.getRenderTarget().height;
@@ -419,7 +422,7 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 	}
 	
 	@Override
-	public ILightMapWrapper getLightmapWrapper(ILevelWrapper level) { return this.lightmapByDimensionType.get(level.getDimensionType()); }
+	public ILightMapWrapper getLightmapWrapper(@NotNull ILevelWrapper level) { return this.lightmapByDimensionType.get(level.getDimensionType()); }
 	
 	@Override
 	public boolean isFogStateSpecial()

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

@@ -11,6 +11,7 @@ public class MinecraftServerWrapper implements IMinecraftSharedWrapper
 	public static final MinecraftServerWrapper INSTANCE = new MinecraftServerWrapper();
 	
 	public DedicatedServer dedicatedServer = null;
+	public boolean preventAutoPause = false;
 	
 	
 	//=============//
@@ -49,4 +50,10 @@ public class MinecraftServerWrapper implements IMinecraftSharedWrapper
 		return this.dedicatedServer.getPlayerCount();
 	}
 	
+	@Override
+	public void setPreventAutoPause(boolean preventAutoPause)
+	{
+		this.preventAutoPause = preventAutoPause;
+	}
+	
 }

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 org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 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 Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	private int textureId = 0;
 	

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

@@ -2,7 +2,6 @@ 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;
@@ -25,8 +24,7 @@ import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.ChunkSource;
-import org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -54,7 +52,7 @@ import com.seibel.distanthorizons.core.util.ColorUtil;
 
 public class ClientLevelWrapper implements IClientLevelWrapper
 {
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger(ClientLevelWrapper.class.getSimpleName());
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	/**
 	 * weak references are to prevent rare issues
 	 * where, upon world closure, some levels aren't shutdown/removed properly
@@ -66,17 +64,14 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 	private static final Minecraft MINECRAFT = Minecraft.getInstance();
 	
 	private final ClientLevel level;
-	private final ConcurrentHashMap<BlockState, ClientBlockStateColorCache> blockCache = new ConcurrentHashMap<>();
+	private final ConcurrentHashMap<BlockState, ClientBlockStateColorCache> blockColorCacheByBlockState = new ConcurrentHashMap<>();
 	
 	/** cached method reference to reduce GC overhead */
-	private final Function<BlockState, ClientBlockStateColorCache> cachedBlockColorCacheFunction = (blockState) -> this.createBlockColorCache(blockState);
+	private final Function<BlockState, ClientBlockStateColorCache> createCachedBlockColorCacheFunc = (blockState) -> new ClientBlockStateColorCache(blockState, this);
 	
 	
 	private BlockStateWrapper dirtBlockWrapper;
-	private BlockStateWrapper waterBlockWrapper;
-	private BiomeWrapper plainsBiomeWrapper;
-	@Deprecated // TODO circular references are bad
-	private IDhLevel parentDhLevel;
+	private IDhLevel dhLevel;
 	
 	
 	
@@ -99,6 +94,11 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 	@Nullable
 	public static IClientLevelWrapper getWrapperIfDifferent(@Nullable IClientLevelWrapper levelWrapper, @NotNull ClientLevel level)
 	{
+		if (KEYED_CLIENT_LEVEL_MANAGER.isEnabled() && KEYED_CLIENT_LEVEL_MANAGER.getServerKeyedLevel() != levelWrapper)
+		{
+			return getWrapper(level);
+		}
+		
 		ClientLevelWrapper clientLevelWrapper = (ClientLevelWrapper)levelWrapper;
 		if (clientLevelWrapper == null
 			|| clientLevelWrapper.level != level)
@@ -163,13 +163,17 @@ 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
-			// TODO this assumes only one level per dimension type, the SubDimensionLevelMatcher will need to be added for supporting multiple levels per dimension
+			// Note: this assumes only one level per dimension type, multiverse servers may not behave correctly
 			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())
@@ -195,16 +199,18 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 	//====================//
 	
 	@Override
-	public int getBlockColor(DhBlockPos pos, IBiomeWrapper biome, FullDataSourceV2 fullDataSource, IBlockStateWrapper blockWrapper)
+	public int getBlockColor(DhBlockPos blockPos, IBiomeWrapper biome, FullDataSourceV2 fullDataSource, IBlockStateWrapper blockWrapper)
 	{
-		ClientBlockStateColorCache blockColorCache = this.blockCache.computeIfAbsent(
-				((BlockStateWrapper) blockWrapper).blockState,
-				this.cachedBlockColorCacheFunction);
+		ClientBlockStateColorCache blockColorCache = this.blockColorCacheByBlockState.get(((BlockStateWrapper) blockWrapper).blockState);
+		if (blockColorCache == null)
+		{
+			blockColorCache = this.blockColorCacheByBlockState.computeIfAbsent(
+					((BlockStateWrapper) blockWrapper).blockState,
+					this.createCachedBlockColorCacheFunc);
+		}
 		
-		return blockColorCache.getColor((BiomeWrapper) biome, fullDataSource, pos);
+		return blockColorCache.getColor((BiomeWrapper) biome, fullDataSource, blockPos);
 	}
-	/** used by {@link ClientLevelWrapper#cachedBlockColorCacheFunction} */
-	private ClientBlockStateColorCache createBlockColorCache(BlockState block) { return new ClientBlockStateColorCache(block, this); }
 	
 	
 	@Override
@@ -228,47 +234,7 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 	}
 	
 	@Override 
-	public int getWaterBlockColor()
-	{
-		if (this.waterBlockWrapper == null)
-		{
-			try
-			{
-				this.waterBlockWrapper = (BlockStateWrapper) BlockStateWrapper.deserialize(BlockStateWrapper.WATER_RESOURCE_LOCATION_STRING, this);
-			}
-			catch (IOException e)
-			{
-				// shouldn't happen, but just in case
-				LOGGER.warn("Unable to get water color with resource location ["+BlockStateWrapper.WATER_RESOURCE_LOCATION_STRING+"] with level ["+this+"].", e);
-				return -1;
-			}
-		}
-		
-		return this.getBlockColor(DhBlockPos.ZERO, BiomeWrapper.EMPTY_WRAPPER, null, this.waterBlockWrapper);
-	}
-	
-	@Override 
-	public void clearBlockColorCache() { this.blockCache.clear(); }
-	
-	@Override
-	public IBiomeWrapper getPlainsBiomeWrapper()
-	{
-		if (this.plainsBiomeWrapper == null)
-		{
-			try
-			{
-				this.plainsBiomeWrapper = (BiomeWrapper) BiomeWrapper.deserialize(BiomeWrapper.PLAINS_RESOURCE_LOCATION_STRING, this);
-			}
-			catch (IOException e)
-			{
-				// shouldn't happen, but just in case
-				LOGGER.warn("Unable to get planes biome with resource location ["+BiomeWrapper.PLAINS_RESOURCE_LOCATION_STRING+"] with level ["+this+"].", e);
-				return null;
-			}
-		}
-		
-		return this.plainsBiomeWrapper;
-	}
+	public void clearBlockColorCache() { this.blockColorCacheByBlockState.clear(); }
 	
 	@Override
 	public IDimensionTypeWrapper getDimensionType() { return DimensionTypeWrapper.getDimensionTypeWrapper(this.level.dimensionType()); }
@@ -326,20 +292,6 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 		return new ChunkWrapper(chunk, this);
 	}
 	
-	@Override
-	public boolean hasChunkLoaded(int chunkX, int chunkZ)
-	{
-		ChunkSource source = this.level.getChunkSource();
-		return source.hasChunk(chunkX, chunkZ);
-	}
-	
-	@Override
-	public IBlockStateWrapper getBlockState(DhBlockPos pos)
-	{ return BlockStateWrapper.fromBlockState(this.level.getBlockState(McObjectConverter.Convert(pos)), this); }
-	
-	@Override
-	public IBiomeWrapper getBiome(DhBlockPos pos) { return BiomeWrapper.getBiomeWrapper(this.level.getBiome(McObjectConverter.Convert(pos)), this); }
-	
 	@Override
 	public ClientLevel getWrappedMcObject() { return this.level; }
 	
@@ -347,18 +299,18 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 	public void onUnload() 
 	{ 
 		LEVEL_WRAPPER_REF_BY_CLIENT_LEVEL.remove(this.level);
-		this.parentDhLevel = null;
+		this.dhLevel = null;
 	}
 	
 	@Override
 	public File getDhSaveFolder()
 	{
-		if (this.parentDhLevel == null)
+		if (this.dhLevel == null)
 		{
 			return null;
 		}
 		
-		return this.parentDhLevel.getSaveStructure().getSaveFolder(this);
+		return this.dhLevel.getSaveStructure().getSaveFolder(this);
 	}
 	
 	
@@ -369,17 +321,19 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 	//===================//
 	
 	@Override
-	public void setParentLevel(IDhLevel parentLevel) { this.parentDhLevel = parentLevel; }
+	public void setDhLevel(IDhLevel dhLevel) { this.dhLevel = dhLevel; }
+	@Override 
+	public IDhLevel getDhLevel() { return this.dhLevel; }
 	
 	@Override 
 	public IDhApiCustomRenderRegister getRenderRegister()
 	{
-		if (this.parentDhLevel == null)
+		if (this.dhLevel == null)
 		{
 			return null;
 		}
 		
-		return this.parentDhLevel.getGenericRenderer();
+		return this.dhLevel.getGenericRenderer();
 	}
 	
 	@Override

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

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

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

@@ -0,0 +1,92 @@
+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,114 +19,118 @@
 
 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.core.util.objects.UncheckedInterruptedException;
+import com.seibel.distanthorizons.common.wrappers.worldGeneration.params.ThreadWorldGenParams;
+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 org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 
 public final class GenerationEvent
 {
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger(MethodHandles.lookup().lookupClass().getSimpleName());
-	private static int generationFutureDebugIDs = 0;
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();;
 	
+	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;
-	/** the number of chunks wide this event is */
-	public final int size;
+	public final int widthInChunks;
 	public final EDhApiWorldGenerationStep targetGenerationStep;
 	public final EDhApiDistantGeneratorMode generatorMode;
-	public EventTimer timer = null;
-	public long inQueueTime;
-	public long timeoutTime = -1;
-	public CompletableFuture<Void> future = null;
+	public final CompletableFuture<Void> future;
 	public final Consumer<IChunkWrapper> resultConsumer;
 	
 	
 	
-	public GenerationEvent(
-			DhChunkPos minPos, int size, BatchGenerationEnvironment generationGroup,
+	//=============//
+	// constructor //
+	//=============//
+	
+	private GenerationEvent(
+			DhChunkPos minPos, int widthInChunks, BatchGenerationEnvironment generationGroup,
 			EDhApiDistantGeneratorMode generatorMode, EDhApiWorldGenerationStep targetGenerationStep, Consumer<IChunkWrapper> resultConsumer)
 	{
-		this.inQueueTime = System.nanoTime();
-		this.id = generationFutureDebugIDs++;
+		this.id = DEBUG_ID_REF.getAndIncrement();
+		
 		this.minPos = minPos;
-		this.size = size;
-		this.generatorMode = generatorMode;
+		this.widthInChunks = widthInChunks;
 		this.targetGenerationStep = targetGenerationStep;
-		this.threadedParam = ThreadedParameters.getOrMake(generationGroup.params);
+		this.generatorMode = generatorMode;
+		this.threadedParam = ThreadWorldGenParams.getOrMake(generationGroup.globalParams);
+		this.future = new CompletableFuture<>();
 		this.resultConsumer = resultConsumer;
 	}
 	
 	
 	
-	public static GenerationEvent startEvent(
-			DhChunkPos minPos, int size, BatchGenerationEnvironment genEnvironment,
+	//=======//
+	// start //
+	//=======//
+	
+	public static GenerationEvent start(
+			DhChunkPos minPos, int widthInChunks, BatchGenerationEnvironment genEnvironment,
 			EDhApiDistantGeneratorMode generatorMode, EDhApiWorldGenerationStep target, Consumer<IChunkWrapper> resultConsumer,
 			ExecutorService worldGeneratorThreadPool)
 	{
-		GenerationEvent generationEvent = new GenerationEvent(minPos, size, genEnvironment, generatorMode, target, resultConsumer);
-		generationEvent.future = CompletableFuture.supplyAsync(() ->
+		GenerationEvent genEvent = new GenerationEvent(minPos, widthInChunks, genEnvironment, generatorMode, target, resultConsumer);
+		
+		try
 		{
-			long runStartTime = System.nanoTime();
-			generationEvent.timeoutTime = runStartTime;
-			generationEvent.inQueueTime = runStartTime - generationEvent.inQueueTime;
-			generationEvent.timer = new EventTimer("setup");
-			
-			BatchGenerationEnvironment.isDistantGeneratorThread.set(true);
-			
-			try
+			worldGeneratorThreadPool.execute(() ->
 			{
-				genEnvironment.generateLodFromListAsync(generationEvent, (runnable) -> 
+				try
 				{
-					worldGeneratorThreadPool.execute(() ->
-					{
-						boolean alreadyMarked = BatchGenerationEnvironment.isCurrentThreadDistantGeneratorThread();
-						if (!alreadyMarked)
-						{
-							BatchGenerationEnvironment.isDistantGeneratorThread.set(true);
-						}
+					BatchGenerationEnvironment.isDhWorldGenThreadRef.set(true);
 					
+					
+					if (genEvent.generatorMode == EDhApiDistantGeneratorMode.INTERNAL_SERVER)
+					{
+						genEnvironment.internalServerGenerator.generateChunksViaInternalServer(genEvent);
+						genEvent.future.complete(null);
+					}
+					else
+					{
 						try
 						{
-							runnable.run();
+							genEnvironment.generateEvent(genEvent);
 						}
 						catch (Throwable throwable)
 						{
-							handleWorldGenThrowable(generationEvent, throwable);
+							handleWorldGenThrowable(genEvent, throwable);
 						}
 						finally
 						{
-							if (!alreadyMarked)
-							{
-								BatchGenerationEnvironment.isDistantGeneratorThread.set(false);
-							}
+							genEvent.future.complete(null);
 						}
-					});
-				});
-			}
-			catch (Throwable initialThrowable)
-			{
-				handleWorldGenThrowable(generationEvent, initialThrowable);
-			}
-			finally
-			{
-				BatchGenerationEnvironment.isDistantGeneratorThread.remove();
-			}
+					}
+				}
+				catch (Throwable initialThrowable)
+				{
+					handleWorldGenThrowable(genEvent, initialThrowable);
+				}
+				finally
+				{
+					BatchGenerationEnvironment.isDhWorldGenThreadRef.remove();
+				}
+			});
+		}
+		catch (RejectedExecutionException e)
+		{
+			genEvent.future.completeExceptionally(e);
+		}
 		
-			return null;
-		}, worldGeneratorThreadPool);
-		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)
@@ -137,9 +141,8 @@ public final class GenerationEvent
 			throwable = throwable.getCause();
 		}
 		
-		if (throwable instanceof InterruptedException
-			|| throwable instanceof UncheckedInterruptedException
-			|| throwable instanceof RejectedExecutionException)
+		boolean isShutdownException = ExceptionUtil.isShutdownException(throwable);
+		if (isShutdownException)
 		{
 			// these exceptions can be ignored, generally they just mean
 			// the thread is busy so it'll need to try again later.
@@ -154,35 +157,15 @@ 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()
-	{
-		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();
-	}
+	//================//
+	// base overrides //
+	//================//
 	
 	@Override
-	public String toString() { return this.id + ":" + this.size + "@" + this.minPos + "(" + this.targetGenerationStep + ")"; }
+	public String toString() { return this.id + ":" + this.widthInChunks + "@" + this.minPos + "(" + this.targetGenerationStep + ")"; }
+	
+	
 	
 }

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

@@ -0,0 +1,310 @@
+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.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 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());
+					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 =
+					// orange text
+					"\u00A76" + "Distant Horizons: slow world gen." + "\u00A7r\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/ThreadedParameters.java

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

@@ -0,0 +1,744 @@
+/*
+ *    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(), !hasHeightmapData);
+		
+		
+		
+		//===========================//
+		// 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

@@ -0,0 +1,343 @@
+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(), false);
+	}
+	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

@@ -0,0 +1,148 @@
+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/ChunkFileReader.java

@@ -1,875 +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.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 ChunkFileReader
-{
-	private static final AtomicBoolean ZERO_CHUNK_POS_ERROR_LOGGED_REF = new AtomicBoolean(false);
-	
-	
-	#if MC_VER >= MC_1_21_10
-	// BLOCK_STATE_CODEC can no longer be statically created since
-	// it needs a level reference
-	#elif 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_21_10
-		// BLOCK_STATE_CODEC is created statically
-		// TODO clean up this code separation
-		#else
-		final Codec<PalettedContainer<BlockState>> BLOCK_STATE_CODEC = PalettedContainerFactory.create(level.registryAccess()).blockStatesContainerCodec();
-		#endif
-		
-		
-		#if MC_VER >= MC_1_18_2
-		#if MC_VER < MC_1_19_4
-		Registry<Biome> biomes = level.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY);
-		#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));
-			#elif MC_VER < MC_1_21_10
-			Codec<PalettedContainer<Holder<Biome>>> biomeCodec = PalettedContainer.codecRW(
-				biomes.asHolderIdMap(), biomes.holderByNameCodec(), PalettedContainer.Strategy.SECTION_BIOMES, biomes.getOrThrow(Biomes.PLAINS));
-			#else
-			Codec<PalettedContainer<Holder<Biome>>> biomeCodec = PalettedContainer.codecRW(
-				biomes.holderByNameCodec(), PalettedContainerFactory.create(level.registryAccess()).biomeStrategy(), biomes.getOrThrow(Biomes.PLAINS));
-			#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
-					{
-						#if MC_VER < MC_1_21_10
-						blockStateContainer = new PalettedContainer<BlockState>(Block.BLOCK_STATE_REGISTRY, Blocks.AIR.defaultBlockState(), PalettedContainer.Strategy.SECTION_STATES);
-						#else
-						blockStateContainer = PalettedContainerFactory.create(level.registryAccess()).createForBlockStates();
-						#endif
-					}
-				
-				
-					#if MC_VER < MC_1_18_2
-					biomeContainer = tagSection.contains("biomes", 10)
-							? biomeCodec.parse(NbtOps.INSTANCE, tagSection.getCompound("biomes")).promotePartial(string -> logErrors(chunkPos, sectionYPos, string)).getOrThrow(false, (message) -> logWarningOnce(message))
-							: new PalettedContainer<Biome>(biomes, biomes.getOrThrow(Biomes.PLAINS), PalettedContainer.Strategy.SECTION_BIOMES);
-					#else
-					
-					
-					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
-					{
-						#if MC_VER < MC_1_21_3
-						biomeContainer = new PalettedContainer<Holder<Biome>>(
-								biomes.asHolderIdMap(), 
-								biomes.getHolderOrThrow(Biomes.PLAINS), PalettedContainer.Strategy.SECTION_BIOMES);
-						#elif MC_VER < MC_1_21_10
-						biomeContainer = new PalettedContainer<Holder<Biome>>(biomes.asHolderIdMap(),
-								biomes.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 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 org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 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 Logger LOGGER = DhLoggerBuilder.getLogger(MethodHandles.lookup().lookupClass().getSimpleName());
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	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 , true #endif );
+			chunk = new ImposterProtoChunk((LevelChunk) chunk #if MC_VER >= MC_1_18_2 ,/* allow writes */ false #endif );
 		}
 		return chunk;
 	}
@@ -392,10 +392,11 @@ public class DhLitWorldGenRegion extends WorldGenRegion
 			}
 		}
 		
-		if (chunkStatus != ChunkStatus.EMPTY && chunkStatus != debugTriggeredForStatus)
+		if (chunkStatus != ChunkStatus.EMPTY 
+			&& chunkStatus != debugTriggeredForStatus)
 		{
-			LOGGER.info("WorldGen requiring " + chunkStatus
-					+ " outside expected range detected. Force passing EMPTY chunk and seeing if it works.");
+			LOGGER.info("WorldGen requiring [" + chunkStatus + "]"
+					+ " is outside the expected range. Returning EMPTY chunk.");
 			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.BatchGenerationEnvironment;
+import com.seibel.distanthorizons.common.wrappers.worldGeneration.chunkFileHandling.ChunkFileReader;
 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 org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 
 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 Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	/** 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 pos) throws IOException
+	public RegionFile getRegionFile(ChunkPos chunkPos) throws IOException
 	{
 		if (this.storage == null)
 		{
@@ -70,8 +70,8 @@ public class RegionFileStorageExternalCache implements AutoCloseable
 		
 		
 		
-		long posLong = ChunkPos.asLong(pos.getRegionX(), pos.getRegionZ());
-		RegionFile rFile = null;
+		long chunkPosLong = ChunkPos.asLong(chunkPos.getRegionX(), chunkPos.getRegionZ());
+		RegionFile regionFile = 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
-				rFile = this.storage.getRegionFile(pos);
+				regionFile = this.storage.getRegionFile(chunkPos);
 				
 				// 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
-				rFile = this.storage.regionCache.getOrDefault(posLong, null);	
+				regionFile = this.storage.regionCache.getOrDefault(chunkPosLong, null);	
 				#endif
 				
 				break;
@@ -139,19 +139,19 @@ public class RegionFileStorageExternalCache implements AutoCloseable
 		
 		if (retryCount >= maxRetryCount)
 		{
-			BatchGenerationEnvironment.LOAD_LOGGER.warn("Concurrency issue detected when getting region file for chunk at [" + pos + "].");
+			ChunkFileReader.CHUNK_LOAD_LOGGER.warn("Concurrency issue detected when getting region file for chunk at [" + chunkPos + "].");
 		}
 		
 		
-		if (rFile != null)
+		if (regionFile != null)
 		{
-			return rFile;
+			return regionFile;
 		}
 		
 		// Then check our custom cache
 		for (RegionFileCache cache : this.regionFileCache)
 		{
-			if (cache.pos == posLong)
+			if (cache.pos == chunkPosLong)
 			{
 				return cache.file;
 			}
@@ -170,22 +170,22 @@ public class RegionFileStorageExternalCache implements AutoCloseable
 			return null;
 		}
 		
-		Path regionFilePath = storageFolderPath.resolve("r." + pos.getRegionX() + "." + pos.getRegionZ() + ".mca");
+		Path regionFilePath = storageFolderPath.resolve("r." + chunkPos.getRegionX() + "." + chunkPos.getRegionZ() + ".mca");
 		#if MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1
-		rFile = new RegionFile(regionFilePath.toFile(), storageFolderPath.toFile(), false);
+		regionFile = new RegionFile(regionFilePath.toFile(), storageFolderPath.toFile(), false);
 		#elif MC_VER <= MC_1_20_4
-		rFile = new RegionFile(regionFilePath, storageFolderPath, false);
+		regionFile = new RegionFile(regionFilePath, storageFolderPath, false);
 		#else
-		rFile = new RegionFile(new RegionStorageInfo("level", null, "level type"), regionFilePath, storageFolderPath, false);
+		regionFile = new RegionFile(new RegionStorageInfo("level", null, "level type"), regionFilePath, storageFolderPath, false);
 		#endif
 		
-		this.regionFileCache.add(new RegionFileCache(ChunkPos.asLong(pos.getRegionX(), pos.getRegionZ()), rFile));
+		this.regionFileCache.add(new RegionFileCache(ChunkPos.asLong(chunkPos.getRegionX(), chunkPos.getRegionZ()), regionFile));
 		while (this.regionFileCache.size() > MAX_CACHE_SIZE)
 		{
 			this.regionFileCache.poll().file.close();
 		}
 		
-		return rFile;
+		return regionFile;
 	}
 	
 	

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

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.distanthorizons.common.wrappers.worldGeneration;
+package com.seibel.distanthorizons.common.wrappers.worldGeneration.params;
 
 import com.mojang.datafixers.DataFixer;
 import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper;
@@ -27,35 +27,50 @@ 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.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
+import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplateManager;
 #endif
 import net.minecraft.world.level.storage.WorldData;
 
-public final class GlobalParameters
+#if MC_VER < MC_1_19_4
+#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 lodLevel;
-	public final ServerLevel level;
+	public final IDhServerLevel dhServerLevel;
+	public final ServerLevel mcServerLevel;
 	public final Registry<Biome> biomes;
 	public final RegistryAccess registry;
 	public final long worldSeed;
-	public final DataFixer fixerUpper;
+	public final DataFixer dataFixer;
 	
 	#if MC_VER < MC_1_19_2
 	public final StructureManager structures;
@@ -72,15 +87,21 @@ public final class GlobalParameters
 	
 	#if MC_VER >= MC_1_18_2
 	public final BiomeManager biomeManager;
-	public final ChunkScanAccess chunkScanner; // FIXME: Figure out if this is actually needed
+	public final ChunkScanAccess chunkScanner;
 	#endif
 	
-	public GlobalParameters(IDhServerLevel lodLevel)
-	{
-		this.lodLevel = lodLevel;
 	
-		this.level = ((ServerLevelWrapper) lodLevel.getServerLevelWrapper()).getWrappedMcObject();
-		MinecraftServer server = this.level.getServer();
+	
+	//=============//
+	// constructor //
+	//=============//
+	
+	public GlobalWorldGenParams(IDhServerLevel dhServerLevel)
+	{
+		this.dhServerLevel = dhServerLevel;
+		
+		this.mcServerLevel = ((ServerLevelWrapper) dhServerLevel.getServerLevelWrapper()).getWrappedMcObject();
+		MinecraftServer server = this.mcServerLevel.getServer();
 		WorldData worldData = server.getWorldData();
 		this.registry = server.registryAccess();
 		
@@ -99,15 +120,19 @@ public final class GlobalParameters
 		#endif
 		
 		#if MC_VER >= MC_1_18_2
-		this.biomeManager = new BiomeManager(this.level, BiomeManager.obfuscateSeed(this.worldSeed));
-		this.chunkScanner = this.level.getChunkSource().chunkScanner();
+		this.biomeManager = new BiomeManager(this.mcServerLevel, BiomeManager.obfuscateSeed(this.worldSeed));
+		this.chunkScanner = this.mcServerLevel.getChunkSource().chunkScanner();
 		#endif
+		
 		this.structures = server.getStructureManager();
-		this.generator = this.level.getChunkSource().getGenerator();
-		this.fixerUpper = server.getFixerUpper();
+		this.generator = this.mcServerLevel.getChunkSource().getGenerator();
+		this.dataFixer = server.getFixerUpper();
+		
 		#if MC_VER >= MC_1_19_2
-		this.randomState = this.level.getChunkSource().randomState();
+		this.randomState = this.mcServerLevel.getChunkSource().randomState();
 		#endif
 	}
 	
+	
+	
 }

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

@@ -0,0 +1,124 @@
+/*
+ *    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,7 +1,7 @@
 package com.seibel.distanthorizons.common.wrappers.worldGeneration.step;
 
 import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.ThreadedParameters;
+import com.seibel.distanthorizons.common.wrappers.worldGeneration.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;
@@ -19,7 +19,7 @@ import net.minecraft.world.level.chunk.status.ChunkStatus;
 public abstract class AbstractWorldGenStep
 {
 	public abstract void generateGroup(
-			ThreadedParameters tParams, DhLitWorldGenRegion worldGenRegion,
+			ThreadWorldGenParams tParams, DhLitWorldGenRegion worldGenRegion,
 			ArrayGridList<ChunkWrapper> chunkWrappers);
 	
 	public abstract ChunkStatus getChunkStatus();
@@ -27,26 +27,26 @@ public abstract class AbstractWorldGenStep
 	
 	
 	/** @return the list of chunks that have an earlier status and can be generated */
-	protected ArrayList<ChunkAccess> getChunksToGenerate(List<ChunkWrapper> chunkWrappers)
+	protected ArrayList<ChunkWrapper> getChunkWrappersToGenerate(List<ChunkWrapper> chunkWrappers)
 	{
-		ArrayList<ChunkAccess> chunksToGenerate = new ArrayList<>();
+		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 generated this step
+				// this chunk has already been generated up to this step
 				continue;
 			}
 			else if (chunk instanceof ProtoChunk)
 			{
 				chunkWrapper.trySetStatus(this.getChunkStatus());
-				chunksToGenerate.add(chunk);
+				chunkWrappersToGenerate.add(chunkWrapper);
 			}
 		}
 		
-		return chunksToGenerate;
+		return chunkWrappersToGenerate;
 	}
 	
 	

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

@@ -23,13 +23,11 @@ import java.util.ArrayList;
 
 import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.ThreadedParameters;
+import com.seibel.distanthorizons.common.wrappers.worldGeneration.params.ThreadWorldGenParams;
 
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject.DhLitWorldGenRegion;
 import com.seibel.distanthorizons.core.util.gridList.ArrayGridList;
-import net.minecraft.server.level.WorldGenRegion;
 import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.ProtoChunk;
 
 #if MC_VER >= MC_1_18_2
 import net.minecraft.world.level.levelgen.blending.Blender;
@@ -66,47 +64,50 @@ public final class StepBiomes extends AbstractWorldGenStep
 	
 	@Override 
 	public void generateGroup(
-			ThreadedParameters tParams, DhLitWorldGenRegion worldGenRegion, 
+			ThreadWorldGenParams tParams, DhLitWorldGenRegion worldGenRegion, 
 			ArrayGridList<ChunkWrapper> chunkWrappers)
 	{
-		ArrayList<ChunkAccess> chunksToDo = this.getChunksToGenerate(chunkWrappers);
-		for (ChunkAccess chunk : chunksToDo)
+		ArrayList<ChunkWrapper> chunksToDo = this.getChunkWrappersToGenerate(chunkWrappers);
+		for (ChunkWrapper chunkWrapper : chunksToDo)
 		{
+			ChunkAccess chunk = chunkWrapper.getChunk();
+			
+			
 			#if MC_VER < MC_1_18_2
-			this.environment.params.generator.createBiomes(this.environment.params.biomes, chunk);
+			this.environment.globalParams.generator.createBiomes(this.environment.globalParams.biomes, chunk);
 			#elif MC_VER < MC_1_19_2
 			chunk = this.environment.confirmFutureWasRunSynchronously(
-						this.environment.params.generator.createBiomes(
-							this.environment.params.biomes, 
+						this.environment.globalParams.generator.createBiomes(
+							this.environment.globalParams.biomes, 
 							Runnable::run, 
 							Blender.of(worldGenRegion),
-							tParams.structFeat.forWorldGenRegion(worldGenRegion), 
+							tParams.structFeatManager.forWorldGenRegion(worldGenRegion), 
 							chunk)
 					);
 			#elif MC_VER < MC_1_19_4
 			chunk = this.environment.confirmFutureWasRunSynchronously(
-						this.environment.params.generator.createBiomes(
-							this.environment.params.biomes, 
+						this.environment.globalParams.generator.createBiomes(
+							this.environment.globalParams.biomes, 
 							Runnable::run, 
-							this.environment.params.randomState, Blender.of(worldGenRegion),
-							tParams.structFeat.forWorldGenRegion(worldGenRegion), 
+							this.environment.globalParams.randomState, Blender.of(worldGenRegion),
+							tParams.structFeatManager.forWorldGenRegion(worldGenRegion), 
 							chunk)
 					);
 			#elif MC_VER < MC_1_21_1
 			chunk = this.environment.confirmFutureWasRunSynchronously(
-						this.environment.params.generator.createBiomes(
+						this.environment.globalParams.generator.createBiomes(
 							Runnable::run, 
-							this.environment.params.randomState, 
+							this.environment.globalParams.randomState, 
 							Blender.of(worldGenRegion),
-							tParams.structFeat.forWorldGenRegion(worldGenRegion), 
+							tParams.structFeatManager.forWorldGenRegion(worldGenRegion), 
 							chunk)
 					);
 			#else
 			chunk = this.environment.confirmFutureWasRunSynchronously(
-						this.environment.params.generator.createBiomes(
-							this.environment.params.randomState, 
+						this.environment.globalParams.generator.createBiomes(
+							this.environment.globalParams.randomState, 
 							Blender.of(worldGenRegion),
-							tParams.structFeat.forWorldGenRegion(worldGenRegion), 
+							tParams.structFeatManager.forWorldGenRegion(worldGenRegion), 
 							chunk)
 					);
 			#endif

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

@@ -21,15 +21,14 @@ 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.ThreadedParameters;
+import com.seibel.distanthorizons.common.wrappers.worldGeneration.params.ThreadWorldGenParams;
 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 org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 
 #if MC_VER <= MC_1_20_4
 import net.minecraft.world.level.chunk.ChunkStatus;
@@ -37,12 +36,13 @@ 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 extends AbstractWorldGenStep
 {
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	public static final ChunkStatus STATUS = ChunkStatus.FEATURES;
 	
@@ -67,32 +67,24 @@ public final class StepFeatures extends AbstractWorldGenStep
 	
 	@Override
 	public void generateGroup(
-			ThreadedParameters tParams, DhLitWorldGenRegion worldGenRegion,
+			ThreadWorldGenParams tParams, DhLitWorldGenRegion worldGenRegion,
 			ArrayGridList<ChunkWrapper> chunkWrappers)
 	{
-		for (ChunkWrapper chunkWrapper : chunkWrappers)
+		ArrayList<ChunkWrapper> chunksToDo = this.getChunkWrappersToGenerate(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.params.generator.applyBiomeDecoration(worldGenRegion, tParams.structFeat);
+				environment.globalParams.generator.applyBiomeDecoration(worldGenRegion, tParams.structFeatManager);
 				#else
 				if (worldGenRegion.hasChunk(chunkWrapper.getChunkPos().getX(), chunkWrapper.getChunkPos().getZ()))
 				{
-					this.environment.params.generator.applyBiomeDecoration(worldGenRegion, chunk, tParams.structFeat.forWorldGenRegion(worldGenRegion));
+					this.environment.globalParams.generator.applyBiomeDecoration(worldGenRegion, chunk, tParams.structFeatManager.forWorldGenRegion(worldGenRegion));
 				}
 				else
 				{

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

@@ -20,18 +20,14 @@
 package com.seibel.distanthorizons.common.wrappers.worldGeneration.step;
 
 import java.util.ArrayList;
-import java.util.List;
 
 import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.ThreadedParameters;
+import com.seibel.distanthorizons.common.wrappers.worldGeneration.params.ThreadWorldGenParams;
 
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject.DhLitWorldGenRegion;
 import com.seibel.distanthorizons.core.util.gridList.ArrayGridList;
-import com.seibel.distanthorizons.core.util.objects.UncheckedInterruptedException;
-import net.minecraft.server.level.WorldGenRegion;
 import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.ProtoChunk;
 
 #if MC_VER >= MC_1_18_2
 import net.minecraft.world.level.levelgen.blending.Blender;
@@ -68,56 +64,45 @@ public final class StepNoise extends AbstractWorldGenStep
 	
 	@Override
 	public void generateGroup(
-			ThreadedParameters tParams, DhLitWorldGenRegion worldGenRegion,
+			ThreadWorldGenParams tParams, DhLitWorldGenRegion worldGenRegion,
 			ArrayGridList<ChunkWrapper> chunkWrappers)
 	{
-		ArrayList<ChunkAccess> chunksToDo = new ArrayList<>();
-		
-		for (ChunkWrapper chunkWrapper : chunkWrappers)
+		ArrayList<ChunkWrapper> chunksToDo = this.getChunkWrappersToGenerate(chunkWrappers);
+		for (ChunkWrapper chunkWrapper : chunksToDo)
 		{
 			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.params.generator.fillFromNoise(worldGenRegion, tParams.structFeat, chunk);
+			this.environment.globalParams.generator.fillFromNoise(worldGenRegion, tParams.structFeatManager, chunk);
 			#elif MC_VER < MC_1_18_2
 			chunk = this.environment.confirmFutureWasRunSynchronously(
-						this.environment.params.generator.fillFromNoise(
+						this.environment.globalParams.generator.fillFromNoise(
 							Runnable::run,
-							tParams.structFeat.forWorldGenRegion(worldGenRegion), 
+							tParams.structFeatManager.forWorldGenRegion(worldGenRegion), 
 							chunk));
 			#elif MC_VER < MC_1_19_2
 			chunk = this.environment.confirmFutureWasRunSynchronously(
-						this.environment.params.generator.fillFromNoise(
+						this.environment.globalParams.generator.fillFromNoise(
 							Runnable::run, 
 							Blender.of(worldGenRegion),
-							tParams.structFeat.forWorldGenRegion(worldGenRegion), 
+							tParams.structFeatManager.forWorldGenRegion(worldGenRegion), 
 							chunk));
 			#elif MC_VER < MC_1_21_1
 			chunk = this.environment.confirmFutureWasRunSynchronously(
-						this.environment.params.generator.fillFromNoise(
+						this.environment.globalParams.generator.fillFromNoise(
 							Runnable::run, 
 							Blender.of(worldGenRegion), 
-							this.environment.params.randomState,
-							tParams.structFeat.forWorldGenRegion(worldGenRegion), 
+							this.environment.globalParams.randomState,
+							tParams.structFeatManager.forWorldGenRegion(worldGenRegion), 
 							chunk));
 			#else
 			chunk = this.environment.confirmFutureWasRunSynchronously(
-						this.environment.params.generator.fillFromNoise(
+						this.environment.globalParams.generator.fillFromNoise(
 							Blender.of(worldGenRegion), 
-							this.environment.params.randomState,
-							tParams.structFeat.forWorldGenRegion(worldGenRegion), 
+							this.environment.globalParams.randomState,
+							tParams.structFeatManager.forWorldGenRegion(worldGenRegion), 
 							chunk));
 			#endif
-			UncheckedInterruptedException.throwIfInterrupted();
 		}
 	}
 	

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

@@ -20,17 +20,14 @@
 package com.seibel.distanthorizons.common.wrappers.worldGeneration.step;
 
 import java.util.ArrayList;
-import java.util.List;
 
 import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.ThreadedParameters;
+import com.seibel.distanthorizons.common.wrappers.worldGeneration.params.ThreadWorldGenParams;
 
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject.DhLitWorldGenRegion;
 import com.seibel.distanthorizons.core.util.gridList.ArrayGridList;
-import net.minecraft.server.level.WorldGenRegion;
 import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.ProtoChunk;
 
 #if MC_VER <= MC_1_20_4
 import net.minecraft.world.level.chunk.ChunkStatus;
@@ -64,30 +61,14 @@ public final class StepStructureReference extends AbstractWorldGenStep
 	
 	@Override
 	public void generateGroup(
-			ThreadedParameters tParams, DhLitWorldGenRegion worldGenRegion,
+			ThreadWorldGenParams tParams, DhLitWorldGenRegion worldGenRegion,
 			ArrayGridList<ChunkWrapper> chunkWrappers)
 	{
-		ArrayList<ChunkAccess> chunksToDo = new ArrayList<ChunkAccess>();
-		
-		for (ChunkWrapper chunkWrapper : chunkWrappers)
+		ArrayList<ChunkWrapper> chunksToDo = this.getChunkWrappersToGenerate(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);
-				chunksToDo.add(chunk);
-			}
-		}
-		
-		for (ChunkAccess chunk : chunksToDo)
-		{
-			// System.out.println("StepStructureReference: "+chunk.getPos());
-			this.environment.params.generator.createReferences(worldGenRegion, tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk);
+			this.environment.globalParams.generator.createReferences(worldGenRegion, tParams.structFeatManager.forWorldGenRegion(worldGenRegion), chunk);
 		}
 	}
 	

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

@@ -20,22 +20,17 @@
 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.ThreadedParameters;
+import com.seibel.distanthorizons.common.wrappers.worldGeneration.params.ThreadWorldGenParams;
 
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject.DhLitWorldGenRegion;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.util.gridList.ArrayGridList;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.server.level.WorldGenRegion;
-import net.minecraft.world.level.Level;
 import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.ProtoChunk;
-import org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 
 #if MC_VER <= MC_1_20_4
 import net.minecraft.world.level.chunk.ChunkStatus;
@@ -46,7 +41,7 @@ import net.minecraft.world.level.chunk.status.ChunkStatus;
 
 public final class StepStructureStart extends AbstractWorldGenStep
 {
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	private static final ChunkStatus STATUS = ChunkStatus.STRUCTURE_STARTS;
 	private static final ReentrantLock STRUCTURE_PLACEMENT_LOCK = new ReentrantLock();
 	
@@ -71,74 +66,80 @@ public final class StepStructureStart extends AbstractWorldGenStep
 	
 	@Override
 	public void generateGroup(
-			ThreadedParameters tParams, DhLitWorldGenRegion worldGenRegion,
+			ThreadWorldGenParams tParams, DhLitWorldGenRegion worldGenRegion,
 			ArrayGridList<ChunkWrapper> chunkWrappers)
 	{
-		ArrayList<ChunkAccess> chunksToDo = this.getChunksToGenerate(chunkWrappers);
+		ArrayList<ChunkWrapper> chunksToDo = this.getChunkWrappersToGenerate(chunkWrappers);
 		
+		// TODO should be put in wrapped environment so we can skip some other world gen steps
+		//  SURFACE wouldn't need structure generation either
 		#if MC_VER < MC_1_19_2
-		if (this.environment.params.worldGenSettings.generateFeatures())
-		{
+		if (!this.environment.globalParams.worldGenSettings.generateFeatures())
 		#elif MC_VER < MC_1_19_4
-		if (this.environment.params.worldGenSettings.generateStructures()) 
-		{
+		if (!this.environment.globalParams.worldGenSettings.generateStructures()) 
 		#else
-		if (this.environment.params.worldOptions.generateStructures())
-		{
+		if (!this.environment.globalParams.worldOptions.generateStructures())
 		#endif
-			for (ChunkAccess chunk : chunksToDo)
+		{
+			return;
+		}
+		
+		
+		
+		for (ChunkWrapper chunkWrapper : chunksToDo)
+		{
+			ChunkAccess chunk = chunkWrapper.getChunk();
+			
+			// 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
 			{
-				// 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();
+				tParams.structCheck.onStructureLoad(chunk.getPos(), chunk.getAllStarts());
+			}
+			catch (ArrayIndexOutOfBoundsException firstEx)
+			{
+				// There's a rare issue with StructStart where it throws ArrayIndexOutOfBounds
+				// 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
-				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
+				// reset the structureStart
+				tParams.recreateStructureCheck();
 				
-				#if MC_VER >= MC_1_18_2
 				try
 				{
+					// try running the structure logic again
 					tParams.structCheck.onStructureLoad(chunk.getPos(), chunk.getAllStarts());
 				}
-				catch (ArrayIndexOutOfBoundsException firstEx)
+				catch (ArrayIndexOutOfBoundsException secondEx)
 				{
-					// There's a rare issue with StructStart where it throws ArrayIndexOutOfBounds
-					// 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
-					}
+					// 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
 				}
-				
-				#endif
-				
-				STRUCTURE_PLACEMENT_LOCK.unlock();
 			}
+			
+			#endif
+			
+			STRUCTURE_PLACEMENT_LOCK.unlock();
 		}
 	}
 	

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

@@ -20,17 +20,14 @@
 package com.seibel.distanthorizons.common.wrappers.worldGeneration.step;
 
 import java.util.ArrayList;
-import java.util.List;
 
 import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.ThreadedParameters;
+import com.seibel.distanthorizons.common.wrappers.worldGeneration.params.ThreadWorldGenParams;
 
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject.DhLitWorldGenRegion;
 import com.seibel.distanthorizons.core.util.gridList.ArrayGridList;
-import net.minecraft.server.level.WorldGenRegion;
 import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.ProtoChunk;
 
 #if MC_VER <= MC_1_20_4
 import net.minecraft.world.level.chunk.ChunkStatus;
@@ -64,37 +61,24 @@ public final class StepSurface extends AbstractWorldGenStep
 	
 	@Override
 	public void generateGroup(
-			ThreadedParameters tParams, DhLitWorldGenRegion worldGenRegion,
+			ThreadWorldGenParams tParams, DhLitWorldGenRegion worldGenRegion,
 			ArrayGridList<ChunkWrapper> chunkWrappers)
 	{
-		ArrayList<ChunkAccess> chunksToDo = new ArrayList<>();
-		
-		for (ChunkWrapper chunkWrapper : chunkWrappers)
+		ArrayList<ChunkWrapper> chunksToDo = this.getChunkWrappersToGenerate(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);
-				chunksToDo.add(chunk);
-			}
-		}
 			
-		for (ChunkAccess chunk : chunksToDo)
-		{
-			// System.out.println("StepSurface: "+chunk.getPos());
 			#if MC_VER < MC_1_18_2
-			environment.params.generator.buildSurfaceAndBedrock(worldGenRegion, chunk);
+			this.environment.globalParams.generator.buildSurfaceAndBedrock(worldGenRegion, chunk);
 			#elif MC_VER < MC_1_19_2
-			environment.params.generator.buildSurface(worldGenRegion, tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk);
+			this.environment.globalParams.generator.buildSurface(worldGenRegion, tParams.structFeatManager.forWorldGenRegion(worldGenRegion), chunk);
 			#else
-			environment.params.generator.buildSurface(worldGenRegion, tParams.structFeat.forWorldGenRegion(worldGenRegion), environment.params.randomState, chunk);
+			this.environment.globalParams.generator.buildSurface(worldGenRegion, tParams.structFeatManager.forWorldGenRegion(worldGenRegion), this.environment.globalParams.randomState, chunk);
 			#endif
 		}
 	}
 	
+	
+	
 }

fabric/build.gradle

@@ -19,7 +19,9 @@ 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")
         }
@@ -76,11 +78,11 @@ dependencies {
     // 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.10")) 
+    if (buildVersionBefore(minecraft_version, "1.21.9")) 
     {
         addModJar(fabricApi.module("fabric-resource-loader-v0", rootProject.fabric_api_version))
     }
-    else // > 1.21.10
+    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))

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

@@ -60,7 +60,7 @@ import java.nio.FloatBuffer;
 import java.util.HashSet;
 import java.util.concurrent.AbstractExecutorService;
 
-#if MC_VER < MC_1_21_10
+#if MC_VER < MC_1_21_9
 import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
 #endif
 
@@ -68,7 +68,7 @@ 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 com.seibel.distanthorizons.core.logging.DhLogger;
 import org.lwjgl.glfw.GLFW;
 
 /**
@@ -85,7 +85,7 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 	private final ClientApi clientApi = ClientApi.INSTANCE;
 	private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
 	private static final AbstractPluginPacketSender PACKET_SENDER = (AbstractPluginPacketSender) SingletonInjector.INSTANCE.get(IPluginPacketSender.class);
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	// 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};
@@ -130,8 +130,16 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 		{
 			if (MC.clientConnectedToDedicatedServer())
 			{
-				IClientLevelWrapper wrappedLevel = ClientLevelWrapper.getWrapper(level);
-				SharedApi.INSTANCE.chunkLoadEvent(new ChunkWrapper(chunk, wrappedLevel), wrappedLevel);
+				// executor to prevent locking up the render/event thread
+				AbstractExecutorService executor = ThreadPoolUtil.getFileHandlerExecutor();
+				if (executor != null)
+				{
+					executor.execute(() ->
+					{
+						IClientLevelWrapper wrappedLevel = ClientLevelWrapper.getWrapper(level);
+						SharedApi.INSTANCE.chunkLoadEvent(new ChunkWrapper(chunk, wrappedLevel), wrappedLevel);
+					});
+				}
 			}
 		});
 		
@@ -145,8 +153,6 @@ 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)
 					{
@@ -185,8 +191,6 @@ 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)
 						{
@@ -219,8 +223,8 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 		// render event //
 		//==============//
 
-		// TODO wait for fabric to re-add their rendering API
-		#if MC_VER < MC_1_21_10
+		
+		#if MC_VER < MC_1_21_9
 		WorldRenderEvents.AFTER_SETUP.register((renderContext) ->
 		{
 			ClientApi.RENDER_STATE.mcProjectionMatrix = McObjectConverter.Convert(renderContext.projectionMatrix());

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

@@ -20,10 +20,8 @@
 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;
@@ -40,7 +38,7 @@ import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.MinecraftServer;
-import org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 import org.lwjgl.util.tinyfd.TinyFileDialogs;
 
 #if MC_VER >= MC_1_19_2
@@ -49,8 +47,6 @@ import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
 import net.fabricmc.fabric.api.command.v1.CommandRegistrationCallback;
 #endif
 
-import javax.swing.*;
-import java.awt.*;
 import java.util.function.Consumer;
 
 /**
@@ -66,16 +62,19 @@ public class FabricMain extends AbstractModInitializer implements ClientModIniti
 	private static final ResourceLocation INITIAL_PHASE = new ResourceLocation(ModInfo.RESOURCE_NAMESPACE, ModInfo.DEDICATED_SERVER_INITIAL_PATH);
 	#endif
 	
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	
 	
 	@Override
-	protected void createInitialBindings()
+	protected void createInitialSharedBindings()
 	{
 		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(); }
@@ -109,6 +108,7 @@ 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);
@@ -153,11 +153,6 @@ 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

@@ -30,7 +30,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 org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 
 #if MC_VER >= MC_1_20_6
 import com.seibel.distanthorizons.common.CommonPacketPayload;
@@ -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 Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	private final boolean isDedicatedServer;
 	
@@ -93,10 +93,6 @@ public class FabricServerProxy implements AbstractModInitializer.IEventProxy
 		
 		/* Register the mod needed event callbacks */
 		
-		// ServerTickEvent
-		ServerTickEvents.END_SERVER_TICK.register((server) -> SERVER_API.serverTickEvent());
-		
-		
 		// can be enabled to test overrides/events without having to build a separate API project 
 		if (false)
 		{

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

@@ -19,7 +19,7 @@
 
 package com.seibel.distanthorizons.fabric.mixins.client;
 
-#if MC_VER < MC_1_21_10
+#if MC_VER < MC_1_21_9
 import net.minecraft.world.entity.Entity;
 import org.spongepowered.asm.mixin.Mixin;
 

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

@@ -3,8 +3,10 @@ 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;
@@ -16,6 +18,8 @@ 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)
@@ -45,8 +49,24 @@ public class MixinClientPacketListener
 	@Inject(method = "enableChunkLight", at = @At("TAIL"))
 	void onEnableChunkLight(LevelChunk chunk, int x, int z, CallbackInfo ci)
 	{
-		IClientLevelWrapper clientLevel = ClientLevelWrapper.getWrapper((ClientLevel) chunk.getLevel());
-		SharedApi.INSTANCE.chunkLoadEvent(new ChunkWrapper(chunk, clientLevel), clientLevel);
+		if (chunk == null)
+		{
+			return;
+		}
+		
+		// executor to prevent locking up the render thread
+		AbstractExecutorService executor = ThreadPoolUtil.getFileHandlerExecutor();
+		if (executor == null)
+		{
+			return;
+		}
+		
+		
+		executor.execute(() ->
+		{
+			IClientLevelWrapper clientLevel = ClientLevelWrapper.getWrapper((ClientLevel) this.level);
+			SharedApi.INSTANCE.chunkLoadEvent(new ChunkWrapper(chunk, clientLevel), clientLevel);
+		});
 	}
 
 	#endif

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

@@ -12,7 +12,7 @@ import java.util.List;
 @Mixin(DebugScreenOverlay.class)
 public class MixinDebugScreenOverlay
 {
-	#if MC_VER < MC_1_21_10
+	#if MC_VER < MC_1_21_9
 	@Inject(method = "getSystemInformation", at = @At("RETURN"))
 	private void addCustomF3(CallbackInfoReturnable<List<String>> cir)
 	{

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

@@ -30,7 +30,7 @@ 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_10
+#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;
@@ -77,7 +77,7 @@ import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 
-import org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 
 
 
@@ -88,7 +88,7 @@ public class MixinLevelRenderer
     private ClientLevel level;
 	
 	@Unique
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	
 	#if MC_VER < MC_1_17_1
@@ -116,7 +116,7 @@ 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_10
+	#elif MC_VER < MC_1_21_9
 	@Inject(at = @At("HEAD"), method = "prepareChunkRenders", cancellable = true)
 	private void prepareChunkRenders(Matrix4fc projectionMatrix, double d, double e, double f, CallbackInfoReturnable<ChunkSectionsToRender> callback)
 	#else
@@ -141,7 +141,7 @@ 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_10
+		#elif MC_VER < MC_1_21_9
 		// MC combined the model view and projection matricies
 	    ClientApi.RENDER_STATE.mcModelViewMatrix = McObjectConverter.Convert(projectionMatrix);
 	    ClientApi.RENDER_STATE.mcProjectionMatrix = new Mat4f();
@@ -169,7 +169,7 @@ public class MixinLevelRenderer
 		{
 		    ClientApi.INSTANCE.renderDeferredLodsForShaders();
 	    }
-		#elif MC_VER < MC_1_21_10
+		#elif MC_VER < MC_1_21_9
 	    // rendering handled via Fabric Api render event
 		#else
 		// handled here and in MixinChunkSectionsToRender
@@ -178,7 +178,7 @@ public class MixinLevelRenderer
 	
 	
 	
-	#if MC_VER < MC_1_21_10
+	#if MC_VER < MC_1_21_9
 	// rendering handled via Fabric Api render event
 	#else
 	@Inject(at = @At("HEAD"), method = "prepareChunkRenders")

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

@@ -29,6 +29,7 @@ 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;
@@ -61,28 +62,40 @@ 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 || mc.getWrappedClientLevel() == null)
+		if (mc == null)
 		{
 			return;
 		}
 		
-		
 		IClientLevelWrapper clientLevel = mc.getWrappedClientLevel();
-		MinecraftRenderWrapper renderWrapper = (MinecraftRenderWrapper)SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
+		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
-		renderWrapper.updateLightmap(this.lightPixels, clientLevel);
+		this.renderWrapper.updateLightmap(this.lightPixels, clientLevel);
 		#elif MC_VER < MC_1_21_5
-		renderWrapper.setLightmapId(this.target.getColorTextureId(), clientLevel);
+		this.renderWrapper.setLightmapId(this.target.getColorTextureId(), clientLevel);
 		#else
 		GlTexture glTexture = (GlTexture) this.texture;
-		renderWrapper.setLightmapId(glTexture.glId(), clientLevel);
+		this.renderWrapper.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 org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 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 Logger LOGGER = DhLoggerBuilder.getLogger(MixinMinecraft.class.getSimpleName());
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	
 	@Shadow

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

@@ -13,8 +13,7 @@ public class MixinLevelTicks<T>
 
 #else
 
-import com.seibel.distanthorizons.common.wrappers.DependencySetupDoneCheck;
-
+import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
 import net.minecraft.world.ticks.LevelTicks;
 import net.minecraft.world.ticks.ScheduledTick;
 
@@ -26,18 +25,12 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 @Mixin(LevelTicks.class) // available in 1.18.2+, but only needed in 1.21.4+
 public class MixinLevelTicks<T>
 {
-	// TODO put in a common location
-	private static boolean isWorldGenThread()
-	{ return DependencySetupDoneCheck.isDone && DependencySetupDoneCheck.getIsCurrentThreadDistantGeneratorThread.get(); }
-	
-	
-	
 	@Inject(method = "schedule", at = @At(value = "HEAD"), cancellable = true)
 	private void onChunkSave(ScheduledTick<T> tick, CallbackInfo ci)
 	{
 		// In MC 1.21.4 an error check was added to log attempting to schedule ticks for unloaded chunks
 		// this caused a lot of unnecessary errors when generating sand (FallingBlock.class).
-		if (isWorldGenThread())
+		if (BatchGenerationEnvironment.isThisDhWorldGenThread())
 		{
 			ci.cancel();
 		}

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

@@ -19,6 +19,7 @@
 
 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
@@ -35,10 +36,8 @@ 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;
@@ -55,16 +54,11 @@ 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 (isWorldGenThread())
+		if (BatchGenerationEnvironment.isThisDhWorldGenThread())
 		{
 			// 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,19 +19,19 @@
 
 package com.seibel.distanthorizons.fabric.mixins.server;
 
-import com.seibel.distanthorizons.common.wrappers.DependencySetupDoneCheck;
+import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
 import com.seibel.distanthorizons.core.util.objects.RunOnThisThreadExecutorService;
 import org.spongepowered.asm.mixin.Mixin;
+
+import net.minecraft.Util;
+
 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
@@ -46,15 +46,11 @@ 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 (isWorldGenThread())
+		if (BatchGenerationEnvironment.isThisDhWorldGenThread())
 		{
 			// run this task on the current DH thread instead of a new MC thread
 			ci.setReturnValue(new RunOnThisThreadExecutorService());
@@ -70,7 +66,7 @@ public class MixinUtilBackgroundThread
 			at = @At("HEAD"), cancellable = true)
 	private static void overrideUtil$wrapThreadWithTaskName(String string, Runnable r, CallbackInfoReturnable<Runnable> ci)
 	{
-		if (isWorldGenThread())
+		if (BatchGenerationEnvironment.isThisDhWorldGenThread())
 		{
 			//ApiShared.LOGGER.info("util wrapThreadWithTaskName(Runnable) triggered");
 			ci.setReturnValue(r);
@@ -86,7 +82,7 @@ public class MixinUtilBackgroundThread
 			at = @At("HEAD"), cancellable = true)
 	private static void overrideUtil$wrapThreadWithTaskNameForSupplier(String string, Supplier<?> r, CallbackInfoReturnable<Supplier<?>> ci)
 	{
-		if (isWorldGenThread())
+		if (BatchGenerationEnvironment.isThisDhWorldGenThread())
 		{
 			//ApiShared.LOGGER.info("util wrapThreadWithTaskName(Supplier) triggered");
 			ci.setReturnValue(r);

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

@@ -5,13 +5,13 @@ 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 org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 
 import java.io.IOException;
 
 public class TestChunkInputReplacerEvent extends DhApiChunkProcessingEvent
 {
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	private static final String REPLACEMENT_BLOCK_STATE_NAMESPACE = "minecraft:stone";
 	

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 org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 
 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 Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	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 org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 
 // TODO add to API example once Builderb0y has given the all-clear
 public class TestWorldGenBindingEvent extends DhApiLevelLoadEvent
 {
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	@Override
 	public void onLevelLoad(DhApiEventParam<DhApiLevelLoadEvent.EventParam> event)

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

@@ -17,20 +17,16 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.distanthorizons.common.wrappers;
+package com.seibel.distanthorizons.fabric.wrappers.modAccessor;
 
-import java.util.function.Supplier;
+import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IC2meAccessor;
 
-public class DependencySetupDoneCheck
+public class C2meAccessor implements IC2meAccessor
 {
-	// TODO move to DependencySetup
-	public static boolean isDone = false;
-	/** 
-	 * 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; });
+	@Override
+	public String getModName()
+	{
+		return "c2me";
+	}
 	
 }

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

@@ -34,22 +34,14 @@ 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

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 org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 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 Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	
 	#if MC_VER < MC_1_19_2

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

@@ -86,11 +86,13 @@ public class ForgeMain extends AbstractModInitializer
 	}
 	
 	@Override
-	protected void createInitialBindings()
+	protected void createInitialSharedBindings()
 	{
 		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(); }

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

@@ -47,7 +47,7 @@ import net.minecraftforge.event.server.ServerStoppingEvent;
 #endif
 
 
-import org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 
 import java.util.function.Supplier;
 
@@ -90,16 +90,6 @@ 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)

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

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

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

@@ -22,12 +22,15 @@ package com.seibel.distanthorizons.forge.mixins.server;
 import java.util.concurrent.ExecutorService;
 import java.util.function.Supplier;
 
+import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
+import com.seibel.distanthorizons.core.logging.DhLogger;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import com.seibel.distanthorizons.common.wrappers.DependencySetupDoneCheck;
 import com.seibel.distanthorizons.core.util.objects.RunOnThisThreadExecutorService;
 
 import net.minecraft.Util;
@@ -35,17 +38,17 @@ import net.minecraft.Util;
 @Mixin(Util.class)
 public class MixinUtilBackgroundThread
 {
-	private static boolean shouldApplyOverride()
-	{
-		return DependencySetupDoneCheck.isDone && DependencySetupDoneCheck.getIsCurrentThreadDistantGeneratorThread.get();
-	}
+	@Unique
+	private static final DhLogger LOGGER = new DhLoggerBuilder().name("MixinUtilBackgroundThread").build();
+	
+	
 	
 	@Inject(method = "backgroundExecutor", at = @At("HEAD"), cancellable = true)
 	private static void overrideUtil$backgroundExecutor(CallbackInfoReturnable<ExecutorService> ci)
 	{
-		if (shouldApplyOverride())
+		if (BatchGenerationEnvironment.isThisDhWorldGenThread())
 		{
-			//ApiShared.LOGGER.info("util backgroundExecutor triggered");
+			//LOGGER.info("util backgroundExecutor triggered");
 			ci.setReturnValue(new RunOnThisThreadExecutorService());
 		}
 	}
@@ -55,21 +58,22 @@ public class MixinUtilBackgroundThread
 			at = @At("HEAD"), cancellable = true)
 	private static void overrideUtil$wrapThreadWithTaskName(String string, Runnable r, CallbackInfoReturnable<Runnable> ci)
 	{
-		if (shouldApplyOverride())
+		if (BatchGenerationEnvironment.isThisDhWorldGenThread())
 		{
-			//ApiShared.LOGGER.info("util wrapThreadWithTaskName(Runnable) triggered");
+			//LOGGER.info("util wrapThreadWithTaskName(Runnable) triggered");
 			ci.setReturnValue(r);
 		}
 	}
 	#endif
+	
 	#if MC_VER >= MC_1_18_2
 	@Inject(method = "wrapThreadWithTaskName(Ljava/lang/String;Ljava/util/function/Supplier;)Ljava/util/function/Supplier;",
 			at = @At("HEAD"), cancellable = true)
 	private static void overrideUtil$wrapThreadWithTaskNameForSupplier(String string, Supplier<?> r, CallbackInfoReturnable<Supplier<?>> ci)
 	{
-		if (shouldApplyOverride())
+		if (BatchGenerationEnvironment.isThisDhWorldGenThread())
 		{
-			//ApiShared.LOGGER.info("util wrapThreadWithTaskName(Supplier) triggered");
+			//LOGGER.info("util wrapThreadWithTaskName(Supplier) triggered");
 			ci.setReturnValue(r);
 		}
 	}

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

@@ -6,7 +6,7 @@
         "server.MixinUtilBackgroundThread",
         "server.MixinChunkGenerator",
         "server.MixinTFChunkGenerator",
-      "server.MixinChunkMap",
+        "server.MixinChunkMap",
         "server.MixinServerPlayer",
         "server.MixinEntity"
     ],

gradle.properties

@@ -5,8 +5,8 @@ org.gradle.caching=true
 
 # Mod Info
 mod_name=DistantHorizons
-mod_version=2.3.5-b
-api_version=4.1.0
+mod_version=2.3.7-b-dev
+api_version=5.0.0
 maven_group=com.seibel.distanthorizons
 mod_readable_name=Distant Horizons
 mod_description=This mod generates and renders simplified terrain beyond the normal view distance at a low performance cost. Allowing you to see much farther without turning your game into a slideshow.
@@ -23,6 +23,7 @@ manifold_version=2025.1.27
 nightconfig_version=3.6.6
 lz4_version=1.8.0
 xz_version=1.9
+zstd_version=1.5.7-6
 # Before updating, read relocate_natives/README.md
 sqlite_jdbc_version=3.47.2.0
 # 8.2.1 is the newest version we can use since that's the version MC 1.16.5 uses 

neoforge/build.gradle

@@ -65,7 +65,10 @@ dependencies {
     
     // Neoforge
     neoForge "net.neoforged:neoforge:${rootProject.neoforge_version}"
-    addMod("curse.maven:TerraFirmaCraft-302973:4616004", rootProject.enable_terrafirmacraft)
+
+    // Iris
+    addMod("maven.modrinth:iris:${rootProject.neo_iris_version}", rootProject.neo_enable_iris)
+
 }
 
 

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

@@ -42,7 +42,7 @@ import net.neoforged.neoforge.event.level.LevelEvent;
 import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent;
 import net.minecraft.world.level.chunk.ChunkAccess;
 
-import org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 import org.lwjgl.glfw.GLFW;
 
 import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
@@ -64,7 +64,7 @@ import java.util.concurrent.AbstractExecutorService;
 public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
 {
 	private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 
 	
 	
@@ -149,8 +149,6 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
 			}
 			
 			// executor to prevent locking up the render/event thread
-			// if the getChunk() takes longer than expected 
-			// (which can be caused by certain mods) 
 			AbstractExecutorService executor = ThreadPoolUtil.getFileHandlerExecutor();
 			if (executor != null)
 			{
@@ -176,8 +174,6 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
 			}
 			
 			// executor to prevent locking up the render/event thread
-			// if the getChunk() takes longer than expected 
-			// (which can be caused by certain mods) 
 			AbstractExecutorService executor = ThreadPoolUtil.getFileHandlerExecutor();
 			if (executor != null)
 			{
@@ -250,7 +246,7 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
 	@SubscribeEvent
 	public void afterLevelEntityRenderEvent(RenderLevelStageEvent.AfterEntities event)
 	{
-		#if MC_VER < MC_1_21_10
+		#if MC_VER < MC_1_21_9
 		ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, (ClientLevel)event.getLevel());
 		#else
 		ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, event.getLevelRenderer().level);
@@ -263,7 +259,7 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
 	@SubscribeEvent
 	public void afterLevelTranslucentRenderEvent(RenderLevelStageEvent.AfterTranslucentBlocks event)
 	{
-		#if MC_VER < MC_1_21_10
+		#if MC_VER < MC_1_21_9
 		ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, (ClientLevel)event.getLevel());
 		#else
 		ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, event.getLevelRenderer().level);
@@ -275,7 +271,7 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
 	@SubscribeEvent
 	public void afterLevelRenderEvent(RenderLevelStageEvent.AfterLevel event)
 	{
-		#if MC_VER < MC_1_21_10
+		#if MC_VER < MC_1_21_9
 		ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, (ClientLevel)event.getLevel());
 		#else
 		ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, event.getLevelRenderer().level);

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

@@ -30,9 +30,13 @@ import com.seibel.distanthorizons.core.network.messages.AbstractNetworkMessage;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IPluginPacketSender;
 import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IServerPlayerWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IC2meAccessor;
+import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IIrisAccessor;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IModChecker;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IOptifineAccessor;
 import com.seibel.distanthorizons.coreapi.ModInfo;
+import com.seibel.distanthorizons.neoforge.wrappers.modAccessor.C2meAccessor;
+import com.seibel.distanthorizons.neoforge.wrappers.modAccessor.IrisAccessor;
 import com.seibel.distanthorizons.neoforge.wrappers.NeoforgeMinecraftRenderWrapper;
 import com.seibel.distanthorizons.neoforge.wrappers.modAccessor.ModChecker;
 import com.seibel.distanthorizons.neoforge.wrappers.modAccessor.OptifineAccessor;
@@ -124,11 +128,14 @@ public class NeoforgeMain extends AbstractModInitializer
 	protected IEventProxy createServerProxy(boolean isDedicated) { return new NeoforgeServerProxy(isDedicated); }
 	
 	@Override
-	protected void createInitialBindings()
+	protected void createInitialSharedBindings()
 	{
 		SingletonInjector.INSTANCE.bind(IModChecker.class, ModChecker.INSTANCE);
 		SingletonInjector.INSTANCE.bind(IPluginPacketSender.class, new NeoforgePluginPacketSender());
-		
+	}
+	@Override
+	protected void createInitialClientBindings()
+	{
 		// replace MC RenderWrapper with more specific neoforge version
 		SingletonInjector.INSTANCE.unbind(IMinecraftRenderWrapper.class, MinecraftRenderWrapper.INSTANCE); // TODO replace with a replaceOrBind for simplicity
 		SingletonInjector.INSTANCE.bind(IMinecraftRenderWrapper.class, NeoforgeMinecraftRenderWrapper.INSTANCE);
@@ -141,6 +148,12 @@ public class NeoforgeMain extends AbstractModInitializer
 	protected void initializeModCompat()
 	{
 		this.tryCreateModCompatAccessor("optifine", IOptifineAccessor.class, OptifineAccessor::new);
+		this.tryCreateModCompatAccessor("c2me", IC2meAccessor.class, C2meAccessor::new);
+		
+		#if MC_VER >= MC_1_20_6
+		// 1.20.6 is the lowest version Iris supports Neoforge
+		this.tryCreateModCompatAccessor("iris", IIrisAccessor.class, IrisAccessor::new);
+		#endif
 		
 		#if MC_VER < MC_1_20_6
 		ModLoadingContext.get().registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class,

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

@@ -24,14 +24,13 @@ import net.neoforged.bus.api.SubscribeEvent;
 import net.neoforged.neoforge.event.server.ServerAboutToStartEvent;
 import net.neoforged.neoforge.event.server.ServerStoppingEvent;
 
-import org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 
 import java.util.function.Supplier;
 
 #if MC_VER < MC_1_20_6
 import net.neoforged.neoforge.event.TickEvent;
 #else 
-import net.neoforged.neoforge.event.tick.ServerTickEvent;
 #endif
 
 
@@ -40,7 +39,7 @@ public class NeoforgeServerProxy implements AbstractModInitializer.IEventProxy
 	private static LevelAccessor GetEventLevel(LevelEvent e) { return e.getLevel(); }
 	
 	private final ServerApi serverApi = ServerApi.INSTANCE;
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	private final boolean isDedicated;
 	public static Supplier<Boolean> isGenerationThreadChecker = null;
 	
@@ -52,7 +51,7 @@ public class NeoforgeServerProxy implements AbstractModInitializer.IEventProxy
 	public NeoforgeServerProxy(boolean isDedicated)
 	{
 		this.isDedicated = isDedicated;
-		isGenerationThreadChecker = BatchGenerationEnvironment::isCurrentThreadDistantGeneratorThread;
+		isGenerationThreadChecker = BatchGenerationEnvironment::isThisDhWorldGenThread;
 	}
 	
 	@Override
@@ -68,23 +67,6 @@ public class NeoforgeServerProxy implements AbstractModInitializer.IEventProxy
 	// events //
 	//========//
 	
-	#if MC_VER < MC_1_20_6
-	@SubscribeEvent
-	public void serverTickEvent(TickEvent.ServerTickEvent event)
-	{
-		if (event.phase == TickEvent.Phase.END)
-		{
-			this.serverApi.serverTickEvent();
-		}
-	}
-	#else
-	@SubscribeEvent
-	public void serverTickEvent(ServerTickEvent.Post event)
-	{
-		this.serverApi.serverTickEvent();
-	}
-	#endif
-	
 	// ServerWorldLoadEvent
 	@SubscribeEvent
 	public void dedicatedWorldLoadEvent(ServerAboutToStartEvent event)
@@ -152,7 +134,7 @@ public class NeoforgeServerProxy implements AbstractModInitializer.IEventProxy
 	private static ServerLevelWrapper getServerLevelWrapper(ServerLevel level) { return ServerLevelWrapper.getWrapper(level); }
 	private static ServerLevelWrapper getServerLevelWrapper(ResourceKey<Level> resourceKey, PlayerEvent event)
 	{
-		#if MC_VER < MC_1_21_10
+		#if MC_VER < MC_1_21_9
 		//noinspection DataFlowIssue (possible NPE after getServer())
 		return getServerLevelWrapper(event.getEntity().getServer().getLevel(resourceKey));
 		#else

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

@@ -1,6 +1,6 @@
 package com.seibel.distanthorizons.neoforge.mixins.client;
 
-#if MC_VER < MC_1_21_10
+#if MC_VER < MC_1_21_9
 import com.seibel.distanthorizons.core.logging.f3.F3Screen;
 import net.minecraft.client.gui.components.DebugScreenOverlay;
 import org.spongepowered.asm.mixin.Mixin;
@@ -18,7 +18,7 @@ import net.minecraft.client.gui.components.DebugScreenOverlay;
 public class MixinDebugScreenOverlay
 {
 	
-	#if MC_VER < MC_1_21_10
+	#if MC_VER < MC_1_21_9
 	@Inject(method = "getSystemInformation", at = @At("RETURN"))
 	private void addCustomF3(CallbackInfoReturnable<List<String>> cir)
 	{

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

@@ -48,7 +48,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 
 
-import org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 
 import com.seibel.distanthorizons.neoforge.NeoforgeClientProxy;
 import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
@@ -76,14 +76,14 @@ public class MixinLevelRenderer
 	private ClientLevel level;
 	
 	@Unique
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	
 	
 	#if MC_VER < MC_1_21_6
 	@Inject(at = @At("HEAD"), method = "renderSectionLayer")
 	private void renderChunkLayer(RenderType renderType, double x, double y, double z, Matrix4f modelViewMatrix, Matrix4f projectionMatrix, CallbackInfo callback)
-	#elif MC_VER < MC_1_21_10
+	#elif MC_VER < MC_1_21_9
 	@Inject(at = @At("HEAD"), method = "renderLevel")
 	private void onRenderLevel(
 			GraphicsResourceAllocator resourceAllocator, DeltaTracker deltaTracker, 

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

@@ -38,7 +38,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import com.mojang.blaze3d.platform.NativeImage;
 #elif MC_VER < MC_1_21_5
 import com.mojang.blaze3d.pipeline.TextureTarget;
-#elif MC_VER < MC_1_21_10
+#elif MC_VER < MC_1_21_9
 import com.mojang.blaze3d.opengl.GlTexture;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.textures.GpuTexture;
@@ -82,7 +82,7 @@ public class MixinLightTexture
 		renderWrapper.updateLightmap(this.lightPixels, clientLevel);
 		#elif MC_VER < MC_1_21_5
 		renderWrapper.setLightmapId(this.target.getColorTextureId(), clientLevel);
-		#elif MC_VER < MC_1_21_10
+		#elif MC_VER < MC_1_21_9
 		GlTexture glTexture = (GlTexture) this.texture;
 		renderWrapper.setLightmapId(glTexture.glId(), clientLevel);
 		#else

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

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

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

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

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

@@ -35,7 +35,7 @@ public class MixinTracingExecutor
 }
 #else
 
-import com.seibel.distanthorizons.common.wrappers.DependencySetupDoneCheck;
+import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
 import com.seibel.distanthorizons.core.util.objects.RunOnThisThreadExecutorService;
 import net.minecraft.TracingExecutor;
 import org.spongepowered.asm.mixin.Mixin;
@@ -55,11 +55,6 @@ 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(); }
-	
-	
 	// Util.backgroundExecutor().forName("init_biomes")
 	// needed for world gen
 	
@@ -67,7 +62,7 @@ public class MixinTracingExecutor
 	@Inject(method = "forName(Ljava/lang/String;)Ljava/util/concurrent/Executor;", at = @At("HEAD"), cancellable = true)
 	private void forName(String executorName, CallbackInfoReturnable<Executor> ci)
 	{
-		if (isWorldGenThread())
+		if (BatchGenerationEnvironment.isThisDhWorldGenThread())
 		{
 			// run this task on the current DH thread instead of a new MC thread
 			ci.setReturnValue(new RunOnThisThreadExecutorService());

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

@@ -19,18 +19,20 @@
 
 package com.seibel.distanthorizons.neoforge.mixins.server;
 
-import java.util.concurrent.ExecutorService;
-import java.util.function.Supplier;
-
+import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
 import com.seibel.distanthorizons.core.util.objects.RunOnThisThreadExecutorService;
 import org.spongepowered.asm.mixin.Mixin;
+
+import net.minecraft.Util;
+
+#if MC_VER < MC_1_21_3
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import com.seibel.distanthorizons.common.wrappers.DependencySetupDoneCheck;
-
-import net.minecraft.Util;
+import java.util.concurrent.ExecutorService;
+import java.util.function.Supplier;
+#endif
 
 /**
  * This is needed for DH's world gen so we can run
@@ -42,16 +44,13 @@ import net.minecraft.Util;
 @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 (isWorldGenThread())
+		if (BatchGenerationEnvironment.isThisDhWorldGenThread())
 		{
 			// run this task on the current DH thread instead of a new MC thread
 			ci.setReturnValue(new RunOnThisThreadExecutorService());
@@ -67,7 +66,7 @@ public class MixinUtilBackgroundThread
 			at = @At("HEAD"), cancellable = true)
 	private static void overrideUtil$wrapThreadWithTaskName(String string, Runnable r, CallbackInfoReturnable<Runnable> ci)
 	{
-		if (isWorldGenThread())
+		if (BatchGenerationEnvironment.isThisDhWorldGenThread())
 		{
 			//ApiShared.LOGGER.info("util wrapThreadWithTaskName(Runnable) triggered");
 			ci.setReturnValue(r);
@@ -83,7 +82,7 @@ public class MixinUtilBackgroundThread
 			at = @At("HEAD"), cancellable = true)
 	private static void overrideUtil$wrapThreadWithTaskNameForSupplier(String string, Supplier<?> r, CallbackInfoReturnable<Supplier<?>> ci)
 	{
-		if (isWorldGenThread())
+		if (BatchGenerationEnvironment.isThisDhWorldGenThread())
 		{
 			//ApiShared.LOGGER.info("util wrapThreadWithTaskName(Supplier) triggered");
 			ci.setReturnValue(r);

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

@@ -3,9 +3,9 @@ package com.seibel.distanthorizons.neoforge.wrappers;
 import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftRenderWrapper;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import net.minecraft.client.Minecraft;
-import org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 
-#if MC_VER < MC_1_21_10
+#if MC_VER < MC_1_21_9
 #else
 import com.mojang.blaze3d.opengl.GlTexture;
 import com.mojang.blaze3d.textures.GpuTexture;
@@ -18,7 +18,7 @@ public class NeoforgeMinecraftRenderWrapper extends MinecraftRenderWrapper
 {
 	public static final NeoforgeMinecraftRenderWrapper INSTANCE = new NeoforgeMinecraftRenderWrapper();
 	
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger(MethodHandles.lookup().lookupClass().getSimpleName());
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	private static final Minecraft MC = Minecraft.getInstance();
 	
 	
@@ -26,7 +26,7 @@ public class NeoforgeMinecraftRenderWrapper extends MinecraftRenderWrapper
 	@Override
 	public int getDepthTextureId()
 	{
-		#if MC_VER < MC_1_21_10
+		#if MC_VER < MC_1_21_9
 		// no special handling required,
 		// both neo/fabric uses the same back end objects
 		return super.getDepthTextureId();
@@ -53,7 +53,7 @@ public class NeoforgeMinecraftRenderWrapper extends MinecraftRenderWrapper
 	@Override
 	public int getColorTextureId()
 	{
-		#if MC_VER < MC_1_21_10
+		#if MC_VER < MC_1_21_9
 		// no special handling required,
 		// both neo/fabric uses the same back end objects
 		return super.getColorTextureId();

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

@@ -1,6 +1,6 @@
 package com.seibel.distanthorizons.neoforge.wrappers;
 
-#if MC_VER < MC_1_21_10
+#if MC_VER < MC_1_21_9
 public class NeoforgeTextureUnwrapper
 { /* not needed for older MC versions */ }
 #else

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/wrappers/modAccessor/C2meAccessor.java

@@ -17,40 +17,16 @@
  *    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.worldGeneration;
+import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IC2meAccessor;
 
-//FIXME: Move this outside the WorldGenerationStep thingy
-public class Rolling
+public class C2meAccessor implements IC2meAccessor
 {
-	
-	private final int size;
-	private double total = 0d;
-	private int index = 0;
-	private final double[] samples;
-	
-	public Rolling(int size)
+	@Override
+	public String getModName()
 	{
-		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;
+		return "c2me";
 	}
 	
 }

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

@@ -0,0 +1,67 @@
+/*
+ *    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.neoforge.wrappers.modAccessor;
+
+// 1.20.6 is the lowest version Iris supports Neoforge
+#if MC_VER >= MC_1_20_6
+
+import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IIrisAccessor;
+
+#if MC_VER != MC_1_21_9
+import net.irisshaders.iris.Iris;
+import net.irisshaders.iris.api.v0.IrisApi;
+#endif
+
+public class IrisAccessor implements IIrisAccessor
+{
+	@Override
+	public String getModName() 
+	{
+		#if MC_VER == MC_1_21_9
+		return "iris"; // Iris doesn't support this MC version
+		#else
+		return Iris.MODID;
+		#endif
+	}
+	
+	@Override
+	public boolean isShaderPackInUse() 
+	{
+		#if MC_VER == MC_1_21_9
+		return true; // Iris doesn't support this MC version
+		#else
+		return IrisApi.getInstance().isShaderPackInUse();
+		#endif
+	}
+	
+	@Override
+	public boolean isRenderingShadowPass() 
+	{
+		#if MC_VER == MC_1_21_9
+		return false; // Iris doesn't support this MC version
+		#else
+		return IrisApi.getInstance().isRenderingShadowPass();
+		#endif
+	}
+	
+}
+
+#endif
+

versionProperties/1.16.5.properties

@@ -48,7 +48,6 @@ forge_version=36.2.39
 	neoforge_version_range=[*,)
 	
     # Forge mod versions
-    starlight_version_forge=
     terraforged_version=4044290
 
     # Forge mod run

versionProperties/1.17.1.properties

@@ -47,7 +47,6 @@ forge_version=37.1.1
 	neoforge_version_range=[*,)
 	
     # Forge mod versions
-    starlight_version_forge=3457784
     terraforged_version=
 
     # Forge mod run

versionProperties/1.18.2.properties

@@ -56,7 +56,6 @@ forge_version=40.2.10
 	neoforge_version_range=[*,)
 	
     # Forge mod versions
-    starlight_version_forge=
     terraforged_version=
 
     # Forge mod run

versionProperties/1.19.2.properties

@@ -47,7 +47,6 @@ forge_version=43.3.2
 	neoforge_version_range=[*,)
 	
     # Forge mod versions
-    starlight_version_forge=
     terraforged_version=
 
     # Forge mod run

versionProperties/1.19.4.properties

@@ -46,7 +46,6 @@ forge_version=45.2.4
 	neoforge_version_range=[*,)
 	
     # Forge mod versions
-    starlight_version_forge=
     terraforged_version=
 
     # Forge mod run