remove dev from version number

Make some GLProxy methods static to prevent setup order issues

.editorconfig

@@ -10,7 +10,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

api/src/main/java/com/seibel/distanthorizons/api/enums/EDhApiDetailLevel.java

@@ -39,10 +39,6 @@ package com.seibel.distanthorizons.api.enums;
  */
 public enum EDhApiDetailLevel
 {
-	// Reminder:
-	// when adding items up the API minor version
-	// when removing items up the API major version
-	
 	/**
 	 * detail level: 0 <Br>
 	 * width in Blocks: 1

api/src/main/java/com/seibel/distanthorizons/api/enums/config/EDhApiBlocksToAvoid.java

@@ -28,10 +28,6 @@ package com.seibel.distanthorizons.api.enums.config;
  */
 public enum EDhApiBlocksToAvoid
 {
-	// Reminder:
-	// when adding items up the API minor version
-	// when removing items up the API major version
-	
 	NONE(false),
 	NON_COLLIDING(true);
 	

api/src/main/java/com/seibel/distanthorizons/api/enums/config/EDhApiDataCompressionMode.java

@@ -23,6 +23,7 @@ package com.seibel.distanthorizons.api.enums.config;
  * UNCOMPRESSED <br>
  * LZ4 <br>
  * Z_STD <br>
+ * Z_STD_STREAM <br>
  * LZMA2 <br><br>
  * 
  * Note: speed and compression ratios are examples
@@ -33,10 +34,6 @@ package com.seibel.distanthorizons.api.enums.config;
  */
 public enum EDhApiDataCompressionMode
 {
-	// Reminder:
-	// when adding items up the API minor version
-	// when removing items up the API major version
-	
 	/** 
 	 * Should only be used internally and for unit testing. <br><br> 
 	 * 
@@ -57,18 +54,32 @@ public enum EDhApiDataCompressionMode
 	LZ4(1),
 	
 	/**
-	 * Decent speed and good compression. <br><br> 
+	 * Great speed and good compression. <br><br> 
 	 *
+	 * Read Speed: 2.1 MS / DTO <br>
+	 * Write Speed: 4.9 MS / DTO <br>
+	 * Compression ratio: 0.2606 <br>
+	 */
+	Z_STD_BLOCK(4),
+	
+	/**
+	 * Similar to {@link EDhApiDataCompressionMode#Z_STD_BLOCK}
+	 * except slower. <br><br>
+	 * 
+	 * This option is only provided for legacy support when processing old databases. <br><br>
+	 * 
 	 * Read Speed: 9.31 MS / DTO <br>
 	 * Write Speed: 15.13 MS / DTO <br>
 	 * Compression ratio: 0.2606 <br>
 	 */
-	Z_STD(2),
-	
+	@Deprecated
+	@DisallowSelectingViaConfigGui
+	Z_STD_STREAM(2),
 	
 	/** 
-	 * Extremely slow, but very good compression. <br><br> 
-	 *
+	 * Extremely slow, but very good compression. <br>
+	 * Often causes whole computer stuttering due to memory bandwidth saturation. <br><br>
+	 * 
 	 * Read Speed: 13.29 MS / DTO <br>
 	 * Write Speed: 70.95 MS / DTO <br>
 	 * Compression ratio: 0.2068 <br>

api/src/main/java/com/seibel/distanthorizons/api/enums/config/EDhApiGpuUploadMethod.java

@@ -44,9 +44,9 @@ public enum EDhApiGpuUploadMethod
 	/** Fast rendering but may stutter when uploading. */
 	SUB_DATA(false, false),
 	
-	/** Don't upload, only should be used for debugging */
-	@Deprecated // TODO remove before release
-	NONE(false, false),
+	///** Don't upload, only should be used for debugging */
+	//@Deprecated
+	//NONE(false, false),
 	
 	/**
 	 * May end up storing buffers in System memory. <br>

api/src/main/java/com/seibel/distanthorizons/api/enums/config/EDhApiGrassSideRendering.java

@@ -29,10 +29,6 @@ package com.seibel.distanthorizons.api.enums.config;
  */
 public enum EDhApiGrassSideRendering
 {
-	// Reminder:
-	// when adding items up the API minor version
-	// when removing items up the API major version
-	
 	AS_GRASS,
 	FADE_TO_DIRT,
 	AS_DIRT;

api/src/main/java/com/seibel/distanthorizons/api/enums/config/EDhApiHorizontalQuality.java

@@ -31,11 +31,6 @@ package com.seibel.distanthorizons.api.enums.config;
  */
 public enum EDhApiHorizontalQuality
 {
-	// Reminder:
-	// when adding items up the API minor version
-	// when removing items up the API major version
-	
-	
 	// Note: any quadraticBase less than 2.0f has issues with DetailDistanceUtil, and will always return the lowest detail level.
 	//  So for now we are limiting the lowest value to 2.0
 	//  LOWEST was originally 1.0f and LOW was 1.5f

api/src/main/java/com/seibel/distanthorizons/api/enums/config/EDhApiLodShading.java

@@ -29,10 +29,6 @@ package com.seibel.distanthorizons.api.enums.config;
  */
 public enum EDhApiLodShading
 {
-	// Reminder:
-	// when adding items up the API minor version
-	// when removing items up the API major version
-	
 	/** 
 	 * Uses Minecraft's shading for LODs. <Br>
 	 * This means if Minecraft's shading is disabled DH's shading will be as well.

api/src/main/java/com/seibel/distanthorizons/api/enums/config/EDhApiMcRenderingFadeMode.java

@@ -33,10 +33,6 @@ package com.seibel.distanthorizons.api.enums.config;
  */
 public enum EDhApiMcRenderingFadeMode
 {
-	// Reminder:
-	// when adding items up the API minor version
-	// when removing items up the API major version
-	
 	/**
 	 * No fading is done, there will be a pronounced border between
 	 * Minecraft and Distant Horizons. <br>

api/src/main/java/com/seibel/distanthorizons/api/enums/config/EDhApiServerFolderNameMode.java

@@ -35,11 +35,6 @@ package com.seibel.distanthorizons.api.enums.config;
  */
 public enum EDhApiServerFolderNameMode
 {
-	// Reminder:
-	// when adding items up the API minor version
-	// when removing items up the API major version
-	
-	
 	/** Only use the server name */
 	NAME_ONLY,
 	

api/src/main/java/com/seibel/distanthorizons/api/enums/config/EDhApiVanillaOverdraw.java

@@ -34,11 +34,6 @@ package com.seibel.distanthorizons.api.enums.config;
 @Deprecated // not currently in use, if the config this enum represents is re-implemented, the deprecated flag can be removed
 public enum EDhApiVanillaOverdraw
 {
-	// Reminder:
-	// when adding items up the API minor version
-	// when removing items up the API major version
-	
-	
 	/**
 	 * Don't draw LODs where a minecraft chunk could be.
 	 * Use Overdraw Offset to tweak the border thickness.

api/src/main/java/com/seibel/distanthorizons/api/enums/config/EDhApiWorldCompressionMode.java

@@ -28,10 +28,6 @@ package com.seibel.distanthorizons.api.enums.config;
  */
 public enum EDhApiWorldCompressionMode
 {
-	// Reminder:
-	// when adding items up the API minor version
-	// when removing items up the API major version
-	
 	/** 
 	 * Every block/biome change is recorded in the database. <br>
 	 * This is what DH 2.0 and 2.0.1 all used by default and will store a lot of data. 

api/src/main/java/com/seibel/distanthorizons/api/enums/config/quickOptions/EDhApiQualityPreset.java

@@ -35,10 +35,6 @@ import com.seibel.distanthorizons.api.enums.config.DisallowSelectingViaConfigGui
  */
 public enum EDhApiQualityPreset
 {
-	// Reminder:
-	// when adding items up the API minor version
-	// when removing items up the API major version
-	
 	@DisallowSelectingViaConfigGui
 	CUSTOM,
 	

api/src/main/java/com/seibel/distanthorizons/api/enums/config/quickOptions/EDhApiThreadPreset.java

@@ -34,10 +34,6 @@ import com.seibel.distanthorizons.api.enums.config.DisallowSelectingViaConfigGui
  */
 public enum EDhApiThreadPreset
 {
-	// Reminder:
-	// when adding items up the API minor version
-	// when removing items up the API major version
-	
 	@DisallowSelectingViaConfigGui
 	CUSTOM,
 	

api/src/main/java/com/seibel/distanthorizons/api/enums/rendering/EDhApiDebugRendering.java

@@ -33,11 +33,6 @@ package com.seibel.distanthorizons.api.enums.rendering;
  */
 public enum EDhApiDebugRendering
 {
-	// Reminder:
-	// when adding items up the API minor version
-	// when removing items up the API major version
-	
-	
 	/** LODs are rendered normally */
 	OFF,
 	

api/src/main/java/com/seibel/distanthorizons/api/enums/rendering/EDhApiFogDrawMode.java

@@ -33,10 +33,6 @@ package com.seibel.distanthorizons.api.enums.rendering;
 @Deprecated
 public enum EDhApiFogDrawMode
 {
-	// Reminder:
-	// when adding items up the API minor version
-	// when removing items up the API major version
-	
 	/**
 	 * Use whatever Fog setting Optifine is using.
 	 * If Optifine isn't installed this defaults to {@link EDhApiFogDrawMode#FOG_ENABLED}.

api/src/main/java/com/seibel/distanthorizons/api/enums/rendering/EDhApiFogFalloff.java

@@ -30,11 +30,6 @@ package com.seibel.distanthorizons.api.enums.rendering;
  */
 public enum EDhApiFogFalloff
 {
-	// Reminder:
-	// when adding items up the API minor version
-	// when removing items up the API major version
-	
-	
 	LINEAR(0),
 	EXPONENTIAL(1),
 	EXPONENTIAL_SQUARED(2);

api/src/main/java/com/seibel/distanthorizons/api/enums/rendering/EDhApiHeightFogDirection.java

@@ -33,11 +33,6 @@ package com.seibel.distanthorizons.api.enums.rendering;
  */
 public enum EDhApiHeightFogDirection
 {
-	// Reminder:
-	// when adding items up the API minor version
-	// when removing items up the API major version
-	
-	
 	ABOVE_CAMERA                (true,  true,  false),
 	BELOW_CAMERA                (true,  false, true),
 	ABOVE_AND_BELOW_CAMERA      (true,  true,  true),

api/src/main/java/com/seibel/distanthorizons/api/enums/rendering/EDhApiRendererMode.java

@@ -29,11 +29,6 @@ package com.seibel.distanthorizons.api.enums.rendering;
  */
 public enum EDhApiRendererMode
 {
-	// Reminder:
-	// when adding items up the API minor version
-	// when removing items up the API major version
-	
-	
 	DEFAULT,
 	DEBUG,
 	DISABLED;

api/src/main/java/com/seibel/distanthorizons/api/enums/rendering/EDhApiTransparency.java

@@ -29,11 +29,6 @@ package com.seibel.distanthorizons.api.enums.rendering;
  */
 public enum EDhApiTransparency
 {
-	// Reminder:
-	// when adding items up the API minor version
-	// when removing items up the API major version
-	
-	
 	DISABLED(false, false),
 	FAKE(true, true),
 	COMPLETE(true, false);

api/src/main/java/com/seibel/distanthorizons/api/enums/worldGeneration/EDhApiDistantGeneratorMode.java

@@ -34,11 +34,6 @@ package com.seibel.distanthorizons.api.enums.worldGeneration;
  */
 public enum EDhApiDistantGeneratorMode
 {
-	// Reminder:
-	// when adding items up the API minor version
-	// when removing items up the API major version
-	
-	
 	/** Don't generate any new terrain, just generate LODs for already generated chunks. */
 	PRE_EXISTING_ONLY((byte) 1),
 	

api/src/main/java/com/seibel/distanthorizons/api/enums/worldGeneration/EDhApiDistantGeneratorProgressDisplayLocation.java

@@ -31,11 +31,6 @@ package com.seibel.distanthorizons.api.enums.worldGeneration;
  */
 public enum EDhApiDistantGeneratorProgressDisplayLocation
 {
-	// Reminder:
-	// when adding items up the API minor version
-	// when removing items up the API major version
-	
-	
 	OVERLAY,
 	CHAT,
 	LOG,

api/src/main/java/com/seibel/distanthorizons/api/interfaces/config/client/IDhApiGraphicsConfig.java

@@ -104,7 +104,7 @@ public interface IDhApiGraphicsConfig extends IDhApiConfigGroup
 	 * 2 = blending of 5x5			<br>
 	 * ...							<br>
 	 */
-//	IDhApiConfigValue<Integer> getBiomeBlending();
+	IDhApiConfigValue<Integer> getBiomeBlending();
 	
 	
 	

api/src/main/java/com/seibel/distanthorizons/api/interfaces/data/IDhApiTerrainDataRepo.java

@@ -161,9 +161,16 @@ public interface IDhApiTerrainDataRepo
 	//=========//
 	
 	/** 
+	 * Creates a new cache you manage that can be used to speed up repeat
+	 * read operations. <br>
+	 * Without a cache each operation must: hit the backing database file,
+	 * decompress it, and parse it; which is a fairly slow process. <br>
+	 * 
 	 * @return a {@link IDhApiTerrainDataCache} backed by {@link java.lang.ref.SoftReference}'s.
-	 * @since API 3.0.0
+	 * @since API 5.0.0
 	 */
-	IDhApiTerrainDataCache getSoftCache();
+	IDhApiTerrainDataCache createSoftCache();
+	
+	
 	
 }

api/src/main/java/com/seibel/distanthorizons/api/interfaces/events/IDhApiEventInjector.java

@@ -41,6 +41,7 @@ public interface IDhApiEventInjector extends IDependencyInjector<IDhApiEvent>
 	 * @throws IllegalArgumentException if the implementation object doesn't implement the interface
 	 */
 	// Note to self: Don't try adding a generic type to IDhApiEvent, the constructor won't accept it
+	// TODO why are we removing the class instead of an instance?
 	boolean unbind(Class<? extends IDhApiEvent> dependencyInterface, Class<? extends IDhApiEvent> dependencyClassToRemove) throws IllegalArgumentException;
 	
 	

api/src/main/java/com/seibel/distanthorizons/api/objects/data/DhApiChunk.java

@@ -31,7 +31,7 @@ import java.util.List;
  * Contains a list of {@link DhApiTerrainDataPoint} representing the blocks in a Minecraft chunk.
  *
  * @author Builderb0y, James Seibel
- * @version 2024-7-21
+ * @version 2025-12-11
  * @since API 2.0.0
  * 
  * @see IDhApiWrapperFactory
@@ -54,27 +54,12 @@ public class DhApiChunk
 	// constructors //
 	//==============//
 	
-	/** 
-	 * Deprecated due to the topYBlockPos and bottomYBlockPos variables being put in the wrong order. 
-	 * They should have been in bottom -> top order. 
-	 * 
-	 * @see DhApiChunk#create(int, int, int, int) 
-	 */
-	@Deprecated
-	public DhApiChunk(int chunkPosX, int chunkPosZ, int topYBlockPos, int bottomYBlockPos) 
-	{ this(chunkPosX, chunkPosZ, bottomYBlockPos, topYBlockPos, false); }
-	
-	/**
-	 * @since API 3.0.0 
-	 */
+	/** @since API 3.0.0 */
 	public static DhApiChunk create(int chunkPosX, int chunkPosZ, int bottomYBlockPos, int topYBlockPos)
-	{ return new DhApiChunk(chunkPosX, chunkPosZ, bottomYBlockPos, topYBlockPos, false); }
+	{ return new DhApiChunk(chunkPosX, chunkPosZ, bottomYBlockPos, topYBlockPos); }
 	
-	/** 
-	 * Only visible to internal DH methods 
-	 * @param ignoredParameter is only present to differentiate the two constructors and isn't actually used
-	 */
-	private DhApiChunk(int chunkPosX, int chunkPosZ, int bottomYBlockPos, int topYBlockPos, boolean ignoredParameter)
+	/** Only visible to internal DH methods */
+	private DhApiChunk(int chunkPosX, int chunkPosZ, int bottomYBlockPos, int topYBlockPos)
 	{
 		this.chunkPosX = chunkPosX;
 		this.chunkPosZ = chunkPosZ;

api/src/main/java/com/seibel/distanthorizons/api/objects/data/DhApiTerrainDataPoint.java

@@ -29,7 +29,7 @@ import java.util.ArrayList;
  * Holds a single datapoint of terrain data.
  *
  * @author James Seibel
- * @version 2024-7-20
+ * @version 2025-11-15
  * @since API 1.0.0
  */
 public class DhApiTerrainDataPoint
@@ -47,6 +47,10 @@ public class DhApiTerrainDataPoint
 	
 	public final int blockLightLevel;
 	public final int skyLightLevel;
+	/**
+	 * An unsigned block position of the bottom vertex for this LOD relative to the level's minimum height. 
+	 * Should be greater than or equal to 0.
+	 */
 	public final int bottomYBlockPos;
 	public final int topYBlockPos;
 	
@@ -59,28 +63,7 @@ public class DhApiTerrainDataPoint
 	// constructors //
 	//==============//
 	
-	/**
-	 * Deprecated due to the topYBlockPos and bottomYBlockPos variables being put in the wrong order. 
-	 * They should have been in bottom -> top order. 
-	 *
-	 * @see DhApiTerrainDataPoint#create(byte, int, int, int, int, IDhApiBlockStateWrapper, IDhApiBiomeWrapper) 
-	 */
-	@Deprecated
-	public DhApiTerrainDataPoint(
-			byte detailLevel, 
-			int blockLightLevel, int skyLightLevel, 
-			int topYBlockPos, int bottomYBlockPos, 
-			IDhApiBlockStateWrapper blockStateWrapper, IDhApiBiomeWrapper biomeWrapper)
-	{
-		this(detailLevel, blockLightLevel, skyLightLevel,
-			bottomYBlockPos, topYBlockPos,
-			blockStateWrapper, biomeWrapper, 
-			false);
-	}
-	
-	/**
-	 * @since API 3.0.0 
-	 */
+	/** @since API 3.0.0 */
 	public static DhApiTerrainDataPoint create(
 			byte detailLevel,
 			int blockLightLevel, int skyLightLevel,
@@ -91,20 +74,15 @@ public class DhApiTerrainDataPoint
 		return new DhApiTerrainDataPoint(
 			detailLevel, blockLightLevel, skyLightLevel,
 			bottomYBlockPos, topYBlockPos,
-			blockStateWrapper, biomeWrapper,
-			false); 
+			blockStateWrapper, biomeWrapper); 
 	}
 	
-	/**
-	 * Only visible to internal DH methods 
-	 * @param ignoredParameter is only present to differentiate the two constructors and isn't actually used
-	 */
+	/** Only visible to internal DH methods */
 	private DhApiTerrainDataPoint(
 			byte detailLevel,
 			int blockLightLevel, int skyLightLevel,
 			int bottomYBlockPos, int topYBlockPos,
-			IDhApiBlockStateWrapper blockStateWrapper, IDhApiBiomeWrapper biomeWrapper,
-			boolean ignoredParameter
+			IDhApiBlockStateWrapper blockStateWrapper, IDhApiBiomeWrapper biomeWrapper
 		)
 	{
 		this.detailLevel = detailLevel;
@@ -118,4 +96,24 @@ public class DhApiTerrainDataPoint
 		this.biomeWrapper = biomeWrapper;
 	}
 	
+	
+	
+	//================//
+	// base overrides //
+	//================//
+	
+	@Override 
+	public String toString()
+	{
+		return "[Block:" + this.blockStateWrapper.getSerialString() + 
+				",Biome:" + this.biomeWrapper.getName() + 
+				",TopY:" + this.topYBlockPos + 
+				",BottomY:" + this.bottomYBlockPos + 
+				",BlockLight:" + this.blockLightLevel +
+				",SkyLight:" + this.skyLightLevel + 
+				"]";
+	}
+	
+	
+	
 }

api/src/main/java/com/seibel/distanthorizons/coreapi/ModInfo.java

@@ -31,14 +31,14 @@ public final class ModInfo
 	public static final String DEDICATED_SERVER_INITIAL_PATH = "dedicated_server_initial";
 	
 	/** Incremented every time any packets are added, changed or removed, with a few exceptions. */
-	public static final int PROTOCOL_VERSION = 12;
+	public static final int PROTOCOL_VERSION = 13;
 	public static final String WRAPPER_PACKET_PATH = "message";
 	
 	/** The internal mod name */
 	public static final String NAME = "DistantHorizons";
 	/** Human-readable version of NAME */
 	public static final String READABLE_NAME = "Distant Horizons";
-	public static final String VERSION = "2.3.7-b-dev";
+	public static final String VERSION = "2.4.3-b";
 	/** Returns true if the current build is an unstable developer build, false otherwise. */
 	public static final boolean IS_DEV_BUILD = VERSION.toLowerCase().contains("dev");
 	

core/src/main/java/com/seibel/distanthorizons/core/Initializer.java

@@ -20,36 +20,41 @@
 package com.seibel.distanthorizons.core;
 
 import com.github.luben.zstd.ZstdOutputStream;
+import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.render.renderer.generic.GenericRenderObjectFactory;
 import com.seibel.distanthorizons.core.sql.DatabaseUpdater;
 import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
-import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
-import com.seibel.distanthorizons.coreapi.ModInfo;
 import com.seibel.distanthorizons.core.world.DhApiWorldProxy;
 import com.seibel.distanthorizons.core.api.external.methods.config.DhApiConfig;
 import com.seibel.distanthorizons.core.api.external.methods.data.DhApiTerrainDataRepo;
 import com.seibel.distanthorizons.api.DhApi;
 import com.seibel.distanthorizons.core.render.DhApiRenderProxy;
+import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
+import com.seibel.distanthorizons.coreapi.util.StringUtil;
 import net.jpountz.lz4.LZ4FrameOutputStream;
-import org.apache.logging.log4j.LogManager;
 import com.seibel.distanthorizons.core.logging.DhLogger;
 import org.sqlite.SQLiteJDBCLoader;
-import org.sqlite.util.OSInfo;
 import org.tukaani.xz.XZOutputStream;
 
-import java.awt.*;
-import java.io.File;
+import java.lang.management.GarbageCollectorMXBean;
+import java.lang.management.ManagementFactory;
+import java.util.List;
 
 /** Handles first time Core setup. */
 public class Initializer
 {
 	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
+	private static final IMinecraftClientWrapper MC_CLIENT = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
+	
+	
 	
 	public static void init()
 	{
+		LOGGER.info("Running library validation...");
+		
 		// confirm that all referenced libraries are available to use
 		try
 		{
@@ -57,6 +62,17 @@ public class Initializer
 			// will throw an error (not an exception)
 			Class<?> lz4Compressor = LZ4FrameOutputStream.class;
 			Class<?> zstdCompressor = ZstdOutputStream.class;
+			
+			{
+				byte[] testCompressByteArray = new byte[1024];
+				for (int i = 0; i < testCompressByteArray.length; i++)
+				{
+					testCompressByteArray[i] = (byte) (i % 126);
+				}
+				byte[] compressedBytes = com.github.luben.zstd.Zstd.compress(testCompressByteArray);
+				com.github.luben.zstd.Zstd.decompress(compressedBytes);
+			}
+			
 			Class<?> lzmaCompressor = XZOutputStream.class;
 			//Class<?> networking = ByteBuf.class;
 			Class<?> config = com.electronwill.nightconfig.core.Config.class;
@@ -73,9 +89,7 @@ public class Initializer
 		}
 		catch (Throwable e)
 		{
-			LOGGER.fatal("Critical programmer error: One or more libraries aren't present. Error: [" + e.getMessage() + "].", e);
-			// throwing here should crash the game, notifying the developer that something is wrong
-			throw new RuntimeException(e);
+			MC_CLIENT.crashMinecraft("Distant Horizons critical setup error: One or more libraries are either in-accessible, corrupted, or overwritten by another mod. Error: [" + e.getMessage() + "].", e);
 		}
 		
 		// confirm the resource directory is present
@@ -89,8 +103,7 @@ public class Initializer
 		}
 		catch (Exception e)
 		{
-			LOGGER.fatal("Critical programmer error: Can't read SQL Scripts resource folder is either missing or malformed. Error: [" + e.getMessage() + "].");
-			throw new RuntimeException(e);
+			MC_CLIENT.crashMinecraft("Critical programmer error: Can't read SQL Scripts resource folder is either missing or malformed. Error: [" + e.getMessage() + "].", e);
 		}
 		
 		// This code has been disabled since it can cause Mac
@@ -121,6 +134,43 @@ public class Initializer
 			LOGGER.error("Programmer Error: No ["+IWrapperFactory.class.getSimpleName()+"] assigned to the DhApi.");
 		}
 		
+		// log a warning if G1GC is being used
+		// (this garbage collector is known to cause stuttering)
+		{
+			boolean g1GcInUse = false;
+			
+			StringBuilder garbageCollectorNames = new StringBuilder();
+			List<GarbageCollectorMXBean> gcMxBeans = ManagementFactory.getGarbageCollectorMXBeans();
+			for (GarbageCollectorMXBean gcMxBean : gcMxBeans)
+			{
+				if (!garbageCollectorNames.toString().isEmpty())
+				{
+					garbageCollectorNames.append(", ");
+				}
+				garbageCollectorNames.append(gcMxBean.getName());
+				
+				// "G1 Young Generation" // "G1 Concurrent GC" // "G1 Old Generation"
+				if (gcMxBean.getName().toLowerCase().contains("g1 "))
+				{
+					g1GcInUse = true;
+				}
+			}
+			LOGGER.info("Garbage collectors: ["+garbageCollectorNames+"]");
+			
+			
+			if (g1GcInUse
+				&& Config.Common.Logging.Warning.logGarbageCollectorWarning.get())
+			{
+				LOGGER.warn(
+					"Distant Horizons: G1 Garbage collector detected. \n" +
+					"This garbage collector can cause FPS stuttering. \n" +
+					"It's recommended to use a concurrent garbage collector \n" +
+					"like ZGC (Java 21+) or Shenandoah (Java 8 through 17) for a smoother experience. \n" +
+					"");
+				
+			}
+		}
+		
 	}
 	
 }

core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/client/DhApiGraphicsConfig.java

@@ -97,10 +97,9 @@ public class DhApiGraphicsConfig implements IDhApiGraphicsConfig
 	public IDhApiConfigValue<Boolean> tintWithAvoidedBlocks()
 	{ return new DhApiConfigValue<Boolean, Boolean>(Config.Client.Advanced.Graphics.Quality.tintWithAvoidedBlocks); }
 	
-	// TODO re-implement
-//	@Override
-//	public IDhApiConfigValue<Integer> getBiomeBlending()
-//	{ return new DhApiConfigValue<Integer, Integer>(Quality.lodBiomeBlending); }
+	@Override
+	public IDhApiConfigValue<Integer> getBiomeBlending()
+	{ return new DhApiConfigValue<Integer, Integer>(Config.Client.Advanced.Graphics.Quality.lodBiomeBlending); }
 	
 	
 	

core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/data/DhApiTerrainDataRepo.java

@@ -277,7 +277,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 					if (!getSpecificYCoordinate)
 					{
 						// if we aren't look for a specific datapoint, add each datapoint to the return array
-						returnArray[i] = DhApiTerrainDataPointUtil.createApiDatapoint(levelWrapper, mapping, requestedDetailLevel, dataPoint);
+						returnArray[i] = DhApiTerrainDataPointUtil.createApiDatapoint(levelWrapper.getMinHeight(), mapping, requestedDetailLevel, dataPoint);
 					}
 					else
 					{
@@ -294,7 +294,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 							if (bottomY <= requestedY && requestedY < topY) // blockPositions start from the bottom of the block, thus "<=" for bottomY, just "<" for topY
 							{
 								// this datapoint contains the requested block position, return it
-								DhApiTerrainDataPoint apiTerrainData = DhApiTerrainDataPointUtil.createApiDatapoint(levelWrapper, mapping, requestedDetailLevel, dataPoint);
+								DhApiTerrainDataPoint apiTerrainData = DhApiTerrainDataPointUtil.createApiDatapoint(levelWrapper.getMinHeight(), mapping, requestedDetailLevel, dataPoint);
 								return DhApiResult.createSuccess(new DhApiTerrainDataPoint[]{apiTerrainData});
 							}
 						}
@@ -345,7 +345,10 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 			@Nullable
 			IDhApiTerrainDataCache dataCache)
 	{
-		return this.raycastLodData(levelWrapper, new Vec3d(rayOriginX, rayOriginY, rayOriginZ), new Vec3f(rayDirectionX, rayDirectionY, rayDirectionZ), maxRayBlockLength, dataCache);
+		return this.raycastLodData(levelWrapper, 
+				new Vec3d(rayOriginX, rayOriginY, rayOriginZ), 
+				new Vec3f(rayDirectionX, rayDirectionY, rayDirectionZ), 
+				maxRayBlockLength, dataCache);
 	}
 	
 	/**
@@ -363,8 +366,8 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 	{
 		rayDirection.normalize();
 		
-		int minBlockHeight = levelWrapper.getMinHeight();
-		int maxBlockHeight = levelWrapper.getMaxHeight();
+		int minLevelBlockHeight = levelWrapper.getMinHeight();
+		int maxLevelBlockHeight = levelWrapper.getMaxHeight();
 		
 		
 		
@@ -380,7 +383,8 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 		DhApiRaycastResult closetFoundDataPoint = null;
 		
 		
-		while (blockPos.y >= minBlockHeight && blockPos.y < maxBlockHeight
+		while (blockPos.y >= minLevelBlockHeight 
+				&& blockPos.y < maxLevelBlockHeight
 				&& currentLength <= maxRayBlockLength)
 		{
 			// get the LOD columns around this position
@@ -403,7 +407,8 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 					{
 						// does this LOD contain the given Y position?
 						Vec3i dataPointPos = new Vec3i(columnPos.x, dataPoint.bottomYBlockPos, columnPos.z);
-						if (exactPos.y >= dataPoint.bottomYBlockPos && exactPos.y <= dataPoint.topYBlockPos)
+						if (exactPos.y >= dataPoint.bottomYBlockPos 
+							&& exactPos.y <= dataPoint.topYBlockPos)
 						{
 							if (closetFoundDataPoint == null)
 							{
@@ -516,7 +521,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 	//=============//
 	
 	@Override
-	public IDhApiTerrainDataCache getSoftCache() { return new DhApiTerrainDataCache(); }
+	public IDhApiTerrainDataCache createSoftCache() { return new DhApiTerrainDataCache(); }
 	
 	
 	
@@ -572,12 +577,16 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 					}
 					
 					// draw raycast position
-					if (rayCast.success && rayCast.payload != null)
+					if (rayCast.success 
+						&& rayCast.payload != null)
 					{
 						DebugRenderer.makeParticle(
 							new DebugRenderer.BoxParticle(
 								new DebugRenderer.Box(
-									DhSectionPos.encode((byte) 0, rayCast.payload.pos.x, rayCast.payload.pos.z), rayCast.payload.dataPoint.bottomYBlockPos, rayCast.payload.dataPoint.topYBlockPos, -0.1f, Color.RED),
+									DhSectionPos.encode((byte) 0, rayCast.payload.pos.x, rayCast.payload.pos.z), 
+										rayCast.payload.dataPoint.bottomYBlockPos, 
+										rayCast.payload.dataPoint.topYBlockPos, 
+										-0.1f, Color.RED),
 							1.0, 0f
 							)
 						);

core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientApi.java

@@ -29,9 +29,7 @@ import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.network.messages.MessageRegistry;
 import com.seibel.distanthorizons.core.pos.DhChunkPos;
 import com.seibel.distanthorizons.core.render.DhApiRenderProxy;
-import com.seibel.distanthorizons.core.render.renderer.VanillaFadeRenderer;
-import com.seibel.distanthorizons.core.render.renderer.LodRenderer;
-import com.seibel.distanthorizons.core.render.renderer.RenderParams;
+import com.seibel.distanthorizons.core.render.renderer.*;
 import com.seibel.distanthorizons.core.util.TimerUtil;
 import com.seibel.distanthorizons.core.util.objects.Pair;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
@@ -45,9 +43,7 @@ import com.seibel.distanthorizons.api.enums.rendering.EDhApiRendererMode;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.level.IServerKeyedClientLevel;
 import com.seibel.distanthorizons.core.render.glObject.GLProxy;
-import com.seibel.distanthorizons.core.render.renderer.TestRenderer;
 import com.seibel.distanthorizons.core.world.AbstractDhWorld;
-import com.seibel.distanthorizons.core.world.DhClientServerWorld;
 import com.seibel.distanthorizons.core.world.DhClientWorld;
 import com.seibel.distanthorizons.core.world.IDhClientWorld;
 import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
@@ -60,6 +56,8 @@ import org.jetbrains.annotations.Nullable;
 import org.lwjgl.glfw.GLFW;
 
 import java.io.File;
+import java.lang.management.GarbageCollectorMXBean;
+import java.lang.management.ManagementFactory;
 import java.util.*;
 import java.util.concurrent.LinkedBlockingQueue;
 
@@ -97,6 +95,7 @@ public class ClientApi
 	private boolean isDevBuildMessagePrinted = false;
 	private boolean lowMemoryWarningPrinted = false;
 	private boolean highVanillaRenderDistanceWarningPrinted = false;
+	private boolean g1GarbageCollectorWarningPrinted = false;
 	
 	private long lastStaticWarningMessageSentMsTime = 0L;
 	
@@ -322,41 +321,6 @@ public class ClientApi
 	
 	
 	
-	//============//
-	// clint tick //
-	//============//
-	
-	@Deprecated
-	public void clientTickEvent()
-	{
-		IProfilerWrapper profiler = MC_CLIENT.getProfiler();
-		profiler.push("DH-ClientTick");
-		
-		try
-		{
-			IDhClientWorld clientWorld = SharedApi.tryGetDhClientWorld();
-			if (clientWorld != null)
-			{
-				clientWorld.clientTick();
-				
-				// Ignore local world gen, as it's managed by server ticking
-				if (!(clientWorld instanceof DhClientServerWorld))
-				{
-					SharedApi.worldGenTick(clientWorld::worldGenTick);
-				}
-			}
-		}
-		catch (Exception e)
-		{
-			// handle errors here to prevent blowing up a mixin or API up stream
-			LOGGER.error("Unexpected error in ClientApi.clientTickEvent(), error: "+e.getMessage(), e);
-		}
-		
-		profiler.pop();
-	}
-	
-	
-	
 	//============//
 	// networking //
 	//============//
@@ -415,8 +379,11 @@ public class ClientApi
 			
 			try
 			{
+				// make sure the GLProxy is created for future use
+				GLProxy.getInstance();
+				
 				// these tasks always need to be called, regardless of whether the renderer is enabled or not to prevent memory leaks
-				GLProxy.getInstance().runRenderThreadTasks();
+				GLProxy.runRenderThreadTasks();
 			}
 			catch (Exception e)
 			{
@@ -570,8 +537,13 @@ public class ClientApi
 	{
 		// only fade when DH is rendering
 		if (Config.Client.Advanced.Debugging.rendererMode.get() == EDhApiRendererMode.DEFAULT
-			// only fade when requested
-			&& Config.Client.Advanced.Graphics.Quality.vanillaFadeMode.get() == EDhApiMcRenderingFadeMode.DOUBLE_PASS
+			&&
+			(
+				// only fade when requested
+				Config.Client.Advanced.Graphics.Quality.vanillaFadeMode.get() == EDhApiMcRenderingFadeMode.DOUBLE_PASS
+				// or if LOD-only mode is enabled (fading is used to remove the MC render pass)
+				|| Config.Client.Advanced.Debugging.lodOnlyMode.get()
+			)
 			// don't fade when Iris shaders are active, otherwise the rendering can get weird
 			&& !DhApiRenderProxy.INSTANCE.getDeferTransparentRendering())
 		{
@@ -679,7 +651,8 @@ public class ClientApi
 	{
 		// dev build
 		if (ModInfo.IS_DEV_BUILD 
-			&& !this.isDevBuildMessagePrinted && MC_CLIENT.playerExists())
+			&& !this.isDevBuildMessagePrinted 
+			&& MC_CLIENT.playerExists())
 		{
 			this.isDevBuildMessagePrinted = true;
 			this.lastStaticWarningMessageSentMsTime = System.currentTimeMillis();
@@ -725,10 +698,11 @@ public class ClientApi
 		if (!this.highVanillaRenderDistanceWarningPrinted 
 			&& Config.Common.Logging.Warning.showHighVanillaRenderDistanceWarning.get())
 		{
+			this.highVanillaRenderDistanceWarningPrinted = true;
+			
 			// DH generally doesn't need a vanilla render distance above 12 
 			if (MC_RENDER.getRenderDistance() > 12)
 			{
-				this.highVanillaRenderDistanceWarningPrinted = true;
 				this.lastStaticWarningMessageSentMsTime = System.currentTimeMillis();
 				
 				String message =

core/src/main/java/com/seibel/distanthorizons/core/api/internal/ClientPluginChannelApi.java

@@ -9,6 +9,7 @@ import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.network.event.internal.CloseInternalEvent;
 import com.seibel.distanthorizons.core.network.messages.base.LevelInitMessage;
 import com.seibel.distanthorizons.core.network.session.NetworkSession;
+import com.seibel.distanthorizons.core.render.glObject.GLProxy;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import org.jetbrains.annotations.NotNull;
@@ -89,7 +90,7 @@ public class ClientPluginChannelApi
 		
 		LOGGER.info("Server level key received: [" + msg.levelKey + "].");
 		
-		MC.executeOnRenderThread(() -> 
+		GLProxy.queueRunningOnRenderThread(() -> 
 		{
 			IClientLevelWrapper clientLevel = MC.getWrappedClientLevel(true);
 			IServerKeyedClientLevel existingKeyedClientLevel = KEYED_CLIENT_LEVEL_MANAGER.getServerKeyedLevel();

core/src/main/java/com/seibel/distanthorizons/core/api/internal/ServerApi.java

@@ -53,30 +53,6 @@ public class ServerApi
 	
 	
 	
-	//=============//
-	// tick events //
-	//=============//
-	
-	public void serverTickEvent()
-	{
-		try
-		{
-			IDhServerWorld serverWorld = SharedApi.tryGetDhServerWorld();
-			if (serverWorld != null)
-			{
-				serverWorld.serverTick();
-				SharedApi.worldGenTick(serverWorld::worldGenTick);
-			}
-		}
-		catch (Exception e)
-		{
-			// try catch is necessary to prevent crashing the internal server when an exception is thrown
-			LOGGER.error("ServerTickEvent error: " + e.getMessage(), e);
-		}
-	}
-	
-	
-	
 	//===============//
 	// server events //
 	//===============//

core/src/main/java/com/seibel/distanthorizons/core/api/internal/SharedApi.java

@@ -141,16 +141,6 @@ public class SharedApi
 		}
 	}
 	
-	public static void worldGenTick(Runnable worldGenRunnable)
-	{
-		lastWorldGenTickDelta--;
-		if (lastWorldGenTickDelta <= 0)
-		{
-			worldGenRunnable.run();
-			lastWorldGenTickDelta = 20;
-		}
-	}
-	
 	@Nullable
 	public static AbstractDhWorld getAbstractDhWorld() { return currentWorld; }
 	

core/src/main/java/com/seibel/distanthorizons/core/api/internal/chunkUpdating/ChunkUpdateQueueManager.java

@@ -8,6 +8,10 @@ import com.seibel.distanthorizons.core.pos.DhChunkPos;
 import com.seibel.distanthorizons.core.world.EWorldEnvironment;
 import com.seibel.distanthorizons.core.logging.DhLogger;
 
+import java.util.Collections;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
 public class ChunkUpdateQueueManager
 {
 	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
@@ -15,6 +19,7 @@ public class ChunkUpdateQueueManager
 	
 	public final ChunkPosQueue updateQueue;
 	public final ChunkPosQueue preUpdateQueue;
+	public final Set<DhChunkPos> ignoredChunkPosSet = Collections.newSetFromMap(new ConcurrentHashMap<>());
 	
 	public int maxSize = 500;
 	
@@ -38,12 +43,18 @@ public class ChunkUpdateQueueManager
 	// list/set methods //
 	//==================//
 	
-	public boolean contains(DhChunkPos pos) { return this.updateQueue.contains(pos) || this.preUpdateQueue.contains(pos); }
+	public boolean contains(DhChunkPos pos) 
+	{ 
+		return this.updateQueue.contains(pos)
+			|| this.ignoredChunkPosSet.contains(pos)	
+			|| this.preUpdateQueue.contains(pos); 
+	}
 	
 	public void clear()
 	{
 		this.updateQueue.clear();
 		this.preUpdateQueue.clear();
+		this.ignoredChunkPosSet.clear();
 	}
 	public int getQueuedCount() { return this.updateQueue.getQueuedCount() + this.preUpdateQueue.getQueuedCount(); }
 	public boolean isEmpty()
@@ -131,6 +142,15 @@ public class ChunkUpdateQueueManager
 	
 	
 	
+	//=========//
+	// ignores //
+	//=========//
+	
+	public void addPosToIgnore(DhChunkPos chunkPos) { this.ignoredChunkPosSet.add(chunkPos); }
+	public void removePosToIgnore(DhChunkPos chunkPos) { this.ignoredChunkPosSet.remove(chunkPos); }
+	
+	
+	
 	//==================//
 	// position methods //
 	//==================//

core/src/main/java/com/seibel/distanthorizons/core/config/Config.java

@@ -33,13 +33,12 @@ import com.seibel.distanthorizons.core.config.types.enums.*;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.pos.DhSectionPos;
+import com.seibel.distanthorizons.core.util.NativeDialogUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper;
 import com.seibel.distanthorizons.coreapi.ModInfo;
 import com.seibel.distanthorizons.core.logging.DhLogger;
-import org.lwjgl.util.tinyfd.TinyFileDialogs;
 
-import java.awt.*;
 import java.io.File;
 import java.util.*;
 import java.util.List;
@@ -103,10 +102,7 @@ public class Config
 		
 		public static ConfigUiLinkedEntry quickEnableWorldGenerator = new ConfigUiLinkedEntry(Common.WorldGenerator.enableDistantGeneration);
 		
-		public static ConfigEntry<Boolean> quickShowWorldGenProgress = new ConfigEntry.Builder<Boolean>()
-				.set(false) // TODO should be set by the underlying world gen progress button, not a static default
-				.setAppearance(EConfigEntryAppearance.ONLY_IN_GUI)
-				.build();
+		public static ConfigUiLinkedEntry quickShowWorldGenProgress = new ConfigUiLinkedEntry(Common.WorldGenerator.showGenerationProgress);
 		
 		public static ConfigUiLinkedEntry quickLodCloudRendering = new ConfigUiLinkedEntry(Advanced.Graphics.GenericRendering.enableCloudRendering);
 		
@@ -126,7 +122,6 @@ public class Config
 		{
 			// common config links need to have their destination
 			// since they aren't part of "client" config class
-			// TODO determine their destination programically instead of hard coding the value
 			
 			public static ConfigUIComment advancedHeader = new ConfigUIComment.Builder().setParentConfigClass(Advanced.class).build();
 			
@@ -172,6 +167,20 @@ public class Config
 				public static ConfigCategory culling = new ConfigCategory.Builder().set(Culling.class).build();
 				public static ConfigUISpacer cullingSpacer = new ConfigUISpacer.Builder().build();
 				
+				public static ConfigEntry<Boolean> overrideVanillaGraphicsSettings = new ConfigEntry.Builder<Boolean>()
+					.set(true)
+					.comment("" +
+						"If true some vanilla graphics settings will be automatically changed \n" +
+						"during DH setup to provide a better experience. \n" +
+						" \n" +
+						"IE disabling vanilla clouds (which render on top of DH LODs), \n" +
+						"   and chunk fading (DH already fades MC chunks) \n" +
+						"")
+					.build();
+				public static ConfigUISpacer overrideVanillaSpacer = new ConfigUISpacer.Builder().build();
+				
+				
+				
 				public static ConfigCategory experimental = new ConfigCategory.Builder().set(Experimental.class).build();
 				
 				
@@ -263,7 +272,7 @@ public class Config
 					public static ConfigEntry<Double> lodBias = new ConfigEntry.Builder<Double>()
 							.setMinDefaultMax(0d, 0d, null)
 							.comment(""
-									+ "What the value should vanilla Minecraft's texture LodBias be? \n"
+									+ "What value should vanilla Minecraft's texture LodBias be? \n"
 									+ "If set to 0 the mod wont overwrite vanilla's default (which so happens to also be 0)")
 							.build();
 					
@@ -410,6 +419,14 @@ public class Config
 									"")
 							.build();
 					
+					public static ConfigEntry<Integer> fadeDistanceInBlocks = new ConfigEntry.Builder<Integer>()
+							.setMinDefaultMax(0, 1_600, 30_000_000)
+							.comment("" +
+									"The distance in blocks from the camera where the SSAO will fade out to. \n"+
+									"This is done to prevent banding and noise at extreme distances. \n"+
+									"")
+							.build();
+					
 				}
 				
 				public static class GenericRendering
@@ -776,6 +793,11 @@ public class Config
 									+ "A comma separated list of block resource locations that won't be rendered by DH. \n"
 									+ "Air is always included in this list. \n"
 									+ "Requires a restart to change. \n"
+									+ "\n"
+									+ "Note:\n"
+									+ "If you see gaps, or holes you may have to change\n"
+									+ "worldCompression to ["+EDhApiWorldCompressionMode.MERGE_SAME_BLOCKS+"] and re-generate the LODs.\n"
+									+ "Black spots may happen occur to block lighting being zero for covered blocks.\n"
 									+ "")
 							.build();
 					
@@ -1233,23 +1255,17 @@ public class Config
 							.setAppearance(EConfigEntryAppearance.ONLY_IN_FILE) // no GUI renderer set up currently
 							.build();
 					
-					public static ConfigUIButton uiButtonTest = new ConfigUIButton(() -> 
+					public static ConfigUIButton uiButtonTest = new ConfigUIButton(() ->
 					{
 						// running on a separate thread is necessary to prevent locking
-						new Thread(() -> 
-						{
-							if (!GraphicsEnvironment.isHeadless())
-							{
-								LOGGER.info("Attempting to show tinyfd message box...");
-								boolean buttonPress = TinyFileDialogs.tinyfd_messageBox("Button pressed!", "UITester dialog", "ok", "info", false);
-								LOGGER.info("dialog returned with ["+(buttonPress ? "TRUE" : "FALSE")+"]");
-							}
-							else
-							{
-								LOGGER.info("button pressed!");
-							}
-						}).start();
+						new Thread(() -> onButtonPressed()).start();
 					});
+					public static void onButtonPressed()
+					{
+						LOGGER.info("Attempting to show tinyfd message box...");
+						boolean buttonPress = NativeDialogUtil.showDialog("Button pressed!", "UITester dialog", "ok", "info");
+						LOGGER.info("dialog returned with ["+(buttonPress ? "TRUE" : "FALSE")+"]");
+					}
 					
 					public static ConfigCategory categoryTest = new ConfigCategory.Builder().set(CategoryTest.class).build();
 					
@@ -1365,6 +1381,37 @@ public class Config
 							+ "")
 					.build();
 			
+			public static ConfigEntry<Integer> generationCenterChunkX = new ConfigEntry.Builder<Integer>()
+				.setChatCommandName("generation.bounds.centerChunk.x")
+				.setAppearance(EConfigEntryAppearance.ONLY_IN_FILE)
+				.setMinDefaultMax(Integer.MIN_VALUE, 0, Integer.MAX_VALUE)
+				.comment("" +
+					"The center X chunk position that the world gen max radius is centered around. \n" +
+					"")
+				.build();
+			public static ConfigEntry<Integer> generationCenterChunkZ = new ConfigEntry.Builder<Integer>()
+				.setChatCommandName("generation.bounds.centerChunk.z")
+				.setAppearance(EConfigEntryAppearance.ONLY_IN_FILE)
+				.setMinDefaultMax(Integer.MIN_VALUE, 0, Integer.MAX_VALUE)
+				.comment("" +
+					"The center Z chunk position that the world gen max radius is centered around. \n" +
+					"")
+				.build();
+			public static ConfigEntry<Integer> generationMaxChunkRadius = new ConfigEntry.Builder<Integer>()
+				.setChatCommandName("generation.bounds.radiusInChunks")
+				.setAppearance(EConfigEntryAppearance.ONLY_IN_FILE)
+				.setMinDefaultMax(0, 0, Integer.MAX_VALUE)
+				.comment("" +
+					"The max radius in chunks around the central point where world generation is allowed. \n" +
+					"If this value is set to 0, generation bounds are disabled and the render distance will be used. \n" +
+					"\n" +
+					"This should only be set if you have a pre-generated world that has a very limited size. \n" +
+					"Setting this on a normal MC world will prevent the world generator from filling \n" +
+					"out your render distance. \n" +
+					"")
+				.build();
+			
+			
 		}
 		
 		public static class LodBuilding
@@ -1390,37 +1437,9 @@ public class Config
 					.build();
 			
 			public static ConfigEntry<EDhApiDataCompressionMode> dataCompression = new ConfigEntry.Builder<EDhApiDataCompressionMode>()
-					.set(EDhApiDataCompressionMode.Z_STD)
-					.comment(""
-							+ "What algorithm should be used to compress new LOD data? \n"
-							+ "This setting will only affect new or updated LOD data, \n"
-							+ "any data already generated when this setting is changed will be\n"
-							+ "unaffected until it needs to be re-written to the database.\n"
-							+ "\n"
-							+ EDhApiDataCompressionMode.UNCOMPRESSED + " \n"
-							+ "Should only be used for testing, is worse in every way vs ["+EDhApiDataCompressionMode.LZ4+"].\n"
-							+ "Expected Compression Ratio: 1.0\n"
-							+ "Estimated average DTO read speed: 6.09 milliseconds\n"
-							+ "Estimated average DTO write speed: 6.01 milliseconds\n"
-							+ "\n"
-							+ EDhApiDataCompressionMode.LZ4 + " \n"
-							+ "A good option if you're CPU limited and have plenty of hard drive space.\n"
-							+ "Expected Compression Ratio: 0.4513\n"
-							+ "Estimated average DTO read speed: 3.25 ms\n"
-							+ "Estimated average DTO write speed: 5.99 ms\n"
-							+ "\n"
-							+ EDhApiDataCompressionMode.Z_STD + " \n"
-							+ "A good option if you're CPU limited and have plenty of hard drive space.\n"
-							+ "Expected Compression Ratio: 0.2606\n"
-							+ "Estimated average DTO read speed: 9.31 ms\n"
-							+ "Estimated average DTO write speed: 15.13 ms\n"
-							+ "\n"
-							+ EDhApiDataCompressionMode.LZMA2 + " \n"
-							+ "Slow but very good compression.\n"
-							+ "Expected Compression Ratio: 0.2\n"
-							+ "Estimated average DTO read speed: 13.29 ms\n"
-							+ "Estimated average DTO write speed: 70.95 ms\n"
-							+ "")
+					.set(EDhApiDataCompressionMode.Z_STD_BLOCK)
+					// only visible via the API since there is no reason to use any compressor except ZStandard as of 2025-11-24
+					.setAppearance(EConfigEntryAppearance.ONLY_IN_API)
 					.build();
 			
 			public static ConfigEntry<EDhApiWorldCompressionMode> worldCompression = new ConfigEntry.Builder<EDhApiWorldCompressionMode>()
@@ -1443,49 +1462,6 @@ public class Config
 							+ "")
 					.build();
 			
-			public static ConfigEntry<Boolean> recalculateChunkHeightmaps = new ConfigEntry.Builder<Boolean>()
-					.set(false)
-					.comment(""
-							+ "True: Recalculate chunk height maps before chunks can be used by DH.\n"
-							+ "      This can fix problems with worlds created by World Painter or \n"
-							+ "      other external tools where the heightmap format may be incorrect. \n"
-							+ "False: Assume any height maps handled by Minecraft are correct. \n"
-							+ "\n"
-							+ "Fastest: False\n"
-							+ "Most Compatible: True\n"
-							+ "")
-					.build();
-			
-			public static ConfigEntry<Boolean> pullLightingForPregeneratedChunks = new ConfigEntry.Builder<Boolean>()
-					.set(false)
-					.comment(""
-							+ "If true LOD generation for pre-existing chunks will attempt to pull the lighting data \n"
-							+ "saved in Minecraft's Region files. \n"
-							+ "If false DH will pull in chunks without lighting and re-light them. \n"
-							+ " \n"
-							+ "Setting this to true will result in faster LOD generation \n"
-							+ "for already generated worlds, but is broken by most lighting mods. \n"
-							+ " \n"
-							+ "Set this to false if LODs are black. \n"
-							+ "")
-					.build();
-			
-			public static ConfigEntry<Boolean> assumePreExistingChunksAreFinished = new ConfigEntry.Builder<Boolean>()
-					.set(false)
-					.comment(""
-							+ "When DH pulls in pre-existing chunks it will attempt to \n"
-							+ "run any missing world generation steps; for example: \n"
-							+ "if a chunk has the status SURFACE, DH will skip BIOMES \n"
-							+ "and SURFACE, but will run FEATURES. \n"
-							+ " \n"
-							+ "However if for some reason the chunks are malformed \n"
-							+ "or there's some other issue that causes the status \n"
-							+ "to be incorrect that can either cause world gen \n"
-							+ "lock-ups and/or crashes. \n"
-							+ "If either of those happen try setting this to True. \n"
-							+ "")
-					.build();
-			
 			public static ConfigCategory experimental = new ConfigCategory.Builder().set(Experimental.class).build();
 			
 			
@@ -1527,6 +1503,7 @@ public class Config
 							+ "How many threads should be used by Distant Horizons? \n"
 							+ "")
 					.build();
+			
 			public static final ConfigEntry<Double> threadRunTimeRatio = new ConfigEntry.Builder<Double>()
 					.setChatCommandName("threading.threadRunTimeRatio")
 					.setMinDefaultMax(0.01, ThreadPresetConfigEventHandler.getDefaultRunTimeRatio(), 1.0)
@@ -1540,6 +1517,19 @@ public class Config
 							"")
 					.build();
 			
+			public static final ConfigEntry<Integer> threadPriority = new ConfigEntry.Builder<Integer>()
+				.setAppearance(EConfigEntryAppearance.ONLY_IN_FILE) // only in file since this requires a MC reboot to change
+				.setMinDefaultMax(Thread.MIN_PRIORITY, // 1
+					Thread.NORM_PRIORITY, // 5 (1 higher than C2ME's default priority of 4 which can help reduce issues with Chunky)
+					Thread.MAX_PRIORITY) // 10
+				.comment(""
+					+ "What Java thread priority should DH's primary thread pools run with? \n"
+					+ "\n"
+					+ "You probably don't need to change this unless you are also \n"
+					+ "running C2ME and are seeing thread starvation in either C2ME or DH. \n"
+					+ "")
+				.build();
+			
 			
 			
 		}
@@ -1576,14 +1566,6 @@ public class Config
 							+ "This can be useful for debugging.")
 					.build();
 			
-			public static ConfigEntry<EDhApiLoggerLevel> logWorldGenPerformanceToFile = new ConfigEntry.Builder<EDhApiLoggerLevel>()
-					.setChatCommandName("logging.logWorldGenPerformance")
-					.set(EDhApiLoggerLevel.INFO)
-					.comment(""
-							+ "If enabled, the mod will log performance about the world generation process. \n"
-							+ "This can be useful for debugging.")
-					.build();
-			
 			public static ConfigEntry<EDhApiLoggerLevel> logWorldGenChunkLoadEventToFile = new ConfigEntry.Builder<EDhApiLoggerLevel>()
 					.setChatCommandName("logging.logWorldGenLoadEvent")
 					.set(EDhApiLoggerLevel.INFO)
@@ -1669,6 +1651,14 @@ public class Config
 								+ "")
 						.build();
 				
+				public static ConfigEntry<Boolean> showSlowWorldGenSettingWarnings = new ConfigEntry.Builder<Boolean>()
+						.set(true)
+						.comment(""
+								+ "If enabled, a chat message will be displayed when DH has too many chunks \n"
+								+ "queued for updating. \n"
+								+ "")
+						.build();
+				
 				public static ConfigEntry<Boolean> showModCompatibilityWarningsOnStartup = new ConfigEntry.Builder<Boolean>()
 						.set(true)
 						.comment(""
@@ -1677,6 +1667,15 @@ public class Config
 								+ "")
 						.build();
 				
+				public static ConfigEntry<Boolean> logGarbageCollectorWarning = new ConfigEntry.Builder<Boolean>()
+					.set(true)
+					.comment(""
+						+ "If enabled, a message will be logged if the garbage \n"
+						+ "collector Java is currently using is known \n"
+						+ "to cause stutters and/or issues. \n"
+						+ "")
+					.build();
+				
 			}
 		}
 		
@@ -1746,32 +1745,6 @@ public class Config
 						"")
 				.build();
 		
-		public static ConfigEntry<Integer> generationBoundsX = new ConfigEntry.Builder<Integer>()
-				.setChatCommandName("generation.bounds.x")
-				.setAppearance(EConfigEntryAppearance.ONLY_IN_FILE)
-				.setMinDefaultMax(Integer.MIN_VALUE, 0, Integer.MAX_VALUE)
-				.comment("" +
-						"Defines the X-coordinate of the central point for generation boundaries, in blocks. \n" +
-						"")
-				.build();
-		public static ConfigEntry<Integer> generationBoundsZ = new ConfigEntry.Builder<Integer>()
-				.setChatCommandName("generation.bounds.z")
-				.setAppearance(EConfigEntryAppearance.ONLY_IN_FILE)
-				.setMinDefaultMax(Integer.MIN_VALUE, 0, Integer.MAX_VALUE)
-				.comment("" +
-						"Defines the Z-coordinate of the central point for generation boundaries, in blocks. \n" +
-						"")
-				.build();
-		public static ConfigEntry<Integer> generationBoundsRadius = new ConfigEntry.Builder<Integer>()
-				.setChatCommandName("generation.bounds.radius")
-				.setAppearance(EConfigEntryAppearance.ONLY_IN_FILE)
-				.setMinDefaultMax(0, 0, Integer.MAX_VALUE)
-				.comment("" +
-						"Defines the radius around the central point within which generation is allowed, in blocks. \n" +
-						"If this value is set to 0, generation bounds are disabled." +
-						"")
-				.build();
-		
 		
 		// Real-time updates
 		public static ConfigEntry<Boolean> enableRealTimeUpdates = new ConfigEntry.Builder<Boolean>()
@@ -1892,7 +1865,6 @@ public class Config
 				ThreadPresetConfigEventHandler.INSTANCE.setUiOnlyConfigValues();
 				RenderQualityPresetConfigEventHandler.INSTANCE.setUiOnlyConfigValues();
 				QuickRenderToggleConfigEventHandler.INSTANCE.setUiOnlyConfigValues();
-				QuickShowWorldGenProgressConfigEventHandler.INSTANCE.setUiOnlyConfigValues();
 			}
 			catch (Exception e)
 			{

core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/presets/QuickShowWorldGenProgressConfigEventHandler.java

@@ -1,66 +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.core.config.eventHandlers.presets;
-
-import com.seibel.distanthorizons.api.enums.rendering.EDhApiRendererMode;
-import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiDistantGeneratorProgressDisplayLocation;
-import com.seibel.distanthorizons.core.config.Config;
-import com.seibel.distanthorizons.core.config.listeners.ConfigChangeListener;
-
-public class QuickShowWorldGenProgressConfigEventHandler
-{
-	public static QuickShowWorldGenProgressConfigEventHandler INSTANCE = new QuickShowWorldGenProgressConfigEventHandler();
-	
-	private final ConfigChangeListener<Boolean> quickChangeListener;
-	private final ConfigChangeListener<EDhApiDistantGeneratorProgressDisplayLocation> fullChangeListener;
-	
-	
-	
-	/** private since we only ever need one handler at a time */
-	private QuickShowWorldGenProgressConfigEventHandler()
-	{
-		this.quickChangeListener = new ConfigChangeListener<>(Config.Client.quickShowWorldGenProgress, 
-				(val) -> 
-				{
-					boolean quickShowProgress = Config.Client.quickShowWorldGenProgress.get();
-					Config.Common.WorldGenerator.showGenerationProgress.set(
-							quickShowProgress
-							? EDhApiDistantGeneratorProgressDisplayLocation.OVERLAY
-							: EDhApiDistantGeneratorProgressDisplayLocation.DISABLED); 
-				});
-		this.fullChangeListener = new ConfigChangeListener<>(Config.Common.WorldGenerator.showGenerationProgress, 
-				(val) -> 
-				{
-					boolean showProgress = Config.Common.WorldGenerator.showGenerationProgress.get() != EDhApiDistantGeneratorProgressDisplayLocation.DISABLED;
-					Config.Client.quickShowWorldGenProgress.setWithoutFiringEvents(showProgress); 
-				});
-	}
-	
-	/**
-	 * Set the UI only config based on what is set in the file. <br>
-	 * This should only be called once.
-	 */
-	public void setUiOnlyConfigValues()
-	{
-		boolean showProgress = Config.Common.WorldGenerator.showGenerationProgress.get() != EDhApiDistantGeneratorProgressDisplayLocation.DISABLED;
-		Config.Client.quickShowWorldGenProgress.set(showProgress);
-	}
-	
-}

core/src/main/java/com/seibel/distanthorizons/core/config/file/ConfigFileHandler.java

@@ -24,12 +24,14 @@ import com.seibel.distanthorizons.core.config.ConfigHandler;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.config.types.AbstractConfigBase;
 import com.seibel.distanthorizons.core.config.types.ConfigEntry;
+import com.seibel.distanthorizons.core.jar.EPlatform;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.distanthorizons.coreapi.ModInfo;
 import org.apache.logging.log4j.LogManager;
 import com.seibel.distanthorizons.core.logging.DhLogger;
 
+import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;

core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/FullDataPointIdMap.java

@@ -268,7 +268,7 @@ public class FullDataPointIdMap
 			// necessary to prevent issues with deserializing objects after the level has been closed
 			if (Thread.interrupted())
 			{
-				throw new InterruptedException(FullDataPointIdMap.class.getSimpleName() + " task interrupted.");
+				throw new InterruptedException("[" + FullDataPointIdMap.class.getSimpleName() + "] deserializing interrupted.");
 			}
 			
 			

core/src/main/java/com/seibel/distanthorizons/core/dataObjects/fullData/sources/FullDataSourceV2.java

@@ -44,6 +44,7 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
 import com.seibel.distanthorizons.coreapi.ModInfo;
 import it.unimi.dsi.fastutil.bytes.ByteArrayList;
+import it.unimi.dsi.fastutil.ints.IntArrayList;
 import it.unimi.dsi.fastutil.longs.LongArrayList;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -92,8 +93,6 @@ public class FullDataSourceV2
 	public long lastModifiedUnixDateTime;
 	public long createdUnixDateTime;
 	
-	public int levelMinY;
-	
 	/** 
 	 * stores how far each column has been generated should start with {@link EDhApiWorldGenerationStep#EMPTY}
 	 *
@@ -299,9 +298,9 @@ public class FullDataSourceV2
 	 * returns {@link FullDataPointUtil#EMPTY_DATA_POINT} if the given {@link DhBlockPos}
 	 * is outside this data source's boundaries.
 	 */
-	public long getDataPointAtBlockPos(DhBlockPos blockPos)
+	public long getDataPointAtBlockPos(int blockPosX, int blockPosY, int blockPosZ, int levelMinY)
 	{
-		DhLodPos requestedPos = new DhLodPos(LodUtil.BLOCK_DETAIL_LEVEL, blockPos.getX(), blockPos.getZ());
+		DhLodPos requestedPos = new DhLodPos(LodUtil.BLOCK_DETAIL_LEVEL, blockPosX, blockPosZ);
 		
 		// stop if the requested blockPos is outside this datasource
 		{
@@ -331,6 +330,7 @@ public class FullDataSourceV2
 		
 		
 		// search for a datapoint that contains the given block y position
+		int relBlockPosY = blockPosY - levelMinY;
 		long dataPoint;
 		for (int i = 0; i < dataColumn.size(); i++)
 		{
@@ -345,14 +345,13 @@ public class FullDataSourceV2
 			
 			
 			
-			int requestedY = blockPos.getY();
-			int bottomY = FullDataPointUtil.getBottomY(dataPoint) + this.levelMinY;
+			int bottomY = FullDataPointUtil.getBottomY(dataPoint);
 			int height = FullDataPointUtil.getHeight(dataPoint);
 			int topY = bottomY + height;
 			
 			// does this datapoint contain the requested Y position? 
-			if (bottomY <= requestedY
-				&& requestedY < topY) // blockPositions start from the bottom of the block, thus "<=" for bottomY, just "<" for topY
+			if (bottomY <= relBlockPosY
+				&& relBlockPosY < topY) // blockPositions start from the bottom of the block, thus "<=" for bottomY, just "<" for topY
 			{
 				return dataPoint;
 			}
@@ -367,7 +366,7 @@ public class FullDataSourceV2
 	// updating //
 	//==========//
 	
-	public boolean updateFromChunk(@NotNull FullDataSourceV2 inputDataSource)
+	public boolean updateFromDataSource(@NotNull FullDataSourceV2 inputDataSource)
 	{
 		// don't try updating if the input is empty
 		if (inputDataSource.mapping.isEmpty())
@@ -470,7 +469,7 @@ public class FullDataSourceV2
 		return dataChanged;
 	}
 	
-	public boolean updateFromSameDetailLevel(FullDataSourceV2 inputDataSource, int[] remappedIds)
+	private boolean updateFromSameDetailLevel(FullDataSourceV2 inputDataSource, int[] remappedIds)
 	{
 		// both data sources should have the same detail level
 		if (DhSectionPos.getDetailLevel(inputDataSource.pos) != DhSectionPos.getDetailLevel(this.pos))
@@ -486,96 +485,103 @@ public class FullDataSourceV2
 			for (int z = 0; z < WIDTH; z++)
 			{
 				int index = relativePosToIndex(x, z);
-				
 				LongArrayList inputDataArray = inputDataSource.dataPoints[index];
-				if (inputDataArray != null)
+				if (inputDataArray == null)
 				{
-					byte thisGenState = this.columnGenerationSteps.getByte(index);
-					byte inputGenState = inputDataSource.columnGenerationSteps.getByte(index);
+					continue;
+				}
 				
-					
-					// determine if this column should be updated
-					boolean genStateAllowsUpdating = false;
-					// if the input is downsampled, we only want to replace empty or downsampled values
-					if (inputGenState == EDhApiWorldGenerationStep.DOWN_SAMPLED.value
-						&&
-						(
-							thisGenState == EDhApiWorldGenerationStep.EMPTY.value
-							|| thisGenState == EDhApiWorldGenerationStep.DOWN_SAMPLED.value
-						))
+				
+				
+				byte thisGenState = this.columnGenerationSteps.getByte(index);
+				byte inputGenState = inputDataSource.columnGenerationSteps.getByte(index);
+				
+				
+				// determine if this column should be updated
+				boolean genStateAllowsUpdating = false;
+				// if the input is downsampled, we only want to replace empty or downsampled values
+				if (inputGenState == EDhApiWorldGenerationStep.DOWN_SAMPLED.value
+					&&
+					(
+						thisGenState == EDhApiWorldGenerationStep.EMPTY.value
+						|| thisGenState == EDhApiWorldGenerationStep.DOWN_SAMPLED.value
+					))
+				{
+					genStateAllowsUpdating = true;
+				}
+				// if the input is any other non-empty value,
+				// replace anything that is less-complete
+				else if (inputGenState != EDhApiWorldGenerationStep.EMPTY.value
+					&& thisGenState <= inputGenState)
+				{
+					// don't apply less-complete generation data
+					genStateAllowsUpdating = true;
+				}
+				
+				if (!genStateAllowsUpdating)
+				{
+					continue;
+				}
+				
+				
+				
+				// check if the data changed
+				if (this.dataPoints[index] == null)
+				{
+					// no data was present previously
+					this.dataPoints[index] = new LongArrayList(inputDataArray);
+					dataChanged = true;
+				}
+				else if (this.dataPoints[index].size() != inputDataArray.size())
+				{
+					// data is present, but the size is different
+					dataChanged = true;
+				}
+				
+				int oldDataHash = 0;
+				if (!dataChanged)
+				{
+					// some old data existed with the same length,
+					// we'll have to compare the caches
+					oldDataHash = this.dataPoints[index].hashCode();
+				}
+				
+				
+				// copy over the new data
+				this.dataPoints[index].clear();
+				this.dataPoints[index].addAll(inputDataArray);
+				this.remapDataColumn(index, remappedIds);
+				
+				if (RUN_DATA_ORDER_VALIDATION)
+				{
+					throwIfDataColumnInWrongOrder(inputDataSource.pos, this.dataPoints[index]);
+				}
+				
+				
+				
+				if (!dataChanged)
+				{
+					// check if the identical length data column hashes are the same
+					// hashes need to be compared after the ID's have been remapped otherwise the ID's won't match even if the data is the same
+					if (oldDataHash != this.dataPoints[index].hashCode())
 					{
-						genStateAllowsUpdating = true;
-					}
-					// if the input is any other non-empty value,
-					// replace anything that is less-complete
-					else if (inputGenState != EDhApiWorldGenerationStep.EMPTY.value
-							&& thisGenState <= inputGenState)
-					{
-						// don't apply less-complete generation data
-						genStateAllowsUpdating = true;
-					}
-					
-					
-					if (genStateAllowsUpdating)
-					{
-						// check if the data changed
-						if (this.dataPoints[index] == null)
-						{
-							// no data was present previously
-							this.dataPoints[index] = new LongArrayList(inputDataArray);
-							dataChanged = true;
-						}
-						else if (this.dataPoints[index].size() != inputDataArray.size())
-						{
-							// data is present, but the size is different
-							dataChanged = true;
-						}
-						
-						int oldDataHash = 0;
-						if (!dataChanged)
-						{
-							// some old data existed with the same length,
-							// we'll have to compare the caches
-							oldDataHash = this.dataPoints[index].hashCode();
-						}
-						
-						
-						// copy over the new data
-						this.dataPoints[index].clear();
-						this.dataPoints[index].addAll(inputDataArray);
-						this.remapDataColumn(index, remappedIds);
-						
-						if (RUN_DATA_ORDER_VALIDATION)
-						{
-							throwIfDataColumnInWrongOrder(inputDataSource.pos, this.dataPoints[index]);
-						}
-						
-						
-						
-						if (!dataChanged)
-						{
-							// check if the identical length data column hashes are the same
-							// hashes need to be compared after the ID's have been remapped otherwise the ID's won't match even if the data is the same
-							if (oldDataHash != this.dataPoints[index].hashCode())
-							{
-								// the hashes are different, something was changed
-								dataChanged = true;
-							}
-						}
-						
-						
-						this.columnGenerationSteps.set(index, inputGenState);
-						// always overwrite the compression mode since we're replacing this column
-						this.columnWorldCompressionMode.set(index, inputDataSource.columnWorldCompressionMode.getByte(index));
-						this.isEmpty = false;
+						// the hashes are different, something was changed
+						dataChanged = true;
 					}
 				}
+				
+				
+				this.columnGenerationSteps.set(index, inputGenState);
+				// always overwrite the compression mode since we're replacing this column
+				this.columnWorldCompressionMode.set(index, inputDataSource.columnWorldCompressionMode.getByte(index));
+				this.isEmpty = false;
 			}
 		}
 		
 		return dataChanged;
 	}
-	public boolean updateFromOneBelowDetailLevel(FullDataSourceV2 inputDataSource, int[] remappedIds)
+	
+	private boolean updateFromOneBelowDetailLevel(FullDataSourceV2 inputDataSource, int[] remappedIds)
 	{
 		if (DhSectionPos.getDetailLevel(inputDataSource.pos) + 1 != DhSectionPos.getDetailLevel(this.pos))
 		{
@@ -711,176 +717,221 @@ public class FullDataSourceV2
 	{
 		LongArrayList newColumnList = new LongArrayList();
 		
-		// special numbers:
-		// -2 = the column's height hasn't been determined yet
-		// -1 = we've reached the end of the column
-		int[] currentDatapointIndex = new int[] { -2, -2, -2, -2 };
+		
+		//=========================//
+		// get the 4 input columns //
+		//=========================//
+		
+		LongArrayList[] inputColumns = new LongArrayList[4];
+		int colIndex = 0;
+		for (int inputX = x; inputX < x + 2; inputX++)
+		{
+			for (int inputZ = z; inputZ < z + 2; inputZ++, colIndex++)
+			{
+				inputColumns[colIndex] = inputDataSource.dataPoints[relativePosToIndex(inputX, inputZ)];
+				if (inputColumns[colIndex] != null 
+					&& RUN_DATA_ORDER_VALIDATION)
+				{
+					throwIfDataColumnInWrongOrder(inputDataSource.pos, inputColumns[colIndex]);
+				}
+			}
+		}
+		
+		
+		
+		//========================================//
+		// find all y levels where changes happen //
+		//========================================//
+		
+		IntArrayList yTransitions = new IntArrayList();
+		for (int i = 0; i < 4; i++)
+		{
+			if (inputColumns[i] == null 
+				|| inputColumns[i].isEmpty())
+			{
+				continue;
+			}
+			
+			for (int j = 0; j < inputColumns[i].size(); j++)
+			{
+				long datapoint = inputColumns[i].getLong(j);
+				int minY = FullDataPointUtil.getBottomY(datapoint);
+				int maxY = minY + FullDataPointUtil.getHeight(datapoint);
+				
+				if (!yTransitions.contains(minY))
+				{
+					yTransitions.add(minY);
+				}
+				
+				if (!yTransitions.contains(maxY))
+				{
+					yTransitions.add(maxY);
+				}
+			}
+		}
+		
+		// can happen if the columns are empty
+		if (yTransitions.isEmpty())
+		{
+			return newColumnList;
+		}
+		
+		// sort the transitions from bottom to top // TODO
+		yTransitions.sort(null);
+		
+		// create index trackers for each column, 
+		// starting with the top-most datapoint
+		int[] currentIndices = new int[4];
+		for (int i = 0; i < 4; i++)
+		{
+			if (inputColumns[i] != null 
+				&& !inputColumns[i].isEmpty())
+			{
+				currentIndices[i] = inputColumns[i].size() - 1;
+			}
+			else
+			{
+				currentIndices[i] = -1;
+			}
+		}
+		
+		
+		
+		//=======================//
+		// process each Y change //
+		//=======================//
 		
 		int lastId = 0;
 		byte lastBlockLight = 0;
 		byte lastSkyLight = 0;
-		int height = 0;
-		int minY = 0;
+		int currentMinY = yTransitions.getInt(0);
+		int accumulatedHeight = 0;
 		
-		
-		// these arrays will be reused quite often, so re-using them helps reduce some GC pressure
-		long[] datapointsForYSlice = new long[4];
 		int[] mergeIds = new int[4];
 		int[] mergeBlockLights = new int[4];
 		int[] mergeSkyLights = new int[4];
 		
-		
-		for (int blockY = 0; blockY < RenderDataPointUtil.MAX_WORLD_Y_SIZE; blockY++, height++)
+		for (int yIndex = 0; yIndex < yTransitions.size() - 1; yIndex++)
 		{
-			// if each column has reached the end of their data, nothing more needs to be done
-			if (currentDatapointIndex[0] == -1
-				&& currentDatapointIndex[1] == -1
-				&& currentDatapointIndex[2] == -1
-				&& currentDatapointIndex[3] == -1
-				)
-			{
-				break;
-			}
-			
-			
-			// scary double loop but, 
-			// this will only ever loop 4 times, 
-			// once for each of the 4 input columns
-			Arrays.fill(datapointsForYSlice, 0L);
-			int colIndex = 0;
-			for (int inputX = x; inputX < x + 2; inputX++)
-			{
-				for (int inputZ = z; inputZ < z + 2; inputZ++, colIndex++)
-				{
-					// TODO throw an assertion if the column isn't in top-down order or just fix it...
-					LongArrayList inputDataArray = inputDataSource.dataPoints[relativePosToIndex(inputX, inputZ)];
-					if (inputDataArray == null || inputDataArray.size() == 0)
-					{
-						currentDatapointIndex[colIndex] = -1;
-						continue;
-					}
-					
-					// determine the last index (the lowest data point) for each column
-					if (currentDatapointIndex[colIndex] == -2)
-					{
-						currentDatapointIndex[colIndex] = inputDataArray.size() - 1;
-						
-						if (RUN_DATA_ORDER_VALIDATION)
-						{
-							throwIfDataColumnInWrongOrder(inputDataSource.pos, inputDataArray);
-						}
-					}
-					
-					
-					int dataPointIndex = currentDatapointIndex[colIndex];
-					if (dataPointIndex == -1)
-					{
-						// went over the end 
-						continue;
-					}
-					long datapoint = inputDataArray.getLong(dataPointIndex);
-					
-					int datapointMinY = FullDataPointUtil.getBottomY(datapoint);
-					int numbOfBlocksTall = FullDataPointUtil.getHeight(datapoint);
-					int datapointMaxY = (datapointMinY + numbOfBlocksTall);
-					
-					
-					// check if y position is inside this datapoint
-					if (blockY < datapointMinY)
-					{
-						// this y-slice is below this datapoint, nothing can be added
-						continue;
-					}
-					else if (blockY >= datapointMaxY)
-					{
-						// this y-slice is above the current datapoint,
-						// try the next data point
-						
-						int newDatapointIndex = currentDatapointIndex[colIndex] - 1;
-						if (newDatapointIndex < 0)
-						{
-							// went to far, no additional data present
-							newDatapointIndex = -1;
-						}
-						currentDatapointIndex[colIndex] = newDatapointIndex;
-						
-						
-						// try again with the next data point
-						inputZ--;
-						colIndex--;
-						continue;
-					}
-					
-					
-					
-					datapointsForYSlice[colIndex] = datapoint;
-				}
-			}
-			
+			int sliceMinY = yTransitions.getInt(yIndex);
+			int sliceMaxY = yTransitions.getInt(yIndex + 1);
+			int sliceHeight = sliceMaxY - sliceMinY;
 			
+			// Sample at the midpoint of this slice
+			int sampleY = sliceMinY + (sliceHeight / 2);
 			
+			// Get data from each column at this Y level
 			Arrays.fill(mergeIds, 0);
 			Arrays.fill(mergeBlockLights, 0);
 			Arrays.fill(mergeSkyLights, 0);
+			
 			for (int i = 0; i < 4; i++)
 			{
-				mergeIds[i] = FullDataPointUtil.getId(datapointsForYSlice[i]);
-				mergeBlockLights[i] = FullDataPointUtil.getBlockLight(datapointsForYSlice[i]);
-				mergeSkyLights[i] = FullDataPointUtil.getSkyLight(datapointsForYSlice[i]);
+				// skip columns that are empty or where we have already reached the bottom
+				if (currentIndices[i] == -1)
+				{
+					continue;
+				}
+				
+				
+				LongArrayList column = inputColumns[i];
+				if (column == null)
+				{
+					continue;
+				}
+				
+				// move the index down if we've passed the current datapoint
+				while (currentIndices[i] >= 0)
+				{
+					long datapoint = column.getLong(currentIndices[i]);
+					int inputMinY = FullDataPointUtil.getBottomY(datapoint);
+					int inputMaxY = inputMinY + FullDataPointUtil.getHeight(datapoint);
+					
+					if (sampleY >= inputMaxY)
+					{
+						// Sample point is above this datapoint, move to next (lower) one
+						currentIndices[i]--;
+					}
+					else if (sampleY >= inputMinY 
+							&& sampleY < inputMaxY)
+					{
+						// Sample point is within this datapoint
+						mergeIds[i] = FullDataPointUtil.getId(datapoint);
+						mergeBlockLights[i] = FullDataPointUtil.getBlockLight(datapoint);
+						mergeSkyLights[i] = FullDataPointUtil.getSkyLight(datapoint);
+						break;
+					}
+					else
+					{
+						// Sample point is below this datapoint
+						break;
+					}
+				}
 			}
 			
 			
-			// determine the most common values for this slice
-			int id = determineMostValueInColumnSlice(mergeIds, inputDataSource.mapping);
+			
+			// Determine merged values for this slice
+			int id = determineMostCommonValueInColumnSlice(mergeIds, inputDataSource.mapping);
 			byte blockLight = (byte) determineAverageValueInColumnSlice(mergeBlockLights);
 			byte skyLight = (byte) determineAverageValueInColumnSlice(mergeSkyLights);
 			
-			// if this slice is different then the last one, create a new one
-			if (id != lastId
-				// block and sky light might not be necessary
-				|| blockLight != lastBlockLight
-				|| skyLight != lastSkyLight)
+			// Check if we need to start a new datapoint
+			if (accumulatedHeight == 0)
 			{
-				if (height != 0)
-				{
-					try
-					{
-						long datapoint = FullDataPointUtil.encode(lastId, height, minY, lastBlockLight, lastSkyLight);
-						newColumnList.add(datapoint);
-					}
-					catch (DataCorruptedException e)
-					{
-						// shouldn't happen, (especially if validation is disabled) but just in case
-						LOGGER.warn("Skipping corrupt datapoint for pos ["+DhSectionPos.toString(inputDataSource.pos)+"] at relative position ["+x+","+z+"] with data: ID["+lastId+"], Height["+height+"], minY["+minY+"], lastBlockLight["+lastBlockLight+"], lastSkyLight["+lastSkyLight+"].");
-					}
-				}
-				
+				// first datapoint
 				lastId = id;
 				lastBlockLight = blockLight;
 				lastSkyLight = skyLight;
-				height = 0;
-				minY = blockY;
+				currentMinY = sliceMinY;
+				accumulatedHeight = sliceHeight;
+			}
+			else if (id != lastId 
+					|| blockLight != lastBlockLight 
+					|| skyLight != lastSkyLight)
+			{
+				// the data changed, create a new datapoint
+				try
+				{
+					long datapoint = FullDataPointUtil.encode(lastId, accumulatedHeight, currentMinY, lastBlockLight, lastSkyLight);
+					newColumnList.add(datapoint);
+				}
+				catch (DataCorruptedException e)
+				{
+					LOGGER.warn("Skipping corrupt datapoint for pos ["+DhSectionPos.toString(inputDataSource.pos)+"] at relative position ["+x+","+z+"] with data: ID["+lastId+"], Height["+accumulatedHeight+"], minY["+currentMinY+"], lastBlockLight["+lastBlockLight+"], lastSkyLight["+lastSkyLight+"].");
+				}
+				
+				// start the next datapoint
+				lastId = id;
+				lastBlockLight = blockLight;
+				lastSkyLight = skyLight;
+				currentMinY = sliceMinY;
+				accumulatedHeight = sliceHeight;
+			}
+			else
+			{
+				// this datapoint is the same as the last one, 
+				// just extend it's height
+				accumulatedHeight += sliceHeight;
 			}
 		}
 		
-		// add the last slice if present
-		if (height != 0)
+		
+		// add the final datapoint if needed
+		if (accumulatedHeight > 0)
 		{
 			try
 			{
-				newColumnList.add(FullDataPointUtil.encode(lastId, height, minY, lastBlockLight, lastSkyLight));
+				newColumnList.add(FullDataPointUtil.encode(lastId, accumulatedHeight, currentMinY, lastBlockLight, lastSkyLight));
 			}
 			catch (DataCorruptedException e)
 			{
-				// shouldn't happen, (especially if validation is disabled) but just in case
-				LOGGER.warn("Skipping corrupt datapoint for pos ["+DhSectionPos.toString(inputDataSource.pos)+"] at relative position ["+x+","+z+"] with data: ID["+lastId+"], Height["+height+"], minY["+minY+"], lastBlockLight["+lastBlockLight+"], lastSkyLight["+lastSkyLight+"].");
+				LOGGER.warn("Skipping corrupt datapoint for pos ["+DhSectionPos.toString(inputDataSource.pos)+"] at relative position ["+x+","+z+"] with data: ID["+lastId+"], Height["+accumulatedHeight+"], minY["+currentMinY+"], lastBlockLight["+lastBlockLight+"], lastSkyLight["+lastSkyLight+"].");
 			}
 		}
 		
 		
-		// flip the array if necessary
-		// TODO why is this sometimes necessary? What did I (James) screw up that causes the mergedInputDataArray
-		//  to sometimes be in a different order? Is it potentially related to what detail level is coming in?
+		// confirm the array is in the correct order
 		ensureDataColumnOrder(newColumnList);
 		
 		return newColumnList;
@@ -898,23 +949,8 @@ public class FullDataSourceV2
 			dataColumn.set(i, FullDataPointUtil.remap(remappedIds, dataColumn.getLong(i)));
 		}
 	}
-	private static boolean areDataColumnsDifferent(long[] oldDataArray, long[] newDataArray)
-	{
-		if (oldDataArray == null || oldDataArray.length != newDataArray.length)
-		{
-			// new data was added/removed
-			return true;
-		}
-		else
-		{
-			// check if the new column data is different
-			int oldArrayHash = Arrays.hashCode(oldDataArray);
-			int newArrayHash = Arrays.hashCode(newDataArray);
-			return (newArrayHash != oldArrayHash);
-		}
-	}
 	/** @param mapping can be included to ignore air ID's, otherwise all 4 values are treated equally */
-	private static int determineMostValueInColumnSlice(int[] sliceArray, @Nullable FullDataPointIdMap mapping)
+	private static int determineMostCommonValueInColumnSlice(int[] sliceArray, @Nullable FullDataPointIdMap mapping)
 	{
 		if (RUN_UPDATE_DEV_VALIDATION)
 		{
@@ -958,7 +994,7 @@ public class FullDataSourceV2
 			}
 		}
 		
-		// return the most common occurance
+		// return the most common occurrence
 		int maxCount = Math.max(count0, Math.max(count1, Math.max(count2, count3)));
 		if (maxCount == count0)
 		// if the max count is 1 then we'll just go with the first column
@@ -1271,13 +1307,13 @@ public class FullDataSourceV2
 	{
 		try
 		{
-			LodDataBuilder.correctDataColumnOrder(columnDataPoints);
+			LodDataBuilder.putListInTopDownOrder(columnDataPoints);
 			if (this.runApiChunkValidation)
 			{
 				LodDataBuilder.validateOrThrowApiDataColumn(columnDataPoints);
 			}
 			
-			LongArrayList packedDataPoints = LodDataBuilder.convertApiDataPointListToPackedLongArray(columnDataPoints, this, 0);
+			LongArrayList packedDataPoints = LodDataBuilder.convertApiDataPointListToPackedLongArray(columnDataPoints, this, 0, true);
 			
 			// TODO there should be an "unknown" compression and generation step, or be defined via the datapoints
 			this.setSingleColumn(packedDataPoints, relX, relZ, EDhApiWorldGenerationStep.SURFACE, EDhApiWorldCompressionMode.MERGE_SAME_BLOCKS);
@@ -1300,7 +1336,7 @@ public class FullDataSourceV2
 		{
 			long datapoint = dataColumn.getLong(i);
 			
-			DhApiTerrainDataPoint apiDataPoint = DhApiTerrainDataPointUtil.createApiDatapoint(this.levelMinY, this.mapping, DhSectionPos.getDetailLevel(this.pos), datapoint);
+			DhApiTerrainDataPoint apiDataPoint = DhApiTerrainDataPointUtil.createApiDatapoint(0, this.mapping, DhSectionPos.getDetailLevel(this.pos), datapoint);
 			apiList.add(apiDataPoint);
 		}
 		

core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/BufferQuad.java

@@ -157,8 +157,8 @@ public final class BufferQuad
 			return false;
 		
 		// make sure these quads share the same perpendicular axis
-		if ((mergeDirection == BufferMergeDirectionEnum.EastWest && this.y != quad.y) ||
-				(mergeDirection == BufferMergeDirectionEnum.NorthSouthOrUpDown && this.x != quad.x))
+		if ((mergeDirection == BufferMergeDirectionEnum.EastWest && this.y != quad.y)
+			|| (mergeDirection == BufferMergeDirectionEnum.NorthSouthOrUpDown && this.x != quad.x))
 		{
 			return false;
 		}

core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/ColumnBox.java

@@ -24,19 +24,19 @@ import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.enums.EDhDirection;
 import com.seibel.distanthorizons.core.level.IDhClientLevel;
 import com.seibel.distanthorizons.core.pooling.PhantomArrayListCheckout;
-import com.seibel.distanthorizons.core.pooling.PhantomArrayListPool;
 import com.seibel.distanthorizons.core.util.ColorUtil;
 import com.seibel.distanthorizons.core.util.LodUtil;
 import com.seibel.distanthorizons.core.util.RenderDataPointUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnArrayView;
+import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
 import com.seibel.distanthorizons.coreapi.util.MathUtil;
 import it.unimi.dsi.fastutil.longs.LongArrayList;
 import org.jetbrains.annotations.NotNull;
 
 public class ColumnBox
 {
-	private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
+	private static final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
 	
 	/** 
 	 * if the skylight has this value that means
@@ -46,7 +46,6 @@ public class ColumnBox
 	
 	
 	
-	
 	//=========//
 	// builder //
 	//=========//
@@ -124,7 +123,7 @@ public class ColumnBox
 					&& !isTopTransparent;
 			if (!skipTop)
 			{
-				builder.addQuadUp(minX, maxY, minZ, width, width, ColorUtil.applyShade(color, MC.getShade(EDhDirection.UP)), irisBlockMaterialId, skyLightTop, blockLight);
+				builder.addQuadUp(minX, maxY, minZ, width, width, ColorUtil.applyShade(color, MC_RENDER.getShade(EDhDirection.UP)), irisBlockMaterialId, skyLightTop, blockLight);
 			}
 		}
 		
@@ -135,7 +134,7 @@ public class ColumnBox
 					&& !isBottomTransparent;
 			if (!skipBottom)
 			{
-				builder.addQuadDown(minX, minY, minZ, width, width, ColorUtil.applyShade(color, MC.getShade(EDhDirection.DOWN)), irisBlockMaterialId, skyLightBot, blockLight);
+				builder.addQuadDown(minX, minY, minZ, width, width, ColorUtil.applyShade(color, MC_RENDER.getShade(EDhDirection.DOWN)), irisBlockMaterialId, skyLightBot, blockLight);
 			}
 		}
 		
@@ -249,10 +248,10 @@ public class ColumnBox
 	}
 	
 	private static void makeAdjVerticalQuad(
-			LodQuadBuilder builder, PhantomArrayListCheckout phantomArrayCheckout,
-			@NotNull ColumnArrayView adjColumnView, boolean adjacentIsSameDetailLevel, int caveCullingMaxY, EDhDirection direction,
-			short x, short yMin, short z, short horizontalWidth, short ySize,
-			int color, byte irisBlockMaterialId, byte blockLight)
+		LodQuadBuilder builder, PhantomArrayListCheckout phantomArrayCheckout,
+		@NotNull ColumnArrayView adjColumnView, boolean adjacentIsSameDetailLevel, int caveCullingMaxY, EDhDirection direction,
+		short x, short yMin, short z, short horizontalWidth, short ySize,
+		int color, byte irisBlockMaterialId, byte blockLight)
 	{
 		// pooled arrays
 		LongArrayList segments = phantomArrayCheckout.getLongArray(0, 0);
@@ -265,7 +264,7 @@ public class ColumnBox
 		// no adjacent data //
 		//==================//
 		
-		color = ColorUtil.applyShade(color, MC.getShade(direction));
+		color = ColorUtil.applyShade(color, MC_RENDER.getShade(direction));
 		
 		if (adjColumnView.size == 0
 			|| RenderDataPointUtil.hasZeroHeight(adjColumnView.get(0)))
@@ -311,9 +310,10 @@ public class ColumnBox
 			long adjBelowPoint = (adjIndex + 1 < adjCount) ? adjColumnView.get(adjIndex + 1) : RenderDataPointUtil.EMPTY_DATA;
 			
 			boolean adjOverVoid = !RenderDataPointUtil.doesDataPointExist(adjBelowPoint);
-			boolean adjTransparent = !adjOverVoid
-					&& RenderDataPointUtil.getAlpha(adjPoint) < 255
-					&& transparencyEnabled;
+			boolean adjTransparent = 
+				!adjOverVoid
+				&& RenderDataPointUtil.getAlpha(adjPoint) < 255
+				&& transparencyEnabled;
 			
 			byte adjSkyLight = RenderDataPointUtil.getLightSky(adjPoint);
 			byte lightToApply;
@@ -323,14 +323,14 @@ public class ColumnBox
 				// Adjacent is opaque
 				boolean adjacentCoversThis =
 					!adjacentIsSameDetailLevel
-					&& RenderDataPointUtil.getYMax(adjPoint) >= caveCullingMaxY
-					&&
-					(
-						(x == 0 && direction == EDhDirection.WEST)
-						|| (z == 0 && direction == EDhDirection.NORTH)
-						|| (x == 256 && direction == EDhDirection.EAST)
-						|| (z == 256 && direction == EDhDirection.SOUTH)
-					);
+						&& RenderDataPointUtil.getYMax(adjPoint) >= caveCullingMaxY
+						&&
+						(
+							(x == 0 && direction == EDhDirection.WEST)
+							|| (z == 0 && direction == EDhDirection.NORTH)
+							|| (x == 256 && direction == EDhDirection.EAST)
+							|| (z == 256 && direction == EDhDirection.SOUTH)
+						);
 				
 				lightToApply = adjacentCoversThis ? adjSkyLight : SKYLIGHT_COVERED;
 			}
@@ -363,10 +363,10 @@ public class ColumnBox
 		{
 			long segment = segments.getLong(i);
 			tryAddVerticalFaceWithSkyLightToBuilder(
-					builder, direction,
-					x, z, horizontalWidth,
-					color, irisBlockMaterialId, blockLight,
-					YSegmentUtil.getSkyLight(segment), inputTransparent, YSegmentUtil.getEndY(segment), YSegmentUtil.getStartY(segment)
+				builder, direction,
+				x, z, horizontalWidth,
+				color, irisBlockMaterialId, blockLight,
+				YSegmentUtil.getSkyLight(segment), inputTransparent, YSegmentUtil.getEndY(segment), YSegmentUtil.getStartY(segment)
 			);
 		}
 	}

core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/LodBufferContainer.java

@@ -107,12 +107,13 @@ public class LodBufferContainer implements AutoCloseable
 		
 		
 		// upload on MC's render thread
-		GLProxy.getInstance().queueRunningOnRenderThread(() ->
+		GLProxy.queueRunningOnRenderThread(() ->
 		{
 			try
 			{
 				// skip this event if requested
-				if (Thread.interrupted() || this.uploadFuture.isCancelled())
+				if (Thread.interrupted() 
+					|| this.uploadFuture.isCancelled())
 				{
 					throw new InterruptedException();
 				}
@@ -294,7 +295,7 @@ public class LodBufferContainer implements AutoCloseable
 	{
 		this.buffersUploaded = false;
 		
-		GLProxy.getInstance().queueRunningOnRenderThread(() ->
+		GLProxy.queueRunningOnRenderThread(() ->
 		{
 			for (GLVertexBuffer buffer : this.vbos)
 			{

core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/bufferBuilding/LodQuadBuilder.java

@@ -32,6 +32,7 @@ import com.seibel.distanthorizons.core.logging.DhLogger;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.util.ColorUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import com.seibel.distanthorizons.coreapi.util.MathUtil;
 import org.lwjgl.system.MemoryUtil;
@@ -44,7 +45,7 @@ import org.lwjgl.system.MemoryUtil;
 public class LodQuadBuilder
 {
 	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
-	private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
+	private static final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
 	
 	@SuppressWarnings("unchecked")
 	private final ArrayList<BufferQuad>[] opaqueQuads = (ArrayList<BufferQuad>[]) new ArrayList[6];
@@ -148,8 +149,18 @@ public class LodQuadBuilder
 			throw new IllegalArgumentException("addQuadAdj() is only for adj direction! Not UP or Down!");
 		}
 		
+		
+		ArrayList<BufferQuad> quadList;
+		if (this.doTransparency && ColorUtil.getAlpha(color) < 255)
+		{
+			quadList = this.transparentQuads[dir.ordinal()];
+		}
+		else
+		{
+			quadList = this.opaqueQuads[dir.ordinal()]; 
+		}
+		
 		BufferQuad quad = new BufferQuad(x, y, z, widthEastWest, widthNorthSouthOrUpDown, color, irisBlockMaterialId, skyLight, blockLight, dir);
-		ArrayList<BufferQuad> quadList = (this.doTransparency && ColorUtil.getAlpha(color) < 255) ? this.transparentQuads[dir.ordinal()] : this.opaqueQuads[dir.ordinal()];
 		if (!quadList.isEmpty()
 			&& (
 				quadList.get(quadList.size() - 1).tryMerge(quad, BufferMergeDirectionEnum.EastWest)
@@ -369,7 +380,7 @@ public class LodQuadBuilder
 								// for horizontal and bottom faces of grass blocks, use the  dirt color to
 								// prevent green cliff walls
 								color = this.clientLevelWrapper.getDirtBlockColor();
-								color = ColorUtil.applyShade(color, MC.getShade(quad.direction));
+								color = ColorUtil.applyShade(color, MC_RENDER.getShade(quad.direction));
 							}
 						}
 					}
@@ -388,31 +399,33 @@ public class LodQuadBuilder
 	}
 	private void putVertex(ByteBuffer bb, short x, short y, short z, int color, byte normalIndex, byte irisBlockMaterialId, byte skylight, byte blocklight, int mx, int my, int mz)
 	{
-		skylight %= 16;
-		blocklight %= 16;
-		
 		bb.putShort(x);
 		bb.putShort(y);
 		bb.putShort(z);
 		
 		short meta = 0;
-		meta |= (skylight | (blocklight << 4));
-		byte mirco = 0;
-		// mirco offset which is a xyz 2bit value
-		// 0b00 = no offset
-		// 0b01 = positive offset
-		// 0b11 = negative offset
-		// format is: 0b00zzyyxx
-		if (mx != 0) mirco |= mx > 0 ? 0b01 : 0b11;
-		if (my != 0) mirco |= my > 0 ? 0b0100 : 0b1100;
-		if (mz != 0) mirco |= mz > 0 ? 0b010000 : 0b110000;
-		meta |= mirco << 8;
-		
+		{
+			skylight %= 16;
+			blocklight %= 16;
+			meta |= (short) (skylight | (blocklight << 4));
+			
+			byte mircoOffset = 0;
+			// mirco offset which is a xyz 2bit value
+			// 0b00 = no offset
+			// 0b01 = positive offset
+			// 0b11 = negative offset
+			// format is: 0b00zzyyxx
+			if (mx != 0) { mircoOffset |= (byte) (mx > 0 ? 0b01 : 0b11); }
+			if (my != 0) { mircoOffset |= (byte) (my > 0 ? 0b0100 : 0b1100); }
+			if (mz != 0) { mircoOffset |= (byte) (mz > 0 ? 0b010000 : 0b110000); }
+			meta |= (short) (mircoOffset << 8);
+		}
 		bb.putShort(meta);
+		
 		byte r = (byte) ColorUtil.getRed(color);
 		byte g = (byte) ColorUtil.getGreen(color);
 		byte b = (byte) ColorUtil.getBlue(color);
-		byte a = this.doTransparency ? (byte) ColorUtil.getAlpha(color) : (byte) 255; // TODO should this be called here or happen somewhere else?
+		byte a = this.doTransparency ? (byte) ColorUtil.getAlpha(color) : (byte) 255;
 		bb.put(r);
 		bb.put(g);
 		bb.put(b);

core/src/main/java/com/seibel/distanthorizons/core/dataObjects/transformers/FullDataToRenderDataTransformer.java

@@ -31,11 +31,9 @@ import com.seibel.distanthorizons.core.pooling.PhantomArrayListCheckout;
 import com.seibel.distanthorizons.core.pooling.PhantomArrayListPool;
 import com.seibel.distanthorizons.core.pos.DhSectionPos;
 import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPosMutable;
-import com.seibel.distanthorizons.core.render.LodQuadTree;
 import com.seibel.distanthorizons.core.util.*;
 import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
 import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import com.seibel.distanthorizons.coreapi.util.BitShiftUtil;
@@ -54,11 +52,11 @@ public class FullDataToRenderDataTransformer
 	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	private static final IWrapperFactory WRAPPER_FACTORY = SingletonInjector.INSTANCE.get(IWrapperFactory.class);
-	private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
 	
-	private static final LongOpenHashSet brokenPos = new LongOpenHashSet();
+	private static final LongOpenHashSet BROKEN_POS_SET = new LongOpenHashSet();
+	private static final PhantomArrayListPool ARRAY_LIST_POOL = new PhantomArrayListPool("Data Transformer");
 	
-	public static final PhantomArrayListPool ARRAY_LIST_POOL = new PhantomArrayListPool("Data Transformer");
+	private static HashSet<IBlockStateWrapper> snowLayerBlockStates = null;
 	
 	
 	
@@ -198,6 +196,16 @@ public class FullDataToRenderDataTransformer
 		HashSet<IBlockStateWrapper> blockStatesToIgnore = WRAPPER_FACTORY.getRendererIgnoredBlocks(levelWrapper);
 		HashSet<IBlockStateWrapper> caveBlockStatesToIgnore = WRAPPER_FACTORY.getRendererIgnoredCaveBlocks(levelWrapper);
 		
+		// build snow block cache if needed
+		if (snowLayerBlockStates == null)
+		{
+			snowLayerBlockStates = new HashSet<>();
+			// ignore snow layers 1-3, everything above should be considered a full block
+			snowLayerBlockStates.add(WRAPPER_FACTORY.deserializeBlockStateWrapperOrGetDefault("minecraft:snow_STATE_{layers:1}", levelWrapper));
+			snowLayerBlockStates.add(WRAPPER_FACTORY.deserializeBlockStateWrapperOrGetDefault("minecraft:snow_STATE_{layers:2}", levelWrapper));
+			snowLayerBlockStates.add(WRAPPER_FACTORY.deserializeBlockStateWrapperOrGetDefault("minecraft:snow_STATE_{layers:3}", levelWrapper));
+		}
+		
 		int caveCullingMaxY = Config.Client.Advanced.Graphics.Culling.caveCullingHeight.get() - levelWrapper.getMinHeight();
 		boolean caveCullingEnabled = 
 			Config.Client.Advanced.Graphics.Culling.enableCaveCulling.get()
@@ -252,9 +260,9 @@ public class FullDataToRenderDataTransformer
 			}
 			catch (IndexOutOfBoundsException e)
 			{
-				if (!brokenPos.contains(fullDataMapping.getPos()))
+				if (!BROKEN_POS_SET.contains(fullDataMapping.getPos()))
 				{
-					brokenPos.add(fullDataMapping.getPos());
+					BROKEN_POS_SET.add(fullDataMapping.getPos());
 					String levelId = levelWrapper.getDhIdentifier();
 					LOGGER.warn("Unable to get data point with id ["+id+"] " +
 							"(Max possible ID: ["+fullDataMapping.getMaxValidId()+"]) " +
@@ -324,10 +332,26 @@ public class FullDataToRenderDataTransformer
 			// non-solid block check //
 			//=======================//
 			
-			if (ignoreNonCollidingBlocks
-					&& !block.isSolid()
-					&& !block.isLiquid()
-					&& block.getOpacity() != LodUtil.BLOCK_FULLY_OPAQUE)
+			boolean ignoreNonSolidBlock =
+				ignoreNonCollidingBlocks
+				&& !block.isSolid()
+				&& !block.isLiquid()
+				&& block.getOpacity() != LodUtil.BLOCK_FULLY_OPAQUE;
+			
+			// merge snow into the block below it
+			if (snowLayerBlockStates.contains(block))
+			{
+				// sometimes a snow datapoint will be multiple blocks tall,
+				// in that case we just want to drop the top by 1
+				blockHeight -= 1;
+				if (blockHeight == 0)
+				{
+					// this snow block was entirely removed, just color the block below it
+					ignoreNonSolidBlock = true;
+				}
+			}
+			
+			if (ignoreNonSolidBlock)
 			{
 				if (colorBelowWithAvoidedBlocks)
 				{

core/src/main/java/com/seibel/distanthorizons/core/dataObjects/transformers/LodDataBuilder.java

@@ -74,7 +74,7 @@ public class LodDataBuilder
 		long pos = DhSectionPos.encode(DhSectionPos.SECTION_BLOCK_DETAIL_LEVEL, sectionPosX, sectionPosZ);
 		
 		FullDataSourceV2 dataSource = FullDataSourceV2.createEmpty(pos);
-		dataSource.isEmpty = false;
+		dataSource.isEmpty = false; // this will be set to "true" if any blocks are found
 		// chunk updates always propagate up
 		dataSource.applyToParent = true;
 		
@@ -244,6 +244,15 @@ public class LodDataBuilder
 							blockLight = newBlockLight;
 							skyLight = newSkyLight;
 							lastY = y;
+							
+							
+							// mark the data source as non-empty if we find any non-air blocks
+							if (dataSource.isEmpty
+								&& newBlockState != null 
+								&& !newBlockState.isAir())
+							{
+								dataSource.isEmpty = false;
+							}
 						}
 					}
 					
@@ -261,7 +270,6 @@ public class LodDataBuilder
 			return null;
 		}
 		
-		LodUtil.assertTrue(!dataSource.isEmpty);
 		return dataSource;
 	}
 	
@@ -289,13 +297,29 @@ public class LodDataBuilder
 			for (int relBlockX = 0; relBlockX < LodUtil.CHUNK_WIDTH; relBlockX++)
 			{
 				List<DhApiTerrainDataPoint> columnDataPoints = apiChunk.getDataPoints(relBlockX, relBlockZ);
-				LodDataBuilder.correctDataColumnOrder(columnDataPoints);
+				
+				// mark the data source as non-empty if we find any non-air blocks
+				if (dataSource.isEmpty)
+				{
+					for (int i = 0; i < columnDataPoints.size(); i++)
+					{
+						DhApiTerrainDataPoint dataPoint = columnDataPoints.get(i);
+						if (dataPoint.blockStateWrapper != null
+							&& !dataPoint.blockStateWrapper.isAir())
+						{
+							dataSource.isEmpty = false;
+							break;
+						}
+					}
+				}
+				
+				LodDataBuilder.putListInTopDownOrder(columnDataPoints);
 				if (runAdditionalValidation)
 				{
 					validateOrThrowApiDataColumn(columnDataPoints);
 				}
 				
-				LongArrayList packedDataPoints = convertApiDataPointListToPackedLongArray(columnDataPoints, dataSource, apiChunk.bottomYBlockPos);
+				LongArrayList packedDataPoints = convertApiDataPointListToPackedLongArray(columnDataPoints, dataSource, apiChunk.bottomYBlockPos, runAdditionalValidation);
 				
 				// TODO add the ability for API users to define a different compression mode
 				//  or add a "unkown" compression mode
@@ -303,7 +327,6 @@ public class LodDataBuilder
 						packedDataPoints,
 						relBlockX + relSourceBlockX, relBlockZ + relSourceBlockZ,
 						EDhApiWorldGenerationStep.LIGHT, EDhApiWorldCompressionMode.MERGE_SAME_BLOCKS);
-				dataSource.isEmpty = false;
 			}
 		}
 		return dataSource;
@@ -317,41 +340,97 @@ public class LodDataBuilder
 	
 	/** @see FullDataPointUtil */
 	public static LongArrayList convertApiDataPointListToPackedLongArray(
-			@Nullable List<DhApiTerrainDataPoint> columnDataPoints, FullDataSourceV2 dataSource,
-			int bottomYBlockPos) throws DataCorruptedException
+			@Nullable List<DhApiTerrainDataPoint> topDownColumnDataPoints, FullDataSourceV2 dataSource,
+			int bottomYBlockPos, boolean runAdditionalValidation) throws DataCorruptedException
 	{
-		// this null check does 2 nice things at the same time:
-		// if columnDataPoints is null,
-		// then packedDataPoints will be of length 0
-		// AND the below loop won't run.
-		int size = (columnDataPoints != null) ? columnDataPoints.size() : 0;
-		
-		// TODO make missing air LODs
-		// TODO merge duplicate datapoints
-		LongArrayList packedDataPoints = new LongArrayList(new long[size]);
-		for (int index = 0; index < size; index++)
+		if (topDownColumnDataPoints == null 
+			|| topDownColumnDataPoints.size() == 0)
 		{
-			DhApiTerrainDataPoint dataPoint = columnDataPoints.get(index);
+			return new LongArrayList(0);
+		}
+		
+		
+		
+		// array to store data
+		int size = topDownColumnDataPoints.size();
+		LongArrayList packedDataPoints = new LongArrayList(size);
+		packedDataPoints.clear();
+		
+		
+		if (runAdditionalValidation)
+		{
+			// check for missing data
+			int lastTopY = Integer.MAX_VALUE;
+			for (int i = 0; i < size; i++)
+			{
+				DhApiTerrainDataPoint apiDataPoint = topDownColumnDataPoints.get(i);
+				
+				if (lastTopY != apiDataPoint.topYBlockPos
+					// the first index won't have a lastTopY value
+					&& i != 0)
+				{
+					throw new DataCorruptedException("LOD data has a gap between ["+lastTopY+"] and ["+apiDataPoint.bottomYBlockPos+"]. Empty areas should be filled with air datapoints so light propagates correctly.");
+				}
+				lastTopY = apiDataPoint.bottomYBlockPos;
+			}
+		}
+		
+		
+		// go through data from top down
+		long lastDataPoint = FullDataPointUtil.EMPTY_DATA_POINT;
+		for (int i = 0; i < size; i++)
+		{
+			DhApiTerrainDataPoint apiDataPoint = topDownColumnDataPoints.get(i);
 			
-			int id = dataSource.mapping.addIfNotPresentAndGetId(
-					(IBiomeWrapper) (dataPoint.biomeWrapper),
-					(IBlockStateWrapper) (dataPoint.blockStateWrapper)
+			int thisId = dataSource.mapping.addIfNotPresentAndGetId(
+					(IBiomeWrapper) (apiDataPoint.biomeWrapper),
+					(IBlockStateWrapper) (apiDataPoint.blockStateWrapper)
 			);
+			int thisHeight = (apiDataPoint.topYBlockPos - apiDataPoint.bottomYBlockPos);
 			
-			packedDataPoints.set(index, FullDataPointUtil.encode(
-					id,
-					dataPoint.topYBlockPos - dataPoint.bottomYBlockPos,
-					dataPoint.bottomYBlockPos - bottomYBlockPos,
-					(byte) (dataPoint.blockLightLevel),
-					(byte) (dataPoint.skyLightLevel)
-			));
+			int lastId = FullDataPointUtil.getId(lastDataPoint);
+			byte lastBlockLight = (byte)FullDataPointUtil.getBlockLight(lastDataPoint);
+			byte lastSkyLight = (byte)FullDataPointUtil.getSkyLight(lastDataPoint);
+			
+			
+			// if the ID and light are the same, merge the height
+			if (thisId == lastId
+				&& apiDataPoint.blockLightLevel == lastBlockLight
+				&& apiDataPoint.skyLightLevel == lastSkyLight
+				// the first index should always be added to the list
+				&& i != 0 )
+			{
+				// add adjacent height
+				int lastHeight = FullDataPointUtil.getHeight(lastDataPoint);
+				int newHeight = (lastHeight + thisHeight);
+				lastDataPoint = FullDataPointUtil.setHeight(lastDataPoint, newHeight);
+				
+				// subtract bottom Y
+				int lastBottomY = FullDataPointUtil.getBottomY(lastDataPoint);
+				int newBottomY = lastBottomY - thisHeight;
+				lastDataPoint = FullDataPointUtil.setBottomY(lastDataPoint, newBottomY);
+				 
+				packedDataPoints.set(packedDataPoints.size()-1, lastDataPoint);
+			}
+			else
+			{
+				// data changed, create a new datapoint
+				long dataPoint = FullDataPointUtil.encode(
+					thisId,
+					thisHeight,
+					apiDataPoint.bottomYBlockPos - bottomYBlockPos,
+					(byte) (apiDataPoint.blockLightLevel),
+					(byte) (apiDataPoint.skyLightLevel)
+				);
+				lastDataPoint = dataPoint;
+				packedDataPoints.add(dataPoint);
+			}
 		}
 		
 		return packedDataPoints;
 	}
 	
-	/** also corrects the order if it's backwards */
-	public static void correctDataColumnOrder(List<DhApiTerrainDataPoint> dataPoints)
+	public static void putListInTopDownOrder(List<DhApiTerrainDataPoint> dataPoints)
 	{
 		// order doesn't need to be checked if there is 0 or 1 items
 		if (dataPoints.size() > 1)

core/src/main/java/com/seibel/distanthorizons/core/enums/EMinecraftColor.java

@@ -0,0 +1,12 @@
+package com.seibel.distanthorizons.core.enums;
+
+/**
+ * TODO
+ * might be deprecated in the future? in that case we'll probably want a wrapper 
+ * function to handle colors for new MC versions
+ * 
+ * source: https://minecraft.wiki/w/Formatting_codes
+ */
+public class EMinecraftColor
+{
+}

core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/DelayedFullDataSourceSaveCache.java

@@ -104,7 +104,7 @@ public class DelayedFullDataSourceSaveCache implements AutoCloseable
 			}
 			
 			// write the new data into memory
-			memoryDataSource.updateFromChunk(inputDataSource);
+			memoryDataSource.updateFromDataSource(inputDataSource);
 			// keep track of when the last time we saved something was
 			pair.updateLastWrittenTimestamp();
 		}

core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/GeneratedFullDataSourceProvider.java

@@ -47,6 +47,8 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
+import java.io.IOException;
+import java.sql.SQLException;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -80,8 +82,9 @@ public class GeneratedFullDataSourceProvider extends FullDataSourceProviderV2 im
 	// constructor //
 	//=============//
 	
-	public GeneratedFullDataSourceProvider(IDhLevel level, ISaveStructure saveStructure) { super(level, saveStructure); }
-	public GeneratedFullDataSourceProvider(IDhLevel level, ISaveStructure saveStructure, @Nullable File saveDirOverride) 
+	public GeneratedFullDataSourceProvider(IDhLevel level, ISaveStructure saveStructure) throws SQLException, IOException 
+	{ this(level, saveStructure, null); }
+	public GeneratedFullDataSourceProvider(IDhLevel level, ISaveStructure saveStructure, @Nullable File saveDirOverride) throws SQLException, IOException
 	{
 		super(level, saveStructure, saveDirOverride);
 		

core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/RemoteFullDataSourceProvider.java

@@ -24,20 +24,22 @@ import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSour
 import com.seibel.distanthorizons.core.file.structure.ISaveStructure;
 import com.seibel.distanthorizons.core.generation.RemoteWorldRetrievalQueue;
 import com.seibel.distanthorizons.core.level.IDhLevel;
-import com.seibel.distanthorizons.core.level.WorldGenModule;
+import com.seibel.distanthorizons.core.level.LodRequestModule;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.multiplayer.client.SyncOnLoadRequestQueue;
 import com.seibel.distanthorizons.core.logging.DhLogger;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
+import java.io.IOException;
+import java.sql.SQLException;
 import java.util.Collections;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 /**
  * Only handles {@link SyncOnLoadRequestQueue} requests (IE updating existing LODs based on a timestamp).
- * Missing data is handled by {@link WorldGenModule} and {@link RemoteWorldRetrievalQueue}.
+ * Missing data is handled by {@link LodRequestModule} and {@link RemoteWorldRetrievalQueue}.
  */
 public class RemoteFullDataSourceProvider extends GeneratedFullDataSourceProvider
 {
@@ -58,7 +60,8 @@ public class RemoteFullDataSourceProvider extends GeneratedFullDataSourceProvide
 	
 	public RemoteFullDataSourceProvider(
 			IDhLevel level, ISaveStructure saveStructure, @Nullable File saveDirOverride, 
-			@Nullable SyncOnLoadRequestQueue syncOnLoadRequestQueue)
+			@Nullable SyncOnLoadRequestQueue syncOnLoadRequestQueue
+		) throws SQLException, IOException
 	{
 		super(level, saveStructure, saveDirOverride);
 		this.syncOnLoadRequestQueue = syncOnLoadRequestQueue;

core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/V1/FullDataSourceProviderV1.java

@@ -43,7 +43,7 @@ public class FullDataSourceProviderV1<TDhLevel extends IDhLevel>
 	// constructor //
 	//=============//
 	
-	public FullDataSourceProviderV1(TDhLevel level, File saveDir)
+	public FullDataSourceProviderV1(TDhLevel level, File saveDir) throws SQLException, IOException
 	{
 		this.level = level;
 		this.saveDir = saveDir;
@@ -52,7 +52,7 @@ public class FullDataSourceProviderV1<TDhLevel extends IDhLevel>
 			LOGGER.warn("Unable to create full data folder, file saving may fail.");
 		}
 		
-		this.repo = this.createRepo();
+		this.repo = new FullDataSourceV1Repo(AbstractDhRepo.DEFAULT_DATABASE_TYPE, new File(this.saveDir.getPath() + File.separator + ISaveStructure.DATABASE_NAME));
 	}
 	
 	
@@ -61,21 +61,6 @@ public class FullDataSourceProviderV1<TDhLevel extends IDhLevel>
 	// abstract methods //
 	//==================//
 	
-	/** When this is called the parent folders should be created */
-	protected FullDataSourceV1Repo createRepo()
-	{
-		try
-		{
-			return new FullDataSourceV1Repo(AbstractDhRepo.DEFAULT_DATABASE_TYPE, new File(this.saveDir.getPath() + File.separator + ISaveStructure.DATABASE_NAME));
-		}
-		catch (SQLException e)
-		{
-			// should only happen if there is an issue with the database (it's locked or can't be created if missing) 
-			// or the database update failed
-			throw new RuntimeException(e);
-		}
-	}
-	
 	protected FullDataSourceV1 createDataSourceFromDto(FullDataSourceV1DTO dto) throws InterruptedException, IOException, DataCorruptedException
 	{
 		FullDataSourceV1 dataSource = FullDataSourceV1.createEmpty(dto.pos);

core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/V2/DataMigratorV1.java

@@ -14,6 +14,8 @@ import com.seibel.distanthorizons.core.render.renderer.IDebugRenderable;
 import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
 
 import java.io.File;
+import java.io.IOException;
+import java.sql.SQLException;
 import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.List;
@@ -62,7 +64,8 @@ public class DataMigratorV1 implements IDebugRenderable, AutoCloseable
 	
 	public DataMigratorV1(
 			FullDataUpdaterV2 dataUpdater,
-			IDhLevel level, String levelId, File saveDir)
+			IDhLevel level, String levelId, File saveDir
+		) throws SQLException, IOException
 	{
 		this.dataUpdater = dataUpdater;
 		this.saveDir = saveDir;

core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/V2/FullDataSourceProviderV2.java

@@ -96,11 +96,11 @@ public class FullDataSourceProviderV2 implements IDebugRenderable, AutoCloseable
 	// constructor //
 	//=============//
 	
-	public FullDataSourceProviderV2(IDhLevel level, ISaveStructure saveStructure) { this(level, saveStructure, null); }
-	public FullDataSourceProviderV2(IDhLevel level, ISaveStructure saveStructure, @Nullable File saveDirOverride) 
+	public FullDataSourceProviderV2(IDhLevel level, ISaveStructure saveStructure) throws SQLException, IOException { this(level, saveStructure, null); }
+	public FullDataSourceProviderV2(IDhLevel level, ISaveStructure saveStructure, @Nullable File saveDirOverride) throws SQLException, IOException
 	{
 		this.saveDir = (saveDirOverride == null) ? saveStructure.getSaveFolder(level.getLevelWrapper()) : saveDirOverride;
-		this.repo = this.createRepo();
+		this.repo = new FullDataSourceV2Repo(AbstractDhRepo.DEFAULT_DATABASE_TYPE, new File(this.saveDir.getPath() + File.separator + ISaveStructure.DATABASE_NAME));
 		this.level = level;
 		
 		this.levelId = this.level.getLevelWrapper().getDhIdentifier();
@@ -112,19 +112,6 @@ public class FullDataSourceProviderV2 implements IDebugRenderable, AutoCloseable
 		DebugRenderer.register(this, Config.Client.Advanced.Debugging.DebugWireframe.showFullDataUpdateStatus);
 		
 	}
-	private FullDataSourceV2Repo createRepo()
-	{
-		try
-		{
-			return new FullDataSourceV2Repo(AbstractDhRepo.DEFAULT_DATABASE_TYPE, new File(this.saveDir.getPath() + File.separator + ISaveStructure.DATABASE_NAME));
-		}
-		catch (SQLException e)
-		{
-			// should only happen if there is an issue with the database (it's locked or the folder path is missing) 
-			// or the database update failed
-			throw new RuntimeException(e);
-		}
-	}
 	
 	
 	
@@ -134,14 +121,14 @@ public class FullDataSourceProviderV2 implements IDebugRenderable, AutoCloseable
 	
 	public void addDataSourceUpdateListener(IDataSourceUpdateListenerFunc<FullDataSourceV2> listener)
 	{
-		synchronized (this.dataUpdater)
+		synchronized (this.dataUpdater.dateSourceUpdateListeners)
 		{
 			this.dataUpdater.dateSourceUpdateListeners.add(listener);
 		}
 	}
 	public void removeDataSourceUpdateListener(IDataSourceUpdateListenerFunc<FullDataSourceV2> listener)
 	{
-		synchronized (this.dataUpdater)
+		synchronized (this.dataUpdater.dateSourceUpdateListeners)
 		{
 			this.dataUpdater.dateSourceUpdateListeners.add(listener);
 		}
@@ -239,7 +226,27 @@ public class FullDataSourceProviderV2 implements IDebugRenderable, AutoCloseable
 		catch (InterruptedException ignore) { }
 		catch (IOException e)
 		{
-			LOGGER.warn("File read Error for pos ["+DhSectionPos.toString(pos)+"], error: "+e.getMessage(), e);
+			String message = e.getMessage();
+			if (CORRUPT_DATA_ERRORS_LOGGED.add(message))
+			{
+				LOGGER.warn("File read Error for pos [" + DhSectionPos.toString(pos) + "], this error message will only be logged once, error: [" + message + "].", e);
+			}
+		}
+		catch (IllegalStateException e)
+		{	
+			String message = e.getMessage();
+			if (CORRUPT_DATA_ERRORS_LOGGED.add(message))
+			{
+				LOGGER.warn("Incorrectly formatted data for: [" + DhSectionPos.toString(pos) + "], this error message will only be logged once, error: [" + message + "].", e);
+			}
+		}
+		catch (Exception e)
+		{
+			String message = e.getMessage();
+			if (CORRUPT_DATA_ERRORS_LOGGED.add(message))
+			{
+				LOGGER.warn("Unexpected error getting: [" + DhSectionPos.toString(pos) + "], this error message will only be logged once, error: [" + message + "].", e);
+			}
 		}
 		
 		// an error occurred

core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/V2/FullDataUpdatePropagatorV2.java

@@ -82,6 +82,7 @@ public class FullDataUpdatePropagatorV2 implements IDebugRenderable, AutoCloseab
 	}
 	
 	
+	
 	//================//
 	// parent updates //
 	//================//
@@ -184,7 +185,7 @@ public class FullDataUpdatePropagatorV2 implements IDebugRenderable, AutoCloseab
 								parentLocked = true;
 								this.dataUpdater.lockedPosSet.add(parentUpdatePos);
 								
-								try (FullDataSourceV2 parentDataSource = this.provider.get(parentUpdatePos))
+								try (FullDataSourceV2 parentDataSource = this.provider.get(parentUpdatePos)) // TODO can we cache anything in memory to speed up the propagation process? Compression/Disk IO is by far the slowest part of this process
 								{
 									// will return null if the file handler is shutting down
 									if (parentDataSource != null)
@@ -203,7 +204,7 @@ public class FullDataUpdatePropagatorV2 implements IDebugRenderable, AutoCloseab
 													// can return null when the file handler is being shut down
 													if (childDataSource != null)
 													{
-														parentDataSource.updateFromChunk(childDataSource);
+														parentDataSource.updateFromDataSource(childDataSource);
 													}
 												}
 											}
@@ -213,6 +214,8 @@ public class FullDataUpdatePropagatorV2 implements IDebugRenderable, AutoCloseab
 											}
 											finally
 											{
+												this.provider.repo.setApplyToParent(childPos, false);
+												
 												childReadLock.unlock();
 												this.dataUpdater.lockedPosSet.remove(childPos);
 											}
@@ -224,11 +227,7 @@ public class FullDataUpdatePropagatorV2 implements IDebugRenderable, AutoCloseab
 											parentDataSource.applyToParent = true;
 										}
 										
-										this.dataUpdater.updateDataSource(parentDataSource, false);
-										for (Long childPos : updatePosByParentPos.get(parentUpdatePos))
-										{
-											this.provider.repo.setApplyToParent(childPos, false);
-										}
+										this.dataUpdater.updateDataSource(parentDataSource);
 									}
 								}
 							}
@@ -321,7 +320,7 @@ public class FullDataUpdatePropagatorV2 implements IDebugRenderable, AutoCloseab
 													// will return null if the file handler is shutting down
 													if (childDataSource != null)
 													{
-														childDataSource.updateFromChunk(parentDataSource);
+														childDataSource.updateFromDataSource(parentDataSource);
 														
 														// don't propagate child updates past the bottom of the tree
 														if (DhSectionPos.getDetailLevel(childPos) != DhSectionPos.SECTION_BLOCK_DETAIL_LEVEL)
@@ -329,7 +328,7 @@ public class FullDataUpdatePropagatorV2 implements IDebugRenderable, AutoCloseab
 															childDataSource.applyToChildren = true;
 														}
 														
-														this.dataUpdater.updateDataSource(childDataSource, false);
+														this.dataUpdater.updateDataSource(childDataSource);
 													}
 												}
 											}
@@ -339,12 +338,12 @@ public class FullDataUpdatePropagatorV2 implements IDebugRenderable, AutoCloseab
 											}
 											finally
 											{
+												this.provider.repo.setApplyToChild(parentUpdatePos, false);
+												
 												childWriteLock.unlock();
 												this.dataUpdater.lockedPosSet.remove(childPos);
 											}
 										}
-										
-										this.provider.repo.setApplyToChild(parentUpdatePos, false);
 									}
 								}
 							}

core/src/main/java/com/seibel/distanthorizons/core/file/fullDatafile/V2/FullDataUpdaterV2.java

@@ -63,7 +63,7 @@ public class FullDataUpdaterV2 implements IDebugRenderable, AutoCloseable
 	
 	/**
 	 * Can be used if you don't want to lock the current thread
-	 * Otherwise the sync version {@link FullDataUpdaterV2#updateDataSource(FullDataSourceV2, boolean)} may be a better choice.
+	 * Otherwise the sync version {@link FullDataUpdaterV2#updateDataSource(FullDataSourceV2)} may be a better choice.
 	 */
 	public CompletableFuture<Void> updateDataSourceAsync(@NotNull FullDataSourceV2 inputDataSource)
 	{
@@ -86,7 +86,7 @@ public class FullDataUpdaterV2 implements IDebugRenderable, AutoCloseable
 			{
 				try
 				{
-					this.updateDataSource(inputDataSource, true);
+					this.updateDataSource(inputDataSource);
 				}
 				catch (Exception e)
 				{
@@ -107,7 +107,7 @@ public class FullDataUpdaterV2 implements IDebugRenderable, AutoCloseable
 	}
 	
 	/** After this method returns the inputData will be written to file. */
-	public void updateDataSource(@NotNull FullDataSourceV2 inputData, boolean lockOnUpdatePos)
+	public void updateDataSource(@NotNull FullDataSourceV2 inputData)
 	{
 		if (this.isShutdownRef.get())
 		{
@@ -117,27 +117,22 @@ public class FullDataUpdaterV2 implements IDebugRenderable, AutoCloseable
 		
 		long updatePos = inputData.getPos();
 		
-		boolean methodLocked = false;
 		// a lock is necessary to prevent two threads from writing to the same position at once,
 		// if that happens only the second update will apply and the LOD will end up with hole(s)
 		ReentrantLock updateLock = this.updateLockProvider.getLock(updatePos);
 		
 		try
 		{
-			if (lockOnUpdatePos)
-			{
-				methodLocked = true;
-				updateLock.lock();
-				this.lockedPosSet.add(updatePos);
-			}
+			updateLock.lock();
+			this.lockedPosSet.add(updatePos);
 			
 			
 			// get or create the data source
 			try (FullDataSourceV2 recipientDataSource = this.provider.get(updatePos))
 			{
-				if (recipientDataSource != null)
+				if (recipientDataSource != null) // will be null if the repo was shut down
 				{
-					boolean dataModified = recipientDataSource.updateFromChunk(inputData);
+					boolean dataModified = recipientDataSource.updateFromDataSource(inputData);
 					if (dataModified)
 					{
 						// save the updated data to the database
@@ -150,11 +145,14 @@ public class FullDataUpdaterV2 implements IDebugRenderable, AutoCloseable
 						}
 						
 						
-						for (IDataSourceUpdateListenerFunc<FullDataSourceV2> listener : this.dateSourceUpdateListeners)
+						synchronized (this.dateSourceUpdateListeners)
 						{
-							if (listener != null)
+							for (IDataSourceUpdateListenerFunc<FullDataSourceV2> listener : this.dateSourceUpdateListeners)
 							{
-								listener.OnDataSourceUpdated(recipientDataSource);
+								if (listener != null)
+								{
+									listener.OnDataSourceUpdated(recipientDataSource);
+								}
 							}
 						}
 					}
@@ -167,11 +165,8 @@ public class FullDataUpdaterV2 implements IDebugRenderable, AutoCloseable
 		}
 		finally
 		{
-			if (methodLocked)
-			{
-				updateLock.unlock();
-				this.lockedPosSet.remove(updatePos);
-			}
+			updateLock.unlock();
+			this.lockedPosSet.remove(updatePos);
 		}
 	}
 	

core/src/main/java/com/seibel/distanthorizons/core/generation/BatchGenerator.java

@@ -24,12 +24,13 @@ import com.seibel.distanthorizons.api.interfaces.override.worldGenerator.IDhApiW
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.level.IDhLevel;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.util.ExceptionUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.worldGeneration.IBatchGeneratorEnvironmentWrapper;
 import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IOverrideInjector;
 import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiDistantGeneratorMode;
 import com.seibel.distanthorizons.core.util.LodUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
-import com.seibel.distanthorizons.core.wrapperInterfaces.worldGeneration.AbstractBatchGenerationEnvironmentWrapper;
 import com.seibel.distanthorizons.core.logging.DhLogger;
 
 import java.util.concurrent.CompletableFuture;
@@ -42,10 +43,10 @@ import java.util.function.Consumer;
  */
 public class BatchGenerator implements IDhApiWorldGenerator
 {
-	private static final IWrapperFactory FACTORY = SingletonInjector.INSTANCE.get(IWrapperFactory.class);
+	private static final IWrapperFactory WRAPPER_FACTORY = SingletonInjector.INSTANCE.get(IWrapperFactory.class);
 	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
-	public AbstractBatchGenerationEnvironmentWrapper generationEnvironment;
+	public IBatchGeneratorEnvironmentWrapper generationEnvironment;
 	public IDhLevel targetDhLevel;
 	
 	
@@ -57,7 +58,7 @@ public class BatchGenerator implements IDhApiWorldGenerator
 	public BatchGenerator(IDhLevel targetDhLevel)
 	{
 		this.targetDhLevel = targetDhLevel;
-		this.generationEnvironment = FACTORY.createBatchGenerator(targetDhLevel);
+		this.generationEnvironment = WRAPPER_FACTORY.createBatchGenerator(targetDhLevel);
 		LOGGER.info("Batch Chunk Generator initialized");
 	}
 	
@@ -83,26 +84,26 @@ public class BatchGenerator implements IDhApiWorldGenerator
 	
 	
 	
-	
 	//===================//
 	// generator methods //
 	//===================//
 	
 	@Override
 	public CompletableFuture<Void> generateChunks(
-			int chunkPosMinX, int chunkPosMinZ, int generationRequestChunkWidthCount, byte targetDataDetail, EDhApiDistantGeneratorMode generatorMode,
-			ExecutorService worldGeneratorThreadPool, Consumer<Object[]> resultConsumer)
+			int chunkPosMinX,
+			int chunkPosMinZ,
+			int chunkWidthCount,
+			byte targetDataDetail,
+			EDhApiDistantGeneratorMode generatorMode,
+			ExecutorService worldGeneratorThreadPool,
+			Consumer<Object[]> resultConsumer)
 	{
-		EDhApiWorldGenerationStep targetStep = null;
+		EDhApiWorldGenerationStep targetStep;
 		switch (generatorMode)
 		{
-			case PRE_EXISTING_ONLY: // Only load in existing chunks. Note: this requires the biome generation step in order for biomes to be properly initialized.
-			//case BIOME_ONLY: // No blocks. Require fake height in LodBuilder
-				targetStep = EDhApiWorldGenerationStep.BIOMES; 
+			case PRE_EXISTING_ONLY: // Only load in existing chunks.
+				targetStep = EDhApiWorldGenerationStep.EMPTY; // special logic
 				break;
-			//case BIOME_ONLY_SIMULATE_HEIGHT:
-			//	targetStep = EDhApiWorldGenerationStep.NOISE; // Stone only. Requires a fake surface
-			//	break;
 			case SURFACE:
 				targetStep = EDhApiWorldGenerationStep.SURFACE;
 				break;
@@ -112,20 +113,27 @@ public class BatchGenerator implements IDhApiWorldGenerator
 			case INTERNAL_SERVER:
 				targetStep = EDhApiWorldGenerationStep.LIGHT;
 				break;
+				
+			default:
+				throw new IllegalArgumentException("no target step defined for generator mode: ["+generatorMode+"].");
 		}
 		
 		// the consumer needs to be wrapped like this because the API can't use DH core objects (and IChunkWrapper can't be easily put into the API project)
 		Consumer<IChunkWrapper> consumerWrapper = (chunkWrapper) -> resultConsumer.accept(new Object[]{chunkWrapper});
 		try
 		{
-			return this.generationEnvironment.generateChunks(
-					chunkPosMinX, chunkPosMinZ, generationRequestChunkWidthCount, 
+			return this.generationEnvironment.queueGenEvent(
+					chunkPosMinX, chunkPosMinZ, chunkWidthCount, 
 					generatorMode, targetStep, 
 					worldGeneratorThreadPool, consumerWrapper);
 		}
 		catch (Exception e)
 		{
-			if (!LodUtil.isInterruptOrReject(e)) LOGGER.error("Error starting future for chunk generation", e);
+			if (!ExceptionUtil.isInterruptOrReject(e))
+			{
+				LOGGER.error("Error starting future for chunk generation, error: ["+e.getMessage()+"].", e);
+			}
+			
 			CompletableFuture<Void> future = new CompletableFuture<>();
 			future.completeExceptionally(e);
 			return future;
@@ -144,9 +152,10 @@ public class BatchGenerator implements IDhApiWorldGenerator
 	@Override
 	public void close()
 	{
-		LOGGER.info(BatchGenerator.class.getSimpleName() + " shutting down...");
-		this.generationEnvironment.stop();
+		LOGGER.info("["+BatchGenerator.class.getSimpleName()+"] shutting down...");
+		this.generationEnvironment.close();
 	}
 	
 	
+	
 }

core/src/main/java/com/seibel/distanthorizons/core/generation/DhLightingEngine.java

@@ -118,15 +118,19 @@ public class DhLightingEngine
 	 * @param centerChunk the chunk we want to apply lighting to
 	 * @param nearbyChunkList should also contain centerChunk
 	 * @param maxSkyLight should be a value between 0 and 15
+	 * 
+	 * @return the number of light positions iterated over, can be used for profiling.
 	 */
-	private void lightChunk(
+	private int lightChunk(
 			@NotNull IChunkWrapper centerChunk, @NotNull ArrayList<IChunkWrapper> nearbyChunkList, 
 			int maxSkyLight, boolean updateBlockLight, boolean updateSkyLight)
 	{
 		DhChunkPos centerChunkPos = centerChunk.getChunkPos();
 		AdjacentChunkHolder adjacentChunkHolder = new AdjacentChunkHolder(centerChunk);
 		
-		
+		// how many positions we've walked over, can be used for profiling/debugging
+		int posIterations = 0;
+			
 		// try-finally to handle the stableArray resources
 		StableLightPosStack blockLightWorldPosQueue = null;
 		StableLightPosStack skyLightWorldPosQueue = null;
@@ -154,14 +158,15 @@ public class DhLightingEngine
 			// and get any necessary info from them
 			for (int chunkIndex = 0; chunkIndex < nearbyChunkList.size(); chunkIndex++) // using iterators in high traffic areas can cause GC issues due to allocating a bunch of iterators, use an indexed for-loop instead
 			{
-				IChunkWrapper chunk = nearbyChunkList.get(chunkIndex);
-				if (chunk != null && requestedAdjacentPositions.contains(chunk.getChunkPos()))
+				IChunkWrapper neighborChunk = nearbyChunkList.get(chunkIndex);
+				if (neighborChunk != null 
+					&& requestedAdjacentPositions.contains(neighborChunk.getChunkPos()))
 				{
 					// remove the newly found position
-					requestedAdjacentPositions.remove(chunk.getChunkPos());
+					requestedAdjacentPositions.remove(neighborChunk.getChunkPos());
 					
 					// add the adjacent chunk
-					adjacentChunkHolder.add(chunk);
+					adjacentChunkHolder.add(neighborChunk);
 					
 					// get and set the adjacent chunk's initial block lights
 					final DhBlockPosMutable relLightBlockPos = PRIMARY_BLOCK_POS_REF.get();
@@ -174,19 +179,19 @@ public class DhLightingEngine
 					
 					if (updateBlockLight)
 					{
-						ArrayList<DhBlockPos> blockLightPosList = chunk.getWorldBlockLightPosList();
+						ArrayList<DhBlockPos> blockLightPosList = neighborChunk.getWorldBlockLightPosList();
 						for (int blockLightIndex = 0; blockLightIndex < blockLightPosList.size(); blockLightIndex++) // using iterators in high traffic areas can cause GC issues due to allocating a bunch of iterators, use an indexed for-loop instead
 						{
 							DhBlockPos blockLightPos = blockLightPosList.get(blockLightIndex);
 							blockLightPos.mutateToChunkRelativePos(relLightBlockPos);
 							
 							// get the light
-							IBlockStateWrapper blockState = chunk.getBlockState(relLightBlockPos);
+							IBlockStateWrapper blockState = neighborChunk.getBlockState(relLightBlockPos);
 							int lightValue = blockState.getLightEmission();
 							blockLightWorldPosQueue.push(blockLightPos.getX(), blockLightPos.getY(), blockLightPos.getZ(), lightValue);
 							
 							// set the light
-							chunk.setDhBlockLight(relLightBlockPos.getX(), relLightBlockPos.getY(), relLightBlockPos.getZ(), lightValue);
+							neighborChunk.setDhBlockLight(relLightBlockPos.getX(), relLightBlockPos.getY(), relLightBlockPos.getZ(), lightValue);
 						}
 					}
 					
@@ -198,23 +203,24 @@ public class DhLightingEngine
 					
 					// get and set the adjacent chunk's initial skylights,
 					// if the dimension has skylights
-					if (updateSkyLight && maxSkyLight > 0)
+					if (updateSkyLight 
+						&& maxSkyLight > 0)
 					{
-						IMutableBlockPosWrapper mcBlockPos = chunk.getMutableBlockPosWrapper();
+						IMutableBlockPosWrapper mcBlockPos = neighborChunk.getMutableBlockPosWrapper();
 						IBlockStateWrapper previousBlockState = null;
 						
-						int maxY = chunk.getMaxNonEmptyHeight();
-						int minY = chunk.getInclusiveMinBuildHeight();
+						int maxY = neighborChunk.getMaxNonEmptyHeight();
+						int minY = neighborChunk.getInclusiveMinBuildHeight();
 						
 						// get the adjacent chunk's sky lights
 						for (int relX = 0; relX < LodUtil.CHUNK_WIDTH; relX++) // relative block pos
 						{
 							for (int relZ = 0; relZ < LodUtil.CHUNK_WIDTH; relZ++)
 							{
-								// set each pos' sky light all the way down until an opaque block is hit
+								// set each pos sky light all the way down until an opaque block is hit
 								for (int y = maxY; y >= minY; y--)
 								{
-									IBlockStateWrapper block = previousBlockState = chunk.getBlockState(relX, y, relZ, mcBlockPos, previousBlockState);
+									IBlockStateWrapper block = previousBlockState = neighborChunk.getBlockState(relX, y, relZ, mcBlockPos, previousBlockState);
 									if (block != null && block.getOpacity() != LodUtil.BLOCK_FULLY_TRANSPARENT)
 									{
 										// keep moving down until we find a non-transparent block
@@ -223,12 +229,12 @@ public class DhLightingEngine
 									
 									
 									// add sky light to the queue
-									DhBlockPos skyLightPos = new DhBlockPos(chunk.getMinBlockX() + relX, y, chunk.getMinBlockZ() + relZ);
+									DhBlockPos skyLightPos = new DhBlockPos(neighborChunk.getMinBlockX() + relX, y, neighborChunk.getMinBlockZ() + relZ);
 									skyLightWorldPosQueue.push(skyLightPos.getX(), skyLightPos.getY(), skyLightPos.getZ(), maxSkyLight);
 									
 									// set the chunk's sky light
 									skyLightPos.mutateToChunkRelativePos(relLightBlockPos);
-									chunk.setDhSkyLight(relLightBlockPos.getX(), relLightBlockPos.getY(), relLightBlockPos.getZ(), maxSkyLight);
+									neighborChunk.setDhSkyLight(relLightBlockPos.getX(), relLightBlockPos.getY(), relLightBlockPos.getZ(), maxSkyLight);
 								}
 							}
 						}
@@ -243,17 +249,18 @@ public class DhLightingEngine
 				}
 			}
 			
+			
+			
 			// block light
 			if (updateBlockLight)
 			{
 				// done to prevent a rare issue where the light values are incorrectly set to -1
-				// TODO why could that happen?
 				centerChunk.clearDhBlockLighting();
 				
-				this.propagateChunkLightPosList(blockLightWorldPosQueue, adjacentChunkHolder,
-						(neighbourChunk, relBlockPos) -> neighbourChunk.getDhBlockLight(relBlockPos.getX(), relBlockPos.getY(), relBlockPos.getZ()),
-						(neighbourChunk, relBlockPos, newLightValue) -> neighbourChunk.setDhBlockLight(relBlockPos.getX(), relBlockPos.getY(), relBlockPos.getZ(), newLightValue),
-						true);
+				posIterations += this.propagateChunkLightPosList(blockLightWorldPosQueue, adjacentChunkHolder,
+					(neighbourChunk, relBlockPos) -> neighbourChunk.getDhBlockLight(relBlockPos.getX(), relBlockPos.getY(), relBlockPos.getZ()),
+					(neighbourChunk, relBlockPos, newLightValue) -> neighbourChunk.setDhBlockLight(relBlockPos.getX(), relBlockPos.getY(), relBlockPos.getZ(), newLightValue),
+					true);
 			}
 			
 			// sky light
@@ -261,10 +268,10 @@ public class DhLightingEngine
 			{
 				centerChunk.clearDhSkyLighting();
 				
-				this.propagateChunkLightPosList(skyLightWorldPosQueue, adjacentChunkHolder,
-						(neighbourChunk, relBlockPos) -> neighbourChunk.getDhSkyLight(relBlockPos.getX(), relBlockPos.getY(), relBlockPos.getZ()),
-						(neighbourChunk, relBlockPos, newLightValue) -> neighbourChunk.setDhSkyLight(relBlockPos.getX(), relBlockPos.getY(), relBlockPos.getZ(), newLightValue),
-						false);
+				posIterations += this.propagateChunkLightPosList(skyLightWorldPosQueue, adjacentChunkHolder,
+					(neighbourChunk, relBlockPos) -> neighbourChunk.getDhSkyLight(relBlockPos.getX(), relBlockPos.getY(), relBlockPos.getZ()),
+					(neighbourChunk, relBlockPos, newLightValue) -> neighbourChunk.setDhSkyLight(relBlockPos.getX(), relBlockPos.getY(), relBlockPos.getZ(), newLightValue),
+					false);
 			}
 		}
 		catch (Exception e)
@@ -286,10 +293,12 @@ public class DhLightingEngine
 		{
 			centerChunk.setIsDhSkyLightCorrect(true);
 		}
+		
+		return posIterations;
 	}
 	
 	/** Applies each {@link LightPos} from the queue to the given set of {@link IChunkWrapper}'s. */
-	private void propagateChunkLightPosList(
+	private int propagateChunkLightPosList(
 			StableLightPosStack lightPosQueue, AdjacentChunkHolder adjacentChunkHolder,
 			IGetLightFunc getLightFunc, ISetLightFunc setLightFunc,
 			boolean propagatingBlockLights)
@@ -300,88 +309,124 @@ public class DhLightingEngine
 		final DhBlockPosMutable neighbourBlockPos = PRIMARY_BLOCK_POS_REF.get();
 		final DhBlockPosMutable relNeighbourBlockPos = SECONDARY_BLOCK_POS_REF.get();
 		
+		// it doesn't matter what chunk we get the mutable block pos from
 		IMutableBlockPosWrapper mcBlockPos = null;
+		for (int i = 0; i < adjacentChunkHolder.chunkArray.length; i++)
+		{
+			IChunkWrapper chunkWrapper = adjacentChunkHolder.chunkArray[i];
+			if (chunkWrapper != null)
+			{
+				mcBlockPos = chunkWrapper.getMutableBlockPosWrapper();
+				break;
+			}
+		}
+		if (mcBlockPos == null)
+		{
+			LodUtil.assertNotReach("How did we try to light a chunk with no chunks?");
+		}
+		
 		IBlockStateWrapper previousBlockState = null;
 		
-		// update each light position
-		while (!lightPosQueue.isEmpty())
+		
+		int iterations = 0;
+		
+		// update each light level
+		for (int currentLightLevel = LodUtil.MAX_MC_LIGHT; currentLightLevel >= LodUtil.MIN_MC_LIGHT; currentLightLevel--)
 		{
-			// since we don't care about the order the positions are processed,
-			// we can grab the last position instead of the first for a slight performance increase (this way the array doesn't need to be shifted over every loop)
-			lightPosQueue.popMutate(lightPos);
+			// Walking down from the top light level to the bottom can reduce iterating over
+			// the same positions multiple times.
+			// At best this seems to behave at roughly 2x the speed of just blindly putting light pos 
+			// in a queue and at worse slightly faster than the blind queue.
 			
-			int lightValue = lightPos.lightValue;
+			lightPos.lightValue = currentLightLevel;
 			
-			
-			// propagate the lighting in each cardinal direction, IE: -x, +x, -y, +y, -z, +z
-			for (EDhDirection direction : EDhDirection.ALL) // since this is an array instead of an ArrayList this advanced for-loop shouldn't cause any GC issues
+			// update each light position
+			while (!lightPosQueue.isLightLevelEmpty(currentLightLevel))
 			{
-				lightPos.mutateOffset(direction, neighbourBlockPos);
-				neighbourBlockPos.mutateToChunkRelativePos(relNeighbourBlockPos);
+				// since we don't care about the order the positions are processed,
+				// we can grab the last position instead of the first for a slight performance increase (this way the array doesn't need to be shifted over every loop)
+				lightPosQueue.popMutate(lightPos, currentLightLevel);
+				iterations++;
+				
+				int lightValue = lightPos.lightValue;
 				
 				
-				// only continue if the light position is inside one of our chunks
-				IChunkWrapper neighbourChunk = adjacentChunkHolder.getByBlockPos(neighbourBlockPos.getX(), neighbourBlockPos.getZ());
-				if (neighbourChunk == null)
+				// propagate the lighting in each cardinal direction, IE: -x, +x, -y, +y, -z, +z
+				for (EDhDirection direction : EDhDirection.ALL) // since this is an array instead of an ArrayList this advanced for-loop shouldn't cause any GC issues
 				{
-					// the light pos is outside our generator's range, ignore it
-					continue;
-				}
-				
-				if (relNeighbourBlockPos.getY() < neighbourChunk.getMinNonEmptyHeight()
-					|| relNeighbourBlockPos.getY() >= neighbourChunk.getExclusiveMaxBuildHeight())
-				{
-					// the light pos is outside the chunk's min/max height,
-					// this can happen if given a chunk that hasn't finished generating
-					continue;
-				}
-				
-				
-				int currentBlockLight = getLightFunc.getLight(neighbourChunk, relNeighbourBlockPos);
-				if (currentBlockLight >= (lightValue - 1))
-				{
-					// short circuit for when the light value at this position
-					// is already greater-than what we could set it
-					continue;
-				}
-				
-				
-				if (mcBlockPos == null)
-				{
-					// it doesn't matter what chunk we get the position object from
-					// TODO move this getter logic out of ChunkWrapper
-					mcBlockPos = neighbourChunk.getMutableBlockPosWrapper();
-				}
-				
-				
-				IBlockStateWrapper neighbourBlockState = previousBlockState = neighbourChunk.getBlockState(relNeighbourBlockPos, mcBlockPos, previousBlockState);
-				// Math.max(1, ...) is used so that the propagated light level always drops by at least 1, preventing infinite cycles.
-				int targetLevel = lightValue - Math.max(1, neighbourBlockState.getOpacity());
-				if (targetLevel > currentBlockLight)
-				{
-					// this position is darker than the new light value, update/set it
-					setLightFunc.setLight(neighbourChunk, relNeighbourBlockPos, targetLevel);
+					lightPos.mutateOffset(direction, neighbourBlockPos);
+					neighbourBlockPos.mutateToChunkRelativePos(relNeighbourBlockPos);
 					
-					// now that light has been propagated to this blockPos
-					// we need to queue it up so its neighbours can be propagated as well
-					lightPosQueue.push(neighbourBlockPos.getX(), neighbourBlockPos.getY(), neighbourBlockPos.getZ(), targetLevel);
+					
+					// only continue if the light position is inside one of our chunks
+					IChunkWrapper neighbourChunk = adjacentChunkHolder.getByBlockPos(neighbourBlockPos.getX(), neighbourBlockPos.getZ());
+					if (neighbourChunk == null)
+					{
+						// the light pos is outside our generator's range, ignore it
+						continue;
+					}
+					
+					if (relNeighbourBlockPos.getY() < neighbourChunk.getMinNonEmptyHeight()
+						|| relNeighbourBlockPos.getY() >= neighbourChunk.getExclusiveMaxBuildHeight())
+					{
+						// the light pos is outside the chunk's min/max height,
+						// this can happen if given a chunk that hasn't finished generating
+						continue;
+					}
+					
+					
+					int currentBlockLight = getLightFunc.getLight(neighbourChunk, relNeighbourBlockPos);
+					if (currentBlockLight >= (lightValue - 1))
+					{
+						// short circuit for when the light value at this position
+						// is already greater-than what we could set it
+						continue;
+					}
+					
+					
+					IBlockStateWrapper neighbourBlockState = neighbourChunk.getBlockState(relNeighbourBlockPos, mcBlockPos, previousBlockState);
+					previousBlockState = neighbourBlockState;
+					
+					// Math.max(1, ...) is used so that the propagated light level always drops by at least 1, preventing infinite cycles.
+					int targetLightLevel = lightValue - Math.max(1, neighbourBlockState.getOpacity());
+					if (targetLightLevel > currentBlockLight)
+					{
+						// this position is darker than the new light value, update/set it
+						setLightFunc.setLight(neighbourChunk, relNeighbourBlockPos, targetLightLevel);
+						
+						// now that light has been propagated to this blockPos
+						// we need to queue it up so its neighbours can be propagated as well
+						lightPosQueue.push(neighbourBlockPos.getX(), neighbourBlockPos.getY(), neighbourBlockPos.getZ(), targetLightLevel);
+					}
 				}
 			}
 		}
 		
+		for (int currentLightLevel = LodUtil.MAX_MC_LIGHT; currentLightLevel >= LodUtil.MIN_MC_LIGHT; currentLightLevel--)
+		{
+			if (!lightPosQueue.isLightLevelEmpty(currentLightLevel))
+			{
+				LodUtil.assertNotReach("Non empty light pos queue for light level ["+currentLightLevel+"] after light engine running");
+			}
+		}
 		
-		// can be enable if troubleshooting lighting issues
-		if (RENDER_BLOCK_LIGHT_WIREFRAME && propagatingBlockLights)
+		
+		
+		// can be enabled if troubleshooting lighting issues
+		if (RENDER_BLOCK_LIGHT_WIREFRAME 
+			&& propagatingBlockLights)
 		{
 			RenderDhLightValuesAsWireframe(adjacentChunkHolder, true);
 		}
-		else if (RENDER_SKY_LIGHT_WIREFRAME && !propagatingBlockLights)
+		else if (RENDER_SKY_LIGHT_WIREFRAME 
+			&& !propagatingBlockLights)
 		{
 			RenderDhLightValuesAsWireframe(adjacentChunkHolder, false);
 		}
 		
 		
 		// propagation complete
+		return iterations;
 	}
 	
 	
@@ -462,7 +507,7 @@ public class DhLightingEngine
 							point = FullDataPointUtil.setSkyLight(point, skylight);
 							dataPoints.set(index, point);
 							// now for the propagation.
-							recursivelyLightAdjacentDataPoints(dataSource, airIDs, x, z, point);
+							this.recursivelyLightAdjacentDataPoints(dataSource, airIDs, x, z, point);
 						}
 					}
 				}
@@ -596,7 +641,7 @@ public class DhLightingEngine
 						else if (!airIDs.get(FullDataPointUtil.getId(adjacentDataPoint)))
 						{
 							// assume for now that we cannot propagate into non-transparent data points.
-							continue; // TODO how does this work with water? Do we care?
+							continue;
 						}
 						else
 						{
@@ -610,7 +655,7 @@ public class DhLightingEngine
 								adjacentDataPoint = FullDataPointUtil.setSkyLight(adjacentDataPoint, lightLevel - 1);
 								adjacentDataPoints.set(adjacentIndex, adjacentDataPoint);
 								// if propagation succeeded, recursively propagate again starting at the adjacent data point.
-								recursivelyLightAdjacentDataPoints(chunk, airIDs, adjacentX, adjacentZ, adjacentDataPoint);
+								this.recursivelyLightAdjacentDataPoints(chunk, airIDs, adjacentX, adjacentZ, adjacentDataPoint);
 							}
 						}
 					}
@@ -735,16 +780,24 @@ public class DhLightingEngine
 		private static final Queue<StableLightPosStack> lightArrayCache = new ArrayDeque<>();
 		
 		/** the index of the last item in the array, -1 if empty */
-		private int index = -1;
+		private int[] indexByLightLevel = new int[LodUtil.MAX_MC_LIGHT + 1];
 
-		/** x, y, z, and lightValue. */
-		public static final int INTS_PER_LIGHT_POS = 4;
+		/** x, y, z */
+		public static final int INTS_PER_LIGHT_POS = 3;
 		
-		/**
-		 * When tested with a normal 1.20 world James saw a maximum of 36,709 block and 2,355 sky lights,
-		 * so 40,000 should be a good starting point that can contain most lighting tasks.
-		 */
-		private final IntArrayList lightPositions = new IntArrayList(40_000 * INTS_PER_LIGHT_POS);
+		private final IntArrayList[] lightPositionsByLightLevel = new IntArrayList[LodUtil.MAX_MC_LIGHT + 1];
+		
+		
+		public StableLightPosStack()
+		{
+			for (int i = 0; i < this.lightPositionsByLightLevel.length; i++)
+			{
+				// When tested with a normal 1.20 world James saw a maximum of 36,709 block and 2,355 sky lights,
+				// so 40,000 should be a good starting point that can contain most lighting tasks.
+				this.lightPositionsByLightLevel[i] = new IntArrayList(40_000 * INTS_PER_LIGHT_POS);
+				this.indexByLightLevel[i] = -1;
+			}
+		}
 		
 		
 		
@@ -791,45 +844,56 @@ public class DhLightingEngine
 		// stack methods //
 		//===============//
 		
-		public boolean isEmpty() { return this.index == -1; }
-		public int size() { return this.index+1; }
+		public boolean isLightLevelEmpty(int lightLevel) { return this.indexByLightLevel[lightLevel] == -1; }
+		//public int size() { return this.index+1; }
 		
-		public void push(int blockX, int blockY, int blockZ, int lightValue)
+		public void push(int blockX, int blockY, int blockZ, int lightLevel)
 		{
-			this.index++;
-			int subIndex = this.index * INTS_PER_LIGHT_POS;
-			if (subIndex < this.lightPositions.size())
+			IntArrayList lightPositions = this.lightPositionsByLightLevel[lightLevel];
+			
+			this.indexByLightLevel[lightLevel]++;
+			int subIndex = this.indexByLightLevel[lightLevel] * INTS_PER_LIGHT_POS;
+			if (subIndex < lightPositions.size())
 			{
-				this.lightPositions.set(subIndex, blockX);
-				this.lightPositions.set(subIndex + 1, blockY);
-				this.lightPositions.set(subIndex + 2, blockZ);
-				this.lightPositions.set(subIndex + 3, lightValue);
+				lightPositions.set(subIndex, blockX);
+				lightPositions.set(subIndex + 1, blockY);
+				lightPositions.set(subIndex + 2, blockZ);
 			}
 			else
 			{
 				// add a new pos
-				this.lightPositions.add(blockX);
-				this.lightPositions.add(blockY);
-				this.lightPositions.add(blockZ);
-				this.lightPositions.add(lightValue);
+				lightPositions.add(blockX);
+				lightPositions.add(blockY);
+				lightPositions.add(blockZ);
 			}
 		}
 		
 		/** mutates the given {@link LightPos} to match the next {@link LightPos} in the queue. */
-		public void popMutate(LightPos pos)
+		public void popMutate(LightPos pos, int lightLevel)
 		{
-			int subIndex = this.index * INTS_PER_LIGHT_POS;
+			int subIndex = this.indexByLightLevel[lightLevel] * INTS_PER_LIGHT_POS;
+			IntArrayList lightPositions = this.lightPositionsByLightLevel[lightLevel];
 			
-			pos.setX(this.lightPositions.getInt(subIndex));
-			pos.setY(this.lightPositions.getInt(subIndex + 1));
-			pos.setZ(this.lightPositions.getInt(subIndex + 2));
-			pos.lightValue = this.lightPositions.getInt(subIndex + 3);
+			pos.setX(lightPositions.getInt(subIndex));
+			pos.setY(lightPositions.getInt(subIndex + 1));
+			pos.setZ(lightPositions.getInt(subIndex + 2));
 			
-			this.index--;
+			this.indexByLightLevel[lightLevel]--;
 		}
 		
 		@Override
-		public String toString() { return this.index + "/" + (this.lightPositions.size() / INTS_PER_LIGHT_POS); }
+		public String toString() 
+		{ 
+			StringBuilder builder = new StringBuilder();
+			
+			for (int i = 0; i < this.indexByLightLevel.length; i++)
+			{
+				builder.append("light: ").append(i)
+					.append(" size: ").append(this.indexByLightLevel[i]).append("/").append(this.lightPositionsByLightLevel[i].size() / INTS_PER_LIGHT_POS).append("\n");
+			}
+			
+			return builder.toString();
+		}
 		
 	}
 	

core/src/main/java/com/seibel/distanthorizons/core/generation/PregenManager.java

@@ -5,6 +5,7 @@ import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.RemovalCause;
 import com.seibel.distanthorizons.core.api.internal.SharedApi;
 import com.seibel.distanthorizons.core.config.Config;
+import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.file.fullDatafile.GeneratedFullDataSourceProvider;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.pos.DhSectionPos;
@@ -12,6 +13,7 @@ import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos2D;
 import com.seibel.distanthorizons.core.util.FormatUtil;
 import com.seibel.distanthorizons.core.util.LodUtil;
 import com.seibel.distanthorizons.core.util.objects.RollingAverage;
+import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper;
 import com.seibel.distanthorizons.core.logging.DhLogger;
 import org.jetbrains.annotations.Nullable;
@@ -28,6 +30,8 @@ public class PregenManager
 {
 	protected static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
+	private static final IMinecraftSharedWrapper MC_SERVER = SingletonInjector.INSTANCE.get(IMinecraftSharedWrapper.class);
+	
 	private final AtomicReference<PregenState> pregenFuture = new AtomicReference<>();
 	
 	
@@ -51,6 +55,7 @@ public class PregenManager
 			pregenState.completeExceptionally(new IllegalStateException("Pregen is already running."));
 			return pregenState;
 		}
+		
 		pregenState.whenComplete((result, throwable) -> {
 			this.pregenFuture.set(null);
 		});
@@ -104,7 +109,7 @@ public class PregenManager
 					}
 					
 					long timeSincePreviousTaskFinish = System.currentTimeMillis() - this.lastTaskFinishTime.getAndSet(System.currentTimeMillis());
-					this.averageTaskCompletionIntervalMs.addValue(timeSincePreviousTaskFinish);
+					this.averageTaskCompletionIntervalMs.add(timeSincePreviousTaskFinish);
 					
 					PregenState.this.fillPendingQueue();
 				})

core/src/main/java/com/seibel/distanthorizons/core/generation/RemoteWorldRetrievalQueue.java

@@ -11,6 +11,7 @@ import com.seibel.distanthorizons.core.pos.DhSectionPos;
 import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos2D;
 import com.seibel.distanthorizons.core.render.renderer.IDebugRenderable;
 import com.seibel.distanthorizons.core.util.LodUtil;
+import com.seibel.distanthorizons.core.util.WorldGenUtil;
 import com.seibel.distanthorizons.core.util.objects.RollingAverage;
 import com.seibel.distanthorizons.core.logging.DhLogger;
 
@@ -69,7 +70,7 @@ public class RemoteWorldRetrievalQueue extends AbstractFullDataNetworkRequestQue
 					int chunkWidth = DhSectionPos.getChunkWidth(sectionPos);
 					int chunkCount = chunkWidth * chunkWidth;
 					double timePerChunk = (double)totalGenTimeInMs / (double)chunkCount;
-					this.rollingAverageChunkGenTimeInMs.addValue(timePerChunk);
+					this.rollingAverageChunkGenTimeInMs.add(timePerChunk);
 					
 					switch (requestResult)
 					{
@@ -110,12 +111,14 @@ public class RemoteWorldRetrievalQueue extends AbstractFullDataNetworkRequestQue
 	@Override
 	protected boolean isSectionAllowedToGenerate(long sectionPos, DhBlockPos2D targetPos)
 	{
-		if (this.networkState.sessionConfig.getGenerationBoundsRadius() > 0)
+		if (this.networkState.sessionConfig.getGenerationMaxChunkRadius() > 0)
 		{
-			if (DhSectionPos.getChebyshevSignedBlockDistance(sectionPos, new DhBlockPos2D(
-					this.networkState.sessionConfig.getGenerationBoundsX(),
-					this.networkState.sessionConfig.getGenerationBoundsZ()
-			)) > this.networkState.sessionConfig.getGenerationBoundsRadius())
+			boolean posInRange = WorldGenUtil.isPosInWorldGenRange(
+				sectionPos,
+				this.networkState.sessionConfig.getGenerationCenterChunkX(), this.networkState.sessionConfig.getGenerationCenterChunkZ(),
+				this.networkState.sessionConfig.getGenerationMaxChunkRadius()
+				);
+			if (!posInRange)
 			{
 				return false;
 			}

core/src/main/java/com/seibel/distanthorizons/core/generation/WorldGenerationQueue.java

@@ -40,6 +40,7 @@ import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.dataObjects.transformers.LodDataBuilder;
 import com.seibel.distanthorizons.core.render.renderer.DebugRenderer;
 import com.seibel.distanthorizons.core.render.renderer.IDebugRenderable;
+import com.seibel.distanthorizons.core.util.ExceptionUtil;
 import com.seibel.distanthorizons.core.util.LodUtil.AssertFailureException;
 import com.seibel.distanthorizons.core.util.ThreadUtil;
 import com.seibel.distanthorizons.core.util.objects.DataCorruptedException;
@@ -65,15 +66,6 @@ public class WorldGenerationQueue implements IFullDataSourceRetrievalQueue, IDeb
 	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	private static final IWrapperFactory WRAPPER_FACTORY = SingletonInjector.INSTANCE.get(IWrapperFactory.class);
 	
-	/**
-	 * Defines how many tasks can be queued per thread. <br><br>
-	 *
-	 * TODO the multiplier here should change dynamically based on how fast the generator is vs the queuing thread,
-	 *  if this is too high it may cause issues when moving,
-	 *  but if it is too low the generator threads won't have enough tasks to work on
-	 */
-	private static final int MAX_QUEUED_TASKS_PER_THREAD = 3;
-	
 	
 	private final IDhApiWorldGenerator generator;
 	private final IDhServerLevel level;
@@ -218,7 +210,7 @@ public class WorldGenerationQueue implements IFullDataSourceRetrievalQueue, IDeb
 				while (!this.isGeneratorBusy()
 						&& taskStarted)
 				{
-					taskStarted = this.startNextWorldGenTask(this.generationTargetPos);
+					taskStarted = this.tryStartNextWorldGenTask(this.generationTargetPos);
 				}
 			}
 			catch (Exception e)
@@ -240,15 +232,15 @@ public class WorldGenerationQueue implements IFullDataSourceRetrievalQueue, IDeb
 			return true;
 		}
 		
+		// queue more tasks if any of the threads are available
 		int worldGenThreadCount = Math.max(Config.Common.MultiThreading.numberOfThreads.get(), 1);
-		int maxWorldGenTaskCount = worldGenThreadCount * MAX_QUEUED_TASKS_PER_THREAD;
-		return executor.getQueueSize() > maxWorldGenTaskCount;
+		return this.inProgressGenTasksByLodPos.size() > worldGenThreadCount;
 	}
 	/**
 	 * @param targetPos the position to center the generation around
 	 * @return false if no tasks were found to generate
 	 */
-	private boolean startNextWorldGenTask(DhBlockPos2D targetPos)
+	private boolean tryStartNextWorldGenTask(DhBlockPos2D targetPos)
 	{
 		if (this.waitingTasks.isEmpty())
 		{
@@ -257,23 +249,23 @@ public class WorldGenerationQueue implements IFullDataSourceRetrievalQueue, IDeb
 		
 		
 		
-		Mapper closestTaskMap = this.waitingTasks.reduceEntries(1024,
-				entry -> new Mapper(entry.getValue(), DhSectionPos.getSectionBBoxPos(entry.getValue().pos).getCenterBlockPos().toPos2D().chebyshevDist(targetPos.toPos2D())),
-				(aMapper, bMapper) -> aMapper.dist < bMapper.dist ? aMapper : bMapper);
+		TaskDistancePair closestTaskPair = this.waitingTasks.reduceEntries(1024,
+				entry -> new TaskDistancePair(entry.getValue(), DhSectionPos.getSectionBBoxPos(entry.getValue().pos).getCenterBlockPos().toPos2D().chebyshevDist(targetPos.toPos2D())),
+				(TaskDistancePair aTaskPair, TaskDistancePair bTaskPair) -> (aTaskPair.dist < bTaskPair.dist) ? aTaskPair : bTaskPair);
 		
-		if (closestTaskMap == null)
+		if (closestTaskPair == null)
 		{
 			// FIXME concurrency issue
 			return false;
 		}
 		
-		WorldGenTask closestTask = closestTaskMap.task;
+		WorldGenTask closestTask = closestTaskPair.task;
 		
 		// remove the task we found, we are going to start it and don't want to run it multiple times
 		this.waitingTasks.remove(closestTask.pos, closestTask);
 		
 		// do we need to modify this task to generate it?
-		if (this.canGeneratePos(closestTask.pos))
+		if (this.canGenerateDetailLevel(DhSectionPos.getDetailLevel(closestTask.pos)))
 		{
 			// detail level is correct for generation, start generation
 			
@@ -284,11 +276,7 @@ public class WorldGenerationQueue implements IFullDataSourceRetrievalQueue, IDeb
 			{
 				// no task exists for this position, start one
 				InProgressWorldGenTaskGroup newTaskGroup = new InProgressWorldGenTaskGroup(closestTaskGroup);
-				boolean taskStarted = this.tryStartingWorldGenTaskGroup(newTaskGroup);
-				if (!taskStarted)
-				{
-					//LOGGER.trace("Unable to start task: "+closestTask.pos+", skipping. Task position may have already been generated.");
-				}
+				this.startWorldGenTaskGroup(newTaskGroup);
 			}
 			else
 			{
@@ -297,7 +285,7 @@ public class WorldGenerationQueue implements IFullDataSourceRetrievalQueue, IDeb
 				// 		   the newly selected task, we cannot use it,
 				//         as some chunks may have already been written into.
 				
-				//LOGGER.trace("A task already exists for this position, todo: "+closestTask.pos);
+				//LOGGER.warn("A task already exists for this position, todo: "+DhSectionPos.toString(closestTask.pos));
 			}
 			
 			// a task has been started
@@ -329,8 +317,7 @@ public class WorldGenerationQueue implements IFullDataSourceRetrievalQueue, IDeb
 			return true;
 		}
 	}
-	/** @return true if the task was started, false otherwise */
-	private boolean tryStartingWorldGenTaskGroup(InProgressWorldGenTaskGroup newTaskGroup)
+	private void startWorldGenTaskGroup(InProgressWorldGenTaskGroup newTaskGroup)
 	{
 		byte taskDetailLevel = newTaskGroup.group.dataDetail;
 		long taskPos = newTaskGroup.group.pos;
@@ -345,7 +332,7 @@ public class WorldGenerationQueue implements IFullDataSourceRetrievalQueue, IDeb
 			long totalGenTimeInMs = System.currentTimeMillis() - generationStartMsTime;
 			int chunkCount = generationRequestChunkWidthCount * generationRequestChunkWidthCount;
 			double timePerChunk = (double)totalGenTimeInMs / (double)chunkCount;
-			this.rollingAverageChunkGenTimeInMs.addValue(timePerChunk);
+			this.rollingAverageChunkGenTimeInMs.add(timePerChunk);
 		});
 		
 		newTaskGroup.genFuture = generationFuture;
@@ -358,7 +345,7 @@ public class WorldGenerationQueue implements IFullDataSourceRetrievalQueue, IDeb
 				if (exception != null)
 				{
 					// don't log the shutdown exceptions
-					if (!LodUtil.isInterruptOrReject(exception))
+					if (!ExceptionUtil.isInterruptOrReject(exception))
 					{
 						LOGGER.error("Error generating data for pos: " + DhSectionPos.toString(taskPos), exception);
 					}
@@ -383,7 +370,6 @@ public class WorldGenerationQueue implements IFullDataSourceRetrievalQueue, IDeb
 		});
 		
 		this.inProgressGenTasksByLodPos.put(taskPos, newTaskGroup);
-		return true;
 	}
 	private CompletableFuture<Void> startGenerationEvent(
 		long requestPos, 
@@ -412,11 +398,16 @@ public class WorldGenerationQueue implements IFullDataSourceRetrievalQueue, IDeb
 						{
 							IChunkWrapper chunkWrapper = WRAPPER_FACTORY.createChunkWrapper(generatedObjectArray);
 							
-							// TODO light data should be pulled (if possible) from the ChunkAccess object itself via ChunkFileReader.readLight
-							// but this should work for now
-							ArrayList<IChunkWrapper> nearbyChunkList = new ArrayList<IChunkWrapper>();
-							nearbyChunkList.add(chunkWrapper);
-							DhLightingEngine.INSTANCE.bakeChunkBlockLighting(chunkWrapper, nearbyChunkList, this.level.getLevelWrapper().hasSkyLight() ? LodUtil.MAX_MC_LIGHT : LodUtil.MIN_MC_LIGHT);
+							// only light the chunk here if necessary,
+							// lighting before this point is preferred but for potenial legacy API uses this
+							// check should be done
+							if (!chunkWrapper.isDhBlockLightingCorrect())
+							{
+								ArrayList<IChunkWrapper> nearbyChunkList = new ArrayList<>();
+								nearbyChunkList.add(chunkWrapper);
+								byte maxSkyLight = this.level.getLevelWrapper().hasSkyLight() ? LodUtil.MAX_MC_LIGHT : LodUtil.MIN_MC_LIGHT;
+								DhLightingEngine.INSTANCE.bakeChunkBlockLighting(chunkWrapper, nearbyChunkList, maxSkyLight);
+							}
 							
 							try (FullDataSourceV2 dataSource = LodDataBuilder.createFromChunk(this.level.getLevelWrapper(), chunkWrapper))
 							{
@@ -596,9 +587,10 @@ public class WorldGenerationQueue implements IFullDataSourceRetrievalQueue, IDeb
 					exception = exception.getCause();
 				}
 				
-				if (!UncheckedInterruptedException.isInterrupt(exception) && !(exception instanceof CancellationException))
+				if (!UncheckedInterruptedException.isInterrupt(exception) 
+					&& !(exception instanceof CancellationException))
 				{
-					LOGGER.error("Error when terminating data generation for section " + runningTaskGroup.group.pos, exception);
+					LOGGER.error("Error when terminating data generation for pos: ["+DhSectionPos.toString(runningTaskGroup.group.pos)+"], error: ["+exception.getMessage()+"].", exception);
 				}
 				
 				return null;
@@ -623,13 +615,17 @@ public class WorldGenerationQueue implements IFullDataSourceRetrievalQueue, IDeb
 		
 		LOGGER.info("Shutting down world generator thread pool...");
 		
-		AbstractExecutorService executor = ThreadPoolUtil.getWorldGenExecutor();
+		PriorityTaskPicker.Executor executor = ThreadPoolUtil.getWorldGenExecutor();
 		if (executor != null)
 		{
-			List<Runnable> tasks = executor.shutdownNow();
-			LOGGER.info("World generator thread pool shutdown with [" + tasks.size() + "] incomplete tasks.");
+			int queueSize = executor.getQueueSize();
+			executor.clearQueue();
+			LOGGER.info("World generator thread pool shutdown with [" + queueSize + "] incomplete tasks.");
 		}
 		
+		this.inProgressGenTasksByLodPos.values().forEach((inProgressWorldGenTaskGroup) -> inProgressWorldGenTaskGroup.genFuture.cancel(true));
+		this.waitingTasks.values().forEach((worldGenTask) -> worldGenTask.future.cancel(true));
+		
 		
 		this.generator.close();
 		DebugRenderer.unregister(this, Config.Client.Advanced.Debugging.DebugWireframe.showWorldGenQueue);
@@ -687,9 +683,9 @@ public class WorldGenerationQueue implements IFullDataSourceRetrievalQueue, IDeb
 	// helper methods //
 	//================//
 	
-	private boolean canGeneratePos(long taskPos)
+	private boolean canGenerateDetailLevel(byte taskDetailLevel)
 	{
-		byte requestedDetailLevel = (byte) (DhSectionPos.getDetailLevel(taskPos) - DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL);
+		byte requestedDetailLevel = (byte) (taskDetailLevel - DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL);
 		return (this.highestDataDetail <= requestedDetailLevel && requestedDetailLevel <= this.lowestDataDetail);
 	}
 	
@@ -699,11 +695,12 @@ public class WorldGenerationQueue implements IFullDataSourceRetrievalQueue, IDeb
 	// helper classes //
 	//================//
 	
-	private static class Mapper
+	private static class TaskDistancePair
 	{
 		public final WorldGenTask task;
 		public final int dist;
-		public Mapper(WorldGenTask task, int dist)
+		
+		public TaskDistancePair(WorldGenTask task, int dist)
 		{
 			this.task = task;
 			this.dist = dist;

core/src/main/java/com/seibel/distanthorizons/core/jar/JarMain.java

@@ -23,6 +23,7 @@ import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.pos.DhSectionPos;
 import com.seibel.distanthorizons.core.sql.dto.FullDataSourceV2DTO;
 import com.seibel.distanthorizons.core.sql.repo.FullDataSourceV2Repo;
+import com.seibel.distanthorizons.core.util.NativeDialogUtil;
 import com.seibel.distanthorizons.coreapi.ModInfo;
 import com.seibel.distanthorizons.core.jar.gui.BaseJFrame;
 import com.seibel.distanthorizons.core.jar.gui.cusomJObject.JBox;
@@ -31,7 +32,6 @@ import com.seibel.distanthorizons.core.jar.installer.WebDownloader;
 import org.apache.logging.log4j.LogManager;
 import com.seibel.distanthorizons.core.logging.DhLogger;
 import org.apache.logging.log4j.core.LoggerContext;
-import org.lwjgl.util.tinyfd.TinyFileDialogs;
 
 import javax.swing.*;
 import java.awt.*;
@@ -216,7 +216,7 @@ public class JarMain
 			{
 				repo = new FullDataSourceV2Repo(FullDataSourceV2Repo.DEFAULT_DATABASE_TYPE, dbFile);
 			}
-			catch (SQLException e)
+			catch (SQLException | IOException e)
 			{
 				LOGGER.error("Failed to initialize connection with database: ["+exportFile.getAbsolutePath()+"], error: ["+e.getMessage()+"].", e);
 				return;
@@ -441,7 +441,7 @@ public class JarMain
 		installMod.addActionListener(e -> {
 			if (minecraftDirPop.getSelectedFile() == null)
 			{
-				TinyFileDialogs.tinyfd_messageBox(ModInfo.READABLE_NAME, "Please select your install directory", "ok", "warning", false);
+				NativeDialogUtil.showDialog(ModInfo.READABLE_NAME, "Please select your install directory", "ok", "warning");
 				return;
 			}
 			
@@ -455,11 +455,11 @@ public class JarMain
 								ModInfo.NAME + "-" + ModrinthGetter.releaseNames.get(downloadID.get()) + ".jar"
 						).toFile());
 				
-				TinyFileDialogs.tinyfd_messageBox(ModInfo.READABLE_NAME, "Installation done. \nYou can now close the installer", "ok", "info", false);
+				NativeDialogUtil.showDialog(ModInfo.READABLE_NAME, "Installation done. \nYou can now close the installer", "ok", "info");
 			}
 			catch (Exception f)
 			{
-				TinyFileDialogs.tinyfd_messageBox(ModInfo.READABLE_NAME, "Download failed. Check your internet connection \nStacktrace: " + f.getMessage(), "error", "info", false);
+				NativeDialogUtil.showDialog(ModInfo.READABLE_NAME, "Download failed. Check your internet connection \nStacktrace: " + f.getMessage(), "error", "info");
 			}
 		});
 		frame.add(installMod);

core/src/main/java/com/seibel/distanthorizons/core/jar/installer/GitlabGetter.java

@@ -49,7 +49,7 @@ public class GitlabGetter
 	/** Commit sha; Commit info */
 	private static final Map<String, Config> commitInfo = new HashMap<>();
 	/** Pipeline ID; Pipeline info */
-	private static final Map<Integer, ArrayList<Config>> pipelineInfo = new HashMap<>();
+	private static final Map<Number, ArrayList<Config>> pipelineInfo = new HashMap<>();
 	
 	/** Uses our projectID to init this */
 	public GitlabGetter()
@@ -88,7 +88,7 @@ public class GitlabGetter
 		return commitInfo.get(commit);
 	}
 	
-	public ArrayList<Config> getPipelineInfo(int pipeline)
+	public ArrayList<Config> getPipelineInfo(Number pipeline)
 	{
 		if (!pipelineInfo.containsKey(pipeline))
 		{
@@ -111,9 +111,10 @@ public class GitlabGetter
 	/**
 	 * Gets all the Minecraft download links to a pipeline ID
 	 * 
+	 * @param pipelineID Uses {@link Number} instead of a specific value due to the possibility of receiving Integer or Long
 	 * @return Minecraft version; Download URL
 	 */
-	public Map<String, URL> getDownloads(int pipelineID)
+	public Map<String, URL> getDownloads(Number pipelineID)
 	{
 		Map<String, URL> downloads = new HashMap<>();
 		ArrayList<Config> currentPipelineInfo = this.getPipelineInfo(pipelineID);

core/src/main/java/com/seibel/distanthorizons/core/jar/updater/SelfUpdater.java

@@ -29,12 +29,12 @@ import com.seibel.distanthorizons.core.jar.installer.ModrinthGetter;
 import com.seibel.distanthorizons.core.jar.installer.WebDownloader;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.logging.f3.F3Screen;
+import com.seibel.distanthorizons.core.util.NativeDialogUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.IVersionConstants;
 import com.seibel.distanthorizons.coreapi.ModInfo;
 import com.seibel.distanthorizons.coreapi.util.StringUtil;
 import com.seibel.distanthorizons.coreapi.util.jar.DeleteOnUnlock;
 import com.seibel.distanthorizons.core.logging.DhLogger;
-import org.lwjgl.util.tinyfd.TinyFileDialogs;
 
 import javax.swing.*;
 import java.awt.*;
@@ -174,7 +174,7 @@ public class SelfUpdater
 		
 		if (!GitlabGetter.INSTANCE.getDownloads(pipeline.get("id")).containsKey(mcVersion))
 		{
-			LOGGER.warn("Minecraft version ["+ mcVersion +"] is not findable on Gitlab, findable versions are ["+ StringUtil.join(",", GitlabGetter.INSTANCE.getDownloads(pipeline.get("id")).keySet().toArray()) +"].");
+			LOGGER.warn("Minecraft version ["+ mcVersion +"] is not findable on Gitlab, findable versions are ["+ StringUtil.join(", ", GitlabGetter.INSTANCE.getDownloads(pipeline.get("id")).keySet().toArray()) +"].");
 			return false;
 		}
 		
@@ -258,14 +258,13 @@ public class SelfUpdater
 			
 			deleteOldJarOnJvmShutdown = true;
 			
-			// TODO one of these messages contains something TinyFd doesn't like, find it and fix it
-			String successMessage = "Distant Horizons successfully updated. It will apply on game's relaunch"; 
+			String successMessage = "Distant Horizons successfully updated. It will apply on game`s relaunch"; 
 			LOGGER.info(successMessage);
 			new Thread(() -> 
 			{
 				try
 				{
-					TinyFileDialogs.tinyfd_messageBox(ModInfo.READABLE_NAME, successMessage, "ok", "info", false);
+					NativeDialogUtil.showDialog(ModInfo.READABLE_NAME, successMessage, "ok", "info");
 				}
 				catch (Exception ignore) { }
 			}).start();
@@ -288,7 +287,7 @@ public class SelfUpdater
 			LOGGER.error(failMessage, e);
 			try
 			{
-				TinyFileDialogs.tinyfd_messageBox(ModInfo.READABLE_NAME, failMessage, "ok", "error", false);
+				NativeDialogUtil.showDialog(ModInfo.READABLE_NAME, failMessage, "ok", "error");
 			}
 			catch (Exception ignore) { }
 			
@@ -386,7 +385,7 @@ public class SelfUpdater
 			{
 				try
 				{
-					TinyFileDialogs.tinyfd_messageBox(ModInfo.READABLE_NAME, successMessage, "ok", "info", false);
+					NativeDialogUtil.showDialog(ModInfo.READABLE_NAME, successMessage, "ok", "info");
 				}
 				catch (Exception ignore) { }
 			}).start();
@@ -424,7 +423,7 @@ public class SelfUpdater
 			LOGGER.error(failMessage, e);
 			try
 			{
-				TinyFileDialogs.tinyfd_messageBox(ModInfo.READABLE_NAME, failMessage, "ok", "error", false);
+				NativeDialogUtil.showDialog(ModInfo.READABLE_NAME, failMessage, "ok", "error");
 			}
 			catch (Exception ignore) { }
 			

core/src/main/java/com/seibel/distanthorizons/core/level/AbstractDhLevel.java

@@ -55,6 +55,7 @@ import org.jetbrains.annotations.Nullable;
 
 import java.awt.*;
 import java.io.File;
+import java.io.IOException;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -106,9 +107,9 @@ public abstract class AbstractDhLevel implements IDhLevel
 		{
 			newChunkHashRepo = new ChunkHashRepo(AbstractDhRepo.DEFAULT_DATABASE_TYPE, databaseFile);
 		}
-		catch (SQLException e)
+		catch (SQLException | IOException e)
 		{
-			LOGGER.error("Unable to create [ChunkHashRepo], error: ["+e.getMessage()+"].", e);
+			LOGGER.fatal("Unable to create ["+ChunkHashRepo.class.getSimpleName()+"], error: ["+e.getMessage()+"].", e);
 		}
 		this.chunkHashRepo = newChunkHashRepo;
 		
@@ -119,9 +120,9 @@ public abstract class AbstractDhLevel implements IDhLevel
 		{
 			newBeaconBeamRepo = new BeaconBeamRepo(AbstractDhRepo.DEFAULT_DATABASE_TYPE, databaseFile);
 		}
-		catch (SQLException e)
+		catch (SQLException | IOException e)
 		{
-			LOGGER.error("Unable to create [BeaconBeamRepo], error: ["+e.getMessage()+"].", e);
+			LOGGER.error("Unable to create ["+BeaconBeamRepo.class.getSimpleName()+"], error: ["+e.getMessage()+"].", e);
 		}
 		this.beaconBeamRepo = newBeaconBeamRepo;
 	}

core/src/main/java/com/seibel/distanthorizons/core/level/AbstractDhServerLevel.java

@@ -21,6 +21,7 @@ import com.seibel.distanthorizons.core.network.messages.requests.CancelMessage;
 import com.seibel.distanthorizons.core.pos.DhSectionPos;
 import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos2D;
 import com.seibel.distanthorizons.core.util.LodUtil;
+import com.seibel.distanthorizons.core.util.WorldGenUtil;
 import com.seibel.distanthorizons.core.util.math.Vec3d;
 import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IServerPlayerWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
@@ -29,6 +30,8 @@ import com.seibel.distanthorizons.core.logging.DhLogger;
 import org.jetbrains.annotations.NotNull;
 
 import javax.annotation.Nullable;
+import java.io.IOException;
+import java.sql.SQLException;
 import java.util.List;
 import java.util.concurrent.*;
 
@@ -48,23 +51,27 @@ public abstract class AbstractDhServerLevel extends AbstractDhLevel implements I
 	 */
 	protected final ConcurrentLinkedQueue<IServerPlayerWrapper> worldGenPlayerCenteringQueue = new ConcurrentLinkedQueue<>();
 	
-	private final FullDataSourceRequestHandler requestHandler = new FullDataSourceRequestHandler(this);
+	private final FullDataSourceRequestHandler requestHandler;
+	
 	
 	
 	//=============//
 	// constructor //
 	//=============//
 	
-	public AbstractDhServerLevel(ISaveStructure saveStructure, IServerLevelWrapper serverLevelWrapper, ServerPlayerStateManager serverPlayerStateManager)
-	{
-		this(saveStructure, serverLevelWrapper, serverPlayerStateManager, true);
-	}
+	public AbstractDhServerLevel(
+		ISaveStructure saveStructure, 
+		IServerLevelWrapper serverLevelWrapper, 
+		ServerPlayerStateManager serverPlayerStateManager
+		) throws SQLException, IOException
+	{ this(saveStructure, serverLevelWrapper, serverPlayerStateManager, true); }
+	
 	public AbstractDhServerLevel(
 			ISaveStructure saveStructure,
 			IServerLevelWrapper serverLevelWrapper,
 			ServerPlayerStateManager serverPlayerStateManager,
 			boolean runRepoReliantSetup
-		)
+		) throws SQLException, IOException
 	{
 		if (saveStructure.getSaveFolder(serverLevelWrapper).mkdirs())
 		{
@@ -81,6 +88,7 @@ public abstract class AbstractDhServerLevel extends AbstractDhLevel implements I
 		LOGGER.info("Started "+this.getClass().getSimpleName()+" for ["+serverLevelWrapper+"] at ["+saveStructure+"].");
 		
 		this.serverPlayerStateManager = serverPlayerStateManager;
+		this.requestHandler = new FullDataSourceRequestHandler(this);
 	}
 	
 	
@@ -89,12 +97,6 @@ public abstract class AbstractDhServerLevel extends AbstractDhLevel implements I
 	// ticks //
 	//=======//
 	
-	@Override
-	public void serverTick()
-	{
-		this.requestHandler.tick();
-	}
-	
 	@Override
 	public boolean shouldDoWorldGen()
 	{ return Config.Common.WorldGenerator.enableDistantGeneration.get() && !this.worldGenPlayerCenteringQueue.isEmpty(); }
@@ -118,9 +120,6 @@ public abstract class AbstractDhServerLevel extends AbstractDhLevel implements I
 		return new DhBlockPos2D((int) position.x, (int) position.z);
 	}
 	
-	@Override 
-	public void worldGenTick() { this.serverside.worldGenModule.worldGenTick(); }
-	
 	
 	
 	//==================//
@@ -149,16 +148,15 @@ public abstract class AbstractDhServerLevel extends AbstractDhLevel implements I
 					return;
 				}
 				
-				if (Config.Server.generationBoundsRadius.get() > 0)
+				boolean posInRange = WorldGenUtil.isPosInWorldGenRange(
+					message.sectionPos,
+					Config.Common.WorldGenerator.generationCenterChunkX.get(), Config.Common.WorldGenerator.generationCenterChunkZ.get(),
+					Config.Common.WorldGenerator.generationMaxChunkRadius.get()
+				);
+				if (!posInRange)
 				{
-					if (DhSectionPos.getChebyshevSignedBlockDistance(message.sectionPos, new DhBlockPos2D(
-							serverPlayerState.sessionConfig.getGenerationBoundsX(),
-							serverPlayerState.sessionConfig.getGenerationBoundsZ()
-					)) > Config.Server.generationBoundsRadius.get())
-					{
-						message.sendResponse(new RequestOutOfRangeException("Section out of allowed bounds"));
-						return;
-					}
+					message.sendResponse(new RequestOutOfRangeException("Section out of allowed bounds"));
+					return;
 				}
 				
 				if (!Config.Server.Experimental.enableNSizedGeneration.get() && DhSectionPos.getDetailLevel(message.sectionPos) != DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL)
@@ -297,7 +295,7 @@ public abstract class AbstractDhServerLevel extends AbstractDhLevel implements I
 	public void addDebugMenuStringsToList(List<String> messageList)
 	{
 		this.serverside.fullDataFileHandler.addDebugMenuStringsToList(messageList);
-		this.serverside.worldGenModule.addDebugMenuStringsToList(messageList);
+		this.serverside.lodRequestModule.addDebugMenuStringsToList(messageList);
 	}
 	
 	
@@ -330,7 +328,10 @@ public abstract class AbstractDhServerLevel extends AbstractDhLevel implements I
 	{
 		super.close();
 		this.serverside.close();
+		this.requestHandler.close();
 		LOGGER.info("Closed DHLevel for [" + this.getLevelWrapper() + "].");
 	}
 	
+	
+	
 }

core/src/main/java/com/seibel/distanthorizons/core/level/DhClientLevel.java

@@ -49,6 +49,8 @@ import org.jetbrains.annotations.Nullable;
 import javax.annotation.CheckForNull;
 import java.awt.*;
 import java.io.File;
+import java.io.IOException;
+import java.sql.SQLException;
 import java.util.*;
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
@@ -83,7 +85,7 @@ public class DhClientLevel extends AbstractDhLevel implements IDhClientLevel
 					.asMap()
 	);
 	
-	public final WorldGenModule worldGenModule;
+	public final LodRequestModule lodRequestModule;
 	
 	@Nullable
 	private final SyncOnLoadRequestQueue syncOnLoadRequestQueue;
@@ -94,9 +96,18 @@ public class DhClientLevel extends AbstractDhLevel implements IDhClientLevel
 	// constructor //
 	//=============//
 	
-	public DhClientLevel(ISaveStructure saveStructure, IClientLevelWrapper clientLevelWrapper, @Nullable ClientNetworkState networkState) 
+	public DhClientLevel(
+		ISaveStructure saveStructure, 
+		IClientLevelWrapper clientLevelWrapper, 
+		@Nullable ClientNetworkState networkState
+		) throws SQLException, IOException
 	{ this(saveStructure, clientLevelWrapper, null, networkState); }
-	public DhClientLevel(ISaveStructure saveStructure, IClientLevelWrapper clientLevelWrapper, @Nullable File fullDataSaveDirOverride, @Nullable ClientNetworkState networkState)
+	public DhClientLevel(
+		ISaveStructure saveStructure, 
+		IClientLevelWrapper clientLevelWrapper, 
+		@Nullable File fullDataSaveDirOverride, 
+		@Nullable ClientNetworkState networkState
+		) throws SQLException, IOException
 	{
 		File saveFolder = saveStructure.getSaveFolder(clientLevelWrapper);
 		File pre23Folder = saveStructure.getPre23SaveFolder(clientLevelWrapper);
@@ -131,7 +142,7 @@ public class DhClientLevel extends AbstractDhLevel implements IDhClientLevel
 		}
 		
 		this.remoteDataSourceProvider = new RemoteFullDataSourceProvider(this, saveStructure, fullDataSaveDirOverride, this.syncOnLoadRequestQueue);
-		this.worldGenModule = new WorldGenModule(this, this.remoteDataSourceProvider, () -> new WorldGenState(this, networkState));
+		this.lodRequestModule = new LodRequestModule(this,this, this.remoteDataSourceProvider, () -> new LodRequestState(this, networkState));
 		
 		this.clientside = new ClientLevelModule(this);
 		
@@ -239,11 +250,6 @@ public class DhClientLevel extends AbstractDhLevel implements IDhClientLevel
 	@Nullable
 	public DhBlockPos2D getTargetPosForGeneration() { return new DhBlockPos2D(MC_CLIENT.getPlayerBlockPos()); }
 	
-	@Override
-	public void worldGenTick() { this.worldGenModule.worldGenTick(); }
-	
-	public void startRenderer() { this.clientside.startRenderer(); }
-	
 	
 	
 	//===========//
@@ -325,7 +331,7 @@ public class DhClientLevel extends AbstractDhLevel implements IDhClientLevel
 		
 		
 		// world gen
-		this.worldGenModule.addDebugMenuStringsToList(messageList);
+		this.lodRequestModule.addDebugMenuStringsToList(messageList);
 		if (this.syncOnLoadRequestQueue != null)
 		{
 			assert this.networkState != null;
@@ -348,9 +354,9 @@ public class DhClientLevel extends AbstractDhLevel implements IDhClientLevel
 	@Override
 	public void close()
 	{
-		if (this.worldGenModule != null)
+		if (this.lodRequestModule != null)
 		{
-			this.worldGenModule.close();
+			this.lodRequestModule.close();
 		}
 		
 		if (this.networkEventSource != null)
@@ -371,11 +377,11 @@ public class DhClientLevel extends AbstractDhLevel implements IDhClientLevel
 	// helper classes //
 	//================//
 	
-	private static class WorldGenState extends WorldGenModule.AbstractWorldGenState
+	private static class LodRequestState extends LodRequestModule.AbstractLodRequestState
 	{
-		WorldGenState(DhClientLevel level, ClientNetworkState networkState)
+		LodRequestState(DhClientLevel level, ClientNetworkState networkState)
 		{
-			this.worldGenerationQueue = new RemoteWorldRetrievalQueue(networkState, level);
+			this.retrievalQueue = new RemoteWorldRetrievalQueue(networkState, level);
 		}
 	}
 	

core/src/main/java/com/seibel/distanthorizons/core/level/DhClientServerLevel.java

@@ -33,6 +33,8 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapp
 import org.jetbrains.annotations.Nullable;
 
 import java.awt.*;
+import java.io.IOException;
+import java.sql.SQLException;
 import java.util.List;
 
 /** The level used for a singleplayer world */
@@ -48,7 +50,11 @@ public class DhClientServerLevel extends AbstractDhServerLevel implements IDhCli
 	// constructor //
 	//=============//
 	
-	public DhClientServerLevel(ISaveStructure saveStructure, IServerLevelWrapper serverLevelWrapper, ServerPlayerStateManager serverPlayerStateManager)
+	public DhClientServerLevel(
+		ISaveStructure saveStructure, 
+		IServerLevelWrapper serverLevelWrapper, 
+		ServerPlayerStateManager serverPlayerStateManager
+		) throws SQLException, IOException
 	{
 		super(saveStructure, serverLevelWrapper, serverPlayerStateManager, false);
 		

core/src/main/java/com/seibel/distanthorizons/core/level/DhServerLevel.java

@@ -27,6 +27,8 @@ import com.seibel.distanthorizons.core.render.renderer.generic.GenericObjectRend
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper;
 import org.jetbrains.annotations.Nullable;
 
+import java.io.IOException;
+import java.sql.SQLException;
 import java.util.List;
 
 public class DhServerLevel extends AbstractDhServerLevel
@@ -35,10 +37,12 @@ public class DhServerLevel extends AbstractDhServerLevel
 	// constructor //
 	//=============//
 	
-	public DhServerLevel(ISaveStructure saveStructure, IServerLevelWrapper serverLevelWrapper, ServerPlayerStateManager serverPlayerStateManager)
-	{
-		super(saveStructure, serverLevelWrapper, serverPlayerStateManager);
-	}
+	public DhServerLevel(
+		ISaveStructure saveStructure, 
+		IServerLevelWrapper serverLevelWrapper, 
+		ServerPlayerStateManager serverPlayerStateManager
+		) throws SQLException, IOException
+	{ super(saveStructure, serverLevelWrapper, serverPlayerStateManager); }
 	
 	
 	

core/src/main/java/com/seibel/distanthorizons/core/level/IDhLevel.java

@@ -56,9 +56,6 @@ import java.util.concurrent.CompletableFuture;
  */
 public interface IDhLevel extends AutoCloseable, GeneratedFullDataSourceProvider.IOnWorldGenCompleteListener
 {
-	@Deprecated
-	void worldGenTick();
-	
 	/**
 	 * May return either a client or server level wrapper. <br>
 	 * Should not return null

core/src/main/java/com/seibel/distanthorizons/core/level/IDhServerLevel.java

@@ -23,8 +23,6 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapp
 
 public interface IDhServerLevel extends IDhLevel
 {
-    void serverTick();
-	
     IServerLevelWrapper getServerLevelWrapper();
 	
 }

core/src/main/java/com/seibel/distanthorizons/core/level/LodRequestModule.java

@@ -45,18 +45,18 @@ import java.util.function.Supplier;
 
 /**
  * Handles both single-player/server-side world gen and client side LOD requests.
- * TODO rename
  */
-public class WorldGenModule implements Closeable
+public class LodRequestModule implements Closeable
 {
 	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	private final GeneratedFullDataSourceProvider.IOnWorldGenCompleteListener onWorldGenCompleteListener;
+	private final ThreadPoolExecutor tickerThread;
 	
 	private final GeneratedFullDataSourceProvider dataSourceProvider;
-	private final Supplier<? extends AbstractWorldGenState> worldGenStateSupplier;
+	private final Supplier<? extends AbstractLodRequestState> worldGenStateSupplier;
 	
-	private final AtomicReference<AbstractWorldGenState> worldGenStateRef = new AtomicReference<>();
+	private final AtomicReference<AbstractLodRequestState> lodRequestStateRef = new AtomicReference<>();
 	
 	
 	
@@ -64,59 +64,41 @@ public class WorldGenModule implements Closeable
 	// constructor //
 	//=============//
 	
-	public WorldGenModule(
+	public LodRequestModule(
+			IDhLevel level,
 			GeneratedFullDataSourceProvider.IOnWorldGenCompleteListener onWorldGenCompleteListener,
 			GeneratedFullDataSourceProvider dataSourceProvider,
-			Supplier<? extends AbstractWorldGenState> worldGenStateSupplier
+			Supplier<? extends AbstractLodRequestState> worldGenStateSupplier
 		)
 	{
 		this.onWorldGenCompleteListener = onWorldGenCompleteListener;
 		this.dataSourceProvider = dataSourceProvider;
 		this.worldGenStateSupplier = worldGenStateSupplier;
-	}
-	
-	
-	
-	//===================//
-	// world gen control //
-	//===================//
-	
-	public void startWorldGen(GeneratedFullDataSourceProvider dataFileHandler, AbstractWorldGenState newWgs)
-	{
-		// create the new world generator
-		if (!this.worldGenStateRef.compareAndSet(null, newWgs))
-		{
-			LOGGER.warn("Failed to start world gen due to concurrency");
-			newWgs.closeAsync(false);
-		}
-		dataFileHandler.addWorldGenCompleteListener(this.onWorldGenCompleteListener);
-		dataFileHandler.setWorldGenerationQueue(newWgs.worldGenerationQueue);
-	}
-	
-	public void stopWorldGen(GeneratedFullDataSourceProvider dataFileHandler)
-	{
-		AbstractWorldGenState worldGenState = this.worldGenStateRef.get();
-		if (worldGenState == null)
-		{
-			LOGGER.warn("Attempted to stop world gen when it was not running");
-			return;
-		}
 		
-		// shut down the world generator
-		while (!this.worldGenStateRef.compareAndSet(worldGenState, null))
+		String levelId = level.getLevelWrapper().getDhIdentifier();
+		this.tickerThread = ThreadUtil.makeSingleDaemonThreadPool("Request Module Ticker ["+levelId+"]");
+		this.tickerThread.execute(this::tickLoop);
+	}
+	
+	
+	
+	//=========//
+	// ticking //
+	//=========//
+	
+	private void tickLoop()
+	{
+		try
 		{
-			worldGenState = this.worldGenStateRef.get();
-			if (worldGenState == null)
+			while (!Thread.interrupted())
 			{
-				return;
+				Thread.sleep(20);
+				this.tick();
 			}
 		}
-		dataFileHandler.clearRetrievalQueue();
-		worldGenState.closeAsync(true).join(); //TODO: Make it async.
-		dataFileHandler.removeWorldGenCompleteListener(this.onWorldGenCompleteListener);
+		catch (InterruptedException ignore) { }
 	}
-	
-	public void worldGenTick()
+	private void tick()
 	{
 		boolean shouldDoWorldGen = this.onWorldGenCompleteListener.shouldDoWorldGen();
 		// if the world is read only don't generate anything
@@ -136,13 +118,13 @@ public class WorldGenModule implements Closeable
 		
 		if (this.isWorldGenRunning())
 		{
-			AbstractWorldGenState worldGenState = this.worldGenStateRef.get();
-			if (worldGenState != null)
+			AbstractLodRequestState lodRequestState = this.lodRequestStateRef.get();
+			if (lodRequestState != null)
 			{
 				DhBlockPos2D targetPosForGeneration = this.onWorldGenCompleteListener.getTargetPosForGeneration();
 				if (targetPosForGeneration != null)
 				{
-					worldGenState.startGenerationQueueAndSetTargetPos(targetPosForGeneration);
+					lodRequestState.startRequestQueueAndSetTargetPos(targetPosForGeneration);
 				}
 			}
 		}
@@ -150,6 +132,48 @@ public class WorldGenModule implements Closeable
 	
 	
 	
+	//===================//
+	// world gen control //
+	//===================//
+	
+	public void startWorldGen(GeneratedFullDataSourceProvider dataFileHandler, AbstractLodRequestState newWgs)
+	{
+		// create the new world generator
+		if (!this.lodRequestStateRef.compareAndSet(null, newWgs))
+		{
+			LOGGER.warn("Failed to start world gen due to concurrency");
+			newWgs.closeAsync(false);
+		}
+		
+		dataFileHandler.addWorldGenCompleteListener(this.onWorldGenCompleteListener);
+		dataFileHandler.setWorldGenerationQueue(newWgs.retrievalQueue);
+	}
+	
+	public void stopWorldGen(GeneratedFullDataSourceProvider dataFileHandler)
+	{
+		AbstractLodRequestState worldGenState = this.lodRequestStateRef.get();
+		if (worldGenState == null)
+		{
+			LOGGER.warn("Attempted to stop world gen when it was not running");
+			return;
+		}
+		
+		// shut down the world generator
+		while (!this.lodRequestStateRef.compareAndSet(worldGenState, null))
+		{
+			worldGenState = this.lodRequestStateRef.get();
+			if (worldGenState == null)
+			{
+				return;
+			}
+		}
+		dataFileHandler.clearRetrievalQueue();
+		worldGenState.closeAsync(true).join(); //TODO: Make it async.
+		dataFileHandler.removeWorldGenCompleteListener(this.onWorldGenCompleteListener);
+	}
+	
+	
+	
 	//=======================//
 	// base method overrides //
 	//=======================//
@@ -157,13 +181,15 @@ public class WorldGenModule implements Closeable
 	@Override
 	public void close()
 	{
+		this.tickerThread.shutdownNow();
+		
 		// shutdown the world-gen
-		AbstractWorldGenState worldGenState = this.worldGenStateRef.get();
+		AbstractLodRequestState worldGenState = this.lodRequestStateRef.get();
 		if (worldGenState != null)
 		{
-			while (!this.worldGenStateRef.compareAndSet(worldGenState, null))
+			while (!this.lodRequestStateRef.compareAndSet(worldGenState, null))
 			{
-				worldGenState = this.worldGenStateRef.get();
+				worldGenState = this.lodRequestStateRef.get();
 				if (worldGenState == null)
 				{
 					break;
@@ -183,12 +209,12 @@ public class WorldGenModule implements Closeable
 	// getters //
 	//=========//
 	
-	public boolean isWorldGenRunning() { return this.worldGenStateRef.get() != null; }
+	public boolean isWorldGenRunning() { return this.lodRequestStateRef.get() != null; }
 	
 	/** mutates a list so it can be added to an existing {@link IDhLevel}'s debug list  */
 	public void addDebugMenuStringsToList(List<String> messageList)
 	{
-		AbstractWorldGenState worldGenState = this.worldGenStateRef.get();
+		AbstractLodRequestState worldGenState = this.lodRequestStateRef.get();
 		if (worldGenState == null)
 		{
 			return;
@@ -196,9 +222,9 @@ public class WorldGenModule implements Closeable
 		
 		
 		// estimated tasks
-		String waitingCountStr = F3Screen.NUMBER_FORMAT.format(worldGenState.worldGenerationQueue.getWaitingTaskCount());
-		String inProgressCountStr = F3Screen.NUMBER_FORMAT.format(worldGenState.worldGenerationQueue.getInProgressTaskCount());
-		String totalCountEstimateStr = F3Screen.NUMBER_FORMAT.format(worldGenState.worldGenerationQueue.getRetrievalEstimatedRemainingChunkCount());
+		String waitingCountStr = F3Screen.NUMBER_FORMAT.format(worldGenState.retrievalQueue.getWaitingTaskCount());
+		String inProgressCountStr = F3Screen.NUMBER_FORMAT.format(worldGenState.retrievalQueue.getInProgressTaskCount());
+		String totalCountEstimateStr = F3Screen.NUMBER_FORMAT.format(worldGenState.retrievalQueue.getRetrievalEstimatedRemainingChunkCount());
 		String message = "World Gen/Import Tasks: "+waitingCountStr+"/"+totalCountEstimateStr+" (in progress "+inProgressCountStr+")";
 		
 		// estimated chunks/sec
@@ -210,7 +236,7 @@ public class WorldGenModule implements Closeable
 		
 		messageList.add(message);
 		
-		worldGenState.worldGenerationQueue.addDebugMenuStringsToList(messageList);
+		worldGenState.retrievalQueue.addDebugMenuStringsToList(messageList);
 	}
 	
 	
@@ -220,40 +246,22 @@ public class WorldGenModule implements Closeable
 	//================//
 	
 	/** Handles the {@link IFullDataSourceRetrievalQueue} and any other necessary world gen information. */
-	public static abstract class AbstractWorldGenState
+	public static abstract class AbstractLodRequestState
 	{
 		/** static so we only send the disable message once per session */
 		private static long firstProgressMessageSentMs = 0;
 		
-		public IFullDataSourceRetrievalQueue worldGenerationQueue;
+		public IFullDataSourceRetrievalQueue retrievalQueue;
 		
 		private static final ThreadPoolExecutor PROGRESS_UPDATER_THREAD = ThreadUtil.makeSingleDaemonThreadPool("World Gen Progress Updater");
 		private boolean progressUpdateThreadRunning = false;
 		
 		
-		CompletableFuture<Void> closeAsync(boolean doInterrupt)
-		{
-			// this should stop the updater thread
-			this.progressUpdateThreadRunning = false;
-			
-			return this.worldGenerationQueue.startClosingAsync(true, doInterrupt)
-				.exceptionally(e ->
-				{
-					LOGGER.error("Error during first stage of generation queue shutdown, Error: ["+e.getMessage()+"].", e);
-					return null;
-				}
-				).thenRun(this.worldGenerationQueue::close)
-				.exceptionally(e ->
-				{
-					LOGGER.error("Error during second stage of generation queue shutdown, Error: ["+e.getMessage()+"].", e);
-					return null;
-				});
-		}
 		
-		/** @param targetPosForGeneration the position that world generation should be centered around */
-		public void startGenerationQueueAndSetTargetPos(DhBlockPos2D targetPosForGeneration) 
+		/** @param targetPosForRequest the position that world generation should be centered around */
+		public void startRequestQueueAndSetTargetPos(DhBlockPos2D targetPosForRequest) 
 		{ 
-			this.worldGenerationQueue.startAndSetTargetPos(targetPosForGeneration);
+			this.retrievalQueue.startAndSetTargetPos(targetPosForRequest);
 			this.startProgressUpdateThread();
 		}
 		private void startProgressUpdateThread()
@@ -286,8 +294,8 @@ public class WorldGenModule implements Closeable
 		private void sendRetrievalProgress()
 		{
 			// format the remaining chunks
-			int remainingChunkCount = this.worldGenerationQueue.getRetrievalEstimatedRemainingChunkCount();
-			remainingChunkCount += this.worldGenerationQueue.getQueuedChunkCount();
+			int remainingChunkCount = this.retrievalQueue.getRetrievalEstimatedRemainingChunkCount();
+			remainingChunkCount += this.retrievalQueue.getQueuedChunkCount();
 			String remainingChunkCountStr = F3Screen.NUMBER_FORMAT.format(remainingChunkCount);
 			
 			String message = "DH is generating chunks. " + remainingChunkCountStr + " left.";
@@ -350,7 +358,7 @@ public class WorldGenModule implements Closeable
 		/** @return -1 if this method isn't supported or available */
 		public double getEstimatedChunksPerSecond()
 		{
-			RollingAverage avg = this.worldGenerationQueue.getRollingAverageChunkGenTimeInMs();
+			RollingAverage avg = this.retrievalQueue.getRollingAverageChunkGenTimeInMs();
 			if (avg == null)
 			{
 				return -1;
@@ -373,6 +381,27 @@ public class WorldGenModule implements Closeable
 			return chunksPerSecond;
 		}
 		
+		
+		CompletableFuture<Void> closeAsync(boolean doInterrupt)
+		{
+			// this should stop the updater thread
+			this.progressUpdateThreadRunning = false;
+			
+			return this.retrievalQueue.startClosingAsync(true, doInterrupt)
+					.exceptionally(e ->
+							{
+								LOGGER.error("Error during first stage of generation queue shutdown, Error: ["+e.getMessage()+"].", e);
+								return null;
+							}
+					).thenRun(this.retrievalQueue::close)
+					.exceptionally(e ->
+					{
+						LOGGER.error("Error during second stage of generation queue shutdown, Error: ["+e.getMessage()+"].", e);
+						return null;
+					});
+		}
+		
+		
 	}
 	
 	

core/src/main/java/com/seibel/distanthorizons/core/level/ServerLevelModule.java

@@ -28,6 +28,9 @@ import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.coreapi.DependencyInjection.WorldGeneratorInjector;
 import com.seibel.distanthorizons.core.logging.DhLogger;
 
+import java.io.IOException;
+import java.sql.SQLException;
+
 public class ServerLevelModule implements AutoCloseable
 {
 	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
@@ -36,7 +39,7 @@ public class ServerLevelModule implements AutoCloseable
 	public final ISaveStructure saveStructure;
 	public final GeneratedFullDataSourceProvider fullDataFileHandler;
 	
-	public final WorldGenModule worldGenModule;
+	public final LodRequestModule lodRequestModule;
 	
 	
 	
@@ -44,12 +47,12 @@ public class ServerLevelModule implements AutoCloseable
 	// constructor //
 	//=============//
 	
-	public ServerLevelModule(IDhServerLevel parentServerLevel, ISaveStructure saveStructure)
+	public ServerLevelModule(IDhServerLevel parentServerLevel, ISaveStructure saveStructure) throws SQLException, IOException
 	{
 		this.parentServerLevel = parentServerLevel;
 		this.saveStructure = saveStructure;
 		this.fullDataFileHandler = new GeneratedFullDataSourceProvider(parentServerLevel, saveStructure);
-		this.worldGenModule = new WorldGenModule(this.parentServerLevel, this.fullDataFileHandler, () -> new ServerLevelModule.WorldGenState(this.parentServerLevel));
+		this.lodRequestModule = new LodRequestModule(this.parentServerLevel, this.parentServerLevel, this.fullDataFileHandler, () -> new LodRequestState(this.parentServerLevel));
 	}
 	
 	
@@ -62,7 +65,7 @@ public class ServerLevelModule implements AutoCloseable
 	public void close()
 	{
 		// shutdown the world-gen
-		this.worldGenModule.close();
+		this.lodRequestModule.close();
 		this.fullDataFileHandler.close();
 	}
 	
@@ -72,9 +75,9 @@ public class ServerLevelModule implements AutoCloseable
 	// helper classes //
 	//================//
 	
-	public static class WorldGenState extends WorldGenModule.AbstractWorldGenState
+	public static class LodRequestState extends LodRequestModule.AbstractLodRequestState
 	{
-		WorldGenState(IDhServerLevel level)
+		LodRequestState(IDhServerLevel level)
 		{
 			IDhApiWorldGenerator worldGenerator = WorldGeneratorInjector.INSTANCE.get(level.getLevelWrapper());
 			if (worldGenerator == null)
@@ -85,7 +88,7 @@ public class ServerLevelModule implements AutoCloseable
 				// since core world generator's should have the lowest override priority
 				WorldGeneratorInjector.INSTANCE.bind(level.getLevelWrapper(), worldGenerator);
 			}
-			this.worldGenerationQueue = new WorldGenerationQueue(worldGenerator, level);
+			this.retrievalQueue = new WorldGenerationQueue(worldGenerator, level);
 		}
 		
 	}

core/src/main/java/com/seibel/distanthorizons/core/logging/DhLogger.java

@@ -276,7 +276,7 @@ public class DhLogger implements IConfigListener
 			
 			if (mc_client != null)
 			{
-				mc_client.logToChat(level, msgStr);
+				this.logToChat(level, msgStr);
 				messageLogged = true;
 			}
 		}
@@ -296,6 +296,41 @@ public class DhLogger implements IConfigListener
 	}
 	private static boolean loggingLevelIsLessSpecificThan(Level thisLoggingLevel, Level requestedLogLevel)
 	{ return thisLoggingLevel.intLevel() >= requestedLogLevel.intLevel(); }
+	/** Sends the given message to chat with a formatted prefix and color based on the log level. */
+	private void logToChat(Level logLevel, String message)
+	{
+		String prefix = "[" + ModInfo.READABLE_NAME + "] ";
+		if (logLevel == Level.ERROR)
+		{
+			prefix += "\u00A74";
+		}
+		else if (logLevel == Level.WARN)
+		{
+			prefix += "\u00A76";
+		}
+		else if (logLevel == Level.INFO)
+		{
+			prefix += "\u00A7f";
+		}
+		else if (logLevel == Level.DEBUG)
+		{
+			prefix += "\u00A77";
+		}
+		else if (logLevel == Level.TRACE)
+		{
+			prefix += "\u00A78";
+		}
+		else
+		{
+			prefix += "\u00A7f";
+		}
+		
+		prefix += "\u00A7l\u00A7u";
+		prefix += logLevel.name();
+		prefix += ":\u00A7r ";
+		
+		mc_client.sendChatMessage(prefix + message);
+	}
 	
 	
 	

core/src/main/java/com/seibel/distanthorizons/core/multiplayer/config/SessionConfig.java

@@ -33,9 +33,9 @@ public class SessionConfig implements INetworkObject
 		
 		registerConfigEntry(Config.Common.WorldGenerator.enableDistantGeneration, Boolean::logicalAnd);
 		registerConfigEntry(Config.Server.maxGenerationRequestDistance, Math::min);
-		registerConfigEntry(Config.Server.generationBoundsX, (x, y) -> y);
-		registerConfigEntry(Config.Server.generationBoundsZ, (x, y) -> y);
-		registerConfigEntry(Config.Server.generationBoundsRadius, (x, y) -> y);
+		registerConfigEntry(Config.Common.WorldGenerator.generationCenterChunkX, (x, y) -> y);
+		registerConfigEntry(Config.Common.WorldGenerator.generationCenterChunkZ, (x, y) -> y);
+		registerConfigEntry(Config.Common.WorldGenerator.generationMaxChunkRadius, (x, y) -> y);
 		registerConfigEntry(Config.Server.generationRequestRateLimit, Math::min);
 		
 		registerConfigEntry(Config.Server.enableRealTimeUpdates, Boolean::logicalAnd);
@@ -68,9 +68,9 @@ public class SessionConfig implements INetworkObject
 	
 	public boolean isDistantGenerationEnabled() { return this.getValue(Config.Common.WorldGenerator.enableDistantGeneration); }
 	public int getMaxGenerationRequestDistance() { return this.getValue(Config.Server.maxGenerationRequestDistance); }
-	public Integer getGenerationBoundsX() { return this.getValue(Config.Server.generationBoundsX); }
-	public Integer getGenerationBoundsZ() { return this.getValue(Config.Server.generationBoundsZ); }
-	public Integer getGenerationBoundsRadius() { return this.getValue(Config.Server.generationBoundsRadius); }
+	public Integer getGenerationCenterChunkX() { return this.getValue(Config.Common.WorldGenerator.generationCenterChunkX); }
+	public Integer getGenerationCenterChunkZ() { return this.getValue(Config.Common.WorldGenerator.generationCenterChunkZ); }
+	public Integer getGenerationMaxChunkRadius() { return this.getValue(Config.Common.WorldGenerator.generationMaxChunkRadius); }
 	public int getGenerationRequestRateLimit() { return this.getValue(Config.Server.generationRequestRateLimit); }
 	
 	public boolean isRealTimeUpdatesEnabled() { return this.getValue(Config.Server.enableRealTimeUpdates); }

core/src/main/java/com/seibel/distanthorizons/core/multiplayer/server/FullDataSourceRequestHandler.java

@@ -14,6 +14,7 @@ import com.seibel.distanthorizons.core.network.messages.fullData.FullDataSourceR
 import com.seibel.distanthorizons.core.network.messages.fullData.FullDataSourceResponseMessage;
 import com.seibel.distanthorizons.core.pos.DhSectionPos;
 import com.seibel.distanthorizons.core.sql.dto.BeaconBeamDTO;
+import com.seibel.distanthorizons.core.util.ThreadUtil;
 import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
 
 import java.util.List;
@@ -21,7 +22,7 @@ import java.util.Map;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-public class FullDataSourceRequestHandler
+public class FullDataSourceRequestHandler implements AutoCloseable
 {
 	private static final DhLogger LOGGER = new DhLoggerBuilder()
 			.fileLevelConfig(Config.Common.Logging.logNetworkEventToFile)
@@ -29,6 +30,8 @@ public class FullDataSourceRequestHandler
 	
 	
 	private final AbstractDhServerLevel serverLevel;
+	private final ThreadPoolExecutor tickerThread;
+	
 	private String getLevelIdentifier() { return this.serverLevel.getLevelWrapper().getDhIdentifier(); }
 	private GeneratedFullDataSourceProvider fullDataSourceProvider() { return this.serverLevel.serverside.fullDataFileHandler; }
 	private List<BeaconBeamDTO> getAllBeamsForPos(long pos) { return this.serverLevel.beaconBeamRepo.getAllBeamsForPos(pos); }
@@ -37,12 +40,22 @@ public class FullDataSourceRequestHandler
 	private final ConcurrentMap<Long, DataSourceRequestGroup> requestGroupsByFutureId = new ConcurrentHashMap<>();
 	
 	
+	
+	//=============//
+	// constructor //
+	//=============//
+	
 	public FullDataSourceRequestHandler(AbstractDhServerLevel serverLevel)
 	{
 		this.serverLevel = serverLevel;
+		
+		String levelId = this.serverLevel.getServerLevelWrapper().getDhIdentifier();
+		this.tickerThread = ThreadUtil.makeSingleDaemonThreadPool("DataSource Request Ticker ["+levelId+"]");
+		this.tickerThread.execute(this::tickLoop);
 	}
 	
 	
+	
 	//==================//
 	// network handling //
 	//==================//
@@ -214,52 +227,6 @@ public class FullDataSourceRequestHandler
 		}
 	}
 	
-	
-	public void tick()
-	{
-		// Send finished data source requests
-		for (Map.Entry<Long, DataSourceRequestGroup> entry : this.requestGroupsByPos.entrySet())
-		{
-			DataSourceRequestGroup requestGroup = entry.getValue();
-			
-			if (requestGroup.fullDataSource == null)
-			{
-				continue;
-			}
-			
-			LOGGER.debug("[" + this.getLevelIdentifier() + "] Fulfilled request group [" + DhSectionPos.toString(entry.getKey()) + "]");
-			
-			// Make this group unavailable for adding into
-			this.requestGroupsByPos.remove(entry.getKey());
-			if (!requestGroup.tryClose())
-			{
-				continue;
-			}
-			
-			AbstractExecutorService executor = ThreadPoolUtil.getNetworkCompressionExecutor();
-			if (executor == null)
-			{
-				LOGGER.warn("Unable to send FullDataSourceResponseMessage - getNetworkCompressionExecutor() is null");
-				continue;
-			}
-			CompletableFuture.runAsync(() ->
-			{
-				FullDataPayload payload = new FullDataPayload(requestGroup.fullDataSource, this.getAllBeamsForPos(entry.getKey()));
-				requestGroup.fullDataSource.close();
-				
-				for (DataSourceRequestGroup.RequestData requestData : requestGroup.requestMessages.values())
-				{
-					this.requestGroupsByFutureId.remove(requestData.futureId());
-					
-					requestData.serverPlayerState.fullDataPayloadSender.sendInChunks(payload, () -> {
-						requestData.message.sendResponse(new FullDataSourceResponseMessage(payload));
-						requestData.rateLimiterSet.generationRequestRateLimiter.release();
-					});
-				}
-			}, executor);
-		}
-	}
-	
 	private void tryFulfillDataSourceRequestGroup(DataSourceRequestGroup requestGroup, long pos)
 	{
 		this.fullDataSourceProvider().getAsync(pos).thenAccept(fullDataSource ->
@@ -313,4 +280,80 @@ public class FullDataSourceRequestHandler
 		}
 	}
 	
+	
+	
+	//=========//
+	// ticking //
+	//=========//
+	
+	private void tickLoop()
+	{
+		try
+		{
+			while (!Thread.interrupted())
+			{
+				Thread.sleep(20);
+				this.tick();
+			}
+		}
+		catch (InterruptedException ignore) { }
+	}
+	private void tick()
+	{
+		// Send finished data source requests
+		for (Map.Entry<Long, DataSourceRequestGroup> entry : this.requestGroupsByPos.entrySet())
+		{
+			DataSourceRequestGroup requestGroup = entry.getValue();
+			if (requestGroup.fullDataSource == null)
+			{
+				continue;
+			}
+			
+			LOGGER.debug("[" + this.getLevelIdentifier() + "] Fulfilled request group [" + DhSectionPos.toString(entry.getKey()) + "]");
+			
+			// Make this group unavailable for adding into
+			this.requestGroupsByPos.remove(entry.getKey());
+			if (!requestGroup.tryClose())
+			{
+				continue;
+			}
+			
+			AbstractExecutorService executor = ThreadPoolUtil.getNetworkCompressionExecutor();
+			if (executor == null)
+			{
+				LOGGER.warn("Unable to send FullDataSourceResponseMessage - getNetworkCompressionExecutor() is null");
+				continue;
+			}
+			CompletableFuture.runAsync(() ->
+			{
+				FullDataPayload payload = new FullDataPayload(requestGroup.fullDataSource, this.getAllBeamsForPos(entry.getKey()));
+				requestGroup.fullDataSource.close();
+				
+				for (DataSourceRequestGroup.RequestData requestData : requestGroup.requestMessages.values())
+				{
+					this.requestGroupsByFutureId.remove(requestData.futureId());
+					
+					requestData.serverPlayerState.fullDataPayloadSender.sendInChunks(payload, () -> {
+						requestData.message.sendResponse(new FullDataSourceResponseMessage(payload));
+						requestData.rateLimiterSet.generationRequestRateLimiter.release();
+					});
+				}
+			}, executor);
+		}
+	}
+	
+	
+	
+	//================//
+	// base overrides //
+	//================//
+	
+	@Override 
+	public void close()
+	{
+		this.tickerThread.shutdownNow();
+	}
+	
+	
+	
 }

core/src/main/java/com/seibel/distanthorizons/core/multiplayer/server/ServerPlayerState.java

@@ -102,8 +102,8 @@ public class ServerPlayerState implements Closeable
 	private void sendConfigMessage()
 	{
 		double coordinateScale = this.getServerPlayer().getLevel().getDimensionType().getCoordinateScale();
-		this.sessionConfig.constrainValue(Config.Server.generationBoundsX, (int) (Config.Server.generationBoundsX.get() / coordinateScale));
-		this.sessionConfig.constrainValue(Config.Server.generationBoundsZ, (int) (Config.Server.generationBoundsZ.get() / coordinateScale));
+		this.sessionConfig.constrainValue(Config.Common.WorldGenerator.generationCenterChunkX, (int) (Config.Common.WorldGenerator.generationCenterChunkX.get() / coordinateScale));
+		this.sessionConfig.constrainValue(Config.Common.WorldGenerator.generationCenterChunkZ, (int) (Config.Common.WorldGenerator.generationCenterChunkZ.get() / coordinateScale));
 		
 		this.networkSession.sendMessage(new SessionConfigMessage(this.sessionConfig));
 	}

core/src/main/java/com/seibel/distanthorizons/core/network/session/NetworkSession.java

@@ -92,7 +92,8 @@ public class NetworkSession extends AbstractNetworkEventSource
 		{
 			LOGGER.error("Failed to handle the message. New messages will be ignored.", e);
 			LOGGER.error("Message: ["+message+"]");
-			this.close();
+			
+			this.close(e);
 		}
 	}
 	

core/src/main/java/com/seibel/distanthorizons/core/pooling/PhantomArrayListPool.java

@@ -182,7 +182,8 @@ public class PhantomArrayListPool
 								"Potential causes: \n" +
 								"1. your allocated memory isn't high enough \n" +
 								"2. your DH CPU preset is too high \n" +
-								"3. your DH quality preset is too high";
+								"3. your DH quality preset is too high \n" +
+								"4. you have other memory hungry mod(s)";
 						
 						LOGGER.warn(message);
 						if (Config.Common.Logging.Warning.showPoolInsufficientMemoryWarning.get())

core/src/main/java/com/seibel/distanthorizons/core/pos/DhSectionPos.java

@@ -42,6 +42,8 @@ import java.util.function.LongConsumer;
  * <strong>Too big</strong>, and the LOD dropoff will be very noticeable.<br>
  * With those thoughts in mind we decided on a smallest section size of 64 data points square (IE 4x4 chunks).
  *
+ * TODO absolute vs section detail levels
+ * 
  * @author Leetom
  */
 public class DhSectionPos
@@ -279,17 +281,24 @@ public class DhSectionPos
 				+ Math.abs(getCenterBlockPosZ(pos) - blockPos.z);
 	}
 	
+	
+	/** see: {@link DhSectionPos#getChebyshevSignedBlockDistance(long, int, int)} */
+	public static int getChebyshevSignedBlockDistance(long pos, DhBlockPos  blockPos)
+	{ return getChebyshevSignedBlockDistance(pos, blockPos.getX(), blockPos.getZ()); }
+	/** see: {@link DhSectionPos#getChebyshevSignedBlockDistance(long, int, int)} */
+	public static int getChebyshevSignedBlockDistance(long pos, DhBlockPos2D blockPos)
+	{ return getChebyshevSignedBlockDistance(pos, blockPos.x, blockPos.z); }
 	/**
 	 * Returns the signed distance from a given block to a given section. <br>
 	 * Essentially acts like a distance from the block to the nearest edge of the section,
 	 * except inside the section it's negative. <br>
 	 * Useful for detail level insensitive distance comparisons.
 	 */
-	public static int getChebyshevSignedBlockDistance(long pos, DhBlockPos2D blockPos)
+	public static int getChebyshevSignedBlockDistance(long pos, int blockPosX, int blockPosZ)
 	{
 		return Math.max(
-				Math.abs(getCenterBlockPosX(pos) - blockPos.x),
-				Math.abs(getCenterBlockPosZ(pos) - blockPos.z)
+			Math.abs(getCenterBlockPosX(pos) - blockPosX),
+			Math.abs(getCenterBlockPosZ(pos) - blockPosZ)
 		) - getBlockWidth(pos) / 2;
 	}
 	

core/src/main/java/com/seibel/distanthorizons/core/render/LodQuadTree.java

@@ -762,7 +762,6 @@ public class LodQuadTree extends QuadTree<LodRenderSection> implements IDebugRen
 			{
 				// walk through each node
 				Iterator<QuadNode<LodRenderSection>> nodeIterator = this.nodeIterator();
-				ArrayList<CompletableFuture<Void>> renderDataBuildFutures = new ArrayList<>();
 				while (nodeIterator.hasNext())
 				{
 					QuadNode<LodRenderSection> quadNode = nodeIterator.next();

core/src/main/java/com/seibel/distanthorizons/core/render/LodRenderSection.java

@@ -42,7 +42,7 @@ import com.seibel.distanthorizons.core.render.renderer.DebugRenderer;
 import com.seibel.distanthorizons.core.render.renderer.generic.BeaconRenderHandler;
 import com.seibel.distanthorizons.core.sql.dto.BeaconBeamDTO;
 import com.seibel.distanthorizons.core.sql.repo.BeaconBeamRepo;
-import com.seibel.distanthorizons.core.util.PerfRecorder;
+import com.seibel.distanthorizons.core.util.WorldGenUtil;
 import com.seibel.distanthorizons.core.util.threading.PriorityTaskPicker;
 import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
@@ -133,6 +133,7 @@ public class LodRenderSection implements IDebugRenderable, AutoCloseable
 	//=============//
 	// constructor //
 	//=============//
+	//region constructor
 	
 	public LodRenderSection(
 			long pos, 
@@ -153,11 +154,14 @@ public class LodRenderSection implements IDebugRenderable, AutoCloseable
 		DebugRenderer.register(this, Config.Client.Advanced.Debugging.DebugWireframe.showRenderSectionStatus);
 	}
 	
+	//endregion constructor
+	
 	
 	
 	//======================================//
 	// render data generation and uploading //
 	//======================================//
+	//region render data uploading
 	
 	/** @return true if the upload started, false if it wasn't able to for any reason */
 	public synchronized boolean uploadRenderDataToGpuAsync()
@@ -314,7 +318,10 @@ public class LodRenderSection implements IDebugRenderable, AutoCloseable
 				}
 			});
 	}
-	/** async is done so each thread can run without waiting on others */
+	/** 
+	 * async is done so each thread can run without waiting on others 
+	 * @param direction the direction to load relative to the given position, null will return the given position
+	 */
 	private CompletableFuture<ColumnRenderSource> getRenderSourceForPosAsync(long pos, @Nullable EDhDirection direction) 
 	{
 		if (direction != null)
@@ -400,11 +407,14 @@ public class LodRenderSection implements IDebugRenderable, AutoCloseable
 		});
 	}
 	
+	//endregion render data uploading
 	
 	
-	//========================//
-	// getters and properties //
-	//========================//
+	
+	//====================//
+	// enabling rendering //
+	//====================//
+	//region enabling rendering
 	
 	public boolean canRender() { return this.bufferContainer != null; }
 	
@@ -439,11 +449,14 @@ public class LodRenderSection implements IDebugRenderable, AutoCloseable
 	
 	public boolean gpuUploadInProgress() { return this.getAndBuildRenderDataFuture != null; }
 	
+	//endregion enabling rendering
+	
 	
 	
 	//=================================//
 	// full data retrieval (world gen) //
 	//=================================//
+	//region full data retrieval
 	
 	public boolean isFullyGenerated()
 	{
@@ -528,6 +541,18 @@ public class LodRenderSection implements IDebugRenderable, AutoCloseable
 					}
 					
 					long pos = missingGenerationPos.removeLong(i);
+					
+					boolean posInRange = WorldGenUtil.isPosInWorldGenRange(
+						pos,
+						Config.Common.WorldGenerator.generationCenterChunkX.get(), Config.Common.WorldGenerator.generationCenterChunkZ.get(),
+						Config.Common.WorldGenerator.generationMaxChunkRadius.get()
+					);
+					if (!posInRange)
+					{
+						continue;
+					}
+					
+					
 					boolean positionQueued = (this.fullDataSourceProvider.queuePositionForRetrieval(pos) != null);
 					if (!positionQueued)
 					{
@@ -539,11 +564,14 @@ public class LodRenderSection implements IDebugRenderable, AutoCloseable
 		}
 	}
 	
+	//endregion full data retrieval
+	
 	
 	
 	//=================//
 	// beacon handling //
 	//=================//
+	//region beacon handling
 	
 	/** gets the active beacon list and stops/starts beacon rendering as necessary */
 	private void getAndRefreshRenderingBeacons()
@@ -617,11 +645,14 @@ public class LodRenderSection implements IDebugRenderable, AutoCloseable
 		}
 	}
 	
+	//endregion beacon handling
+	
 	
 	
 	//==============//
 	// base methods //
 	//==============//
+	//region base methods
 	
 	@Override
 	public void debugRender(DebugRenderer debugRenderer)
@@ -708,6 +739,8 @@ public class LodRenderSection implements IDebugRenderable, AutoCloseable
 		
 	}
 	
+	//endregion base methods
+	
 	
 	
 }

core/src/main/java/com/seibel/distanthorizons/core/render/glObject/GLProxy.java

@@ -56,13 +56,13 @@ public class GLProxy
 	
 	public static final Set<String> LOGGED_GL_MESSAGES = Collections.newSetFromMap(new ConcurrentHashMap<String, Boolean>());
 	
+	private static final ConcurrentLinkedQueue<Runnable> RENDER_THREAD_RUNNABLE_QUEUE = new ConcurrentLinkedQueue<>();
+	
 	
 	
 	private static GLProxy instance = null;
 	
 	
-	private final ConcurrentLinkedQueue<Runnable> renderThreadRunnableQueue = new ConcurrentLinkedQueue<>();
-	
 	/** Minecraft's GL capabilities */
 	public final GLCapabilities glCapabilities;
 	
@@ -231,7 +231,7 @@ public class GLProxy
 		return uploadOverride;
 	}
 	
-	public boolean runningOnRenderThread()
+	public static boolean runningOnRenderThread()
 	{
 		long currentContext = GLFW.glfwGetCurrentContext();
 		return currentContext != 0L; // if the context isn't null, it's the MC context
@@ -243,12 +243,12 @@ public class GLProxy
 	// Worker Thread Runnables //
 	//=========================//
 	
-	public void queueRunningOnRenderThread(Runnable renderCall)
+	public static void queueRunningOnRenderThread(Runnable renderCall)
 	{
 		StackTraceElement[] stackTrace = Thread.currentThread().getStackTrace();
-		this.renderThreadRunnableQueue.add(() -> this.runOpenGlCall(renderCall, stackTrace));
+		RENDER_THREAD_RUNNABLE_QUEUE.add(() -> runOpenGlCall(renderCall, stackTrace));
 	}
-	private void runOpenGlCall(Runnable renderCall, StackTraceElement[] stackTrace)
+	private static void runOpenGlCall(Runnable renderCall, StackTraceElement[] stackTrace)
 	{
 		try
 		{
@@ -266,11 +266,11 @@ public class GLProxy
 	 * Doesn't do any thread/GL Context validation.
 	 * Running this outside of the render thread may cause crashes or other issues. 
 	 */
-	public void runRenderThreadTasks()
+	public static void runRenderThreadTasks()
 	{
 		long startTime = System.nanoTime();
 		
-		Runnable runnable = this.renderThreadRunnableQueue.poll();
+		Runnable runnable = RENDER_THREAD_RUNNABLE_QUEUE.poll();
 		while(runnable != null)
 		{
 			runnable.run();
@@ -283,7 +283,7 @@ public class GLProxy
 				break;
 			}
 			
-			runnable = this.renderThreadRunnableQueue.poll();
+			runnable = RENDER_THREAD_RUNNABLE_QUEUE.poll();
 		}
 	}
 	

core/src/main/java/com/seibel/distanthorizons/core/render/glObject/buffer/GLBuffer.java

@@ -100,7 +100,7 @@ public class GLBuffer implements AutoCloseable
 	
 	protected void create(boolean asBufferStorage)
 	{
-		if (!GLProxy.getInstance().runningOnRenderThread())
+		if (!GLProxy.runningOnRenderThread())
 		{
 			LodUtil.assertNotReach("Thread ["+Thread.currentThread()+"] tried to create a GLBuffer outside the MC render thread.");
 		}
@@ -151,7 +151,7 @@ public class GLBuffer implements AutoCloseable
 			BUFFER_ID_TO_PHANTOM.remove(id);
 		}
 		
-		GLProxy.getInstance().queueRunningOnRenderThread(() -> 
+		GLProxy.queueRunningOnRenderThread(() -> 
 		{
 			// destroy the buffer if it exists,
 			// the buffer may not exist if the destroy method is called twice
@@ -198,8 +198,8 @@ public class GLBuffer implements AutoCloseable
 		
 		switch (uploadMethod)
 		{
-			case NONE:
-				return;
+			//case NONE:
+			//	return;
 			case AUTO:
 				LodUtil.assertNotReach("GpuUploadMethod AUTO must be resolved before call to uploadBuffer()!");
 			case BUFFER_STORAGE:
@@ -379,7 +379,7 @@ public class GLBuffer implements AutoCloseable
 					{
 						int id = PHANTOM_TO_BUFFER_ID.get(phantomRef);
 						destroyBufferIdAsync(id);
-						LOGGER.warn("Buffer Phantom collected, ID: ["+id+"]");
+						//LOGGER.warn("Buffer Phantom collected, ID: ["+id+"]");
 					}
 					
 					phantomRef = PHANTOM_REFERENCE_QUEUE.poll();

core/src/main/java/com/seibel/distanthorizons/core/render/glObject/buffer/QuadElementBuffer.java

@@ -44,7 +44,7 @@ public class QuadElementBuffer extends GLElementBuffer
 	
 	public int getCapacity()
 	{
-		return super.getSize() / GLEnums.getTypeSize(getType());
+		return super.getSize() / GLEnums.getTypeSize(this.getType());
 	}
 	
 	private static void buildBufferByte(int quadCount, ByteBuffer buffer)
@@ -140,7 +140,6 @@ public class QuadElementBuffer extends GLElementBuffer
 			return;
 		}
 		int vertexCount = quadCount * 4; // 4 vertices per quad
-		GLProxy gl = GLProxy.getInstance();
 		
 		if (vertexCount < 255)
 		{ // Reserve 1 for the reset index
@@ -158,7 +157,7 @@ public class QuadElementBuffer extends GLElementBuffer
 		
 		ByteBuffer buffer = MemoryUtil.memAlloc(this.indicesCount * GLEnums.getTypeSize(this.type));
 		buildBuffer(quadCount, buffer, this.type);
-		if (!gl.bufferStorageSupported)
+		if (!GLProxy.getInstance().bufferStorageSupported)
 		{
 			
 			this.bind();

core/src/main/java/com/seibel/distanthorizons/core/render/glObject/shader/ShaderProgram.java

@@ -95,7 +95,7 @@ public class ShaderProgram
 		
 		for (int i = 0; i < attributes.length; i++)
 		{
-			GL32.glBindAttribLocation(id, i, attributes[i]);
+			GL32.glBindAttribLocation(this.id, i, attributes[i]);
 		}
 		GL32.glLinkProgram(this.id);
 		

core/src/main/java/com/seibel/distanthorizons/core/render/glObject/texture/DHDepthTexture.java

@@ -25,6 +25,10 @@ public class DHDepthTexture
 		GL43C.glTexParameteri(GL11C.GL_TEXTURE_2D, GL11C.GL_TEXTURE_WRAP_S, GL13C.GL_CLAMP_TO_EDGE);
 		GL43C.glTexParameteri(GL11C.GL_TEXTURE_2D, GL11C.GL_TEXTURE_WRAP_T, GL13C.GL_CLAMP_TO_EDGE);
 		
+		// disable mip-mapping since DH is just going to draw straight to the screen
+		GL43C.glTexParameteri(GL43C.GL_TEXTURE_2D, GL43C.GL_TEXTURE_BASE_LEVEL, 0);
+		GL43C.glTexParameteri(GL43C.GL_TEXTURE_2D, GL43C.GL_TEXTURE_MAX_LEVEL, 0);
+		
 		GL43C.glBindTexture(GL43C.GL_TEXTURE_2D, 0);
 	}
 	

core/src/main/java/com/seibel/distanthorizons/core/render/glObject/texture/DhColorTexture.java

@@ -46,7 +46,7 @@ public class DhColorTexture
 		this.id = GL43C.glGenTextures();
 		
 		boolean isPixelFormatInteger = builder.internalFormat.getPixelFormat().isInteger();
-		this.setupTexture(this.id, builder.width, builder.height, !isPixelFormatInteger);
+		this.setupTexture(this.id, builder.width, builder.height, !isPixelFormatInteger); // this binds the texture
 		
 		// Clean up after ourselves
 		// This is strictly defensive to ensure that other buggy code doesn't tamper with our textures
@@ -67,6 +67,10 @@ public class DhColorTexture
 		GL43C.glTexParameteri(GL11C.GL_TEXTURE_2D, GL11C.GL_TEXTURE_MAG_FILTER, allowsLinear ? GL11C.GL_LINEAR : GL11C.GL_NEAREST);
 		GL43C.glTexParameteri(GL11C.GL_TEXTURE_2D, GL11C.GL_TEXTURE_WRAP_S, GL13C.GL_CLAMP_TO_EDGE);
 		GL43C.glTexParameteri(GL11C.GL_TEXTURE_2D, GL11C.GL_TEXTURE_WRAP_T, GL13C.GL_CLAMP_TO_EDGE);
+		
+		// disable mip-mapping since DH is just going to draw straight to the screen
+		GL43C.glTexParameteri(GL43C.GL_TEXTURE_2D, GL43C.GL_TEXTURE_BASE_LEVEL, 0);
+		GL43C.glTexParameteri(GL43C.GL_TEXTURE_2D, GL43C.GL_TEXTURE_MAX_LEVEL, 0);
 	}
 	
 	private void resizeTexture(int texture, int width, int height)

core/src/main/java/com/seibel/distanthorizons/core/render/glObject/vertexAttribute/VertexPointer.java

@@ -59,8 +59,10 @@ public final class VertexPointer
 	/** Always aligned to 4 bytes */
 	public static VertexPointer addUnsignedBytePointer(boolean normalized, boolean useInteger) { return new VertexPointer(1, GL32.GL_UNSIGNED_BYTE, normalized, 4, useInteger); }
 	/** aligned to 4 bytes */
-	public static VertexPointer addUnsignedBytesPointer(int elementCount, boolean normalized, boolean useInteger) { return new VertexPointer(elementCount, GL32.GL_UNSIGNED_BYTE, normalized, _align(elementCount), useInteger); }
-	public static VertexPointer addUnsignedShortsPointer(int elementCount, boolean normalized, boolean useInteger) { return new VertexPointer(elementCount, GL32.GL_UNSIGNED_SHORT, normalized, _align(elementCount * 2), useInteger); }
+	public static VertexPointer addUnsignedBytesPointer(int elementCount, boolean normalized, boolean useInteger) 
+	{ return new VertexPointer(elementCount, GL32.GL_UNSIGNED_BYTE, normalized, _align(elementCount), useInteger); }
+	public static VertexPointer addUnsignedShortsPointer(int elementCount, boolean normalized, boolean useInteger) 
+	{ return new VertexPointer(elementCount, GL32.GL_UNSIGNED_SHORT, normalized, _align(elementCount * 2), useInteger); }
 	public static VertexPointer addShortsPointer(int elementCount, boolean normalized, boolean useInteger) { return new VertexPointer(elementCount, GL32.GL_SHORT, normalized, _align(elementCount * 2), useInteger); }
 	public static VertexPointer addIntPointer(boolean normalized, boolean useInteger) { return new VertexPointer(1, GL32.GL_INT, normalized, 4, useInteger); }
 	public static VertexPointer addIVec2Pointer(boolean normalized, boolean useInteger) { return new VertexPointer(2, GL32.GL_INT, normalized, 8, useInteger); }

core/src/main/java/com/seibel/distanthorizons/core/render/renderer/DebugRenderer.java

@@ -38,7 +38,6 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRen
 import com.seibel.distanthorizons.core.util.math.Mat4f;
 import com.seibel.distanthorizons.core.util.math.Vec3d;
 import com.seibel.distanthorizons.core.util.math.Vec3f;
-import org.apache.logging.log4j.LogManager;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.lwjgl.opengl.GL32;
@@ -213,7 +212,7 @@ public class DebugRenderer
 		
 		// particle rendering		
 		BoxParticle head = null;
-		while ((head = this.particles.poll()) != null && head.isDead(System.nanoTime()))
+		while ((head = this.particles.poll()) != null && head.isDead())
 		{ /* remove dead particles */ }
 		if (head != null)
 		{
@@ -311,52 +310,50 @@ public class DebugRenderer
 	public static final class BoxParticle implements Comparable<BoxParticle>
 	{
 		public Box box;
-		public long startTime;
-		public long duration;
+		public long startMsTime;
+		public long durationInMs;
 		public float yChange;
 		
-		public BoxParticle(Box box, long startTime, long duration, float yChange)
+		private BoxParticle(Box box, long startMsTime, long durationInMs, float yChange)
 		{
 			this.box = box;
-			this.startTime = startTime;
-			this.duration = duration;
+			this.startMsTime = startMsTime;
+			this.durationInMs = durationInMs;
 			this.yChange = yChange;
 		}
 		
-		public BoxParticle(Box box, long nanoSecondDuratoin, float yChange) { this(box, System.nanoTime(), nanoSecondDuratoin, yChange); }
-		
-		public BoxParticle(Box box, double secondDuration, float yChange) { this(box, System.nanoTime(), (long) (secondDuration * 1000000000), yChange); }
+		public BoxParticle(Box box, double secondDuration, float yChange) { this(box, System.currentTimeMillis(), (long) (secondDuration * 1_000), yChange); }
 		
 		
 		@Override
 		public int compareTo(@NotNull BoxParticle particle)
 		{
-			return Long.compare(this.startTime + this.duration, particle.startTime + particle.duration);
+			return Long.compare(this.startMsTime + this.durationInMs, particle.startMsTime + particle.durationInMs);
 		}
 		
 		public Box getBox()
 		{
-			long now = System.nanoTime();
-			float percent = (now - this.startTime) / (float) this.duration;
+			long nowMs = System.currentTimeMillis();
+			float percent = (nowMs - this.startMsTime) / (float) this.durationInMs;
 			percent = (float) Math.pow(percent, 4);
 			float yDiff = this.yChange * percent;
 			return new Box(new Vec3f(this.box.minPos.x, this.box.minPos.y + yDiff, this.box.minPos.z), new Vec3f(this.box.maxPos.x, this.box.maxPos.y + yDiff, this.box.maxPos.z), this.box.color);
 		}
 		
-		public boolean isDead(long time) { return (time - this.startTime) > this.duration; }
+		public boolean isDead() { return (System.currentTimeMillis() - this.startMsTime) > this.durationInMs; }
 		
 	}
 	
 	public static final class BoxWithLife implements IDebugRenderable, Closeable
 	{
 		public Box box;
-		public BoxParticle particaleOnClose;
+		public BoxParticle particleOnClose;
 		
 		
 		public BoxWithLife(Box box, long ns, float yChange, Color deathColor)
 		{
 			this.box = box;
-			this.particaleOnClose = new BoxParticle(new Box(box.minPos, box.maxPos, deathColor), -1, ns, yChange);
+			this.particleOnClose = new BoxParticle(new Box(box.minPos, box.maxPos, deathColor), -1, ns, yChange);
 			register(this, null);
 		}
 		
@@ -366,7 +363,7 @@ public class DebugRenderer
 		public BoxWithLife(Box box, double s, float yChange, Color deathColor)
 		{
 			this.box = box;
-			this.particaleOnClose = new BoxParticle(new Box(box.minPos, box.maxPos, deathColor), s, yChange);
+			this.particleOnClose = new BoxParticle(new Box(box.minPos, box.maxPos, deathColor), s, yChange);
 		}
 		
 		public BoxWithLife(Box box, double s, float yChange) { this(box, s, yChange, box.color); }
@@ -377,7 +374,7 @@ public class DebugRenderer
 		@Override
 		public void close()
 		{
-			makeParticle(new BoxParticle(this.particaleOnClose.getBox(), System.nanoTime(), this.particaleOnClose.duration, this.particaleOnClose.yChange));
+			makeParticle(new BoxParticle(this.particleOnClose.getBox(), System.nanoTime(), this.particleOnClose.durationInMs, this.particleOnClose.yChange));
 			unregister(this, null);
 		}
 		

core/src/main/java/com/seibel/distanthorizons/core/render/renderer/DhFadeRenderer.java

@@ -31,6 +31,7 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftGLW
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IProfilerWrapper;
 import org.lwjgl.opengl.GL32;
+import org.lwjgl.opengl.GL43C;
 
 import java.nio.ByteBuffer;
 
@@ -95,11 +96,19 @@ public class DhFadeRenderer
 		}
 		
 		this.fadeTexture = GL32.glGenTextures();
-		GLMC.glBindTexture(this.fadeTexture);
-		GL32.glTexImage2D(GL32.GL_TEXTURE_2D, 0, GL32.GL_RGBA16, width, height, 0, GL32.GL_RGBA, GL32.GL_UNSIGNED_SHORT_4_4_4_4, (ByteBuffer) null);
-		GL32.glTexParameteri(GL32.GL_TEXTURE_2D, GL32.GL_TEXTURE_MIN_FILTER, GL32.GL_LINEAR);
-		GL32.glTexParameteri(GL32.GL_TEXTURE_2D, GL32.GL_TEXTURE_MAG_FILTER, GL32.GL_LINEAR);
+		{
+			GLMC.glBindTexture(this.fadeTexture);
+			GL32.glTexImage2D(GL32.GL_TEXTURE_2D, 0, GL32.GL_RGBA16, width, height, 0, GL32.GL_RGBA, GL32.GL_UNSIGNED_SHORT_4_4_4_4, (ByteBuffer) null);
+			GL32.glTexParameteri(GL32.GL_TEXTURE_2D, GL32.GL_TEXTURE_MIN_FILTER, GL32.GL_LINEAR);
+			GL32.glTexParameteri(GL32.GL_TEXTURE_2D, GL32.GL_TEXTURE_MAG_FILTER, GL32.GL_LINEAR);
+			
+			// disable mip-mapping since DH is just going to draw straight to the screen
+			GL43C.glTexParameteri(GL43C.GL_TEXTURE_2D, GL43C.GL_TEXTURE_BASE_LEVEL, 0);
+			GL43C.glTexParameteri(GL43C.GL_TEXTURE_2D, GL43C.GL_TEXTURE_MAX_LEVEL, 0);
+		}
+		
 		GL32.glFramebufferTexture2D(GL32.GL_FRAMEBUFFER, GL32.GL_COLOR_ATTACHMENT0, GL32.GL_TEXTURE_2D, this.fadeTexture, 0);
+		
 	}
 	
 	
@@ -110,8 +119,6 @@ public class DhFadeRenderer
 	
 	public void render(Mat4f mcModelViewMatrix, Mat4f mcProjectionMatrix, float partialTicks, IProfilerWrapper profiler)
 	{
-		GLState mcState = new GLState();
-		
 		try
 		{
 			profiler.push("Fade Generate");
@@ -149,10 +156,6 @@ public class DhFadeRenderer
 		}
 		finally
 		{
-			// make sure we always revert to MC's state to prevent GL state corruption
-			// this is especially important on MC 1.16.5 or when other rendering mods are present
-			mcState.restore();
-			
 			profiler.pop();
 		}
 	}

core/src/main/java/com/seibel/distanthorizons/core/render/renderer/DhTerrainShaderProgram.java

@@ -64,7 +64,7 @@ public class DhTerrainShaderProgram extends ShaderProgram implements IDhApiShade
 	public int uNoiseDropoff = -1;
 	
 	// Debug Uniform
-	public int uWhiteWorld = -1;
+	public int uIsWhiteWorld = -1;
 	
 	
 	
@@ -102,7 +102,7 @@ public class DhTerrainShaderProgram extends ShaderProgram implements IDhApiShade
 		this.uNoiseDropoff = this.getUniformLocation("uNoiseDropoff");
 		
 		// Debug Uniform
-		this.uWhiteWorld = this.getUniformLocation("uWhiteWorld");
+		this.uIsWhiteWorld = this.getUniformLocation("uIsWhiteWorld");
 		
 		
 		// TODO: Add better use of the LODFormat thing
@@ -192,7 +192,7 @@ public class DhTerrainShaderProgram extends ShaderProgram implements IDhApiShade
 		this.setUniform(this.uNoiseDropoff, Config.Client.Advanced.Graphics.NoiseTexture.noiseDropoff.get());
 		
 		// Debug
-		this.setUniform(this.uWhiteWorld, Config.Client.Advanced.Debugging.enableWhiteWorld.get());
+		this.setUniform(this.uIsWhiteWorld, Config.Client.Advanced.Debugging.enableWhiteWorld.get());
 		
 		// Clip Uniform
 		float dhNearClipDistance = RenderUtil.getNearClipPlaneInBlocksForFading(renderParameters.partialTicks);

core/src/main/java/com/seibel/distanthorizons/core/render/renderer/FogRenderer.java

@@ -27,6 +27,7 @@ import com.seibel.distanthorizons.core.util.math.Mat4f;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftGLWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
 import org.lwjgl.opengl.GL32;
+import org.lwjgl.opengl.GL43C;
 
 import java.nio.ByteBuffer;
 
@@ -87,11 +88,17 @@ public class FogRenderer
 		GLMC.glBindFramebuffer(GL32.GL_FRAMEBUFFER, this.fogFramebuffer);
 		
 		this.fogTexture = GLMC.glGenTextures();
-		GLMC.glBindTexture(this.fogTexture);
-		GL32.glTexImage2D(GL32.GL_TEXTURE_2D, 0, GL32.GL_RGBA16, width, height, 0, GL32.GL_RGBA, GL32.GL_UNSIGNED_SHORT_4_4_4_4, (ByteBuffer) null);
-		GL32.glTexParameteri(GL32.GL_TEXTURE_2D, GL32.GL_TEXTURE_MIN_FILTER, GL32.GL_LINEAR);
-		GL32.glTexParameteri(GL32.GL_TEXTURE_2D, GL32.GL_TEXTURE_MAG_FILTER, GL32.GL_LINEAR);
-		GL32.glFramebufferTexture2D(GL32.GL_FRAMEBUFFER, GL32.GL_COLOR_ATTACHMENT0, GL32.GL_TEXTURE_2D, this.fogTexture, 0);
+		{
+			GLMC.glBindTexture(this.fogTexture);
+			GL32.glTexImage2D(GL32.GL_TEXTURE_2D, 0, GL32.GL_RGBA16, width, height, 0, GL32.GL_RGBA, GL32.GL_UNSIGNED_SHORT_4_4_4_4, (ByteBuffer) null);
+			GL32.glTexParameteri(GL32.GL_TEXTURE_2D, GL32.GL_TEXTURE_MIN_FILTER, GL32.GL_LINEAR);
+			GL32.glTexParameteri(GL32.GL_TEXTURE_2D, GL32.GL_TEXTURE_MAG_FILTER, GL32.GL_LINEAR);
+			GL32.glFramebufferTexture2D(GL32.GL_FRAMEBUFFER, GL32.GL_COLOR_ATTACHMENT0, GL32.GL_TEXTURE_2D, this.fogTexture, 0);
+			
+			// disable mip-mapping since DH is just going to draw straight to the screen
+			GL43C.glTexParameteri(GL43C.GL_TEXTURE_2D, GL43C.GL_TEXTURE_BASE_LEVEL, 0);
+			GL43C.glTexParameteri(GL43C.GL_TEXTURE_2D, GL43C.GL_TEXTURE_MAX_LEVEL, 0);
+		}
 	}
 	
 	

core/src/main/java/com/seibel/distanthorizons/core/render/renderer/LodRenderer.java

@@ -42,6 +42,7 @@ import com.seibel.distanthorizons.core.render.renderer.shaders.*;
 import com.seibel.distanthorizons.core.util.math.Mat4f;
 import com.seibel.distanthorizons.core.util.math.Vec3d;
 import com.seibel.distanthorizons.core.util.objects.SortedArraySet;
+import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftGLWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IProfilerWrapper;
@@ -69,6 +70,7 @@ public class LodRenderer
 			.maxCountPerSecond(4)
 			.build();
 	
+	private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
 	private static final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
 	private static final IMinecraftGLWrapper GLMC = SingletonInjector.INSTANCE.get(IMinecraftGLWrapper.class);
 	private static final IIrisAccessor IRIS_ACCESSOR = ModAccessorInjector.INSTANCE.get(IIrisAccessor.class);
@@ -174,6 +176,13 @@ public class LodRenderer
 				return;
 			}
 			
+			// only do this once, that way they can still be reverted if desired
+			if (Config.Client.Advanced.Graphics.overrideVanillaGraphicsSettings.get())
+			{
+				MC.disableVanillaClouds();
+				MC.disableVanillaChunkFadeIn();
+			}
+			
 			this.renderObjectsCreated = true;
 		}
 		
@@ -243,7 +252,10 @@ public class LodRenderer
 			}
 			
 			// far plane clip fading
-			if (Config.Client.Advanced.Graphics.Quality.dhFadeFarClipPlane.get())
+			if (Config.Client.Advanced.Graphics.Quality.dhFadeFarClipPlane.get()
+				// the fade shader messes with the GL state in a way Iris doesn't like,
+				// so skip it if a shader is active
+				&& (IRIS_ACCESSOR == null || !IRIS_ACCESSOR.isShaderPackInUse()))
 			{
 				profiler.popPush("Fade Far Clip Fade");
 				DhFadeRenderer.INSTANCE.render(
@@ -481,12 +493,8 @@ public class LodRenderer
 			return false;
 		}
 		
-		if (!GLProxy.hasInstance())
-		{
-			// shouldn't normally happen, but just in case
-			LOGGER.warn("Renderer setup called but GLProxy has not yet been setup!");
-			return false;
-		}
+		// GLProxy should have already been created by this point, but just in case create it now
+		GLProxy.getInstance();
 		
 		
 		

core/src/main/java/com/seibel/distanthorizons/core/render/renderer/SSAORenderer.java

@@ -27,6 +27,7 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftGLW
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
 import com.seibel.distanthorizons.core.util.math.Mat4f;
 import org.lwjgl.opengl.GL32;
+import org.lwjgl.opengl.GL43C;
 
 import java.nio.ByteBuffer;
 
@@ -87,10 +88,17 @@ public class SSAORenderer
 		GLMC.glBindFramebuffer(GL32.GL_FRAMEBUFFER, this.ssaoFramebuffer);
 		
 		this.ssaoTexture = GLMC.glGenTextures();
-		GLMC.glBindTexture(this.ssaoTexture);
-		GL32.glTexImage2D(GL32.GL_TEXTURE_2D, 0, GL32.GL_R16F, width, height, 0, GL32.GL_RED, GL32.GL_HALF_FLOAT, (ByteBuffer) null);
-		GL32.glTexParameteri(GL32.GL_TEXTURE_2D, GL32.GL_TEXTURE_MIN_FILTER, GL32.GL_LINEAR);
-		GL32.glTexParameteri(GL32.GL_TEXTURE_2D, GL32.GL_TEXTURE_MAG_FILTER, GL32.GL_LINEAR);
+		{
+			GLMC.glBindTexture(this.ssaoTexture);
+			GL32.glTexImage2D(GL32.GL_TEXTURE_2D, 0, GL32.GL_R16F, width, height, 0, GL32.GL_RED, GL32.GL_HALF_FLOAT, (ByteBuffer) null);
+			GL32.glTexParameteri(GL32.GL_TEXTURE_2D, GL32.GL_TEXTURE_MIN_FILTER, GL32.GL_LINEAR);
+			GL32.glTexParameteri(GL32.GL_TEXTURE_2D, GL32.GL_TEXTURE_MAG_FILTER, GL32.GL_LINEAR);
+			
+			// disable mip-mapping since DH is just going to draw straight to the screen
+			GL43C.glTexParameteri(GL43C.GL_TEXTURE_2D, GL43C.GL_TEXTURE_BASE_LEVEL, 0);
+			GL43C.glTexParameteri(GL43C.GL_TEXTURE_2D, GL43C.GL_TEXTURE_MAX_LEVEL, 0);
+		}
+		
 		GL32.glFramebufferTexture2D(GL32.GL_FRAMEBUFFER, GL32.GL_COLOR_ATTACHMENT0, GL32.GL_TEXTURE_2D, this.ssaoTexture, 0);
 	}
 	

core/src/main/java/com/seibel/distanthorizons/core/render/renderer/VanillaFadeRenderer.java

@@ -121,6 +121,16 @@ public class VanillaFadeRenderer
 	
 	public void render(Mat4f mcModelViewMatrix, Mat4f mcProjectionMatrix, float partialTicks, IClientLevelWrapper level)
 	{
+		int depthTextureId = LodRenderer.INSTANCE.getActiveDepthTextureId();
+		if (depthTextureId == -1)
+		{
+			// the renderer hasn't been set up yet
+			// trying to render fading may cause GL errors
+			return;
+		}
+		
+		
+		
 		IProfilerWrapper profiler = MC_CLIENT.getProfiler();
 		profiler.pop(); // get out of "terrain"
 		profiler.push("DH-Vanilla Fade");
@@ -158,7 +168,7 @@ public class VanillaFadeRenderer
 				
 				FadeApplyShader.INSTANCE.fadeTexture = this.fadeTexture;
 				FadeApplyShader.INSTANCE.readFramebuffer = DhFadeShader.INSTANCE.frameBuffer;
-				FadeApplyShader.INSTANCE.drawFramebuffer = LodRenderer.INSTANCE.getActiveFramebufferId();
+				FadeApplyShader.INSTANCE.drawFramebuffer = MC_RENDER.getTargetFramebuffer();
 				FadeApplyShader.INSTANCE.render(partialTicks);
 			}
 			

core/src/main/java/com/seibel/distanthorizons/core/render/renderer/generic/RenderableBoxGroup.java

@@ -337,7 +337,7 @@ public class RenderableBoxGroup
 		@Override 
 		public void close()
 		{
-			GLProxy.getInstance().queueRunningOnRenderThread(() ->
+			GLProxy.queueRunningOnRenderThread(() ->
 			{
 				if (this.instanceChunkPosVbo != 0)
 				{

core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/FogShader.java

@@ -164,10 +164,11 @@ public class FogShader extends AbstractShaderRenderer
 		
 		
 		// Fog uniforms
-		this.shader.setUniform(this.uFogColor, MC_RENDER.isFogStateSpecial() ? this.getSpecialFogColor(partialTicks) : this.getFogColor(partialTicks));
+		this.shader.setUniform(this.uFogColor, this.getFogColor(partialTicks));
 		this.shader.setUniform(this.uFogScale, 1.f / lodDrawDistance);
 		this.shader.setUniform(this.uFogVerticalScale, 1.f / MC.getWrappedClientLevel().getMaxHeight());
-		this.shader.setUniform(this.uFullFogMode, MC_RENDER.isFogStateSpecial() ? 1 : 0);
+		// only used for debugging
+		this.shader.setUniform(this.uFullFogMode, 0); // 1 = render everything with fog color // 7 = use debug rendering
 		
 		
 		// fog config
@@ -177,6 +178,14 @@ public class FogShader extends AbstractShaderRenderer
 		float farFogMax = Config.Client.Advanced.Graphics.Fog.farFogMax.get().floatValue();
 		float farFogDensity = Config.Client.Advanced.Graphics.Fog.farFogDensity.get().floatValue();
 		
+		// override fog if underwater
+		if (MC_RENDER.isFogStateSpecial())
+		{
+			// hide everything behind fog
+			farFogStart = 0.0f;
+			farFogEnd = 0.0f;
+		}
+		
 		this.shader.setUniform(this.uFarFogStart, farFogStart);
 		this.shader.setUniform(this.uFarFogLength, farFogEnd - farFogStart);
 		this.shader.setUniform(this.uFarFogMin, farFogMin);
@@ -229,7 +238,6 @@ public class FogShader extends AbstractShaderRenderer
 		
 		return fogColor;
 	}
-	private Color getSpecialFogColor(float partialTicks) { return MC_RENDER.getSpecialFogColor(partialTicks); }
 	
 	public void setProjectionMatrix(Mat4f projectionMatrix)
 	{

core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/SSAOShader.java

@@ -25,8 +25,10 @@ import com.seibel.distanthorizons.core.render.glObject.shader.ShaderProgram;
 import com.seibel.distanthorizons.core.render.renderer.LodRenderer;
 import com.seibel.distanthorizons.core.render.renderer.SSAORenderer;
 import com.seibel.distanthorizons.core.render.renderer.ScreenQuad;
+import com.seibel.distanthorizons.core.util.NumberUtil;
 import com.seibel.distanthorizons.core.util.math.Mat4f;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftGLWrapper;
+import com.seibel.distanthorizons.coreapi.util.MathUtil;
 import org.lwjgl.opengl.GL32;
 
 /**
@@ -58,6 +60,7 @@ public class SSAOShader extends AbstractShaderRenderer
 	public int uMinLight;
 	public int uBias;
 	public int uDepthMap;
+	public int uFadeDistanceInBlocks;
 	
 	
 	
@@ -81,6 +84,7 @@ public class SSAOShader extends AbstractShaderRenderer
 		this.uMinLight = this.shader.getUniformLocation("uMinLight");
 		this.uBias = this.shader.getUniformLocation("uBias");
 		this.uDepthMap = this.shader.getUniformLocation("uDepthMap");
+		this.uFadeDistanceInBlocks = this.shader.getUniformLocation("uFadeDistanceInBlocks");
 	}
 	
 	
@@ -120,6 +124,10 @@ public class SSAOShader extends AbstractShaderRenderer
 		this.shader.setUniform(this.uBias, bias.floatValue());
 		
 		GL32.glUniform1i(this.uDepthMap, 0);
+		
+		float fadeDistanceInBlocks = Config.Client.Advanced.Graphics.Ssao.fadeDistanceInBlocks.get().floatValue();
+		fadeDistanceInBlocks = MathUtil.clamp(0.0f, fadeDistanceInBlocks, Float.MAX_VALUE); // clamp to prevent accidentally setting a negative number
+		this.shader.setUniform(this.uFadeDistanceInBlocks, fadeDistanceInBlocks);
 	}
 	
 	

core/src/main/java/com/seibel/distanthorizons/core/sql/dto/FullDataSourceV1DTO.java

@@ -69,8 +69,7 @@ public class FullDataSourceV1DTO implements IBaseDTO<Long>
 	/** @return a stream for the data contained in this DTO. */
 	public DhDataInputStream getInputStream() throws IOException
 	{
-		InputStream inputStream = new ByteArrayInputStream(this.dataArray);
-		DhDataInputStream compressedStream = new DhDataInputStream(inputStream, EDhApiDataCompressionMode.LZ4); // LZ4 was used by DH before 2.1.0 and as such must be used until the render data format is changed to record the compressor
+		DhDataInputStream compressedStream = DhDataInputStream.create(this.dataArray, EDhApiDataCompressionMode.LZ4); // LZ4 was used by DH before 2.1.0 and as such must be used until the render data format is changed to record the compressor
 		return compressedStream;
 	}