remove dev from version number

Native dialog was changed with LWJGL 3.4.1

api/build.gradle

@@ -2,10 +2,26 @@ import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 plugins {
     id "java"
-
+    id "com.gradleup.shadow"
-    id "com.github.johnrengelman.shadow" version '8.1.1' apply false
 }
 
+repositories {
+    mavenCentral()
+}
+
+tasks.withType(JavaCompile).configureEach {
+    options.release = 8
+    options.encoding = "UTF-8"
+}
+
+configurations {
+    testImplementation.extendsFrom compileOnly
+}
+
+dependencies {
+    compileOnly "org.apache.logging.log4j:log4j-api:${rootProject.log4j_version}"
+    testImplementation "junit:junit:4.13"
+}
 
 shadowJar {
     // required for basic shadowJar setup
@@ -21,7 +37,7 @@ task addSourcesToCompiledJar(type: ShadowJar) {
     doFirst {
         System.out.println("Adding source files from: \n" +
                 "[" + sourceJarPath + "] to compiled API jar: \n" +
-                "[" + shadowJar.archivePath + "]")
+                "[" + shadowJar.archiveFile.get().asFile + "]")
         
         // Validate the input JAR file
         if (!secondJarFile.exists()) {
@@ -42,7 +58,7 @@ task addSourcesToCompiledJar(type: ShadowJar) {
     }
     
     // set the jars to merge
-    from shadowJar.archivePath
+    from shadowJar.archiveFile.get().asFile
     from secondJarFile
     
     // alternative method to Include the source files in the combined JAR

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,27 +54,31 @@ 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(4),
-	
-	/**
-	 * Similar to {@link EDhApiDataCompressionMode#Z_STD}
-	 * except slower.
-	 * <br>
-	 * This option is only provided for legacy support when processing old databases.
-	 */
 	@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>

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

@@ -35,29 +35,12 @@ public enum EDhApiGpuUploadMethod
 	/** Picks the best option based on the GPU the user has. */
 	AUTO(false, false),
 	
-	// commented out since it isn't currently in use
-	//BUFFER_STORAGE_MAPPING(true, true),
-	
 	/** Fast rendering, no stuttering. */
 	BUFFER_STORAGE(false, true),
 	
 	/** 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),
-	
-	/**
-	 * May end up storing buffers in System memory. <br>
-	 * Fast rending if in GPU memory, slow if in system memory, <br>
-	 * but won't stutter when uploading.
-	 * 
-	 * @deprecated not currently supported
-	 */
-	@Deprecated
-	BUFFER_MAPPING(true, false),
-	
 	/** Fast rendering but may stutter when uploading. */
 	DATA(false, false);
 	

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

@@ -0,0 +1,19 @@
+package com.seibel.distanthorizons.api.enums.config;
+
+import com.seibel.distanthorizons.coreapi.ModInfo;
+
+/**
+ * AUTO, <br>
+ * OPEN_GL, <br>
+ * BLAZE_3D, <br><br>
+ *
+ * @since API 6.0.0
+ * @version 2026-3-10
+ */
+public enum EDhApiRenderApi
+{
+	AUTO,
+	OPEN_GL,
+	BLAZE_3D;
+	
+}

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

@@ -53,7 +53,7 @@ public enum EDhApiVerticalQuality
 	
 	
 	
-	public int calculateMaxVerticalData(byte dataDetail)
+	public int calculateMaxNumberOfVerticalSlicesAtDetailLevel(byte dataDetail)
 	{
 		// for detail levels lower than what the enum defines, use the lowest quality item
 		int index = MathUtil.clamp(0, dataDetail, this.maxVerticalData.length - 1);

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,
 	
@@ -48,11 +43,7 @@ public enum EDhApiDebugRendering
 	SHOW_BLOCK_MATERIAL,
 	
 	/** Only draw overlapping LOD quads. */
-	SHOW_OVERLAPPING_QUADS,
+	SHOW_OVERLAPPING_QUADS;
-	
-	/** LOD colors are based on renderSource flags. */
-	SHOW_RENDER_SOURCE_FLAG;
-	
 	
 	public static EDhApiDebugRendering next(EDhApiDebugRendering type)
 	{
@@ -65,7 +56,7 @@ public enum EDhApiDebugRendering
 			case SHOW_BLOCK_MATERIAL:
 				return SHOW_OVERLAPPING_QUADS;
 			case SHOW_OVERLAPPING_QUADS:
-				return SHOW_RENDER_SOURCE_FLAG;
+				return OFF;
 			default:
 				return OFF;
 		}
@@ -76,8 +67,6 @@ public enum EDhApiDebugRendering
 		switch (type)
 		{
 			case OFF:
-				return SHOW_RENDER_SOURCE_FLAG;
-			case SHOW_RENDER_SOURCE_FLAG:
 				return SHOW_OVERLAPPING_QUADS;
 			case SHOW_OVERLAPPING_QUADS:
 				return SHOW_DETAIL;

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

@@ -20,22 +20,17 @@
 package com.seibel.distanthorizons.api.enums.rendering;
 
 /**
- * Default <br>
+ * DEFAULT <br>
- * Debug <br>
+ * DEBUG_TRIANGLE <br>
- * Disabled <br>
+ * DISABLED <br>
  *
  * @since API 2.0.0
- * @version 2024-4-6
+ * @version 2026-03-23
  */
 public enum EDhApiRendererMode
 {
-	// Reminder:
-	// when adding items up the API minor version
-	// when removing items up the API major version
-	
-	
 	DEFAULT,
-	DEBUG,
+	DEBUG_TRIANGLE,
 	DISABLED;
 	
 	
@@ -45,8 +40,8 @@ public enum EDhApiRendererMode
 		switch (type)
 		{
 			case DEFAULT:
-				return DEBUG;
+				return DEBUG_TRIANGLE;
-			case DEBUG:
+			case DEBUG_TRIANGLE:
 				return DISABLED;
 			default:
 				return DEFAULT;
@@ -60,10 +55,10 @@ public enum EDhApiRendererMode
 		{
 			case DEFAULT:
 				return DISABLED;
-			case DEBUG:
+			case DEBUG_TRIANGLE:
 				return DEFAULT;
 			default:
-				return DEBUG;
+				return DEBUG_TRIANGLE;
 		}
 	}
 	

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

@@ -19,6 +19,8 @@
 
 package com.seibel.distanthorizons.api.interfaces;
 
+import com.seibel.distanthorizons.api.interfaces.block.IDhApiBlockStateWrapper;
+
 /**
  * Implemented by wrappers so developers can
  * access the underlying Minecraft object(s).
@@ -38,7 +40,11 @@ public interface IDhApiUnsafeWrapper
 	 * In order to cast this object to something usable, you may want
 	 * to use <code>obj.getClass()</code> when in your IDE
 	 * in order to determine what object this method returns for
-	 * the specific version of Minecraft you are developing for.
+	 * the specific version of Minecraft you are developing for. <br><br>
+	 * 
+	 * Note:<br>
+	 * This method may return null in some cases, IE {@link IDhApiBlockStateWrapper}
+	 * when it is wrapping air.
 	 */
 	Object getWrappedMcObject();
 	

api/src/main/java/com/seibel/distanthorizons/api/interfaces/block/IDhApiBlockStateWrapper.java

@@ -23,7 +23,10 @@ import com.seibel.distanthorizons.api.enums.rendering.EDhApiBlockMaterial;
 import com.seibel.distanthorizons.api.interfaces.IDhApiUnsafeWrapper;
 
 /**
- * A Minecraft version independent way of handling Blocks.
+ * A Minecraft version independent way of handling Blocks. <br><br>
+ * 
+ * Note: the wrapped object (IE the object returned by {@link IDhApiUnsafeWrapper#getWrappedMcObject}) 
+ * will be null if this object is wrapping air.
  *
  * @author James Seibel
  * @version 2023-6-11

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

@@ -23,10 +23,10 @@ import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigGroup;
 import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
 
 /**
- * Distant Horizons' fog configuration. <br><br>
+ * Distant Horizons' SSAO configuration. <br><br>
  *
  * @author James Seibel
- * @version 2022-9-6
+ * @version 2026-02-05
  * @since API 1.0.0
  */
 public interface IDhApiAmbientOcclusionConfig extends IDhApiConfigGroup
@@ -34,32 +34,4 @@ public interface IDhApiAmbientOcclusionConfig extends IDhApiConfigGroup
 	/** Determines if Ambient Occlusion is rendered */
 	IDhApiConfigValue<Boolean> enabled();
 	
-	/** 
-	 * Determines how many points in space are sampled for the occlusion test. 
-	 * Higher numbers will improve quality and reduce banding, but will increase GPU load. 
-	 */
-	IDhApiConfigValue<Integer> sampleCount();
-	
-	/** Determines the radius Screen Space Ambient Occlusion is applied, measured in blocks. */
-	IDhApiConfigValue<Double> radius();
-	
-	/** Determines how dark the Screen Space Ambient Occlusion effect will be. */
-	IDhApiConfigValue<Double> strength();
-	
-	/** Increasing the value can reduce banding at the cost of reducing the strength of the effect. */
-	IDhApiConfigValue<Double> bias();
-	
-	/** 
-	 * Determines how dark the occlusion shadows can be. <br> 
-	 * 0 = totally black at the corners <br>
-	 * 1 = no shadow
-	 */
-	IDhApiConfigValue<Double> minLight();
-	
-	/**
-	 * The radius, measured in pixels, that blurring is calculated. <br>
-	 * Higher numbers will reduce banding at the cost of GPU performance.
-	 */
-	IDhApiConfigValue<Integer> blurRadius();
-	
 }

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

@@ -44,7 +44,7 @@ public interface IDhApiFarFogConfig extends IDhApiConfigGroup
 	 * 0.0 = fog starts at the camera <br>
 	 * 1.0 = fog starts at the edge of the fake chunk render distance <br>
 	 */
-	IDhApiConfigValue<Double> farFogStartDistance();
+	IDhApiConfigValue<Float> farFogStartDistance();
 	
 	/**
 	 * Defines where the fog ends as a percent of the radius
@@ -54,18 +54,18 @@ public interface IDhApiFarFogConfig extends IDhApiConfigGroup
 	 * 0.0 = fog ends at the camera <br>
 	 * 1.0 = fog ends at the edge of the fake chunk render distance <br>
 	 */
-	IDhApiConfigValue<Double> farFogEndDistance();
+	IDhApiConfigValue<Float> farFogEndDistance();
 	
 	/** Defines how opaque the fog is at its thinnest point. */
-	IDhApiConfigValue<Double> farFogMinThickness();
+	IDhApiConfigValue<Float> farFogMinThickness();
 	
 	/** Defines how opaque the fog is at its thickest point. */
-	IDhApiConfigValue<Double> farFogMaxThickness();
+	IDhApiConfigValue<Float> farFogMaxThickness();
 	
 	/** Defines how the fog changes in thickness. */
 	IDhApiConfigValue<EDhApiFogFalloff> farFogFalloff();
 	
 	/** Defines the fog density. */
-	IDhApiConfigValue<Double> farFogDensity();
+	IDhApiConfigValue<Float> farFogDensity();
 	
 }

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

@@ -124,19 +124,19 @@ public interface IDhApiGraphicsConfig extends IDhApiConfigGroup
 	 * 
 	 * @since API 2.0.0
 	 */
-	IDhApiConfigValue<Double> overdrawPreventionRadius();
+	IDhApiConfigValue<Float> overdrawPreventionRadius();
 	
 	/**
 	 * Modifies how bright fake chunks are. <br>
 	 * This is done when generating the vertex data and is applied before any shaders.
 	 */
-	IDhApiConfigValue<Double> brightnessMultiplier();
+	IDhApiConfigValue<Float> brightnessMultiplier();
 	
 	/**
 	 * Modifies how saturated fake chunks are. <br>
 	 * This is done when generating the vertex data and is applied before any shaders.
 	 */
-	IDhApiConfigValue<Double> saturationMultiplier();
+	IDhApiConfigValue<Float> saturationMultiplier();
 	
 	/** Defines if Distant Horizons should attempt to cull fake chunk cave geometry. */
 	IDhApiConfigValue<Boolean> caveCullingEnabled();
@@ -150,12 +150,6 @@ public interface IDhApiGraphicsConfig extends IDhApiConfigGroup
 	/** If enabled vanilla chunk rendering is disabled and only fake chunks are rendered. */
 	IDhApiConfigValue<Boolean> lodOnlyMode();
 	
-	/**
-	 * Setting this to a non-zero number will modify vanilla Minecraft's LOD Bias,
-	 * increasing how quickly its textures fade away.
-	 */
-	IDhApiConfigValue<Double> lodBias();
-	
 	/**
 	 * Determines how LODs should be shaded.
 	 *

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

@@ -52,24 +52,24 @@ public interface IDhApiHeightFogConfig extends IDhApiConfigGroup
 	 * Defines the height fog's base height if {@link IDhApiHeightFogConfig#heightFogDirection()}
 	 * is set to use a specific height.
 	 */
-	IDhApiConfigValue<Double> heightFogBaseHeight();
+	IDhApiConfigValue<Float> heightFogBaseHeight();
 	
 	/** Defines the height fog's starting height as a percent of the world height. */
-	IDhApiConfigValue<Double> heightFogStartingHeightPercent();
+	IDhApiConfigValue<Float> heightFogStartingHeightPercent();
 	
 	/** Defines the height fog's ending height as a percent of the world height. */
-	IDhApiConfigValue<Double> heightFogEndingHeightPercent();
+	IDhApiConfigValue<Float> heightFogEndingHeightPercent();
 	
 	/** Defines how opaque the height fog is at its thinnest point. */
-	IDhApiConfigValue<Double> heightFogMinThickness();
+	IDhApiConfigValue<Float> heightFogMinThickness();
 	
 	/** Defines how opaque the height fog is at its thickest point. */
-	IDhApiConfigValue<Double> heightFogMaxThickness();
+	IDhApiConfigValue<Float> heightFogMaxThickness();
 	
 	/** Defines how the height fog changes in thickness. */
 	IDhApiConfigValue<EDhApiFogFalloff> heightFogFalloff();
 	
 	/** Defines the height fog's density. */
-	IDhApiConfigValue<Double> heightFogDensity();
+	IDhApiConfigValue<Float> heightFogDensity();
 	
 }

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

@@ -37,8 +37,8 @@ public interface IDhApiNoiseTextureConfig extends IDhApiConfigGroup
 	/** Defines how many steps of noise should be applied. */
 	IDhApiConfigValue<Integer> noiseSteps();
 	
-	/** Defines how intense the noise will be. */
+	/** Defines how intense the noise will be, between 0.0 and 1.0. */
-	IDhApiConfigValue<Double> noiseIntensity();
+	IDhApiConfigValue<Float> noiseIntensity();
 	
 	/**
 	 * Defines how far should the noise texture render before it fades away. (in blocks) <br>

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

@@ -1,15 +1,18 @@
 package com.seibel.distanthorizons.api.interfaces.data;
 
 /**
- * Can be used to drastically speed up repeat read operations in {@link IDhApiTerrainDataRepo}.
+ * Can be used to drastically speed up repeat read operations in {@link IDhApiTerrainDataRepo}. <br><br>
+ * 
+ * Once you are done with this cache, closing it will free up any objects
+ * the cache is holding. This can reduce Garbage Collector overhead and reduce stuttering.
  * 
  * @see IDhApiTerrainDataRepo
  * 
  * @author James Seibel
- * @version 2024-7-14
+ * @version 2026-1-29
  * @since API 3.0.0
  */
-public interface IDhApiTerrainDataCache // TODO should this be AutoClosable?
+public interface IDhApiTerrainDataCache extends AutoCloseable
 {
 	/**
 	 * Removes any data that's currently stored in this cache.
@@ -21,4 +24,10 @@ public interface IDhApiTerrainDataCache // TODO should this be AutoClosable?
 	 */
 	void clear();
 	
+	// override without an exception
+	@Override
+	void close();
+	
+	
+	
 }

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

@@ -32,7 +32,7 @@ import com.seibel.distanthorizons.api.objects.data.DhApiTerrainDataPoint;
  * @see IDhApiTerrainDataCache
  * 
  * @author James Seibel
- * @version 2023-6-22
+ * @version 2026-02-03
  * @since API 1.0.0
  */
 public interface IDhApiTerrainDataRepo
@@ -42,24 +42,17 @@ public interface IDhApiTerrainDataRepo
 	// getters //
 	//=========//
 	
-	/** @see IDhApiTerrainDataRepo#getSingleDataPointAtBlockPos(IDhApiLevelWrapper, int, int, int, IDhApiTerrainDataCache) */
-	default DhApiResult<DhApiTerrainDataPoint> getSingleDataPointAtBlockPos(IDhApiLevelWrapper levelWrapper, int blockPosX, int blockPosY, int blockPosZ) { return this.getSingleDataPointAtBlockPos(levelWrapper, blockPosX, blockPosY, blockPosZ, null); }
 	/** 
 	 * Returns the terrain datapoint at the given block position, at/or containing the given Y position. 
 	 * @since API 3.0.0
 	 */
 	DhApiResult<DhApiTerrainDataPoint> getSingleDataPointAtBlockPos(IDhApiLevelWrapper levelWrapper, int blockPosX, int blockPosY, int blockPosZ, IDhApiTerrainDataCache dataCache);
-	
-	/** @see IDhApiTerrainDataRepo#getColumnDataAtBlockPos(IDhApiLevelWrapper, int, int, IDhApiTerrainDataCache) */
-	default DhApiResult<DhApiTerrainDataPoint[]> getColumnDataAtBlockPos(IDhApiLevelWrapper levelWrapper, int blockPosX, int blockPosZ) { return this.getColumnDataAtBlockPos(levelWrapper, blockPosX, blockPosZ, null); }
 	/** 
 	 * Returns every datapoint in the column located at the given block X and Z position top to bottom. 
 	 * @since API 3.0.0 
 	 */
 	DhApiResult<DhApiTerrainDataPoint[]> getColumnDataAtBlockPos(IDhApiLevelWrapper levelWrapper, int blockPosX, int blockPosZ, IDhApiTerrainDataCache dataCache);
 	
-	/** @see IDhApiTerrainDataRepo#getAllTerrainDataAtChunkPos(IDhApiLevelWrapper, int, int, IDhApiTerrainDataCache) */
-	default DhApiResult<DhApiTerrainDataPoint[][][]> getAllTerrainDataAtChunkPos(IDhApiLevelWrapper levelWrapper, int chunkPosX, int chunkPosZ) { return this.getAllTerrainDataAtChunkPos(levelWrapper, chunkPosX, chunkPosZ, null); }
 	/**
 	 * Returns every datapoint in the given chunk's X and Z position. <br><br>
 	 *
@@ -71,8 +64,6 @@ public interface IDhApiTerrainDataRepo
 	 */
 	DhApiResult<DhApiTerrainDataPoint[][][]> getAllTerrainDataAtChunkPos(IDhApiLevelWrapper levelWrapper, int chunkPosX, int chunkPosZ, IDhApiTerrainDataCache dataCache);
 	
-	/** @see IDhApiTerrainDataRepo#getAllTerrainDataAtRegionPos(IDhApiLevelWrapper, int, int, IDhApiTerrainDataCache) */
-	default DhApiResult<DhApiTerrainDataPoint[][][]> getAllTerrainDataAtRegionPos(IDhApiLevelWrapper levelWrapper, int regionPosX, int regionPosZ) { return this.getAllTerrainDataAtRegionPos(levelWrapper, regionPosX, regionPosZ, null); }
 	/**
 	 * Returns every datapoint in the given region's X and Z position. <br><br>
 	 *
@@ -84,8 +75,6 @@ public interface IDhApiTerrainDataRepo
 	 */
 	DhApiResult<DhApiTerrainDataPoint[][][]> getAllTerrainDataAtRegionPos(IDhApiLevelWrapper levelWrapper, int regionPosX, int regionPosZ, IDhApiTerrainDataCache dataCache);
 	
-	/** @see IDhApiTerrainDataRepo#getAllTerrainDataAtDetailLevelAndPos(IDhApiLevelWrapper, byte, int, int, IDhApiTerrainDataCache) */
-	default DhApiResult<DhApiTerrainDataPoint[][][]> getAllTerrainDataAtRegionPos(IDhApiLevelWrapper levelWrapper, byte detailLevel, int posX, int posZ) { return this.getAllTerrainDataAtDetailLevelAndPos(levelWrapper, detailLevel, posX, posZ, null); }
 	/**
 	 * Returns every datapoint in the column located at the given detail level and X/Z position. <br>
 	 * This can be used to return terrain data for non-standard sizes (IE 2x2 blocks or 2x2 chunks).
@@ -101,21 +90,6 @@ public interface IDhApiTerrainDataRepo
 	
 	
 	
-	/** @see IDhApiTerrainDataRepo#raycast(IDhApiLevelWrapper, double, double, double, float, float, float, int, IDhApiTerrainDataCache) */
-	default DhApiResult<DhApiRaycastResult> raycast(
-			IDhApiLevelWrapper levelWrapper,
-			double rayOriginX, double rayOriginY, double rayOriginZ,
-			float rayDirectionX, float rayDirectionY, float rayDirectionZ,
-			int maxRayBlockLength)
-	{
-		return this.raycast(
-				levelWrapper,
-				rayOriginX, rayOriginY, rayOriginZ,
-				rayDirectionX, rayDirectionY, rayDirectionZ,
-				maxRayBlockLength,
-				null);
-	}
-	
 	/**
 	 * Returns the datapoint and position of the LOD
 	 * at the end of the given ray. <br><br>
@@ -161,9 +135,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

@@ -40,8 +40,7 @@ public interface IDhApiEventInjector extends IDependencyInjector<IDhApiEvent>
 	 * @return true if the handler was unbound, false if the handler wasn't bound.
 	 * @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
+	// Note to DH Devs: 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/interfaces/override/worldGenerator/IDhApiWorldGenerator.java

@@ -169,7 +169,7 @@ public interface IDhApiWorldGenerator extends Closeable, IDhApiOverrideable
 	 *
 	 * After the {@link IDhApiWorldGenerator} has been generated, it should be passed into the
 	 * resultConsumer's {@link Consumer#accept(Object)} method.
-	 * Note: if air blocks aren't included in the with the {@link DhApiChunk} with proper lighting, lower detail levels will appear as black/unlit.
+	 * Note: if air blocks aren't included in the {@link IDhApiFullDataSource} with proper lighting, lower detail levels will appear as black/unlit.
 	 *
 	 * @implNote the default implementation of this method throws an {@link UnsupportedOperationException},
 	 * and must be overridden when {@link #getReturnType()} returns {@link EDhApiWorldGeneratorReturnType#API_CHUNKS}.

api/src/main/java/com/seibel/distanthorizons/api/interfaces/render/IDhApiCustomRenderObjectFactory.java

@@ -3,6 +3,7 @@ package com.seibel.distanthorizons.api.interfaces.render;
 import com.seibel.distanthorizons.api.objects.math.DhApiVec3d;
 import com.seibel.distanthorizons.api.objects.math.DhApiVec3f;
 import com.seibel.distanthorizons.api.objects.render.DhApiRenderableBox;
+import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable;
 
 import java.util.List;
 
@@ -18,7 +19,7 @@ import java.util.List;
  * @version 2024-7-3
  * @since API 3.0.0
  */
-public interface IDhApiCustomRenderObjectFactory
+public interface IDhApiCustomRenderObjectFactory extends IBindable
 {
 	/**
 	 * Creates a {@link IDhApiRenderableBoxGroup} from for the given {@link DhApiRenderableBox}

api/src/main/java/com/seibel/distanthorizons/api/interfaces/render/IDhApiRenderProxy.java

@@ -51,14 +51,16 @@ public interface IDhApiRenderProxy
 	//=======================//
 	
 	/**
-	 * Returns the name of Distant Horizons' depth texture. <br>
+	 * Returns the OpenGL name of Distant Horizons' depth texture. <br>
-	 * Will return {@link DhApiResult#success} = false and {@link DhApiResult#payload} = -1 if the texture hasn't been created yet.
+	 * Will return {@link DhApiResult#success} = false and {@link DhApiResult#payload} = -1 if the texture hasn't been created yet
+	 * or a rendering API other than OpenGL is in use.
 	 */
 	DhApiResult<Integer> getDhDepthTextureId();
 	
 	/**
-	 * Returns the name of Distant Horizons' color texture. <br>
+	 * Returns the OpenGL name of Distant Horizons' color texture. <br>
-	 * Will return {@link DhApiResult#success} = false and {@link DhApiResult#payload} = -1 if the texture hasn't been created yet.
+	 * Will return {@link DhApiResult#success} = false and {@link DhApiResult#payload} = -1 if the texture hasn't been created yet
+	 * or a rendering API other than OpenGL is in use
 	 */
 	DhApiResult<Integer> getDhColorTextureId();
 	

api/src/main/java/com/seibel/distanthorizons/api/interfaces/render/IDhApiRenderableBoxGroup.java

@@ -73,7 +73,7 @@ public interface IDhApiRenderableBoxGroup extends List<DhApiRenderableBox>
 	 * This is a good place to change the origin or notify of any box changes. 
 	 */
 	void setPreRenderFunc(Consumer<DhApiRenderParam> renderEventParam);
-	void setPostRenderFunc(Consumer<DhApiRenderParam> renderEventParam); // TODO name?
+	void setPostRenderFunc(Consumer<DhApiRenderParam> renderEventParam);
 	
 	/**
 	 * If a cube's color, position, or other property is changed this method

api/src/main/java/com/seibel/distanthorizons/api/methods/events/abstractEvents/DhApiBeforeBufferRenderEvent.java

@@ -27,7 +27,7 @@ import com.seibel.distanthorizons.api.objects.math.DhApiVec3f;
 
 /**
  * Called before Distant Horizons starts rendering a buffer. <br>
- * This event cannot be cancelled, use {@link DhApiBeforeRenderEvent} if you want to cancel rendering.
+ * This event cannot be canceled, use {@link DhApiBeforeRenderEvent} if you want to cancel rendering.
  * 
  * @author James Seibel
  * @version 2023-1-31

api/src/main/java/com/seibel/distanthorizons/api/methods/events/abstractEvents/DhApiBeforeColorDepthTextureCreatedEvent.java

@@ -31,7 +31,10 @@ import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhAp
  * @author James Seibel
  * @version 2025-6-9
  * @since API 4.1.0
+ * @deprecated Only used for the legacy OpenGL renderer <Br>
+ *             Using {@link DhApiAfterColorDepthTextureCreatedEvent} instead is recommended.
  */
+@Deprecated
 public abstract class DhApiBeforeColorDepthTextureCreatedEvent implements IDhApiEvent<DhApiTextureCreatedParam>
 {
 	/** Fired before Distant Horizons creates. */

api/src/main/java/com/seibel/distanthorizons/api/methods/events/abstractEvents/DhApiBlockColorOverrideEvent.java

@@ -0,0 +1,148 @@
+/*
+ *    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.api.methods.events.abstractEvents;
+
+import com.seibel.distanthorizons.api.enums.rendering.EDhApiBlockMaterial;
+import com.seibel.distanthorizons.api.interfaces.block.IDhApiBlockStateWrapper;
+import com.seibel.distanthorizons.api.interfaces.world.IDhApiLevelWrapper;
+import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEvent;
+import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEventParam;
+import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiEventParam;
+import com.seibel.distanthorizons.coreapi.util.ColorUtil;
+
+import java.awt.*;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * Performance note: this event will be fired thousands of times on concurrent threads, 
+ * make it thread safe and as fast as possible. <Br><Br>
+ * 
+ * This event is fired when DH needs to convert a {@link IDhApiBlockStateWrapper}
+ * into a color for rendering. This event is fired after DH attempts to determine
+ * the color itself (using the base color, tinting, etc.). <Br>
+ * Using this event will override the tinting config for this block
+ * unless you re-implement that logic yourself.
+ * <Br><Br>
+ * 
+ * This event will only trigger for {@link IDhApiBlockStateWrapper}s that have been registered
+ * via {@link DhApiBlockStateWrapperCreatedEvent.EventParam#setAllowApiColorOverride(boolean)}.
+ * 
+ * @author James Seibel
+ * @version 2026-04-14
+ * @since API 6.0.0
+ * @see IDhApiBlockStateWrapper
+ */
+public abstract class DhApiBlockColorOverrideEvent implements IDhApiEvent<DhApiBlockColorOverrideEvent.EventParam>
+{
+	public abstract void blockStateWrapperCreated(DhApiEventParam<EventParam> event);
+	
+	
+	//=========================//
+	// internal DH API methods //
+	//=========================//
+	
+	@Override
+	public final void fireEvent(DhApiEventParam<EventParam> event) { this.blockStateWrapperCreated(event); }
+	
+	
+	//==================//
+	// parameter object //
+	//==================//
+	
+	public static class EventParam implements IDhApiEventParam
+	{
+		private IDhApiLevelWrapper levelWrapper;
+		private IDhApiBlockStateWrapper blockStateWrapper = null;
+		private int colorAsInt = -1;
+		private int blockPosX = 0, blockPosY = 0, blockPosZ = 0;
+		
+		
+		
+		//=============//
+		// constructor //
+		//=============//
+		
+		public EventParam() {}
+		
+		public void update(
+			IDhApiLevelWrapper levelWrapper,
+			IDhApiBlockStateWrapper blockStateWrapper, 
+			int colorAsInt,
+			int blockPosX, int blockPosY, int blockPosZ)
+		{
+			this.levelWrapper = levelWrapper;
+			this.blockStateWrapper = blockStateWrapper;
+			this.colorAsInt = colorAsInt;
+			
+			this.blockPosX = blockPosX;
+			this.blockPosY = blockPosY;
+			this.blockPosZ = blockPosZ;
+		}
+		
+		
+		
+		//=================//
+		// getters/setters //
+		//=================//
+		
+		public IDhApiBlockStateWrapper getBlockStateWrapper() { return this.blockStateWrapper; }
+		
+		public IDhApiLevelWrapper getLevelWrapper() { return levelWrapper; }
+		
+		public int getColorAsInt() { return this.colorAsInt; }
+		public int getRed() { return ColorUtil.getRed(this.colorAsInt); }
+		public int getGreen() { return ColorUtil.getGreen(this.colorAsInt); }
+		public int getBlue() { return ColorUtil.getBlue(this.colorAsInt); }
+		public void setColor(int red, int green, int blue) throws IllegalArgumentException
+		{
+			ColorUtil.throwIfColorValueOutOfIntRange("red", red);
+			ColorUtil.throwIfColorValueOutOfIntRange("green", green);
+			ColorUtil.throwIfColorValueOutOfIntRange("blue", blue);
+			
+			this.colorAsInt = ColorUtil.rgbToInt(red, green, blue);
+		}
+		
+		/** @return the block's X value in the world */
+		public int getBlockPosX() { return blockPosX; }
+		/** @return the block's Y value in the world */
+		public int getBlockPosY() { return blockPosY; }
+		/** @return the block's Z value in the world */
+		public int getBlockPosZ() { return blockPosZ; }
+		
+		
+		
+		/** 
+		 * Returns the same instance of this event.
+		 * Copying this event isn't supported
+		 * since the internal parameters must be mutated
+		 * by API users in order to be tracked by DH's internal
+		 * logic.
+		 */
+		@Override
+		public EventParam copy() { return this; }
+		
+		@Override 
+		public boolean getCopyBeforeFire() { return false; }
+		
+		
+		
+	}
+	
+}

api/src/main/java/com/seibel/distanthorizons/api/methods/events/abstractEvents/DhApiBlockStateWrapperCreatedEvent.java

@@ -0,0 +1,131 @@
+/*
+ *    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.api.methods.events.abstractEvents;
+
+import com.seibel.distanthorizons.api.enums.rendering.EDhApiBlockMaterial;
+import com.seibel.distanthorizons.api.interfaces.block.IDhApiBlockStateWrapper;
+import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEvent;
+import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEventParam;
+import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiEventParam;
+
+/**
+ * Can be used to modify {@link IDhApiBlockStateWrapper}'s as they're created.
+ * This can be helpful for modded blocks that are mis-categorized by DH's base logic. <br><br>
+ *
+ * Note: this is only fired once per {@link IDhApiBlockStateWrapper} that is created
+ * and those {@link IDhApiBlockStateWrapper} will only be created once per JVM session.
+ * 
+ * @author James Seibel
+ * @version 2026-04-14
+ * @since API 6.0.0
+ * @see IDhApiBlockStateWrapper
+ */
+public abstract class DhApiBlockStateWrapperCreatedEvent implements IDhApiEvent<DhApiBlockStateWrapperCreatedEvent.EventParam>
+{
+	public abstract void blockStateWrapperCreated(DhApiEventParam<EventParam> event);
+	
+	
+	//=========================//
+	// internal DH API methods //
+	//=========================//
+	
+	@Override
+	public final void fireEvent(DhApiEventParam<EventParam> event) { this.blockStateWrapperCreated(event); }
+	
+	
+	//==================//
+	// parameter object //
+	//==================//
+	
+	public static class EventParam implements IDhApiEventParam
+	{
+		/** 
+		 * A copy of the wrapper that will be created. <Br>
+		 * Note: modifying this object won't change anything
+		 * a new wrapper will be created after this event finishes.
+		 */
+		private final IDhApiBlockStateWrapper blockStateWrapper;
+		
+		private boolean overridesSet = false;
+		private EDhApiBlockMaterial blockMaterial = null;
+		private Integer opacity = null;
+		private Boolean allowApiColorOverride = null;
+		
+		
+		
+		//=============//
+		// constructor //
+		//=============//
+		
+		public EventParam(IDhApiBlockStateWrapper blockStateWrapper) { this.blockStateWrapper = blockStateWrapper; }
+		
+		
+		
+		//=================//
+		// getters/setters //
+		//=================//
+		
+		public IDhApiBlockStateWrapper getBlockStateWrapper() { return this.blockStateWrapper; }
+		
+		/** if set this will override the value currently set in the given {@link IDhApiBlockStateWrapper} */
+		public void setBlockMaterial(EDhApiBlockMaterial blockMaterial) 
+		{
+			this.blockMaterial = blockMaterial; 
+			this.overridesSet = true;
+		}
+		public EDhApiBlockMaterial getBlockMaterial() { return this.blockMaterial; }
+		
+		/** if set this will override the value currently set in the given {@link IDhApiBlockStateWrapper} */
+		public void setOpacity(int opacity) 
+		{
+			this.opacity = opacity;
+			this.overridesSet = true;
+		}
+		public Integer getOpacity() { return this.opacity; }
+		
+		/** if set to true this {@link IDhApiBlockStateWrapper} will trigger {@link DhApiBlockColorOverrideEvent} */
+		public void setAllowApiColorOverride(boolean allowApiColorOverride) 
+		{
+			this.allowApiColorOverride = allowApiColorOverride;
+			this.overridesSet = true;
+		}
+		public Boolean getAllowApiColorOverride() { return this.allowApiColorOverride; }
+		
+		/** If true then one or more options for this block were set to be changed */
+		public boolean getOverridesSet() { return this.overridesSet; }
+		
+		
+		
+		/** 
+		 * Returns the same instance of this event.
+		 * Copying this event isn't supported
+		 * since the internal parameters must be mutated
+		 * by API users in order to be tracked by DH's internal
+		 * logic.
+		 */
+		@Override
+		public EventParam copy() { return this; }
+		
+		@Override 
+		public boolean getCopyBeforeFire() { return false; }
+		
+	}
+	
+}

api/src/main/java/com/seibel/distanthorizons/api/methods/events/abstractEvents/DhApiColorDepthTextureCreatedEvent.java

@@ -31,7 +31,9 @@ import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhAp
  * @author James Seibel
  * @version 2024-3-2
  * @since API 2.0.0
- * @deprecated Replaced by {@link DhApiBeforeColorDepthTextureCreatedEvent} since this event's name isn't obvious when it fires.
+ * @deprecated Only used for the legacy OpenGL renderer <Br>
+ *              Replaced by {@link DhApiBeforeColorDepthTextureCreatedEvent} since this event's name isn't obvious when it fires.
+ *              Using {@link DhApiAfterColorDepthTextureCreatedEvent} instead is recommended
  */
 @Deprecated // internal notes: this method must be kept around due to Iris using it and we don't want to break old Iris support
 public abstract class DhApiColorDepthTextureCreatedEvent implements IDhApiEvent<DhApiColorDepthTextureCreatedEvent.EventParam>

api/src/main/java/com/seibel/distanthorizons/api/methods/events/sharedParameterObjects/DhApiRenderParam.java

@@ -20,6 +20,8 @@
 package com.seibel.distanthorizons.api.methods.events.sharedParameterObjects;
 
 import com.seibel.distanthorizons.api.enums.rendering.EDhApiRenderPass;
+import com.seibel.distanthorizons.api.interfaces.world.IDhApiLevelWrapper;
+import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiWorldLoadEvent;
 import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEventParam;
 import com.seibel.distanthorizons.api.objects.math.DhApiMat4f;
 
@@ -27,7 +29,7 @@ import com.seibel.distanthorizons.api.objects.math.DhApiMat4f;
  * Contains information relevant to Distant Horizons and Minecraft rendering.
  *
  * @author James Seibel
- * @version 2024-1-31
+ * @version 2025-12-23
  * @since API 1.0.0
  */
 public class DhApiRenderParam implements IDhApiEventParam
@@ -58,9 +60,18 @@ public class DhApiRenderParam implements IDhApiEventParam
 	public final DhApiMat4f dhProjectionMatrix;
 	/** The model view matrix Distant Horizons is using to render this frame. */
 	public final DhApiMat4f dhModelViewMatrix;
+	/** combination of the MVM and projection matrices */
+	public final DhApiMat4f dhMvmProjMatrix;
 	
 	public final int worldYOffset;
 	
+	/**
+	 * The level currently being rendered.
+	 * 
+	 * @since API 5.1.0 
+	 */
+	public final IDhApiLevelWrapper clientLevelWrapper;
+	
 	
 	
 	//==============//
@@ -75,7 +86,8 @@ public class DhApiRenderParam implements IDhApiEventParam
 			parent.nearClipPlane, parent.farClipPlane,
 			parent.mcProjectionMatrix.copy(), parent.mcModelViewMatrix.copy(),
 			parent.dhProjectionMatrix.copy(), parent.dhModelViewMatrix.copy(),
-				parent.worldYOffset
+			parent.worldYOffset,
+			parent.clientLevelWrapper
 		);
 	}
 	public DhApiRenderParam(
@@ -84,7 +96,8 @@ public class DhApiRenderParam implements IDhApiEventParam
 			float nearClipPlane, float farClipPlane,
 			DhApiMat4f newMcProjectionMatrix, DhApiMat4f newMcModelViewMatrix,
 			DhApiMat4f newDhProjectionMatrix, DhApiMat4f newDhModelViewMatrix,
-			int worldYOffset
+			int worldYOffset,
+			IDhApiLevelWrapper clientLevelWrapper
 		)
 	{
 		this.renderPass = renderPass;
@@ -100,7 +113,12 @@ public class DhApiRenderParam implements IDhApiEventParam
 		this.dhProjectionMatrix = newDhProjectionMatrix;
 		this.dhModelViewMatrix = newDhModelViewMatrix;
 		
+		DhApiMat4f combinedMatrix = new DhApiMat4f(this.dhProjectionMatrix);
+		combinedMatrix.multiply(this.dhModelViewMatrix);
+		this.dhMvmProjMatrix = combinedMatrix;
+		
 		this.worldYOffset = worldYOffset;
+		this.clientLevelWrapper = clientLevelWrapper;
 		
 	}
 	

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

api/src/main/java/com/seibel/distanthorizons/api/objects/render/DhApiRenderableBox.java

@@ -23,6 +23,7 @@ public class DhApiRenderableBox
 	public DhApiVec3d maxPos;
 	
 	public Color color;
+	/** @see EDhApiBlockMaterial */
 	public byte material;
 	
 	

api/src/main/java/com/seibel/distanthorizons/coreapi/DependencyInjection/DependencyInjector.java

@@ -43,9 +43,11 @@ public class DependencyInjector<BindableType extends IBindable> implements IDepe
 	protected final boolean allowDuplicateBindings;
 	
 	
+	
 	//==============//
 	// constructors //
 	//==============//
+	//region
 	
 	public DependencyInjector(Class<BindableType> newBindableInterface, boolean newAllowDuplicateBindings)
 	{
@@ -53,11 +55,14 @@ public class DependencyInjector<BindableType extends IBindable> implements IDepe
 		this.allowDuplicateBindings = newAllowDuplicateBindings;
 	}
 	
+	//endregion
+	
 	
 	
 	//=========//
 	// binding //
 	//=========//
+	//region
 	
 	@Override
 	public void bind(Class<? extends BindableType> dependencyInterface, BindableType dependencyImplementation) throws IllegalStateException, IllegalArgumentException
@@ -69,6 +74,11 @@ public class DependencyInjector<BindableType extends IBindable> implements IDepe
 			throw new IllegalStateException("The dependency [" + dependencyInterface.getSimpleName() + "] has already been bound.");
 		}
 		
+		if (dependencyImplementation == null)
+		{
+			throw new NullPointerException("Can't bind null to ["+dependencyInterface.getSimpleName()+"]");
+		}
+		
 		
 		// make sure the given dependency implements the necessary interfaces
 		boolean implementsInterface = this.checkIfClassImplements(dependencyImplementation.getClass(), dependencyInterface) ||
@@ -131,13 +141,27 @@ public class DependencyInjector<BindableType extends IBindable> implements IDepe
 	@Override
 	public boolean checkIfClassExtends(Class<?> classToTest, Class<?> extensionToLookFor) { return extensionToLookFor.isAssignableFrom(classToTest); }
 	
+	//endregion
+	
 	
 	
 	//===========//
 	// unbinding //
 	//===========//
+	//region
+	
+	public void replaceBinding(Class<? extends BindableType> dependencyInterface, BindableType dependencyImplementation) throws IllegalStateException, IllegalArgumentException
+	{
+		this.unbindAll(dependencyInterface);
+		this.bind(dependencyInterface, dependencyImplementation);
+	}
+	
+	public void unbindAll(Class<? extends BindableType> dependencyInterface) throws IllegalStateException, IllegalArgumentException
+	{
+		// remove the dependency if present
+		this.dependencies.remove(dependencyInterface);
+	}
 	
-	// TODO having a bindOrReplace method would probably be better since it wouldn't have the possiblity of having nothing bound
 	public void unbind(Class<? extends BindableType> dependencyInterface, BindableType dependencyImplementation) throws IllegalStateException, IllegalArgumentException
 	{
 		// check if this object is bound
@@ -174,30 +198,27 @@ public class DependencyInjector<BindableType extends IBindable> implements IDepe
 		this.dependencies.remove(dependencyInterface);
 	}
 	
+	//endregion
+	
 	
 	
 	//=========//
 	// getters //
 	//=========//
+	//region
 	
 	@SuppressWarnings("unchecked")
 	@Override
 	public <T extends BindableType> T get(Class<T> interfaceClass) throws ClassCastException
-	{
+	{ return (T) this.getInternalLogic(interfaceClass, false).get(0); }
-		return (T) this.getInternalLogic(interfaceClass, false).get(0);
-	}
 	
 	@Override
 	public <T extends BindableType> ArrayList<T> getAll(Class<T> interfaceClass) throws ClassCastException
-	{
+	{ return this.getInternalLogic(interfaceClass, false); }
-		return this.getInternalLogic(interfaceClass, false);
-	}
 	
 	@Override
 	public <T extends BindableType> T get(Class<T> interfaceClass, boolean allowIncompleteDependencies) throws ClassCastException
-	{
+	{ return (T) this.getInternalLogic(interfaceClass, allowIncompleteDependencies).get(0); }
-		return (T) this.getInternalLogic(interfaceClass, allowIncompleteDependencies).get(0);
-	}
 	
 	/**
 	 * Always returns a list of size 1 or greater,
@@ -230,6 +251,7 @@ public class DependencyInjector<BindableType extends IBindable> implements IDepe
 		return emptyList;
 	}
 	
+	//endregion
 	
 	
 	/** Removes all bound dependencies. */

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

@@ -32,25 +32,27 @@ public final class ModInfo
 	
 	/** Incremented every time any packets are added, changed or removed, with a few exceptions. */
 	public static final int PROTOCOL_VERSION = 13;
-	public static final String WRAPPER_PACKET_PATH = "message";
+
+	/** The full plugin channel name (RESOURCE_NAMESPACE:WRAPPER_PACKET_PATH) must be 20 characters or fewer for compatibility with <1.13. */
+	public static final String WRAPPER_PACKET_PATH = "msg";
 	
 	/** 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 = "3.0.0-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");
 	
 	/** This version should only be updated when breaking changes are introduced to the DH API */
-	public static final int API_MAJOR_VERSION = 5;
+	public static final int API_MAJOR_VERSION = 6;
 	/** This version should be updated whenever new methods are added to the DH API */
 	public static final int API_MINOR_VERSION = 0;
 	/** This version should be updated whenever non-breaking fixes are added to the DH API */
 	public static final int API_PATCH_VERSION = 0;
 	
 	/** If the config file has an older version it'll be re-created from scratch. */
-	public static final int CONFIG_FILE_VERSION = 3;
+	public static final int CONFIG_FILE_VERSION = 4;
 	
 	/** All DH owned threads should start with this string to allow for easier debugging and profiling. */
 	public static final String THREAD_NAME_PREFIX = "DH-";

api/src/main/java/com/seibel/distanthorizons/coreapi/util/ColorUtil.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.distanthorizons.core.util;
+package com.seibel.distanthorizons.coreapi.util;
 
 import java.awt.*;
 
@@ -89,6 +89,16 @@ public class ColorUtil
 	/** @param newBlue should be a value between 0 and 255 */
 	public static int setBlue(int color, int newBlue) { return (getAlpha(color) << 24) | (getRed(color) << 16) | (getGreen(color) << 8) | newBlue; }
 	
+	/** @throws IllegalArgumentException if the given int value is out of the range 0 - 255 (exclusive) */
+	public static void throwIfColorValueOutOfIntRange(String colorName, int value) throws IllegalArgumentException
+	{
+		if (value < 0
+			|| value > 255)
+		{
+			throw new IllegalArgumentException("["+colorName+"] with the value ["+value+"] is out of the expected range 0 - 255 (exclusive).");
+		}
+	}
+	
 	
 	
 	public static int applyShade(int color, int shade)

core/build.gradle

@@ -1,18 +1,23 @@
 plugins {
     id "java"
-    id "com.github.johnrengelman.shadow" version '8.1.1' apply false // Set this to true if you're using the standalone Core project
+    id "com.gradleup.shadow"
 }
 
-apply plugin: "application"
+repositories {
+    mavenCentral()
+    maven { url "https://repo.enonic.com/public/" }
+}
 
-application {
+tasks.withType(JavaCompile).configureEach {
-    mainClass.set("com.seibel.distanthorizons.core.jar.JarMain")
+    options.release = 8
+    options.encoding = "UTF-8"
 }
 
 configurations {
     shadowedArtifact // Used by DH to specify that we want to implement the shadowed core JAR file instead of the regular JAR file
     shade
     implementation.extendsFrom shade
+    testImplementation.extendsFrom compileOnly
 }
 
 OperatingSystem os = org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.currentOperatingSystem;
@@ -20,36 +25,46 @@ OperatingSystem os = org.gradle.nativeplatform.platform.internal.DefaultNativePl
 // Set the OS lwjgl is using to the current os
 project.ext.lwjglNatives = "natives-" + os.toFamilyName()
 
-dependencies { // All of these dependencies are in Vanilla Minecraft, but we need to depend on it as we arent importing Minecraft in the core
+dependencies {
-    // Imports most of lwjgl's libraries (well, only the ones that we need)
+    // API project dependency
-    implementation platform("org.lwjgl:lwjgl-bom:${rootProject.lwjgl_version}") // TODO: Use Minecraft's version for lwjgl_version (which changes in nearly every version) instead of a hard defined version for all versions
+    implementation project(":api")
 
-    // REMEMBER: Dont shadow stuff here, these are just the libs that are included in Minecraft so that the core can use
+    // MC-provided libraries (available at runtime via Minecraft)
-    implementation "org.lwjgl:lwjgl"
+    compileOnly platform("org.lwjgl:lwjgl-bom:${rootProject.lwjgl_version}")
-    implementation "org.lwjgl:lwjgl-assimp"
+    compileOnly "org.lwjgl:lwjgl"
-    implementation "org.lwjgl:lwjgl-glfw"
+    compileOnly "org.lwjgl:lwjgl-assimp"
-    implementation "org.lwjgl:lwjgl-openal"
+    compileOnly "org.lwjgl:lwjgl-glfw"
-    implementation "org.lwjgl:lwjgl-opengl"
+    compileOnly "org.lwjgl:lwjgl-stb"
-    implementation "org.lwjgl:lwjgl-stb"
+    compileOnly "org.lwjgl:lwjgl-tinyfd"
-    implementation "org.lwjgl:lwjgl-tinyfd"
+    testRuntimeOnly platform("org.lwjgl:lwjgl-bom:${rootProject.lwjgl_version}")
-    runtimeOnly "org.lwjgl:lwjgl::$lwjglNatives"
+    testRuntimeOnly "org.lwjgl:lwjgl::$lwjglNatives"
-    runtimeOnly "org.lwjgl:lwjgl-assimp::$lwjglNatives"
+    testRuntimeOnly "org.lwjgl:lwjgl-assimp::$lwjglNatives"
-    runtimeOnly "org.lwjgl:lwjgl-glfw::$lwjglNatives"
+    testRuntimeOnly "org.lwjgl:lwjgl-glfw::$lwjglNatives"
-    runtimeOnly "org.lwjgl:lwjgl-openal::$lwjglNatives"
+    testRuntimeOnly "org.lwjgl:lwjgl-stb::$lwjglNatives"
-    runtimeOnly "org.lwjgl:lwjgl-opengl::$lwjglNatives"
+    testRuntimeOnly "org.lwjgl:lwjgl-tinyfd::$lwjglNatives"
-    runtimeOnly "org.lwjgl:lwjgl-stb::$lwjglNatives"
-    runtimeOnly "org.lwjgl:lwjgl-tinyfd::$lwjglNatives"
 
-    // FIXME for some reason this line doesn't actually shade in the library
+    compileOnly("org.apache.logging.log4j:log4j-api:${rootProject.log4j_version}")
-//    shade "it.unimi.dsi:fastutil:${rootProject.fastutil_version}" // Add our own fastutil version
+    compileOnly("org.apache.logging.log4j:log4j-core:${rootProject.log4j_version}")
+    compileOnly("it.unimi.dsi:fastutil:${rootProject.fastutil_version}")
+    compileOnly("org.joml:joml:${rootProject.joml_version}")
+    compileOnly("io.netty:netty-buffer:${rootProject.netty_version}")
+    compileOnly("org.jetbrains:annotations:16.0.2")
+    compileOnly("com.google.code.findbugs:jsr305:3.0.2")
+    compileOnly("com.google.common:google-collect:0.5")
+    compileOnly("com.google.guava:guava:31.1-jre")
 
+    // DH's bundled libraries (shadowed + relocated in loader jars)
+    implementation("com.github.luben:zstd-jni:${rootProject.zstd_version}")
+    implementation("org.lz4:lz4-java:${rootProject.lz4_version}")
+    implementation("org.tukaani:xz:${rootProject.xz_version}")
+    implementation("org.xerial:sqlite-jdbc:${rootProject.sqlite_jdbc_version}")
+    implementation("com.electronwill.night-config:toml:${rootProject.nightconfig_version}")
+    implementation("com.electronwill.night-config:json:${rootProject.nightconfig_version}")
 
-    // Some other dependencies
+    // JUnit (core tests only)
-    implementation("org.jetbrains:annotations:16.0.2")
+    compileOnly("junit:junit:4.13")
-    implementation("com.google.code.findbugs:jsr305:3.0.2")
+    compileOnly("org.junit.jupiter:junit-jupiter:5.8.2")
-    implementation("com.google.common:google-collect:0.5")
+    compileOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2")
-    implementation("com.google.guava:guava:31.1-jre")
-    
 }
 
 artifacts {

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

@@ -20,36 +20,49 @@
 package com.seibel.distanthorizons.core;
 
 import com.github.luben.zstd.ZstdOutputStream;
+import com.seibel.distanthorizons.api.interfaces.render.IDhApiCustomRenderObjectFactory;
+import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiBeforeRenderEvent;
+import com.seibel.distanthorizons.core.api.internal.ClientApi;
+import com.seibel.distanthorizons.core.config.Config;
+import com.seibel.distanthorizons.core.config.eventHandlers.IgnoredDimensionCsvHandler;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
+import com.seibel.distanthorizons.core.enums.MinecraftTextFormat;
 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 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.lang.management.GarbageCollectorMXBean;
-import java.io.File;
+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()
 	{
+		//============================//
+		// check referenced libraries //
+		//============================//
+		//region
+		
+		LOGGER.info("Running library validation...");
+		
 		// confirm that all referenced libraries are available to use
 		try
 		{
@@ -57,6 +70,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,12 +97,18 @@ public class Initializer
 		}
 		catch (Throwable e)
 		{
-			LOGGER.fatal("Critical programmer error: One or more libraries aren't present. Error: [" + e.getMessage() + "].", 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);
-			// throwing here should crash the game, notifying the developer that something is wrong
-			throw new RuntimeException(e);
 		}
 		
-		// confirm the resource directory is present
+		//endregion
+		
+		
+		
+		//==========================//
+		// check resource directory //
+		//==========================//
+		//region
+		
 		try
 		{
 			int scriptCount = DatabaseUpdater.getAutoUpdateScriptCount();
@@ -89,10 +119,18 @@ 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() + "].");
+			MC_CLIENT.crashMinecraft("Critical programmer error: Can't read SQL Scripts resource folder is either missing or malformed. Error: [" + e.getMessage() + "].", e);
-			throw new RuntimeException(e);
 		}
 		
+		//endregion
+		
+		
+		
+		//===========================//
+		// Java AWT Headless setting // 
+		//===========================//
+		//region
+		
 		// This code has been disabled since it can cause Mac
 		// to lock up and refuse the load (there's a bug with Java.awt texture loading)
 		//if (MC_CLIENT != null)
@@ -109,18 +147,99 @@ public class Initializer
 		//	}
 		//}
 		
+		//endregion
+		
+		
+		
+		//===================//
+		// API delayed setup //
+		//===================//
+		//region
+		
 		// link Core's config to the API
 		DhApi.Delayed.configs = DhApiConfig.INSTANCE;
 		DhApi.Delayed.terrainRepo = DhApiTerrainDataRepo.INSTANCE;
 		DhApi.Delayed.worldProxy = DhApiWorldProxy.INSTANCE;
 		DhApi.Delayed.renderProxy = DhApiRenderProxy.INSTANCE;
-		DhApi.Delayed.customRenderObjectFactory = GenericRenderObjectFactory.INSTANCE;
 		DhApi.Delayed.wrapperFactory = SingletonInjector.INSTANCE.get(IWrapperFactory.class);
 		if (DhApi.Delayed.wrapperFactory == null)
 		{
-			LOGGER.error("Programmer Error: No ["+IWrapperFactory.class.getSimpleName()+"] assigned to the DhApi.");
+			MC_CLIENT.crashMinecraft("Programmer Error: No ["+IWrapperFactory.class.getSimpleName()+"] assigned to the DhApi.", new Exception());
 		}
 		
+		DhApi.Delayed.customRenderObjectFactory = SingletonInjector.INSTANCE.get(IDhApiCustomRenderObjectFactory.class);
+		if (DhApi.Delayed.customRenderObjectFactory == null)
+		{
+			MC_CLIENT.crashMinecraft("Programmer Error: No ["+IDhApiCustomRenderObjectFactory.class.getSimpleName()+"] assigned to the DhApi.", new Exception());
+		}
+		
+		DhApi.events.bind(DhApiBeforeRenderEvent.class, IgnoredDimensionCsvHandler.INSTANCE);
+		
+		//endregion
+		
+		
+		
+		//==============================//
+		// G1 Garbage collector warning //
+		//==============================//
+		//region
+		
+		// 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)
+			{
+				String warningMessageHeader = "Distant Horizons: G1 Garbage collector detected.";
+				String warningMessageBody = 
+					"This 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) \n" +
+					"for a smoother experience."
+					;
+				
+				if (Config.Common.Logging.Warning.logGarbageCollectorWarning.get())
+				{
+					LOGGER.warn(
+						warningMessageHeader + "\n" +
+						warningMessageBody +
+						"");
+				}
+				
+				if (Config.Common.Logging.Warning.showGarbageCollectorWarning.get())
+				{
+					ClientApi.INSTANCE.showChatMessageNextFrame(
+						MinecraftTextFormat.ORANGE + warningMessageHeader + MinecraftTextFormat.CLEAR_FORMATTING + "\n" +
+						warningMessageBody +
+						"");
+				}
+			}
+		}
+		
+		//endregion
+		
+		
+		
 	}
 	
 }

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

@@ -35,30 +35,6 @@ public class DhApiAmbientOcclusionConfig implements IDhApiAmbientOcclusionConfig
 	
 	@Override
 	public IDhApiConfigValue<Boolean> enabled()
-	{ return new DhApiConfigValue<Boolean, Boolean>(Config.Client.Advanced.Graphics.Ssao.enableSsao); }
+	{ return new DhApiConfigValue<Boolean, Boolean>(Config.Client.Advanced.Graphics.enableSsao); }
-	
-	@Override
-	public IDhApiConfigValue<Integer> sampleCount()
-	{ return new DhApiConfigValue<Integer, Integer>(Config.Client.Advanced.Graphics.Ssao.sampleCount); }
-	
-	@Override
-	public IDhApiConfigValue<Double> radius()
-	{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Ssao.radius); }
-	
-	@Override
-	public IDhApiConfigValue<Double> strength()
-	{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Ssao.strength); }
-	
-	@Override
-	public IDhApiConfigValue<Double> bias()
-	{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Ssao.bias); }
-	
-	@Override
-	public IDhApiConfigValue<Double> minLight()
-	{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Ssao.minLight); }
-	
-	@Override
-	public IDhApiConfigValue<Integer> blurRadius()
-	{ return new DhApiConfigValue<Integer, Integer>(Config.Client.Advanced.Graphics.Ssao.blurRadius); }
 	
 }

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

@@ -34,7 +34,7 @@ public class DhApiDebuggingConfig implements IDhApiDebuggingConfig
 	
 	
 	public IDhApiConfigValue<EDhApiDebugRendering> debugRendering()
-	{ return new DhApiConfigValue<EDhApiDebugRendering, EDhApiDebugRendering>(Config.Client.Advanced.Debugging.debugRendering); }
+	{ return new DhApiConfigValue<EDhApiDebugRendering, EDhApiDebugRendering>(Config.Client.Advanced.Debugging.debugRenderingColors); }
 	
 	public IDhApiConfigValue<Boolean> debugKeybindings()
 	{ return new DhApiConfigValue<Boolean, Boolean>(Config.Client.Advanced.Debugging.enableDebugKeybindings); }

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

@@ -34,27 +34,27 @@ public class DhApiFarFogConfig implements IDhApiFarFogConfig
 	
 	
 	@Override
-	public IDhApiConfigValue<Double> farFogStartDistance()
+	public IDhApiConfigValue<Float> farFogStartDistance()
-	{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Fog.farFogStart); }
+	{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Fog.farFogStart); }
 	
 	@Override
-	public IDhApiConfigValue<Double> farFogEndDistance()
+	public IDhApiConfigValue<Float> farFogEndDistance()
-	{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Fog.farFogEnd); }
+	{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Fog.farFogEnd); }
 	
 	@Override
-	public IDhApiConfigValue<Double> farFogMinThickness()
+	public IDhApiConfigValue<Float> farFogMinThickness()
-	{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Fog.farFogMin); }
+	{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Fog.farFogMin); }
 	
 	@Override
-	public IDhApiConfigValue<Double> farFogMaxThickness()
+	public IDhApiConfigValue<Float> farFogMaxThickness()
-	{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Fog.farFogMax); }
+	{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Fog.farFogMax); }
 	
 	@Override
 	public IDhApiConfigValue<EDhApiFogFalloff> farFogFalloff()
 	{ return new DhApiConfigValue<EDhApiFogFalloff, EDhApiFogFalloff>(Config.Client.Advanced.Graphics.Fog.farFogFalloff); }
 	
 	@Override
-	public IDhApiConfigValue<Double> farFogDensity()
+	public IDhApiConfigValue<Float> farFogDensity()
-	{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Fog.farFogDensity); }
+	{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Fog.farFogDensity); }
 	
 }

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

@@ -28,6 +28,7 @@ import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiHeightFogCo
 import com.seibel.distanthorizons.core.config.api.DhApiConfigValue;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.config.api.converters.ApiFogDrawModeConverter;
+import com.seibel.distanthorizons.core.config.api.converters.InvertedBoolConverter;
 
 public class DhApiFogConfig implements IDhApiFogConfig
 {
@@ -67,7 +68,7 @@ public class DhApiFogConfig implements IDhApiFogConfig
 	@Override
 	@Deprecated
 	public IDhApiConfigValue<Boolean> disableVanillaFog()
-	{ return new DhApiConfigValue<>(Config.Client.Advanced.Graphics.Fog.disableVanillaFog); }
+	{ return new DhApiConfigValue<>(Config.Client.Advanced.Graphics.Fog.enableVanillaFog, new InvertedBoolConverter()); }
 	@Override
 	public IDhApiConfigValue<Boolean> enableVanillaFog()
 	{ return new DhApiConfigValue<>(Config.Client.Advanced.Graphics.Fog.enableVanillaFog); }

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

@@ -108,16 +108,16 @@ public class DhApiGraphicsConfig implements IDhApiGraphicsConfig
 	//===========================//
 
 	@Override
-	public IDhApiConfigValue<Double> overdrawPreventionRadius()
+	public IDhApiConfigValue<Float> overdrawPreventionRadius()
-	{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Culling.overdrawPrevention); }
+	{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Culling.overdrawPrevention); }
 	
 	@Override
-	public IDhApiConfigValue<Double> brightnessMultiplier()
+	public IDhApiConfigValue<Float> brightnessMultiplier()
-	{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Quality.brightnessMultiplier); }
+	{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Quality.brightnessMultiplier); }
 	
 	@Override
-	public IDhApiConfigValue<Double> saturationMultiplier()
+	public IDhApiConfigValue<Float> saturationMultiplier()
-	{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Quality.saturationMultiplier); }
+	{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Quality.saturationMultiplier); }
 	
 	@Override
 	public IDhApiConfigValue<Boolean> caveCullingEnabled()
@@ -135,10 +135,6 @@ public class DhApiGraphicsConfig implements IDhApiGraphicsConfig
 	public IDhApiConfigValue<Boolean> lodOnlyMode()
 	{ return new DhApiConfigValue<Boolean, Boolean>(Config.Client.Advanced.Debugging.lodOnlyMode); }
 	
-	@Override
-	public IDhApiConfigValue<Double> lodBias()
-	{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Quality.lodBias); }
-	
 	@Override
 	public IDhApiConfigValue<EDhApiLodShading> lodShading()
 	{ return new DhApiConfigValue<EDhApiLodShading, EDhApiLodShading>(Config.Client.Advanced.Graphics.Quality.lodShading); }

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

@@ -44,31 +44,31 @@ public class DhApiHeightFogConfig implements IDhApiHeightFogConfig
 	{ return new DhApiConfigValue<EDhApiHeightFogDirection, EDhApiHeightFogDirection>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogDirection); }
 	
 	@Override
-	public IDhApiConfigValue<Double> heightFogBaseHeight()
+	public IDhApiConfigValue<Float> heightFogBaseHeight()
-	{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogBaseHeight); }
+	{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogBaseHeight); }
 	
 	@Override
-	public IDhApiConfigValue<Double> heightFogStartingHeightPercent()
+	public IDhApiConfigValue<Float> heightFogStartingHeightPercent()
-	{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogStart); }
+	{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogStart); }
 	
 	@Override
-	public IDhApiConfigValue<Double> heightFogEndingHeightPercent()
+	public IDhApiConfigValue<Float> heightFogEndingHeightPercent()
-	{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogEnd); }
+	{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogEnd); }
 	
 	@Override
-	public IDhApiConfigValue<Double> heightFogMinThickness()
+	public IDhApiConfigValue<Float> heightFogMinThickness()
-	{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogMin); }
+	{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogMin); }
 	
 	@Override
-	public IDhApiConfigValue<Double> heightFogMaxThickness()
+	public IDhApiConfigValue<Float> heightFogMaxThickness()
-	{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogMax); }
+	{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogMax); }
 	
 	@Override
 	public IDhApiConfigValue<EDhApiFogFalloff> heightFogFalloff()
 	{ return new DhApiConfigValue<EDhApiFogFalloff, EDhApiFogFalloff>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogFalloff); }
 	
 	@Override
-	public IDhApiConfigValue<Double> heightFogDensity()
+	public IDhApiConfigValue<Float> heightFogDensity()
-	{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogDensity); }
+	{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogDensity); }
 	
 }

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

@@ -41,8 +41,8 @@ public class DhApiNoiseTextureConfig implements IDhApiNoiseTextureConfig
 	{ return new DhApiConfigValue<Integer, Integer>(Config.Client.Advanced.Graphics.NoiseTexture.noiseSteps); }
 	
 	@Override
-	public IDhApiConfigValue<Double> noiseIntensity()
+	public IDhApiConfigValue<Float> noiseIntensity()
-	{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.NoiseTexture.noiseIntensity); }
+	{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.NoiseTexture.noiseIntensity); }
 	
 	@Override
 	public IDhApiConfigValue<Integer> noiseDropoff()

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

@@ -13,7 +13,7 @@ import java.lang.ref.SoftReference;
 public class DhApiTerrainDataCache implements IDhApiTerrainDataCache
 {
 	private final Object modificationLock = new Object();
-	private Long2ReferenceOpenHashMap<SoftReference<FullDataSourceV2>> posToFullDataRef = new Long2ReferenceOpenHashMap<>();
+	private final Long2ReferenceOpenHashMap<SoftReference<FullDataSourceV2>> posToFullDataRef = new Long2ReferenceOpenHashMap<>();
 	
 	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
@@ -22,6 +22,7 @@ public class DhApiTerrainDataCache implements IDhApiTerrainDataCache
 	//==================//
 	// internal methods //
 	//==================//
+	//region
 	
 	public void add(long pos, FullDataSourceV2 dataSource)
 	{
@@ -48,11 +49,14 @@ public class DhApiTerrainDataCache implements IDhApiTerrainDataCache
 		}
 	}
 	
+	//endregion
+	
 	
 	
 	//=============//
 	// API methods //
 	//=============//
+	//region
 	
 	@Override 
 	public void clear()
@@ -82,6 +86,23 @@ public class DhApiTerrainDataCache implements IDhApiTerrainDataCache
 		}
 	}
 	
+	//endregion
+	
+	
+	
+	//================//
+ 	// base overrides //
+	//================//
+	//region
+	
+	@Override 
+	public void close() { this.clear(); }
+	
+	@Override 
+	public String toString() { return "Size: " + this.posToFullDataRef.size(); }
+	
+	//endregion
+	
 	
 	
 }

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

@@ -32,9 +32,9 @@ import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSour
 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.pos.DhLodPos;
+import com.seibel.distanthorizons.core.pos.DhChunkPos;
 import com.seibel.distanthorizons.core.pos.DhSectionPos;
-import com.seibel.distanthorizons.core.render.renderer.DebugRenderer;
+import com.seibel.distanthorizons.core.render.renderer.AbstractDebugWireframeRenderer;
 import com.seibel.distanthorizons.core.util.DhApiTerrainDataPointUtil;
 import com.seibel.distanthorizons.core.util.FullDataPointUtil;
 import com.seibel.distanthorizons.core.util.LodUtil;
@@ -66,6 +66,8 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 	
 	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
+	private static final AbstractDebugWireframeRenderer DEBUG_RENDERER = SingletonInjector.INSTANCE.get(AbstractDebugWireframeRenderer.class);
+	
 	// debugging values
 	private static volatile boolean debugThreadRunning = false;
 	private static DhApiTerrainDataCache debugDataCache = new DhApiTerrainDataCache();
@@ -89,30 +91,30 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 	//================//
 	
 	@Override
-	public DhApiResult<DhApiTerrainDataPoint> getSingleDataPointAtBlockPos(IDhApiLevelWrapper levelWrapper, int blockPosX, int blockPosY, int blockPosZ, @Nullable IDhApiTerrainDataCache dataCache)
+	public DhApiResult<DhApiTerrainDataPoint> getSingleDataPointAtBlockPos(IDhApiLevelWrapper levelWrapper, int blockPosX, int blockPosY, int blockPosZ, IDhApiTerrainDataCache dataCache)
-	{ return getTerrainDataAtBlockYPos(levelWrapper, new DhLodPos(LodUtil.BLOCK_DETAIL_LEVEL, blockPosX, blockPosZ), blockPosY, dataCache); }
+	{ return getTerrainDataAtBlockYPos(levelWrapper, DhSectionPos.encode(LodUtil.BLOCK_DETAIL_LEVEL, blockPosX, blockPosZ), blockPosY, dataCache); }
 	@Override
-	public DhApiResult<DhApiTerrainDataPoint[]> getColumnDataAtBlockPos(IDhApiLevelWrapper levelWrapper, int blockPosX, int blockPosZ, @Nullable IDhApiTerrainDataCache dataCache)
+	public DhApiResult<DhApiTerrainDataPoint[]> getColumnDataAtBlockPos(IDhApiLevelWrapper levelWrapper, int blockPosX, int blockPosZ, IDhApiTerrainDataCache dataCache)
-	{ return getTerrainDataColumnArray(levelWrapper, new DhLodPos(LodUtil.BLOCK_DETAIL_LEVEL, blockPosX, blockPosZ), null, dataCache); }
+	{ return getTerrainDataColumnArray(levelWrapper, DhSectionPos.encode(LodUtil.BLOCK_DETAIL_LEVEL, blockPosX, blockPosZ), null, dataCache); }
 	
 	@Override
-	public DhApiResult<DhApiTerrainDataPoint[][][]> getAllTerrainDataAtChunkPos(IDhApiLevelWrapper levelWrapper, int chunkPosX, int chunkPosZ, @Nullable IDhApiTerrainDataCache dataCache)
+	public DhApiResult<DhApiTerrainDataPoint[][][]> getAllTerrainDataAtChunkPos(IDhApiLevelWrapper levelWrapper, int chunkPosX, int chunkPosZ, IDhApiTerrainDataCache dataCache)
-	{ return getTerrainDataOverAreaForPositionDetailLevel(levelWrapper, new DhLodPos(LodUtil.CHUNK_DETAIL_LEVEL, chunkPosX, chunkPosZ), dataCache); }
+	{ return getTerrainDataOverAreaForPositionDetailLevel(levelWrapper, DhSectionPos.encode(LodUtil.CHUNK_DETAIL_LEVEL, chunkPosX, chunkPosZ), dataCache); }
 	
 	@Override
-	public DhApiResult<DhApiTerrainDataPoint[][][]> getAllTerrainDataAtRegionPos(IDhApiLevelWrapper levelWrapper, int regionPosX, int regionPosZ, @Nullable IDhApiTerrainDataCache dataCache)
+	public DhApiResult<DhApiTerrainDataPoint[][][]> getAllTerrainDataAtRegionPos(IDhApiLevelWrapper levelWrapper, int regionPosX, int regionPosZ, IDhApiTerrainDataCache dataCache)
-	{ return getTerrainDataOverAreaForPositionDetailLevel(levelWrapper, new DhLodPos(LodUtil.REGION_DETAIL_LEVEL, regionPosX, regionPosZ), dataCache); }
+	{ return getTerrainDataOverAreaForPositionDetailLevel(levelWrapper, DhSectionPos.encode(LodUtil.REGION_DETAIL_LEVEL, regionPosX, regionPosZ), dataCache); }
 	
 	@Override
-	public DhApiResult<DhApiTerrainDataPoint[][][]> getAllTerrainDataAtDetailLevelAndPos(IDhApiLevelWrapper levelWrapper, byte detailLevel, int posX, int posZ, @Nullable IDhApiTerrainDataCache dataCache)
+	public DhApiResult<DhApiTerrainDataPoint[][][]> getAllTerrainDataAtDetailLevelAndPos(IDhApiLevelWrapper levelWrapper, byte detailLevel, int posX, int posZ, IDhApiTerrainDataCache dataCache)
-	{ return getTerrainDataOverAreaForPositionDetailLevel(levelWrapper, new DhLodPos(detailLevel, posX, posZ), dataCache); }
+	{ return getTerrainDataOverAreaForPositionDetailLevel(levelWrapper, DhSectionPos.encode(detailLevel, posX, posZ), dataCache); }
 	
 	
 	
 	// private getters //
 	
 	/** Returns a single API terrain datapoint that contains the given Y block position */
-	private static DhApiResult<DhApiTerrainDataPoint> getTerrainDataAtBlockYPos(IDhApiLevelWrapper levelWrapper, DhLodPos requestedColumnPos, Integer blockYPos, @Nullable IDhApiTerrainDataCache dataCache)
+	private static DhApiResult<DhApiTerrainDataPoint> getTerrainDataAtBlockYPos(IDhApiLevelWrapper levelWrapper, long requestedColumnPos, Integer blockYPos, IDhApiTerrainDataCache dataCache)
 	{
 		DhApiResult<DhApiTerrainDataPoint[]> result = getTerrainDataColumnArray(levelWrapper, requestedColumnPos, blockYPos, dataCache);
 		if (result.success && result.payload.length > 0)
@@ -126,7 +128,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 	}
 	
 	/**
-	 * Returns all the block columns represented by the given {@link DhLodPos}. <br>
+	 * Returns all the block columns represented by the given {@link DhSectionPos}. <br>
 	 * IE, A position with the detail level: <br>
 	 * 0 (block): will return a 1x1 matrix of data. (don't do this, we have a specific method for that.) <br>
 	 * 1 (2 blocks): will return a 2x2 matrix of data. <br>
@@ -135,11 +137,14 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 	 * will stop and return the in progress data if any errors are encountered.
 	 */
 	private static DhApiResult<DhApiTerrainDataPoint[][][]> getTerrainDataOverAreaForPositionDetailLevel(
-			IDhApiLevelWrapper levelWrapper, DhLodPos requestedAreaPos, 
+			IDhApiLevelWrapper levelWrapper, long requestedAreaPos, 
-			@Nullable IDhApiTerrainDataCache dataCache)
+			IDhApiTerrainDataCache dataCache)
 	{
-		DhLodPos startingBlockPos = requestedAreaPos.getCornerLodPos(LodUtil.BLOCK_DETAIL_LEVEL);
+		byte requestedDetailLevel = DhSectionPos.getDetailLevel(requestedAreaPos);
-		int widthOfAreaInBlocks = BitShiftUtil.powerOfTwo(requestedAreaPos.detailLevel);
+		long startingBlockPos = DhSectionPos.encode(LodUtil.BLOCK_DETAIL_LEVEL,
+			DhSectionPos.getX(requestedAreaPos) * BitShiftUtil.powerOfTwo(requestedDetailLevel - LodUtil.BLOCK_DETAIL_LEVEL),
+			DhSectionPos.getZ(requestedAreaPos) * BitShiftUtil.powerOfTwo(requestedDetailLevel - LodUtil.BLOCK_DETAIL_LEVEL));
+		int widthOfAreaInBlocks = BitShiftUtil.powerOfTwo(requestedDetailLevel);
 		
 		DhApiTerrainDataPoint[][][] returnArray = new DhApiTerrainDataPoint[widthOfAreaInBlocks][widthOfAreaInBlocks][];
 		int dataColumnsReturned = 0;
@@ -149,7 +154,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 		{
 			for (int z = 0; z < widthOfAreaInBlocks; z++)
 			{
-				DhLodPos blockColumnPos = new DhLodPos(LodUtil.BLOCK_DETAIL_LEVEL, startingBlockPos.x + x, startingBlockPos.z + z);
+				long blockColumnPos = DhSectionPos.encode(LodUtil.BLOCK_DETAIL_LEVEL, DhSectionPos.getX(startingBlockPos) + x, DhSectionPos.getZ(startingBlockPos) + z);
 				DhApiResult<DhApiTerrainDataPoint[]> result = getTerrainDataColumnArray(levelWrapper, blockColumnPos, null, dataCache);
 				if (result.success)
 				{
@@ -175,8 +180,8 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 	 */
 	private static DhApiResult<DhApiTerrainDataPoint[]> getTerrainDataColumnArray(
 			IDhApiLevelWrapper levelWrapper, 
-			DhLodPos requestedColumnPos, Integer nullableBlockYPos, 
+			long requestedColumnPos, Integer nullableBlockYPos, 
-			@Nullable IDhApiTerrainDataCache apiDataCache)
+			IDhApiTerrainDataCache apiDataCache)
 	{
 		//============//
 		// validation //
@@ -197,9 +202,14 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 		ILevelWrapper coreLevelWrapper = (ILevelWrapper) levelWrapper;
 		
 		
-		// the data cache can be null, but must be our own implementation
+		// require a data cache to prevent horrible performance (especially on ray-casts)
-		if (apiDataCache != null
+		if (apiDataCache == null)
-			&& !(apiDataCache instanceof DhApiTerrainDataCache))
+		{
+			return DhApiResult.createFail("Missing [" + IDhApiTerrainDataCache.class.getSimpleName() + "], if a cache isn't provided your repo operations will be significantly slower.");
+		}
+		
+		// the data cache must be our own implementation
+		if (!(apiDataCache instanceof DhApiTerrainDataCache))
 		{
 			return DhApiResult.createFail("Unsupported [" + IDhApiTerrainDataCache.class.getSimpleName() + "] implementation, only the core class [" + DhApiTerrainDataCache.class.getSimpleName() + "] is a valid parameter.");
 		}
@@ -213,12 +223,12 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 		}
 		
 		// get the detail levels for this request
-		byte requestedDetailLevel = requestedColumnPos.detailLevel;
+		byte requestedDetailLevel = DhSectionPos.getDetailLevel(requestedColumnPos);
 		byte sectionDetailLevel = (byte) (requestedDetailLevel + DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL);
 		
 		// get the positions for this request
-		long sectionPos = requestedColumnPos.getSectionPosWithSectionDetailLevel(sectionDetailLevel);
+		long sectionPos = DhSectionPos.convertToDetailLevel(requestedColumnPos, sectionDetailLevel);
-		DhLodPos relativePos = requestedColumnPos.getDhSectionRelativePositionForDetailLevel();
+		long relativePos = DhSectionPos.getDhSectionRelativePositionForDetailLevel(requestedColumnPos, DhSectionPos.getDetailLevel(requestedColumnPos));
 		
 		
 		
@@ -258,7 +268,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 			//===============================//
 			
 			FullDataPointIdMap mapping = dataSource.mapping;
-			LongArrayList dataColumn = dataSource.getColumnAtRelPos(relativePos.x, relativePos.z);
+			LongArrayList dataColumn = dataSource.getColumnAtRelPos(DhSectionPos.getX(relativePos), DhSectionPos.getZ(relativePos));
 			if (dataColumn != null)
 			{
 				int dataColumnIndexCount = dataColumn.size();
@@ -508,7 +518,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 		
 		// this will throw a cast exception if the chunk object array isn't correct
 		IChunkWrapper chunk = SingletonInjector.INSTANCE.get(IWrapperFactory.class).createChunkWrapper(chunkObjectArray);
-		SharedApi.INSTANCE.applyChunkUpdate(chunk, dhLevel.getLevelWrapper(), true, true);
+		SharedApi.INSTANCE.applyChunkUpdate(chunk, dhLevel.getLevelWrapper());
 		
 		
 		return DhApiResult.createSuccess();
@@ -521,7 +531,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 	//=============//
 	
 	@Override
-	public IDhApiTerrainDataCache getSoftCache() { return new DhApiTerrainDataCache(); }
+	public IDhApiTerrainDataCache createSoftCache() { return new DhApiTerrainDataCache(); }
 	
 	
 	
@@ -541,10 +551,10 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 			Thread thread = new Thread(() -> {
 				try
 				{
-					DhApiResult<DhApiTerrainDataPoint> single = getTerrainDataAtBlockYPos(levelWrapper, new DhLodPos(LodUtil.BLOCK_DETAIL_LEVEL, blockPosX, blockPosZ), blockPosY, debugDataCache);
+					DhApiResult<DhApiTerrainDataPoint> single = getTerrainDataAtBlockYPos(levelWrapper, DhSectionPos.encode(LodUtil.BLOCK_DETAIL_LEVEL, blockPosX, blockPosZ), blockPosY, debugDataCache);
-					DhApiResult<DhApiTerrainDataPoint[]> column = getTerrainDataColumnArray(levelWrapper, new DhLodPos(LodUtil.BLOCK_DETAIL_LEVEL, blockPosX, blockPosZ), null, debugDataCache);
+					DhApiResult<DhApiTerrainDataPoint[]> column = getTerrainDataColumnArray(levelWrapper, DhSectionPos.encode(LodUtil.BLOCK_DETAIL_LEVEL, blockPosX, blockPosZ), null, debugDataCache);
 					
-					DhLodPos chunkPos = new DhLodPos(LodUtil.BLOCK_DETAIL_LEVEL, blockPosX, blockPosZ).convertToDetailLevel(LodUtil.CHUNK_DETAIL_LEVEL);
+					long chunkPos = DhSectionPos.encodeContaining(LodUtil.CHUNK_DETAIL_LEVEL, new DhChunkPos(blockPosX, blockPosZ));
 					DhApiResult<DhApiTerrainDataPoint[][][]> area = getTerrainDataOverAreaForPositionDetailLevel(levelWrapper, chunkPos, debugDataCache);
 					
 					
@@ -580,9 +590,9 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 					if (rayCast.success 
 						&& rayCast.payload != null)
 					{
-						DebugRenderer.makeParticle(
+						DEBUG_RENDERER.makeParticle(
-							new DebugRenderer.BoxParticle(
+							new AbstractDebugWireframeRenderer.BoxParticle(
-								new DebugRenderer.Box(
+								new AbstractDebugWireframeRenderer.Box(
 									DhSectionPos.encode((byte) 0, rayCast.payload.pos.x, rayCast.payload.pos.z), 
 										rayCast.payload.dataPoint.bottomYBlockPos, 
 										rayCast.payload.dataPoint.topYBlockPos, 

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

@@ -23,19 +23,26 @@ import com.seibel.distanthorizons.api.DhApi;
 import com.seibel.distanthorizons.api.enums.config.EDhApiMcRenderingFadeMode;
 import com.seibel.distanthorizons.api.enums.rendering.EDhApiRenderPass;
 import com.seibel.distanthorizons.api.methods.events.abstractEvents.*;
-import com.seibel.distanthorizons.core.api.external.methods.data.DhApiTerrainDataRepo;
 import com.seibel.distanthorizons.core.api.internal.rendering.DhRenderState;
+import com.seibel.distanthorizons.core.enums.MinecraftTextFormat;
 import com.seibel.distanthorizons.core.file.structure.ClientOnlySaveStructure;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.logging.f3.F3Screen;
 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.RenderParams;
-import com.seibel.distanthorizons.core.render.renderer.LodRenderer;
+import com.seibel.distanthorizons.core.render.RenderThreadTaskHandler;
-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.math.Vec3d;
 import com.seibel.distanthorizons.core.util.objects.Pair;
+import com.seibel.distanthorizons.core.util.objects.RollingAverage;
+import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhMetaRenderer;
+import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhVanillaFadeRenderer;
+import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhTestTriangleRenderer;
 import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.network.messages.AbstractNetworkMessage;
@@ -45,12 +52,8 @@ import com.seibel.distanthorizons.api.enums.rendering.EDhApiDebugRendering;
 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;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IProfilerWrapper;
@@ -63,6 +66,8 @@ import org.lwjgl.glfw.GLFW;
 import java.io.File;
 import java.util.*;
 import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.ThreadPoolExecutor;
 
 /**
  * This holds the methods that should be called
@@ -72,11 +77,9 @@ import java.util.concurrent.LinkedBlockingQueue;
 public class ClientApi
 {
 	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
-	
+	private static final DhLogger RATE_LIMITED_LOGGER = new DhLoggerBuilder().maxCountPerSecond(1).build();
-	public static boolean prefLoggerEnabled = false;
 	
 	public static final ClientApi INSTANCE = new ClientApi();
-	public static final TestRenderer TEST_RENDERER = new TestRenderer();
 	
 	private static final IMinecraftClientWrapper MC_CLIENT = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
 	private static final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
@@ -94,6 +97,13 @@ public class ClientApi
 	 */
 	public static final DhRenderState RENDER_STATE = new DhRenderState();
 	
+	/**
+	 * 50ms = 20 FPS
+	 * @link https://fpstoms.com/ 
+	 * @see ClientApi#cameraSpeedRollingAverage
+	 */
+	private static final long MIN_MS_BETWEEN_SPEED_CHECKS = 50;
+	
 	
 	private boolean isDevBuildMessagePrinted = false;
 	private boolean lowMemoryWarningPrinted = false;
@@ -117,10 +127,27 @@ public class ClientApi
 	/** Holds any chunks that were loaded before the {@link ClientApi#clientLevelLoadEvent(IClientLevelWrapper)} was fired. */
 	public final HashMap<Pair<IClientLevelWrapper, DhChunkPos>, IChunkWrapper> waitingChunkByClientLevelAndPos = new HashMap<>();
 	
+	/** publicly available so {@link F3Screen} can display the error */
 	@Nullable
 	public String lastRenderParamValidationMessage = null;
 	
 	
+	/** 
+	 * measured in blocks/second <br>
+	 * 
+	 * The number of points tracked here is related
+	 * to the rate at which we check for speed.
+	 * So if the ms_between is changed the number of points
+	 * tracked should also be to keep the ratio roughly the same.
+	 * @see ClientApi#MIN_MS_BETWEEN_SPEED_CHECKS
+	 */
+	public RollingAverage cameraSpeedRollingAverage = new RollingAverage(40);
+	private Vec3d lastCameraPosForSpeedCheck = new Vec3d();
+	private long msSinceLastSpeedCheck = 0L;
+	
+	public static long firstRenderTimeMs = 0;
+	
+	
 	
 	//==============//
 	// constructors //
@@ -133,6 +160,7 @@ public class ClientApi
 	//==============//
 	// world events //
 	//==============//
+	//region
 	
 	/**
 	 * May be fired slightly before or after the associated
@@ -158,17 +186,16 @@ public class ClientApi
 				
 				if (Config.Common.Logging.Warning.showReplayWarningOnStartup.get())
 				{
-					MC_CLIENT.sendChatMessage("\u00A76" + "Distant Horizons: Replay detected." + "\u00A7r"); // gold color
+					MC_CLIENT.sendChatMessage(MinecraftTextFormat.ORANGE + "Distant Horizons: Replay detected." + MinecraftTextFormat.CLEAR_FORMATTING);
 					MC_CLIENT.sendChatMessage("DH may behave strangely or have missing functionality.");
 					MC_CLIENT.sendChatMessage("In order to use pre-generated LODs, put your DH database(s) in:");
-					MC_CLIENT.sendChatMessage("\u00A77"+".Minecraft" + File.separator + ClientOnlySaveStructure.SERVER_DATA_FOLDER_NAME + File.separator + ClientOnlySaveStructure.REPLAY_SERVER_FOLDER_NAME + File.separator + "DIMENSION_NAME"+"\u00A7r"); // light gray color
+					MC_CLIENT.sendChatMessage(MinecraftTextFormat.GRAY +".Minecraft" + File.separator + ClientOnlySaveStructure.SERVER_DATA_FOLDER_NAME + File.separator + ClientOnlySaveStructure.REPLAY_SERVER_FOLDER_NAME + File.separator + "DIMENSION_NAME"+ MinecraftTextFormat.CLEAR_FORMATTING);
-					MC_CLIENT.sendChatMessage("This can be disabled in DH's config under Advanced -> Logging.");
+					MC_CLIENT.sendChatMessage("This message can be disabled in DH's config under Advanced -> Logging.");
 					MC_CLIENT.sendChatMessage("");
 				}
 			}
 			
-			// firing after clientLevelLoadEvent
+			
-			// TODO if level has prepped to load it should fire level load event
 			DhClientWorld world = new DhClientWorld();
 			SharedApi.setDhWorld(world);
 			
@@ -211,11 +238,14 @@ public class ClientApi
 		this.waitingClientLevels.clear();
 	}
 	
+	//endregion
+	
 	
 	
 	//==============//
 	// level events //
 	//==============//
+	//region
 	
 	public void clientLevelUnloadEvent(IClientLevelWrapper level)
 	{
@@ -232,7 +262,6 @@ public class ClientApi
 			if (world != null)
 			{
 				world.unloadLevel(level);
-				SharedApi.INSTANCE.clearQueuedChunkUpdates();
 				ApiEventInjector.INSTANCE.fireAllEvents(DhApiLevelUnloadEvent.class, new DhApiLevelUnloadEvent.EventParam(level));
 			}
 			else
@@ -247,8 +276,15 @@ public class ClientApi
 		}
 	}
 	
-	public void clientLevelLoadEvent(IClientLevelWrapper levelWrapper)
+	public void clientLevelLoadEvent(@Nullable IClientLevelWrapper levelWrapper)
 	{
+		// can happen if there was an issue during level load
+		if (levelWrapper == null)
+		{
+			return;
+		}
+		
+		
 		// wait a moment before loading the level to give the server a chance to handle the client's login request
 		if (MC_CLIENT.clientConnectedToDedicatedServer())
 		{
@@ -309,7 +345,7 @@ public class ClientApi
 			if (levelWrapper.equals(level))
 			{
 				IChunkWrapper chunkWrapper = this.waitingChunkByClientLevelAndPos.get(levelChunkPair);
-				SharedApi.INSTANCE.chunkLoadEvent(chunkWrapper, levelWrapper);
+				SharedApi.INSTANCE.applyChunkUpdate(chunkWrapper, levelWrapper);
 				keysToRemove.add(levelChunkPair);
 			}
 		}
@@ -321,40 +357,14 @@ public class ClientApi
 		}
 	}
 	
-	
+	//endregion
-	
-	//============//
-	// 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();
-			}
-		}
-		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 //
 	//============//
+	//region
 	
 	/**
 	 * Forwards a decoded message into the registered handlers.
@@ -362,19 +372,39 @@ public class ClientApi
 	 * @see MessageRegistry
 	 */
 	public void pluginMessageReceived(@NotNull AbstractNetworkMessage message)
+	{
+		@Nullable ThreadPoolExecutor executor = ThreadPoolUtil.networkClientHandlerExecutor();
+		if (executor == null)
+		{
+			LOGGER.warn("warn");
+			return;
+		}
+		
+		try
+		{
+			executor.execute(() ->
 			{
 				NetworkSession networkSession = this.pluginChannelApi.networkSession;
 				if (networkSession != null)
 				{
 					networkSession.tryHandleMessage(message);
 				}
+			});
 		}
+		catch (RejectedExecutionException e)
+		{
+			LOGGER.warn("Plugin message executor rejected");
+		}
+	}
+	
+	//endregion
 	
 	
 	
 	//===============//
 	// LOD rendering //
 	//===============//
+	//region
 	
 	/** Should be called before {@link ClientApi#renderDeferredLodsForShaders} */
 	public void renderLods() { this.renderLodLayer(false); }
@@ -387,45 +417,100 @@ public class ClientApi
 	
 	private void renderLodLayer(boolean renderingDeferredLayer)
 	{
-		//=========//
-		// logging //
-		//=========//
-		
-		this.sendQueuedChatMessages();
-		
 		IProfilerWrapper profiler = MC_CLIENT.getProfiler();
-		profiler.pop(); // get out of "terrain"
+		try (IProfilerWrapper.IProfileBlock dhRender_profile = profiler.push("DH-RenderLevel"))
-		profiler.push("DH-RenderLevel");
+		{
+			
+			
+			
+			//===========//
+			// debugging //
+			//===========//
+			//region
+			
+			//DhApiTerrainDataRepo.asyncDebugMethod(
+			//	RENDER_STATE.clientLevelWrapper,
+			//	MC_CLIENT.getPlayerBlockPos().getX(),
+			//	MC_CLIENT.getPlayerBlockPos().getY(),
+			//	MC_CLIENT.getPlayerBlockPos().getZ()
+			//);
+			
+			//endregion
 			
 			
 			
 			//=====================//
 			// render thread tasks //
 			//=====================//
+			//region
 			
 			// only run these tasks once per frame
 			if (!renderingDeferredLayer)
 			{
-			profiler.push("DH render thread tasks");
+				try (IProfilerWrapper.IProfileBlock renderTask_profile = profiler.push("DH render thread tasks"))
+				{
+					//===============//
+					// chat messages //
+					//===============//
+					
+					this.sendQueuedChatMessages();
+					
+					
+					
+					//======================//
+					// GL Proxy queued jobs //
+					//======================//
+					//region
 					
 					try
 					{
 						// these tasks always need to be called, regardless of whether the renderer is enabled or not to prevent memory leaks
-				GLProxy.getInstance().runRenderThreadTasks();
+						RenderThreadTaskHandler.INSTANCE.runRenderThreadTasks();
 					}
 					catch (Exception e)
 					{
 						LOGGER.error("Unexpected issue running render thread tasks, error: [" + e.getMessage() + "].", e);
 					}
 					
-			profiler.pop();
+					//endregion
+					
+					
+					
+					//==============//
+					// camera speed //
+					//==============//
+					//region
+					
+					long nowMs = System.currentTimeMillis();
+					if (this.msSinceLastSpeedCheck + MIN_MS_BETWEEN_SPEED_CHECKS < nowMs)
+					{
+						// calc time since last check
+						double secSinceLastCheck = (nowMs - this.msSinceLastSpeedCheck) / 1_000.0;
+						this.msSinceLastSpeedCheck = nowMs;
+						
+						// get the distance traveled since last frame
+						Vec3d camPos = MC_RENDER.getCameraExactPosition();
+						double distanceInBlocks = camPos.getDistance(this.lastCameraPosForSpeedCheck);
+						double speed = distanceInBlocks / secSinceLastCheck;
+						
+						// record new values for next check
+						this.cameraSpeedRollingAverage.add(speed);
+						this.lastCameraPosForSpeedCheck = camPos;
 					}
 					
+					//endregion
+				}
+			}
+			
+			//endregion
+			
+			
 			
 			
 			//=================//
 			// parameter setup //
 			//=================//
+			//region
 			
 			EDhApiRenderPass renderPass;
 			if (DhApiRenderProxy.INSTANCE.getDeferTransparentRendering())
@@ -448,24 +533,26 @@ public class ClientApi
 			// render prep and actual rendering into different threads/methods
 			// this is annoying since it's possible to start a render with only
 			// partially complete info, but there isn't a better option at the moment
-		RenderParams renderParams =
+			RenderParams renderParams = new RenderParams(renderPass, RENDER_STATE);
-			new RenderParams(
+			
-				renderPass,
+			//endregion
-				RENDER_STATE.frameTime,
-				RENDER_STATE.mcProjectionMatrix, RENDER_STATE.mcModelViewMatrix,
-				RENDER_STATE.clientLevelWrapper
-			);
 			
 			
 			
 			//============//
 			// validation //
 			//============//
+			//region
 			
-		// TODO write this message to the F3 menu so people can see when a different mod screws with the lightmap
+			if (firstRenderTimeMs == 0)
-		String validationMessage = renderParams.getValidationErrorMessage();
+			{
+				firstRenderTimeMs = System.currentTimeMillis();
+			}
+			
+			String validationMessage = renderParams.getValidationErrorMessage(firstRenderTimeMs);
 			if (validationMessage != null)
 			{
+				// store the error message so it can be seen on the F3 screen
 				this.lastRenderParamValidationMessage = validationMessage;
 				return;
 			}
@@ -487,22 +574,29 @@ public class ClientApi
 				return;
 			}
 			
+			if (Config.Client.Advanced.Debugging.rendererMode.get() == EDhApiRendererMode.DISABLED)
+			{
+				return;
+			}
+			
+			//endregion
+			
 			
 			
 			//===========//
 			// rendering //
 			//===========//
+			//region
 			
 			try
 			{
 				// render pass //
-			
-			if (!renderingDeferredLayer)
-			{
 				if (Config.Client.Advanced.Debugging.rendererMode.get() == EDhApiRendererMode.DEFAULT)
 				{
-					boolean renderingCancelledForThisFrame = ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeRenderEvent.class, renderParams);
+					if (!renderingDeferredLayer)
-					if (!renderingCancelledForThisFrame)
+					{
+						boolean renderingCancelled = ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeRenderEvent.class, renderParams);
+						if (!renderingCancelled)
 						{
 							LodRenderer.INSTANCE.render(renderParams, profiler);
 						}
@@ -512,13 +606,6 @@ public class ClientApi
 							ApiEventInjector.INSTANCE.fireAllEvents(DhApiAfterRenderEvent.class, null);
 						}
 					}
-				else if (Config.Client.Advanced.Debugging.rendererMode.get() == EDhApiRendererMode.DEBUG)
-				{
-					profiler.push("Render Debug");
-					ClientApi.TEST_RENDERER.render();
-					profiler.pop();
-				}
-			}
 					else
 					{
 						boolean renderingCancelled = ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeDeferredRenderEvent.class, renderParams);
@@ -534,28 +621,53 @@ public class ClientApi
 						}
 					}
 				}
+				else
+				{
+					if (!renderingDeferredLayer)
+					{
+						IDhMetaRenderer metaRenderer = SingletonInjector.INSTANCE.get(IDhMetaRenderer.class);
+						IDhTestTriangleRenderer testRenderer = SingletonInjector.INSTANCE.get(IDhTestTriangleRenderer.class);
+						if (testRenderer != null
+							&& metaRenderer != null)
+						{
+							// meta renderer needed for render state/texture
+							// for setup on some APIs (IE openGL)
+							metaRenderer.runRenderPassSetup(renderParams);
+							
+							testRenderer.render(renderParams);
+							
+							metaRenderer.runRenderPassCleanup(renderParams);
+						}
+						else
+						{
+							RATE_LIMITED_LOGGER.warn("Unable to find singleton [" + IDhTestTriangleRenderer.class.getSimpleName() + "]");
+						}
+					}
+				}
+			}
 			catch (Exception e)
 			{
 				this.rendererDisabledBecauseOfExceptions = true;
 				LOGGER.error("Unexpected Renderer error in render pass [" + renderPass + "]. Error: " + e.getMessage(), e);
 				
-			MC_CLIENT.sendChatMessage("\u00A74\u00A7l\u00A7uERROR: Distant Horizons renderer has encountered an exception!");
+				MC_CLIENT.sendChatMessage(MinecraftTextFormat.DARK_RED + "" + MinecraftTextFormat.BOLD + "ERROR: Distant Horizons renderer has encountered an exception!" + MinecraftTextFormat.CLEAR_FORMATTING);
-			MC_CLIENT.sendChatMessage("\u00A74Renderer disabled to try preventing GL state corruption.");
+				MC_CLIENT.sendChatMessage(MinecraftTextFormat.DARK_RED + "Renderer disabled to try preventing GL state corruption." + MinecraftTextFormat.CLEAR_FORMATTING);
-			MC_CLIENT.sendChatMessage("\u00A74Toggle DH rendering via the config UI to re-activate DH rendering.");
+				MC_CLIENT.sendChatMessage(MinecraftTextFormat.DARK_RED + "Toggle DH rendering via the config UI to re-activate DH rendering." + MinecraftTextFormat.CLEAR_FORMATTING);
-			MC_CLIENT.sendChatMessage("\u00A74Error: " + e);
+				MC_CLIENT.sendChatMessage(MinecraftTextFormat.DARK_RED + "Error: " + MinecraftTextFormat.CLEAR_FORMATTING + e);
 			}
 			
-		
+			//endregion
-		
-		profiler.pop(); // end LOD
-		profiler.push("terrain"); // go back into "terrain"
 		}
+	}
+	
+	//endregion
 	
 	
 	
 	//================//
 	// fade rendering //
 	//================//
+	//region
 	
 	/** 
 	 * The first fade pass.
@@ -563,8 +675,14 @@ public class ClientApi
 	 */
 	public void renderFadeOpaque()
 	{
+		IDhVanillaFadeRenderer fadeRenderer = SingletonInjector.INSTANCE.get(IDhVanillaFadeRenderer.class);
+		if (fadeRenderer == null)
+		{
+			return;
+		}
+		
 		// only fade when DH is rendering
-		if (Config.Client.Advanced.Debugging.rendererMode.get() == EDhApiRendererMode.DEFAULT
+		if (Config.Client.Advanced.Debugging.rendererMode.get() != EDhApiRendererMode.DISABLED
 			&&
 			(
 				// only fade when requested
@@ -575,7 +693,8 @@ public class ClientApi
 			// don't fade when Iris shaders are active, otherwise the rendering can get weird
 			&& !DhApiRenderProxy.INSTANCE.getDeferTransparentRendering())
 		{
-			VanillaFadeRenderer.INSTANCE.render(RENDER_STATE.mcModelViewMatrix, RENDER_STATE.mcProjectionMatrix, RENDER_STATE.frameTime, RENDER_STATE.clientLevelWrapper);
+			RenderParams renderParams = new RenderParams(EDhApiRenderPass.OPAQUE, RENDER_STATE);
+			fadeRenderer.render(renderParams);
 		}
 	}
 	/** 
@@ -585,8 +704,14 @@ public class ClientApi
 	 */
 	public void renderFadeTransparent()
 	{
+		IDhVanillaFadeRenderer fadeRenderer = SingletonInjector.INSTANCE.get(IDhVanillaFadeRenderer.class);
+		if (fadeRenderer == null)
+		{
+			return;
+		}
+		
 		// only fade when DH is rendering
-		if (Config.Client.Advanced.Debugging.rendererMode.get() == EDhApiRendererMode.DEFAULT)
+		if (Config.Client.Advanced.Debugging.rendererMode.get() != EDhApiRendererMode.DISABLED)
 		{
 			boolean renderFade =
 				(
@@ -599,16 +724,20 @@ public class ClientApi
 				&& !DhApiRenderProxy.INSTANCE.getDeferTransparentRendering();
 			if (renderFade)
 			{
-				VanillaFadeRenderer.INSTANCE.render(RENDER_STATE.mcModelViewMatrix, RENDER_STATE.mcProjectionMatrix, RENDER_STATE.frameTime, RENDER_STATE.clientLevelWrapper);
+				RenderParams renderParams = new RenderParams(EDhApiRenderPass.TRANSPARENT, RENDER_STATE);
+				fadeRenderer.render(renderParams);
 			}
 		}
 	}
 	
+	//endregion
 	
 	
-	//=================//
+	
-	//    DEBUG USE    //
+	//==========//
-	//=================//
+	// keyboard //
+	//==========//
+	//region
 	
 	/** Trigger once on key press, with CLIENT PLAYER. */
 	public void keyPressedEvent(int glfwKey)
@@ -620,23 +749,32 @@ public class ClientApi
 		}
 		
 		
-		if (glfwKey == GLFW.GLFW_KEY_F8)
+		if (glfwKey == GLFW.GLFW_KEY_F6)
-		{
-			Config.Client.Advanced.Debugging.debugRendering.set(EDhApiDebugRendering.next(Config.Client.Advanced.Debugging.debugRendering.get()));
-			MC_CLIENT.sendChatMessage("F8: Set debug mode to " + Config.Client.Advanced.Debugging.debugRendering.get());
-		}
-		else if (glfwKey == GLFW.GLFW_KEY_F6)
 		{
 			Config.Client.Advanced.Debugging.rendererMode.set(EDhApiRendererMode.next(Config.Client.Advanced.Debugging.rendererMode.get()));
 			MC_CLIENT.sendChatMessage("F6: Set rendering to " + Config.Client.Advanced.Debugging.rendererMode.get());
 		}
-		else if (glfwKey == GLFW.GLFW_KEY_P)
+		else if (glfwKey == GLFW.GLFW_KEY_F7)
 		{
-			prefLoggerEnabled = !prefLoggerEnabled;
+			Config.Client.Advanced.Debugging.lodOnlyMode.set(!Config.Client.Advanced.Debugging.lodOnlyMode.get());
-			MC_CLIENT.sendChatMessage("P: Debug Pref Logger is " + (prefLoggerEnabled ? "enabled" : "disabled"));
+			MC_CLIENT.sendChatMessage("F7: Set LOD only mode to " + Config.Client.Advanced.Debugging.lodOnlyMode.get());
+		}
+		else if (glfwKey == GLFW.GLFW_KEY_F8)
+		{
+			Config.Client.Advanced.Debugging.debugRenderingColors.set(EDhApiDebugRendering.next(Config.Client.Advanced.Debugging.debugRenderingColors.get()));
+			MC_CLIENT.sendChatMessage("F8: Set debug mode to " + Config.Client.Advanced.Debugging.debugRenderingColors.get());
 		}
 	}
 	
+	//endregion
+	
+	
+	
+	//======//
+	// chat //
+	//======//
+	//region
+	
 	private void sendQueuedChatMessages()
 	{
 		// this includes if the current build is a dev build
@@ -679,15 +817,15 @@ 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();
 			
 			// remind the user that this is a development build
 			String message =
-					// green text
+					MinecraftTextFormat.DARK_GREEN + "Distant Horizons: nightly/unstable build, version: [" + ModInfo.VERSION+"]." + MinecraftTextFormat.CLEAR_FORMATTING + "\n" +
-					"\u00A72" + "Distant Horizons: nightly/unstable build, version: [" + ModInfo.VERSION+"]." + "\u00A7r\n" +
 							"Issues may occur with this version.\n" +
 							"Here be dragons!\n";
 			MC_CLIENT.sendChatMessage(message);
@@ -711,7 +849,7 @@ public class ClientApi
 			{
 				String message =
 						// orange text		
-						"\u00A76" + "Distant Horizons: Low memory detected." + "\u00A7r \n" +
+						MinecraftTextFormat.ORANGE + "Distant Horizons: Low memory detected." + MinecraftTextFormat.CLEAR_FORMATTING + "\n" +
 						"Stuttering or low FPS may occur. \n" +
 						"Please increase Minecraft's available memory to 4 GB or more. \n" +
 						"This warning can be disabled in DH's config under Advanced -> Logging. \n";
@@ -725,21 +863,20 @@ 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 =
-						// yellow text
+					MinecraftTextFormat.YELLOW + "Distant Horizons: High vanilla render distance detected." + MinecraftTextFormat.CLEAR_FORMATTING + "\n" +
-						"\u00A7e" + "Distant Horizons: High vanilla render distance detected." + "\u00A7r \n" +
 					"Using a high vanilla render distance uses a lot of CPU power \n" +
 					"and doesn't improve graphics much after about 12.\n" +
-						"Lowing your vanilla render distance will give you better FPS\n" +
+					"Lowering your vanilla render distance will give you better FPS\n" +
 					"and reduce stuttering at a similar visual quality.\n" +
-						// gray text		
+					MinecraftTextFormat.GRAY + "A vanilla render distance of 8 is recommended." + MinecraftTextFormat.CLEAR_FORMATTING + "\n" +
-						"\u00A77" + "A vanilla render distance of 8 is recommended." + "\u00A7r \n" +
 					"This message can be disabled in DH's config under Advanced -> Logging.\n";
 				MC_CLIENT.sendChatMessage(message);
 			}
@@ -770,6 +907,8 @@ public class ClientApi
 	 */
 	public void showOverlayMessageNextFrame(String message) { this.overlayMessageQueueForNextFrame.add(message); }
 	
+	//endregion
+	
 	
 	
 }

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.RenderThreadTaskHandler;
 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(() -> 
+		RenderThreadTaskHandler.INSTANCE.queueRunningOnRenderThread("ClientPluginChannelApi onLevelInitMessage", () -> 
 		{
 			IClientLevelWrapper clientLevel = MC.getWrappedClientLevel(true);
 			IServerKeyedClientLevel existingKeyedClientLevel = KEYED_CLIENT_LEVEL_MANAGER.getServerKeyedLevel();

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

@@ -82,15 +82,15 @@ public class ServerApi
 	// level events //
 	//==============//
 	
-	public void serverLevelLoadEvent(IServerLevelWrapper level)
+	public void serverLevelLoadEvent(IServerLevelWrapper levelWrapper)
 	{
-		LOGGER.debug("Server Level " + level + " loading");
+		LOGGER.debug("Server Level " + levelWrapper + " loading");
 		
 		AbstractDhWorld serverWorld = SharedApi.getAbstractDhWorld();
 		if (serverWorld != null)
 		{
-			serverWorld.getOrLoadLevel(level);
+			serverWorld.getOrLoadLevel(levelWrapper);
-			ApiEventInjector.INSTANCE.fireAllEvents(DhApiLevelLoadEvent.class, new DhApiLevelLoadEvent.EventParam(level));
+			ApiEventInjector.INSTANCE.fireAllEvents(DhApiLevelLoadEvent.class, new DhApiLevelLoadEvent.EventParam(levelWrapper));
 		}
 	}
 	public void serverLevelUnloadEvent(IServerLevelWrapper level)
@@ -101,7 +101,6 @@ public class ServerApi
 		if (serverWorld != null)
 		{
 			serverWorld.unloadLevel(level);
-			SharedApi.INSTANCE.clearQueuedChunkUpdates();
 			ApiEventInjector.INSTANCE.fireAllEvents(DhApiLevelUnloadEvent.class, new DhApiLevelUnloadEvent.EventParam(level));
 		}
 	}
@@ -112,8 +111,8 @@ public class ServerApi
 	// chunk modified events //
 	//=======================//
 	
-	public void serverChunkLoadEvent(IChunkWrapper chunkWrapper, ILevelWrapper level) { SharedApi.INSTANCE.applyChunkUpdate(chunkWrapper, level, false, false); }
+	public void serverChunkLoadEvent(IChunkWrapper chunkWrapper, ILevelWrapper level) { SharedApi.INSTANCE.applyChunkUpdate(chunkWrapper, level); }
-	public void serverChunkSaveEvent(IChunkWrapper chunkWrapper, ILevelWrapper level) { SharedApi.INSTANCE.applyChunkUpdate(chunkWrapper, level, true, false); }
+	public void serverChunkSaveEvent(IChunkWrapper chunkWrapper, ILevelWrapper level) { SharedApi.INSTANCE.applyChunkUpdate(chunkWrapper, level); }
 	
 	
 	

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

@@ -24,26 +24,22 @@ import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiWorldUn
 import com.seibel.distanthorizons.core.Initializer;
 import com.seibel.distanthorizons.core.api.internal.chunkUpdating.ChunkUpdateData;
 import com.seibel.distanthorizons.core.api.internal.chunkUpdating.ChunkUpdateQueueManager;
-import com.seibel.distanthorizons.core.config.Config;
+import com.seibel.distanthorizons.core.api.internal.chunkUpdating.WorldChunkUpdateManager;
+import com.seibel.distanthorizons.core.config.eventHandlers.IgnoredDimensionCsvHandler;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
-import com.seibel.distanthorizons.core.generation.DhLightingEngine;
 import com.seibel.distanthorizons.core.level.DhClientLevel;
 import com.seibel.distanthorizons.core.level.IDhLevel;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.logging.f3.F3Screen;
 import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos2D;
 import com.seibel.distanthorizons.core.pos.DhChunkPos;
-import com.seibel.distanthorizons.core.render.renderer.DebugRenderer;
+import com.seibel.distanthorizons.core.render.RenderThreadTaskHandler;
+import com.seibel.distanthorizons.core.render.renderer.AbstractDebugWireframeRenderer;
 import com.seibel.distanthorizons.core.sql.repo.AbstractDhRepo;
-import com.seibel.distanthorizons.core.util.LodUtil;
 import com.seibel.distanthorizons.core.util.objects.Pair;
-import com.seibel.distanthorizons.core.util.threading.PriorityTaskPicker;
 import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
 import com.seibel.distanthorizons.core.world.*;
 import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
 import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector;
@@ -62,44 +58,38 @@ public class SharedApi
 	/** will be null on the server-side */
 	@Nullable
 	private static final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
-	/** will be null on the server-side */
-	@Nullable
-	private static final IMinecraftClientWrapper MC_CLIENT = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
-	private static final IMinecraftSharedWrapper MC_SHARED = SingletonInjector.INSTANCE.get(IMinecraftSharedWrapper.class);
 	
-	public static final ChunkUpdateQueueManager CHUNK_UPDATE_QUEUE_MANAGER = new ChunkUpdateQueueManager();
+	public static final WorldChunkUpdateManager WORLD_CHUNK_UPDATE_MANAGER = WorldChunkUpdateManager.INSTANCE; // local fariable for quick access
-	/** 
-	 * how many chunks can be queued for updating per thread + player (in multiplayer), 
-	 * used to prevent updates from infinitely pilling up if the user flies around extremely fast 
-	 */
-	public static final int MAX_UPDATING_CHUNK_COUNT_PER_THREAD_AND_PLAYER = 1_000;
-	
-	/** how many milliseconds must pass before an overloaded message can be sent in chat or the log */
-	public static final int MIN_MS_BETWEEN_OVERLOADED_LOG_MESSAGE = 30_000;
 	
 	
 	@Nullable
 	private static AbstractDhWorld currentWorld;
-	private static int lastWorldGenTickDelta = 0;
+	private static final Object worldLockObject = new Object();
 	
 	
 	
 	//=============//
 	// constructor //
 	//=============//
+	//region
 	
 	private SharedApi() { }
 	public static void init() { Initializer.init(); }
 	
+	//endregion
+	
 	
 	
 	//===============//
 	// world methods //
 	//===============//
+	//region
 	
 	public static EWorldEnvironment getEnvironment() { return (currentWorld == null) ? null : currentWorld.environment; }
 	
 	public static void setDhWorld(AbstractDhWorld newWorld)
+	{
+		synchronized (worldLockObject)
 		{
 			AbstractDhWorld oldWorld = currentWorld;
 			if (oldWorld != null)
@@ -119,7 +109,10 @@ public class SharedApi
 			else
 			{
 				ThreadPoolUtil.shutdownThreadPools();
-			DebugRenderer.clearRenderables();
+				
+				// delayed get because SharedApi will be created before the singleton has been bound 
+				AbstractDebugWireframeRenderer debugWireframeRenderer = SingletonInjector.INSTANCE.get(AbstractDebugWireframeRenderer.class);
+				debugWireframeRenderer.clearRenderables();
 				
 				if (MC_RENDER != null)
 				{
@@ -129,7 +122,9 @@ public class SharedApi
 				// shouldn't be necessary, but if we missed closing one of the connections this should make sure they're all closed
 				AbstractDhRepo.closeAllConnections();
 				// needs to be closed on world shutdown to clear out un-processed chunks
-			CHUNK_UPDATE_QUEUE_MANAGER.clear();
+				WORLD_CHUNK_UPDATE_MANAGER.clear();
+				
+				RenderThreadTaskHandler.INSTANCE.clearDebugStats();
 				
 				// recommend that the garbage collector cleans up any objects from the old world and thread pools
 				System.gc();
@@ -140,6 +135,7 @@ public class SharedApi
 				DhApiWorldProxy.INSTANCE.setReadOnly(false, false);
 			}
 		}
+	}
 	
 	@Nullable
 	public static AbstractDhWorld getAbstractDhWorld() { return currentWorld; }
@@ -152,44 +148,48 @@ public class SharedApi
 	@Nullable
 	public static IDhServerWorld tryGetDhServerWorld() { return (currentWorld instanceof IDhServerWorld) ? (IDhServerWorld) currentWorld : null; }
 	
+	//endregion
+	
 	
 	
 	//==============//
 	// chunk update //
 	//==============//
+	//region
 	
 	/** 
 	 * Used to prevent getting a full chunk from MC if it isn't necessary. <br>
 	 * This is important since asking MC for a chunk is slow and may block the render thread.
 	 */
-	public static boolean isChunkAtBlockPosAlreadyUpdating(int blockPosX, int blockPosZ)
+	public static boolean isChunkAtBlockPosAlreadyUpdating(ILevelWrapper levelWrapper, int blockPosX, int blockPosZ)
-	{ return CHUNK_UPDATE_QUEUE_MANAGER.contains(new DhChunkPos(new DhBlockPos2D(blockPosX, blockPosZ))); }
-	
-	public static boolean isChunkAtChunkPosAlreadyUpdating(int chunkPosX, int chunkPosZ)
-	{ return CHUNK_UPDATE_QUEUE_MANAGER.contains(new DhChunkPos(chunkPosX, chunkPosZ)); }
-	
-	/** 
-	 * This is often fired when unloading a level.
-	 * This is done to prevent overloading the system when
-	 * rapidly changing dimensions.
-	 * (IE prevent DH from infinitely allocating memory 
-	 */
-	public void clearQueuedChunkUpdates() { CHUNK_UPDATE_QUEUE_MANAGER.clear(); }
-	
-	public int getQueuedChunkUpdateCount() { return CHUNK_UPDATE_QUEUE_MANAGER.getQueuedCount(); }
-	
-	
-	
-	/** handles both block place and break events */
-	public void chunkBlockChangedEvent(IChunkWrapper chunk, ILevelWrapper level) { this.applyChunkUpdate(chunk, level, true, false); }
-	public void chunkLoadEvent(IChunkWrapper chunk, ILevelWrapper level) { this.applyChunkUpdate(chunk, level, true, true); }
-	
-	//public void applyChunkUpdate(IChunkWrapper chunkWrapper, ILevelWrapper level, boolean canGetNeighboringChunks) { this.applyChunkUpdate(chunkWrapper, level, canGetNeighboringChunks, false); }
-	public void applyChunkUpdate(IChunkWrapper chunkWrapper, ILevelWrapper level, boolean canGetNeighboringChunks, boolean newlyLoaded)
 	{
-		//========================//
+		ChunkUpdateQueueManager manager = WORLD_CHUNK_UPDATE_MANAGER.getByLevelWrapper(levelWrapper);
-		// world and level checks //
+		if (manager == null)
-		//========================//
+		{
+			return true;
+		}
+		
+		return manager.contains(new DhChunkPos(new DhBlockPos2D(blockPosX, blockPosZ))); 
+	}
+	
+	public static boolean isChunkAtChunkPosAlreadyUpdating(ILevelWrapper levelWrapper, int chunkPosX, int chunkPosZ)
+	{
+		ChunkUpdateQueueManager manager = WORLD_CHUNK_UPDATE_MANAGER.getByLevelWrapper(levelWrapper);
+		if (manager == null)
+		{
+			return true;
+		}
+		
+		return manager.contains(new DhChunkPos(chunkPosX, chunkPosZ)); 
+	}
+	
+	
+	
+	public void applyChunkUpdate(IChunkWrapper chunkWrapper, ILevelWrapper levelWrapper)
+	{
+		//===================//
+		// validation checks //
+		//===================//
 		
 		if (chunkWrapper == null)
 		{
@@ -200,12 +200,12 @@ public class SharedApi
 		AbstractDhWorld dhWorld = SharedApi.getAbstractDhWorld();
 		if (dhWorld == null)
 		{
-			if (level instanceof IClientLevelWrapper)
+			if (levelWrapper instanceof IClientLevelWrapper)
 			{
 				// If the client world isn't loaded yet, keep track of which chunks were loaded so we can use them later.
 				// This may happen if the client world and client level load events happen out of order
-				IClientLevelWrapper clientLevel = (IClientLevelWrapper) level;
+				IClientLevelWrapper clientLevel = (IClientLevelWrapper) levelWrapper;
-				ClientApi.INSTANCE.waitingChunkByClientLevelAndPos.replace(new Pair<>(clientLevel, chunkWrapper.getChunkPos()), chunkWrapper);
+				ClientApi.INSTANCE.waitingChunkByClientLevelAndPos.put(new Pair<>(clientLevel, chunkWrapper.getChunkPos()), chunkWrapper);
 			}
 			
 			return;
@@ -217,21 +217,21 @@ public class SharedApi
 			return;
 		}
 		
-		
 		// only continue if the level is loaded
-		IDhLevel dhLevel = dhWorld.getLevel(level);
+		IDhLevel dhLevel = dhWorld.getLevel(levelWrapper);
 		if (dhLevel == null)
 		{
-			if (level instanceof IClientLevelWrapper)
+			if (levelWrapper instanceof IClientLevelWrapper)
 			{
 				// the client level isn't loaded yet
-				IClientLevelWrapper clientLevel = (IClientLevelWrapper) level;
+				IClientLevelWrapper clientLevel = (IClientLevelWrapper) levelWrapper;
-				ClientApi.INSTANCE.waitingChunkByClientLevelAndPos.replace(new Pair<>(clientLevel, chunkWrapper.getChunkPos()), chunkWrapper);
+				ClientApi.INSTANCE.waitingChunkByClientLevelAndPos.put(new Pair<>(clientLevel, chunkWrapper.getChunkPos()), chunkWrapper);
 			}
 			
 			return;
 		}
 		
+		// ignore chunk updates if the network should handle them
 		if (dhLevel instanceof DhClientLevel)
 		{
 			if (!((DhClientLevel) dhLevel).shouldProcessChunkUpdate(chunkWrapper.getChunkPos()))
@@ -240,292 +240,67 @@ public class SharedApi
 			}
 		}
 		
-		// shoudln't normally happen, but just in case
+		// ignore chunk updates for non-rendered levels
-		if (CHUNK_UPDATE_QUEUE_MANAGER.contains(chunkWrapper.getChunkPos()))
+		String dimName = dhLevel.getLevelWrapper().getDimensionName();
-		{
+		if (IgnoredDimensionCsvHandler.INSTANCE.dimensionNameShouldBeIgnored(dimName))
-			// TODO this will prevent some LODs from updating across dimensions if multiple levels are loaded
-			return;
-		}
-		
-		
-		
-		//===============================//
-		// update the necessary chunk(s) //
-		//===============================//
-		
-		if (!canGetNeighboringChunks)
-		{
-			// only update the center chunk
-			queueChunkUpdate(chunkWrapper, null, dhLevel, false);
-			return;
-		}
-		
-		
-		ArrayList<IChunkWrapper> neighboringChunkList = getNeighborChunkListForChunk(chunkWrapper, dhLevel);
-		
-		if (newlyLoaded)
-		{
-			// this means this chunkWrapper is a newly loaded chunk 
-			// which may be missing some neighboring chunk data
-			// because it is bordering the render distance
-			// thus, only the chunks neighboring this chunkWrapper will get updated
-			// because those are more likely to have their full neighboring chunk data
-			//TODO this does not prevent those neighboring chunks from updating
-			// this newly loaded chunk that were just skipped
-			// leading to occasional lighting issues
-			for (IChunkWrapper neighboringChunk : neighboringChunkList)
-			{
-				if (neighboringChunk == chunkWrapper)
-				{
-					continue;
-				}
-				
-				this.applyChunkUpdate(neighboringChunk, level, true, false);
-			}
-		}
-		else
-		{
-			// if not all neighboring chunk data is available, do not try to update
-			if (neighboringChunkList.size() < 9)
 		{
 			return;
 		}
 		
-			// update the center with any existing neighbour chunks. 
+		ChunkUpdateQueueManager chunkManager = WORLD_CHUNK_UPDATE_MANAGER.getByLevelWrapper(levelWrapper);
-			// this is done so lighting changes are propagated correctly
+		// ignore the wrong level wrapper type or
-			queueChunkUpdate(chunkWrapper, neighboringChunkList, dhLevel, true);
+		// if the chunk is already queued for handling
-		}
+		if (chunkManager == null 
-	}
+			|| chunkManager.contains(chunkWrapper.getChunkPos()))
-	private static ArrayList<IChunkWrapper> getNeighborChunkListForChunk(IChunkWrapper chunkWrapper, IDhLevel dhLevel)
 		{
-		// get the neighboring chunk list
+			return;
-		ArrayList<IChunkWrapper> neighborChunkList = new ArrayList<>(9);
-		for (int xOffset = -1; xOffset <= 1; xOffset++)
-		{
-			for (int zOffset = -1; zOffset <= 1; zOffset++)
-			{
-				if (xOffset == 0 && zOffset == 0)
-				{
-					// center chunk
-					neighborChunkList.add(chunkWrapper);
-				}
-				else
-				{
-					// neighboring chunk 
-					DhChunkPos neighborPos = new DhChunkPos(chunkWrapper.getChunkPos().getX() + xOffset, chunkWrapper.getChunkPos().getZ() + zOffset);
-					IChunkWrapper neighborChunk = dhLevel.getLevelWrapper().tryGetChunk(neighborPos);
-					if (neighborChunk != null)
-					{
-						neighborChunkList.add(neighborChunk);
-					}
-				}
-			}
-		}
-		return neighborChunkList;
 		}
 		
-	private static void queueChunkUpdate(IChunkWrapper chunkWrapper, @Nullable ArrayList<IChunkWrapper> neighborChunkList, IDhLevel dhLevel, boolean canGetNeighboringChunks)
-	{
 		
+		queueChunkUpdate(chunkManager, chunkWrapper, dhLevel);
+	}
+	
+	private static void queueChunkUpdate(ChunkUpdateQueueManager chunkManager, IChunkWrapper chunkWrapper, IDhLevel dhLevel)
+	{
 		// return if the chunk is already queued
-		if (CHUNK_UPDATE_QUEUE_MANAGER.contains(chunkWrapper.getChunkPos()))
+		if (chunkManager.contains(chunkWrapper.getChunkPos()))
 		{
 			return;
 		}
 		
 		
 		// add chunk update data to preUpdate queue
-		ChunkUpdateData updateData = new ChunkUpdateData(chunkWrapper, neighborChunkList, dhLevel, canGetNeighboringChunks);
+		ChunkUpdateData updateData = new ChunkUpdateData(chunkWrapper, dhLevel);
-		CHUNK_UPDATE_QUEUE_MANAGER.addItemToPreUpdateQueue(chunkWrapper.getChunkPos(), updateData);
+		chunkManager.addItemToPreUpdateQueue(chunkWrapper.getChunkPos(), updateData);
 		
 		
-		// queue updates up to the number of CPU cores allocated for the job
-		// (this prevents doing extra work queuing tasks that may not be necessary)
-		// and makes sure the chunks closest to the player are updated first
-		PriorityTaskPicker.Executor executor = ThreadPoolUtil.getChunkToLodBuilderExecutor();
-		if (executor != null && executor.getQueueSize() < executor.getPoolSize())
-		{
-			try
-			{
-				executor.execute(SharedApi::processQueue);
-			}
-			catch (RejectedExecutionException ignore)
-			{
-				// the executor was shut down, it should be back up shortly and able to accept new jobs
-			}
-		}
-	}
-	
-	private static void processQueue()
-	{
-		// update the center & max size of the queue manager
-		int maxUpdateSizeMultiplier;
-		if (MC_CLIENT != null && MC_CLIENT.playerExists())
-		{
-			// Local worlds & multiplayer
-			CHUNK_UPDATE_QUEUE_MANAGER.setCenter(MC_CLIENT.getPlayerChunkPos());
-			maxUpdateSizeMultiplier = MC_CLIENT.clientConnectedToDedicatedServer() ? 1 : MC_SHARED.getPlayerCount();
-		}
-		else
-		{
-			// Dedicated servers
-			// Also includes spawn chunks since they're likely to be intentionally utilized with updates
-			maxUpdateSizeMultiplier = 1 + MC_SHARED.getPlayerCount();
-		}
-		
-		CHUNK_UPDATE_QUEUE_MANAGER.maxSize = MAX_UPDATING_CHUNK_COUNT_PER_THREAD_AND_PLAYER
-				* Config.Common.MultiThreading.numberOfThreads.get()
-				* maxUpdateSizeMultiplier;
-		
-		
-		
-		//===============================//
-		// update the necessary chunk(s) //
-		//===============================//
-		
-		// process preUpdate queue
-		processQueuedChunkPreUpdate();
-		
-		// process update queue
-		processQueuedChunkUpdate();
-		
 		// queue the next position if there are still positions to process
 		AbstractExecutorService executor = ThreadPoolUtil.getChunkToLodBuilderExecutor();
-		if (executor != null && !CHUNK_UPDATE_QUEUE_MANAGER.isEmpty())
+		if (executor != null)
 		{
 			try
 			{
-				executor.execute(SharedApi::processQueue);
+				executor.execute(WORLD_CHUNK_UPDATE_MANAGER::processEachQueue);
 			}
 			catch (RejectedExecutionException ignore)
 			{
 				// the executor was shut down, it should be back up shortly and able to accept new jobs
 			}
 		}
-		
 	}
 	
-	private static void processQueuedChunkPreUpdate()
+	//endregion
-	{
-		ChunkUpdateData preUpdateData = CHUNK_UPDATE_QUEUE_MANAGER.preUpdateQueue.popClosest();
-		if (preUpdateData == null)
-		{
-			return;
-		}
-		
-		IDhLevel dhLevel = preUpdateData.dhLevel;
-		IChunkWrapper chunkWrapper = preUpdateData.chunkWrapper;
-		boolean canGetNeighboringChunks = preUpdateData.canGetNeighboringChunks;
-		ArrayList<IChunkWrapper> neighborChunkList = preUpdateData.neighborChunkList;
-		
-		try
-		{
-			// check if this chunk has been converted into an LOD already
-			boolean checkChunkHash = !Config.Common.LodBuilding.disableUnchangedChunkCheck.get();
-			if (checkChunkHash)
-			{
-				int oldChunkHash = dhLevel.getChunkHash(chunkWrapper.getChunkPos()); // shouldn't happen on the render thread since it may take a few moments to run
-				int newChunkHash = chunkWrapper.getBlockBiomeHashCode();
-				
-				boolean hasNewChunkHash = (oldChunkHash != newChunkHash);
-				if (!hasNewChunkHash)
-				{
-					// do not update the chunk if the hash is the same
-					return;
-				}
-				
-				// if this chunk will update and can get neighbors
-				// then queue neighboring chunks to update as well
-				// neighboring chunk will get added directly to the update queue
-				// so they won't queue further chunk updates
-				if (neighborChunkList != null 
-					&& !neighborChunkList.isEmpty())
-				{
-					for (IChunkWrapper adjacentChunk : neighborChunkList)
-					{
-						// pulling a new chunkWrapper is necessary to prevent concurrent modification on the existing chunkWrappers
-						IChunkWrapper newCenterChunk = dhLevel.getLevelWrapper().tryGetChunk(adjacentChunk.getChunkPos());
-						if (newCenterChunk != null)
-						{
-							ChunkUpdateData newUpdateData;
-							if (canGetNeighboringChunks)
-							{
-								newUpdateData = new ChunkUpdateData(newCenterChunk, getNeighborChunkListForChunk(newCenterChunk, dhLevel), dhLevel, true);
-							}
-							else
-							{
-								newUpdateData = new ChunkUpdateData(newCenterChunk, null, dhLevel, false);
-							}
-							
-							CHUNK_UPDATE_QUEUE_MANAGER.addItemToUpdateQueue(newCenterChunk.getChunkPos(), newUpdateData);
-						}
-					}
-				}
-			}
-			
-			CHUNK_UPDATE_QUEUE_MANAGER.addItemToUpdateQueue(chunkWrapper.getChunkPos(), preUpdateData);
-		}
-		catch (Exception e)
-		{
-			LOGGER.error("Unexpected error when pre-updating chunk at pos: [" + chunkWrapper.getChunkPos() + "]", e);
-		}
-	}
-	
-	private static void processQueuedChunkUpdate()
-	{
-		//LOGGER.trace(chunkWrapper.getChunkPos() + " " + executor.getActiveCount() + " / " + executor.getQueue().size() + " - " + executor.getCompletedTaskCount());
-		
-		ChunkUpdateData updateData = CHUNK_UPDATE_QUEUE_MANAGER.updateQueue.popClosest();
-		if (updateData == null)
-		{
-			return;
-		}
-		
-		IChunkWrapper chunkWrapper = updateData.chunkWrapper;
-		IDhLevel dhLevel = updateData.dhLevel;
-		ILevelWrapper levelWrapper = dhLevel.getLevelWrapper();
-		// having a list of the nearby chunks is needed for lighting and beacon generation
-		@Nullable ArrayList<IChunkWrapper> nearbyChunkList = updateData.neighborChunkList; 
-		
-		// a non-null list is needed for the lighting engine
-		if (nearbyChunkList == null)
-		{
-			nearbyChunkList = new ArrayList<IChunkWrapper>();
-			nearbyChunkList.add(chunkWrapper);
-		}
-		
-		try
-		{
-			// sky lighting is populated later at the data source level
-			DhLightingEngine.INSTANCE.bakeChunkBlockLighting(chunkWrapper, nearbyChunkList, levelWrapper.hasSkyLight() ? LodUtil.MAX_MC_LIGHT : LodUtil.MIN_MC_LIGHT);
-			
-			dhLevel.updateBeaconBeamsForChunk(chunkWrapper, nearbyChunkList);
-			
-			int newChunkHash = chunkWrapper.getBlockBiomeHashCode();
-			dhLevel.updateChunkAsync(chunkWrapper, newChunkHash);
-		}
-		catch (Exception e)
-		{
-			LOGGER.error("Unexpected error when updating chunk at pos: [" + chunkWrapper.getChunkPos() + "]", e);
-		}
-	}
 	
 	
 	
 	//=========//
 	// F3 Menu //
 	//=========//
+	//region
 	
-	public String getDebugMenuString()
+	public ArrayList<String> getDebugMenuString() { return WORLD_CHUNK_UPDATE_MANAGER.getDebugMenuString(); }
-	{
-		String preUpdatingCountStr = F3Screen.NUMBER_FORMAT.format(CHUNK_UPDATE_QUEUE_MANAGER.preUpdateQueue.getQueuedCount());
-		String updatingCountStr = F3Screen.NUMBER_FORMAT.format(CHUNK_UPDATE_QUEUE_MANAGER.updateQueue.getQueuedCount());
-		String queuedCountStr = F3Screen.NUMBER_FORMAT.format(CHUNK_UPDATE_QUEUE_MANAGER.getQueuedCount());
 	
-		String maxUpdateCountStr = F3Screen.NUMBER_FORMAT.format(CHUNK_UPDATE_QUEUE_MANAGER.maxSize);
+	//endregion
-		
-		return "Queued chunk updates: "+"( "+preUpdatingCountStr+" + "+updatingCountStr+" )  [ "+queuedCountStr+" / "+maxUpdateCountStr+" ]";
-	}
 	
 	
 	

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

@@ -2,6 +2,7 @@ package com.seibel.distanthorizons.core.api.internal.chunkUpdating;
 
 import com.seibel.distanthorizons.core.api.internal.SharedApi;
 import com.seibel.distanthorizons.core.pos.DhChunkPos;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.Comparator;
 import java.util.concurrent.ConcurrentHashMap;
@@ -105,6 +106,7 @@ public class ChunkPosQueue
 		this.furthestQueue.remove(closest);
 		return this.updateDataByChunkPos.remove(closest);
 	}
+	@Nullable
 	public ChunkUpdateData popFurthest()
 	{
 		if (this.furthestQueue.isEmpty())

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

@@ -9,18 +9,13 @@ import java.util.ArrayList;
 public class ChunkUpdateData
 {
 	public IChunkWrapper chunkWrapper;
-	@Nullable
-	public ArrayList<IChunkWrapper> neighborChunkList;
 	public IDhLevel dhLevel;
-	public boolean canGetNeighboringChunks;
 	
 	
 	
-	public ChunkUpdateData(IChunkWrapper chunkWrapper, @Nullable ArrayList<IChunkWrapper> neighborChunkList, IDhLevel dhLevel, boolean canGetNeighborChunks)
+	public ChunkUpdateData(IChunkWrapper chunkWrapper, IDhLevel dhLevel)
 	{
 		this.chunkWrapper = chunkWrapper;
-		this.neighborChunkList = neighborChunkList;
 		this.dhLevel = dhLevel;
-		this.canGetNeighboringChunks = canGetNeighborChunks;
 	}
 }

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

@@ -1,35 +1,79 @@
 package com.seibel.distanthorizons.core.api.internal.chunkUpdating;
 
+import com.google.common.cache.CacheBuilder;
 import com.seibel.distanthorizons.core.api.internal.ClientApi;
 import com.seibel.distanthorizons.core.api.internal.SharedApi;
 import com.seibel.distanthorizons.core.config.Config;
+import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
+import com.seibel.distanthorizons.core.enums.MinecraftTextFormat;
+import com.seibel.distanthorizons.core.generation.DhLightingEngine;
+import com.seibel.distanthorizons.core.level.IDhLevel;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.logging.f3.F3Screen;
 import com.seibel.distanthorizons.core.pos.DhChunkPos;
+import com.seibel.distanthorizons.core.util.LodUtil;
+import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
 import com.seibel.distanthorizons.core.world.EWorldEnvironment;
 import com.seibel.distanthorizons.core.logging.DhLogger;
+import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
+import org.jetbrains.annotations.Nullable;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.*;
 
+
+/**
+ * @see WorldChunkUpdateManager
+ */
 public class ChunkUpdateQueueManager
 {
 	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
+	private static final IMinecraftClientWrapper MC_CLIENT = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
+	private static final IMinecraftSharedWrapper MC_SHARED = SingletonInjector.INSTANCE.get(IMinecraftSharedWrapper.class);
+	
+	/**
+	 * how many chunks can be queued for updating per thread + player (in multiplayer), 
+	 * used to prevent updates from infinitely pilling up if the user flies around extremely fast 
+	 */
+	public static final int MAX_UPDATING_CHUNK_COUNT_PER_THREAD_AND_PLAYER = 1_000;
+	
+	/** how many milliseconds must pass before an overloaded message can be sent in chat or the log */
+	public static final int MIN_MS_BETWEEN_OVERLOADED_LOG_MESSAGE = 30_000;
+	
+	
+	
+	private final Set<DhChunkPos> ignoredChunkPosSet = Collections.newSetFromMap(new ConcurrentHashMap<>());
+	private static long lastOverloadedLogMessageMsTime = 0;
+	
+	
+	
 	
 	public final ChunkPosQueue updateQueue;
 	public final ChunkPosQueue preUpdateQueue;
-	public final Set<DhChunkPos> ignoredChunkPosSet = Collections.newSetFromMap(new ConcurrentHashMap<>());
 	
+	public final ConcurrentMap<DhChunkPos, IChunkWrapper> queuedChunkWrapperByChunkPos = CacheBuilder.newBuilder()
+		.expireAfterWrite(20, TimeUnit.SECONDS)
+		.<DhChunkPos, IChunkWrapper>build()
+		.asMap();
+	
+	/** dynamically changes based on the number of threads currently available */
 	public int maxSize = 500;
 	
-	private static long lastOverloadedLogMessageMsTime = 0;
+	/** used to prevent flickering */
+	public long lastMsTimeShownActiveInF3Screen = System.currentTimeMillis();
 	
 	
 	
 	//=============//
 	// constructor //
 	//=============//
+	//region
 	
 	public ChunkUpdateQueueManager()
 	{
@@ -37,11 +81,14 @@ public class ChunkUpdateQueueManager
 		this.preUpdateQueue = new ChunkPosQueue();
 	}
 	
+	//endregion
+	
 	
 	
 	//==================//
 	// list/set methods //
 	//==================//
+	//region
 	
 	public boolean contains(DhChunkPos pos) 
 	{ 
@@ -57,7 +104,8 @@ public class ChunkUpdateQueueManager
 		this.ignoredChunkPosSet.clear();
 	}
 	public int getQueuedCount() { return this.updateQueue.getQueuedCount() + this.preUpdateQueue.getQueuedCount(); }
-	public boolean isEmpty()
+	
+	public boolean updateQueuesEmpty()
 	{
 		return this.updateQueue.isEmpty()
 				&& this.preUpdateQueue.isEmpty();
@@ -68,41 +116,27 @@ public class ChunkUpdateQueueManager
 	 * If there are no more slots, replaces the item furthest from the center in the update queue.
 	 */
 	public void addItemToPreUpdateQueue(DhChunkPos pos, ChunkUpdateData updateData)
-	{
+	{ this.addItemToQueue(pos, updateData, this.preUpdateQueue); }
-		int remainingSlots = this.maxSize - this.getQueuedCount();
-		
-		// If no slots are left, get one by removing the item furthest from the center
-		if (remainingSlots <= 0)
-		{
-			if (!this.updateQueue.isEmpty())
-			{
-				this.updateQueue.popFurthest();
-			}
-			else
-			{
-				this.preUpdateQueue.popFurthest();
-			}
-		}
-		this.preUpdateQueue.addItem(pos, updateData);
-		
-		remainingSlots = this.maxSize - this.getQueuedCount();
-		if (remainingSlots <= 0)
-		{
-			this.sendOverloadMessage();
-		}
-	}
 	
 	public void addItemToUpdateQueue(DhChunkPos pos, ChunkUpdateData updateData)
+	{ this.addItemToQueue(pos, updateData, this.updateQueue); }
+	
+	private void addItemToQueue(DhChunkPos pos, ChunkUpdateData updateData, ChunkPosQueue queue)
 	{
 		int remainingSlots = this.maxSize - this.getQueuedCount();
 		
 		// If no slots are left, get one by removing the item furthest from the center
 		if (remainingSlots <= 0)
 		{
-			this.updateQueue.popFurthest();
+			ChunkUpdateData removedData = queue.popFurthest();
+			if (removedData != null)
+			{
+				this.queuedChunkWrapperByChunkPos.remove(removedData.chunkWrapper.getChunkPos());
+			}
 		}
 		
-		this.updateQueue.addItem(pos,updateData);
+		queue.addItem(pos,updateData);
+		this.queuedChunkWrapperByChunkPos.putIfAbsent(pos, updateData.chunkWrapper);
 		
 		remainingSlots = this.maxSize - this.getQueuedCount();
 		if (remainingSlots <= 0)
@@ -111,18 +145,19 @@ public class ChunkUpdateQueueManager
 		}
 	}
 	
+	
 	private void sendOverloadMessage()
 	{
 		// limit how often an overloaded message can be sent
 		long msBetweenLastLog = System.currentTimeMillis() - lastOverloadedLogMessageMsTime;
-		if (msBetweenLastLog >= SharedApi.MIN_MS_BETWEEN_OVERLOADED_LOG_MESSAGE)
+		if (msBetweenLastLog >= MIN_MS_BETWEEN_OVERLOADED_LOG_MESSAGE)
 		{
 			lastOverloadedLogMessageMsTime = System.currentTimeMillis();
 			
-			String message = "\u00A76" + "Distant Horizons overloaded, too many chunks queued for LOD processing. " + "\u00A7r" +
+			String message = MinecraftTextFormat.ORANGE + "Distant Horizons overloaded, too many chunks queued for LOD processing. " + MinecraftTextFormat.CLEAR_FORMATTING +
 					"\nThis may result in holes in your LODs. " +
 					"\nFix: move through the world slower, decrease your vanilla render distance, slow down your world pre-generator (IE Chunky), or increase the Distant Horizons' CPU thread counts. " +
-					"\nMax queue count [" + SharedApi.CHUNK_UPDATE_QUEUE_MANAGER.maxSize + "] ([" + SharedApi.MAX_UPDATING_CHUNK_COUNT_PER_THREAD_AND_PLAYER + "] per thread+players).";
+					"\nMax queue count [" + this.maxSize + "] ([" + MAX_UPDATING_CHUNK_COUNT_PER_THREAD_AND_PLAYER + "] per thread+players).";
 			
 			boolean showWarningInChat = Config.Common.Logging.Warning.showUpdateQueueOverloadedChatWarning.get();
 			if (showWarningInChat)
@@ -140,20 +175,200 @@ public class ChunkUpdateQueueManager
 		}
 	}
 	
+	/** 
+	 * Tries to return a cloned chunk wrapper from memory.
+	 * Returns null if no chunk is available.
+	 * <br><br>
+	 * This is done instead of accessing the MC level since
+	 * accessing the level often requires running on the render or server
+	 * thread, which causes stuttering.
+	 */
+	@Nullable
+	public IChunkWrapper tryGetChunk(DhChunkPos pos)
+	{
+		IChunkWrapper existingWrapper = this.queuedChunkWrapperByChunkPos.get(pos);
+		if (existingWrapper == null)
+		{
+			return null;
+		}
+	
+		return existingWrapper.copy();
+	}
+	
+	//endregion
+	
 	
 	
 	//=========//
 	// ignores //
 	//=========//
+	//region
 	
 	public void addPosToIgnore(DhChunkPos chunkPos) { this.ignoredChunkPosSet.add(chunkPos); }
 	public void removePosToIgnore(DhChunkPos chunkPos) { this.ignoredChunkPosSet.remove(chunkPos); }
 	
+	//endregion
+	
+	
+	
+	//===================//
+	// update processing //
+	//===================//
+	//region
+	
+	public void processQueue()
+	{
+		// update the center & max size of the queue manager
+		int maxUpdateSizeMultiplier;
+		if (MC_CLIENT != null && MC_CLIENT.playerExists())
+		{
+			// Local worlds & multiplayer
+			this.setCenter(MC_CLIENT.getPlayerChunkPos());
+			maxUpdateSizeMultiplier = MC_CLIENT.clientConnectedToDedicatedServer() ? 1 : MC_SHARED.getPlayerCount();
+		}
+		else
+		{
+			// Dedicated servers
+			// Also includes spawn chunks since they're likely to be intentionally utilized with updates
+			maxUpdateSizeMultiplier = 1 + MC_SHARED.getPlayerCount();
+		}
+		
+		this.maxSize = MAX_UPDATING_CHUNK_COUNT_PER_THREAD_AND_PLAYER
+			* Config.Common.MultiThreading.numberOfThreads.get()
+			* maxUpdateSizeMultiplier;
+		
+		
+		
+		//===============================//
+		// update the necessary chunk(s) //
+		//===============================//
+		
+		this.processQueuedChunkPreUpdate();
+		this.processQueuedChunkUpdate();
+		
+		// queue the next position if there are still positions to process
+		AbstractExecutorService executor = ThreadPoolUtil.getChunkToLodBuilderExecutor();
+		if (executor != null && !this.updateQueuesEmpty())
+		{
+			try
+			{
+				executor.execute(this::processQueue);
+			}
+			catch (RejectedExecutionException ignore)
+			{
+				// the executor was shut down, it should be back up shortly and able to accept new jobs
+			}
+		}
+		
+	}
+	
+	private void processQueuedChunkPreUpdate()
+	{
+		ChunkUpdateData preUpdateData = this.preUpdateQueue.popClosest();
+		if (preUpdateData == null)
+		{
+			return;
+		}
+		
+		IDhLevel dhLevel = preUpdateData.dhLevel;
+		IChunkWrapper chunkWrapper = preUpdateData.chunkWrapper;
+		chunkWrapper.createDhHeightMaps();
+		
+		try
+		{
+			// check if this chunk has been converted into an LOD already
+			boolean checkChunkHash = !Config.Common.LodBuilding.disableUnchangedChunkCheck.get();
+			if (checkChunkHash)
+			{
+				int oldChunkHash = dhLevel.getChunkHash(chunkWrapper.getChunkPos()); // shouldn't happen on the render thread since it may take a few moments to run
+				int newChunkHash = chunkWrapper.getBlockBiomeHashCode();
+				
+				boolean hasNewChunkHash = (oldChunkHash != newChunkHash);
+				if (!hasNewChunkHash)
+				{
+					// do not update the chunk if the hash is the same
+					return;
+				}
+			}
+			
+			this.addItemToUpdateQueue(chunkWrapper.getChunkPos(), preUpdateData);
+		}
+		catch (Exception e)
+		{
+			LOGGER.error("Unexpected error when pre-updating chunk at pos: [" + chunkWrapper.getChunkPos() + "]", e);
+		}
+	}
+	
+	private void processQueuedChunkUpdate()
+	{
+		ChunkUpdateData updateData = this.updateQueue.popClosest();
+		if (updateData == null)
+		{
+			return;
+		}
+		
+		IChunkWrapper chunkWrapper = updateData.chunkWrapper;
+		IDhLevel dhLevel = updateData.dhLevel;
+		ILevelWrapper levelWrapper = dhLevel.getLevelWrapper();
+		
+		// having a list of the nearby chunks is needed for lighting and beacon generation
+		ArrayList<IChunkWrapper> nearbyChunkList  = this.tryGetNeighborChunkListForChunk(chunkWrapper);
+		
+		
+		
+		try
+		{
+			// sky lighting is populated later at the data source level
+			DhLightingEngine.INSTANCE.bakeChunkBlockLighting(chunkWrapper, nearbyChunkList, levelWrapper.hasSkyLight() ? LodUtil.MAX_MC_LIGHT : LodUtil.MIN_MC_LIGHT);
+			
+			dhLevel.updateBeaconBeamsForChunk(chunkWrapper, nearbyChunkList);
+			
+			int newChunkHash = chunkWrapper.getBlockBiomeHashCode();
+			dhLevel.updateChunkAsync(chunkWrapper, newChunkHash);
+		}
+		catch (Exception e)
+		{
+			LOGGER.error("Unexpected error when updating chunk at pos: [" + chunkWrapper.getChunkPos() + "]", e);
+		}
+		
+		this.queuedChunkWrapperByChunkPos.remove(updateData.chunkWrapper.getChunkPos());
+	}
+	private ArrayList<IChunkWrapper> tryGetNeighborChunkListForChunk(IChunkWrapper chunkWrapper)
+	{
+		// get the neighboring chunk list
+		ArrayList<IChunkWrapper> neighborChunkList = new ArrayList<>(9);
+		for (int xOffset = -1; xOffset <= 1; xOffset++)
+		{
+			for (int zOffset = -1; zOffset <= 1; zOffset++)
+			{
+				if (xOffset == 0 && zOffset == 0)
+				{
+					// center chunk
+					neighborChunkList.add(chunkWrapper);
+				}
+				else
+				{
+					// neighboring chunk 
+					DhChunkPos neighborPos = new DhChunkPos(chunkWrapper.getChunkPos().getX() + xOffset, chunkWrapper.getChunkPos().getZ() + zOffset);
+					IChunkWrapper neighborChunk = this.tryGetChunk(neighborPos);
+					if (neighborChunk != null)
+					{
+						neighborChunkList.add(neighborChunk);
+					}
+				}
+			}
+		}
+		return neighborChunkList;
+	}
+	
+	//endregion
+	
 	
 	
 	//==================//
 	// position methods //
 	//==================//
+	//region
 	
 	public void setCenter(DhChunkPos newCenter)
 	{
@@ -161,5 +376,33 @@ public class ChunkUpdateQueueManager
 		this.preUpdateQueue.setCenter(newCenter);
 	}
 	
+	//endregion
+	
+	
+	
+	//=========//
+	// F3 Menu //
+	//=========//
+	//region
+	
+	public String getDebugMenuString()
+	{
+		String y = MinecraftTextFormat.YELLOW;
+		String o = MinecraftTextFormat.ORANGE;
+		String cf = MinecraftTextFormat.CLEAR_FORMATTING;
+		
+		
+		String preUpdatingCountStr = F3Screen.NUMBER_FORMAT.format(this.preUpdateQueue.getQueuedCount());
+		String updatingCountStr = F3Screen.NUMBER_FORMAT.format(this.updateQueue.getQueuedCount());
+		String queuedCountStr = F3Screen.NUMBER_FORMAT.format(this.getQueuedCount());
+		
+		String maxUpdateCountStr = F3Screen.NUMBER_FORMAT.format(this.maxSize);
+		
+		return "Queued chunk updates: "+"("+y+preUpdatingCountStr+cf+" + "+o+updatingCountStr+cf+") ["+queuedCountStr+"/"+maxUpdateCountStr+"]";
+	}
+	
+	//endregion
+	
+	
 	
 }

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

@@ -0,0 +1,190 @@
+package com.seibel.distanthorizons.core.api.internal.chunkUpdating;
+
+import com.seibel.distanthorizons.core.api.internal.SharedApi;
+import com.seibel.distanthorizons.core.logging.DhLogger;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.world.AbstractDhWorld;
+import com.seibel.distanthorizons.core.world.EWorldEnvironment;
+import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicInteger;
+
+/**
+ * Holds all the {@link ChunkUpdateQueueManager} for a loaded world.
+ * Different queues are needed for each level to prevent
+ * chunks from bleeding between levels (IE a nether chunk applied to the overworld).
+ * 
+ * @see ChunkUpdateQueueManager
+ */
+public class WorldChunkUpdateManager
+{
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	
+	/** singleton since we only expect to have one world loaded at a time */
+	public static final WorldChunkUpdateManager INSTANCE = new WorldChunkUpdateManager();
+	
+	public static final Set<String> LOGGED_GET_ERROR_MESSAGES = Collections.newSetFromMap(new ConcurrentHashMap<String, Boolean>());
+	
+	
+	/** 
+	 * Queues are only removed during world shutdown.
+	 * The assumption is that there will be a limited number of {@link ILevelWrapper}'s
+	 * for a given world.
+	 */
+	private final ConcurrentHashMap<ILevelWrapper, ChunkUpdateQueueManager> updateQueueByLevelWrapper = new ConcurrentHashMap<>();
+	
+	
+	
+	
+	//=============//
+	// constructor //
+	//=============//
+	//region
+	
+	private WorldChunkUpdateManager() {  }
+	
+	//endregion
+	
+	
+	
+	//=================//
+	// manager methods //
+	//=================//
+	//region
+	
+	/**
+	 * @return null if the world is unloaded or the given level wrapper is the wrong type 
+	 */
+	@Nullable
+	public ChunkUpdateQueueManager getByLevelWrapper(ILevelWrapper levelWrapper)
+	{
+		AbstractDhWorld world = SharedApi.getAbstractDhWorld();
+		if (world == null)
+		{
+			// world isn't loaded, no warnings need to be logged
+			return null;
+		}
+		
+		// we only want to load chunks for certain level wrappers
+		// this is done specifically on a local-server to prevent
+		// loading both the server and client level wrappers
+		if (world.environment == EWorldEnvironment.CLIENT_ONLY
+			// when connected to a server we should only ever load client wrappers anyway
+			// but this check confirms it
+			&& !(levelWrapper instanceof IClientLevelWrapper))
+		{
+			// how did we get a server level wrapper on the client?
+			// this shouldn't happen, but just in case
+			return null;
+		}
+		else if (
+			(world.environment == EWorldEnvironment.SERVER_ONLY
+			|| world.environment == EWorldEnvironment.CLIENT_SERVER)
+				// when hosting a server we only care about the server wrappers
+				&& !(levelWrapper instanceof IServerLevelWrapper))
+		{
+			// ignore client updates on the server
+			return null;
+		}
+		
+		
+		ChunkUpdateQueueManager queueManager = this.updateQueueByLevelWrapper.get(levelWrapper);
+		if (queueManager != null)
+		{
+			return queueManager;
+		}
+		
+		return this.updateQueueByLevelWrapper.compute(levelWrapper,
+			(ILevelWrapper newLevelWrapper, ChunkUpdateQueueManager oldQueueManager) ->
+			{
+				if (oldQueueManager != null)
+				{
+					return oldQueueManager;
+				}
+				
+				oldQueueManager = new ChunkUpdateQueueManager();
+				return oldQueueManager;
+			});
+	}
+	
+	public void processEachQueue()
+	{
+		this.updateQueueByLevelWrapper.forEach(
+			(ILevelWrapper levelWrapper, ChunkUpdateQueueManager updateManager) -> 
+		{
+			updateManager.processQueue();
+		});
+	}
+	
+	public int getTotalQueuedCount()
+	{
+		AtomicInteger queueCountRef = new AtomicInteger(0);
+		
+		this.updateQueueByLevelWrapper.forEach(
+			(ILevelWrapper levelWrapper, ChunkUpdateQueueManager updateManager) ->
+			{
+				queueCountRef.addAndGet(updateManager.getQueuedCount());
+			});
+		
+		return queueCountRef.get();
+	}
+	
+	public void clear() { this.updateQueueByLevelWrapper.clear(); }
+	
+	//endregion
+	
+	
+	
+	//=========//
+	// F3 Menu //
+	//=========//
+	//region
+	
+	public ArrayList<String> getDebugMenuString()
+	{
+		ArrayList<String> stringList = new ArrayList<>();
+		stringList.add("");// placeholder for the total count
+		
+		// add each queue to the list
+		AtomicInteger totalQueueCountRef = new AtomicInteger(0);
+		AtomicInteger activeQueueCountRef = new AtomicInteger(0);
+		this.updateQueueByLevelWrapper.forEach(
+			(ILevelWrapper levelWrapper, ChunkUpdateQueueManager updateManager) ->
+			{
+				// is this queue active?
+				if (!updateManager.updateQueuesEmpty())
+				{
+					updateManager.lastMsTimeShownActiveInF3Screen = System.currentTimeMillis();
+					activeQueueCountRef.incrementAndGet();
+				}
+				
+				// show this queue if it hasn't been empty long enough
+				// (done to prevent flickering on the F3 screen when the queue rapidly fills/empties)
+				long timeSinceQueueLastShownActiveMs = System.currentTimeMillis() - updateManager.lastMsTimeShownActiveInF3Screen;
+				if (timeSinceQueueLastShownActiveMs < 4_000)
+				{
+					stringList.add(levelWrapper.getDimensionName() + ": " + updateManager.getDebugMenuString());
+				}
+				
+				totalQueueCountRef.incrementAndGet();
+			});
+		
+		// replace the first line with the number of total/active queues
+		// (helpful if we need to diagnose a leak due to a massive number of queue level wrappers)
+		stringList.set(0, "Chunk Update Queues: "+activeQueueCountRef.get()+"/"+totalQueueCountRef.get());
+		
+		return stringList;
+	}
+	
+	//endregion
+	
+	
+	
+}

core/src/main/java/com/seibel/distanthorizons/core/api/internal/rendering/DhRenderState.java

@@ -2,6 +2,7 @@ package com.seibel.distanthorizons.core.api.internal.rendering;
 
 import com.seibel.distanthorizons.core.api.internal.ClientApi;
 import com.seibel.distanthorizons.core.util.math.Mat4f;
+import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 
 /**
@@ -13,9 +14,32 @@ public class DhRenderState
 {
 	public Mat4f mcModelViewMatrix = null;
 	public Mat4f mcProjectionMatrix = null;
-	public float frameTime = -1;
+	/** 
+	 * percentage of time into the current client tick. <br><br>
+	 * 
+	 * Can be converted to a millisecond frametime 
+	 * (IE time between frames in milliseconds) using the formula: <br>
+	 * <code>
+	 * (partialTickTime/20*1000)
+	 * </code> <br>
+	 * IE 60 FPS = 16.6 MS <br>
+	 * 
+	 * @link https://fpstoms.com/
+	 * @see IMinecraftRenderWrapper#getPartialTickTime()
+	 */
+	public float partialTickTime = -1; 
 	public IClientLevelWrapper clientLevelWrapper = null;
 	
+	/**
+	 * This will generally be true if the player is: <br>
+	 * - blinded <br>
+	 * - under lava/water <br>
+	 * <br>
+	 * In those cases some rendering logic may need to be changed
+	 * to look correct.
+	 */
+	public boolean vanillaFogEnabled = false;
+	
 	
 	
 	//========//
@@ -38,7 +62,7 @@ public class DhRenderState
 			errorReasons += "no Projection Matrix, ";
 		}
 		
-		if (this.frameTime == -1)
+		if (this.partialTickTime == -1)
 		{
 			errorReasons += "no Frame Time, ";
 		}
@@ -51,13 +75,6 @@ public class DhRenderState
 		return errorReasons;
 	}
 	
-	public boolean canRender()
-	{
-		// separated variable to allow for easy checking with the debugger
-		String errorReasons = this.unableToRenderBecause();
-		return errorReasons.isEmpty();
-	}
-	
 	public void canRenderOrThrow() throws IllegalStateException
 	{
 		String errorReasons = this.unableToRenderBecause();

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

@@ -19,7 +19,6 @@
 
 package com.seibel.distanthorizons.core.config;
 
-import com.seibel.distanthorizons.api.DhApi;
 import com.seibel.distanthorizons.api.enums.config.*;
 import com.seibel.distanthorizons.api.enums.config.quickOptions.*;
 import com.seibel.distanthorizons.api.enums.rendering.*;
@@ -27,19 +26,16 @@ import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiDistantGenerat
 import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiDistantGeneratorProgressDisplayLocation;
 import com.seibel.distanthorizons.core.config.eventHandlers.*;
 import com.seibel.distanthorizons.core.config.eventHandlers.presets.*;
-import com.seibel.distanthorizons.core.config.listeners.ConfigChangeListener;
 import com.seibel.distanthorizons.core.config.types.*;
 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.wrapperInterfaces.IWrapperFactory;
+import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 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;
@@ -102,6 +98,7 @@ public class Config
 				.build();
 		
 		public static ConfigUiLinkedEntry quickEnableWorldGenerator = new ConfigUiLinkedEntry(Common.WorldGenerator.enableDistantGeneration);
+		public static ConfigUiLinkedEntry quickEnableServerGeneration = new ConfigUiLinkedEntry(Server.enableServerGeneration);
 		
 		public static ConfigUiLinkedEntry quickShowWorldGenProgress = new ConfigUiLinkedEntry(Common.WorldGenerator.showGenerationProgress);
 		
@@ -123,7 +120,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();
 			
@@ -147,8 +143,11 @@ public class Config
 				public static ConfigCategory quality = new ConfigCategory.Builder().set(Quality.class).build();
 				public static ConfigUISpacer qualitySpacer = new ConfigUISpacer.Builder().build();
 				
-				public static ConfigUiLinkedEntry quickEnableSsao = new ConfigUiLinkedEntry(Ssao.enableSsao);
+				
-				public static ConfigCategory ssao = new ConfigCategory.Builder().set(Ssao.class).build();
+				public static ConfigEntry<Boolean> enableSsao = new ConfigEntry.Builder<Boolean>()
+					.set(true)
+					.comment("Enable Screen Space Ambient Occlusion")
+					.build();
 				public static ConfigUISpacer ssaoSpacer = new ConfigUISpacer.Builder().build();
 				
 				
@@ -169,6 +168,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();
 				
 				
@@ -257,13 +270,6 @@ public class Config
 							.addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE)
 							.build();
 					
-					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"
-									+ "If set to 0 the mod wont overwrite vanilla's default (which so happens to also be 0)")
-							.build();
-					
 					public static ConfigEntry<EDhApiLodShading> lodShading = new ConfigEntry.Builder<EDhApiLodShading>()
 							.set(EDhApiLodShading.AUTO)
 							.comment(""
@@ -317,8 +323,8 @@ public class Config
 									+ "")
 							.build();
 					
-					public static ConfigEntry<Double> brightnessMultiplier = new ConfigEntry.Builder<Double>() // TODO: Make this a float (the ClassicConfigGUI doesnt support floats)
+					public static ConfigEntry<Float> brightnessMultiplier = new ConfigEntry.Builder<Float>()
-							.set(1.0)
+							.set(1.0f)
 							.comment(""
 									+ "How bright LOD colors are. \n"
 									+ "\n"
@@ -328,8 +334,8 @@ public class Config
 							.addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE)
 							.build();
 					
-					public static ConfigEntry<Double> saturationMultiplier = new ConfigEntry.Builder<Double>() // TODO: Make this a float (the ClassicConfigGUI doesnt support floats)
+					public static ConfigEntry<Float> saturationMultiplier = new ConfigEntry.Builder<Float>()
-							.set(1.0)
+							.set(1.0f)
 							.comment(""
 									+ "How saturated LOD colors are. \n"
 									+ "\n"
@@ -352,63 +358,6 @@ public class Config
 							.build();	
 				}
 				
-				public static class Ssao
-				{
-					public static ConfigUIComment ssaoHeader = new ConfigUIComment.Builder().setParentConfigClass(Ssao.class).build();
-					
-					public static ConfigEntry<Boolean> enableSsao = new ConfigEntry.Builder<Boolean>()
-							.set(true)
-							.comment("Enable Screen Space Ambient Occlusion")
-							.build();
-					
-					public static ConfigEntry<Integer> sampleCount = new ConfigEntry.Builder<Integer>()
-							.set(6)
-							.comment("" +
-									"Determines how many points in space are sampled for the occlusion test. \n" +
-									"Higher numbers will improve quality and reduce banding, but will increase GPU load." +
-									"")
-							.build();
-					
-					public static ConfigEntry<Double> radius = new ConfigEntry.Builder<Double>()
-							.set(4.0)
-							.comment("" +
-									"Determines the radius Screen Space Ambient Occlusion is applied, measured in blocks." +
-									"")
-							.build();
-					
-					public static ConfigEntry<Double> strength = new ConfigEntry.Builder<Double>()
-							.set(0.2)
-							.comment("" +
-									"Determines how dark the Screen Space Ambient Occlusion effect will be." +
-									"")
-							.build();
-					
-					public static ConfigEntry<Double> bias = new ConfigEntry.Builder<Double>()
-							.set(0.02)
-							.comment("" +
-									"Increasing the value can reduce banding at the cost of reducing the strength of the effect." +
-									"")
-							.build();
-					
-					public static ConfigEntry<Double> minLight = new ConfigEntry.Builder<Double>()
-							.set(0.25)
-							.comment("" +
-									"Determines how dark the occlusion shadows can be. \n" +
-									"0 = totally black at the corners \n" +
-									"1 = no shadow" +
-									"")
-							.build();
-					
-					public static ConfigEntry<Integer> blurRadius = new ConfigEntry.Builder<Integer>()
-							.set(2)
-							.comment("" +
-									"The radius, measured in pixels, that blurring is calculated for the SSAO. \n" +
-									"Higher numbers will reduce banding at the cost of GPU performance." +
-									"")
-							.build();
-					
-				}
-				
 				public static class GenericRendering
 				{
 					public static ConfigUIComment genericRendererHeader = new ConfigUIComment.Builder().setParentConfigClass(GenericRendering.class).build();
@@ -437,6 +386,15 @@ public class Config
 									+ "")
 							.build();
 					
+					public static ConfigEntry<Boolean> expandDistantBeacons = new ConfigEntry.Builder<Boolean>()
+						.set(true) 
+						.comment(""
+							+ "If true LOD beacon beams will be rendered wider at extreme distances, \n"
+							+ "making them easier to see. \n"
+							+ "If false all LOD beacon beams will only ever be 1 block wide. \n"
+							+ "")
+						.build();
+					
 					public static ConfigEntry<Boolean> enableCloudRendering = new ConfigEntry.Builder<Boolean>()
 							.set(true)
 							.comment(""
@@ -444,19 +402,23 @@ public class Config
 									+ "")
 							.build();
 					
-					public static ConfigEntry<Boolean> enableInstancedRendering = new ConfigEntry.Builder<Boolean>()
+					public static ConfigEntry<String> dimensionEnabledCloudRenderingCsv = new ConfigEntry.Builder<String>()
-							.set(true)
+						.set("minecraft:overworld")
+						.setAppearance(EConfigEntryAppearance.ALL)
 						.comment(""
-									+ "Can be disabled to use much slower but more compatible direct rendering. \n"
+							+ "A comma separated separated list of dimension resource locations where DH clouds will render.\n"
-									+ "Disabling this can be used to fix some crashes on Mac. \n"
+							+ "\n"
+							+ "Example: \"minecraft:overworld,minecraft:the_end\"\n"
+							+ "\n"
+							+ "Changes will only be seen when the world is re-loaded.\n"
 							+ "")
 						.build();
 				}
 				
 				public static class Fog
 				{
-					private static final Double FOG_RANGE_MIN = 0.0;
+					private static final Float FOG_RANGE_MIN = 0.0f;
-					private static final Double FOG_RANGE_MAX = Math.sqrt(2.0);
+					private static final Float FOG_RANGE_MAX = (float)Math.sqrt(2.0);
 					
 					
 					
@@ -485,16 +447,11 @@ public class Config
 									+ "Note: Other mods may conflict with this setting. \n"
 									+ "")
 							.build();
-					@Deprecated
-					public static ConfigEntry<Boolean> disableVanillaFog = new ConfigEntry.Builder<Boolean>()
-							.set(!enableVanillaFog.get())
-							.setAppearance(EConfigEntryAppearance.ONLY_IN_API)
-							.build();
 					
 					
 					
-					public static ConfigEntry<Double> farFogStart = new ConfigEntry.Builder<Double>()
+					public static ConfigEntry<Float> farFogStart = new ConfigEntry.Builder<Float>()
-							.setMinDefaultMax(FOG_RANGE_MIN, 0.4, FOG_RANGE_MAX)
+							.setMinDefaultMax(FOG_RANGE_MIN, 0.4f, FOG_RANGE_MAX)
 							.comment(""
 									+ "At what distance should the far fog start? \n"
 									+ "\n"
@@ -503,8 +460,8 @@ public class Config
 									+ "1.414: Fog starts at the corner of the vanilla render distance.")
 							.build();
 					
-					public static ConfigEntry<Double> farFogEnd = new ConfigEntry.Builder<Double>()
+					public static ConfigEntry<Float> farFogEnd = new ConfigEntry.Builder<Float>()
-							.setMinDefaultMax(FOG_RANGE_MIN, 1.0, FOG_RANGE_MAX)
+							.setMinDefaultMax(FOG_RANGE_MIN, 1.0f, FOG_RANGE_MAX)
 							.comment(""
 									+ "Where should the far fog end? \n"
 									+ "\n"
@@ -513,8 +470,8 @@ public class Config
 									+ "1.414: Fog ends at the corner of the vanilla render distance.")
 							.build();
 					
-					public static ConfigEntry<Double> farFogMin = new ConfigEntry.Builder<Double>()
+					public static ConfigEntry<Float> farFogMin = new ConfigEntry.Builder<Float>()
-							.setMinDefaultMax(-5.0, 0.0, FOG_RANGE_MAX)
+							.setMinDefaultMax(-5.0f, 0.0f, FOG_RANGE_MAX)
 							.comment(""
 									+ "What is the minimum fog thickness? \n"
 									+ "\n"
@@ -522,8 +479,8 @@ public class Config
 									+ "1.0: Fully opaque fog.")
 							.build();
 					
-					public static ConfigEntry<Double> farFogMax = new ConfigEntry.Builder<Double>()
+					public static ConfigEntry<Float> farFogMax = new ConfigEntry.Builder<Float>()
-							.setMinDefaultMax(FOG_RANGE_MIN, 1.0, 5.0)
+							.setMinDefaultMax(FOG_RANGE_MIN, 1.0f, 5.0f)
 							.comment(""
 									+ "What is the maximum fog thickness? \n"
 									+ "\n"
@@ -541,8 +498,8 @@ public class Config
 									+ EDhApiFogFalloff.EXPONENTIAL_SQUARED + ": 1/(e^((distance*density)^2)")
 							.build();
 					
-					public static ConfigEntry<Double> farFogDensity = new ConfigEntry.Builder<Double>()
+					public static ConfigEntry<Float> farFogDensity = new ConfigEntry.Builder<Float>()
-							.setMinDefaultMax(0.01, 2.5, 50.0)
+							.setMinDefaultMax(0.01f, 2.5f, 50.0f)
 							.comment(""
 									+ "Used in conjunction with the Fog Falloff.")
 							.build();
@@ -551,14 +508,6 @@ public class Config
 					
 					
 					
-					static
-					{
-						disableVanillaFog.addListener(
-								new ConfigChangeListener<Boolean>(disableVanillaFog,
-								(disableVanillaFog) -> enableVanillaFog.setApiValue(disableVanillaFog))
-						);
-					}
-					
 					public static class HeightFog
 					{
 						public static ConfigUIComment heightFogHeader = new ConfigUIComment.Builder().setParentConfigClass(HeightFog.class).build();
@@ -596,13 +545,13 @@ public class Config
 										+ EDhApiHeightFogDirection.ABOVE_AND_BELOW_SET_HEIGHT + ": Height fog starts from a set height and goes towards both the sky and void")
 								.build();
 						
-						public static ConfigEntry<Double> heightFogBaseHeight = new ConfigEntry.Builder<Double>()
+						public static ConfigEntry<Float> heightFogBaseHeight = new ConfigEntry.Builder<Float>()
-								.setMinDefaultMax(-4096.0, 80.0, 4096.0)
+								.setMinDefaultMax(-3_000_000.0f, 80.0f, 3_000_000.0f)
 								.comment("If the height fog is calculated around a set height, what is that height position?")
 								.build();
 						
-						public static ConfigEntry<Double> heightFogStart = new ConfigEntry.Builder<Double>()
+						public static ConfigEntry<Float> heightFogStart = new ConfigEntry.Builder<Float>()
-								.setMinDefaultMax(FOG_RANGE_MIN, 0.0, FOG_RANGE_MAX)
+								.setMinDefaultMax(FOG_RANGE_MIN, 0.0f, FOG_RANGE_MAX)
 								.comment(""
 										+ "Should the start of the height fog be offset? \n"
 										+ "\n"
@@ -610,8 +559,8 @@ public class Config
 										+ "1.0: Fog start with offset of the entire world's height. (Includes depth)")
 								.build();
 						
-						public static ConfigEntry<Double> heightFogEnd = new ConfigEntry.Builder<Double>()
+						public static ConfigEntry<Float> heightFogEnd = new ConfigEntry.Builder<Float>()
-								.setMinDefaultMax(FOG_RANGE_MIN, 0.6, FOG_RANGE_MAX)
+								.setMinDefaultMax(FOG_RANGE_MIN, 0.6f, FOG_RANGE_MAX)
 								.comment(""
 										+ "Should the end of the height fog be offset? \n"
 										+ "\n"
@@ -619,8 +568,8 @@ public class Config
 										+ "1.0: Fog end with offset of the entire world's height. (Include depth)")
 								.build();
 						
-						public static ConfigEntry<Double> heightFogMin = new ConfigEntry.Builder<Double>()
+						public static ConfigEntry<Float> heightFogMin = new ConfigEntry.Builder<Float>()
-								.setMinDefaultMax(0.0, 0.0, FOG_RANGE_MAX)
+								.setMinDefaultMax(0.0f, 0.0f, FOG_RANGE_MAX)
 								.comment(""
 										+ "What is the minimum fog thickness? \n"
 										+ "\n"
@@ -628,8 +577,8 @@ public class Config
 										+ "1.0: Fully opaque fog.")
 								.build();
 						
-						public static ConfigEntry<Double> heightFogMax = new ConfigEntry.Builder<Double>()
+						public static ConfigEntry<Float> heightFogMax = new ConfigEntry.Builder<Float>()
-								.setMinDefaultMax(FOG_RANGE_MIN, 1.0, 5.0)
+								.setMinDefaultMax(FOG_RANGE_MIN, 1.0f, 5.0f)
 								.comment(""
 										+ "What is the maximum fog thickness? \n"
 										+ "\n"
@@ -647,8 +596,8 @@ public class Config
 										+ EDhApiFogFalloff.EXPONENTIAL_SQUARED + ": 1/(e^((height*density)^2)")
 								.build();
 						
-						public static ConfigEntry<Double> heightFogDensity = new ConfigEntry.Builder<Double>()
+						public static ConfigEntry<Float> heightFogDensity = new ConfigEntry.Builder<Float>()
-								.setMinDefaultMax(0.01, 20.0, 50.0)
+								.setMinDefaultMax(0.01f, 20.0f, 50.0f)
 								.comment("What is the height fog's density?")
 								.build();
 						
@@ -676,13 +625,13 @@ public class Config
 									+ "")
 							.build();
 					
-					public static ConfigEntry<Double> noiseIntensity = new ConfigEntry.Builder<Double>()    // TODO: Make this a float (the ClassicConfigGUI doesn't support floats)
+					public static ConfigEntry<Float> noiseIntensity = new ConfigEntry.Builder<Float>()
-							.setMinDefaultMax(0d, 5d, 100d)                    // TODO: Once this becomes a float make it 0-1 instead of 0-100 (I did this cus doubles only allow 2 decimal places)
+							.setMinDefaultMax(0f, 0.05f, 1f)
 							.comment(""
 									+ "How intense should the noise should be?")
 							.build();
 					
-					public static ConfigEntry<Integer> noiseDropoff = new ConfigEntry.Builder<Integer>()    // TODO: Make this a float (the ClassicConfigGUI doesn't support floats)
+					public static ConfigEntry<Integer> noiseDropoff = new ConfigEntry.Builder<Integer>()
 							.setMinDefaultMax(0, 1024, null)
 							.comment(""
 									+ "Defines how far should the noise texture render before it fades away. (in blocks) \n"
@@ -696,13 +645,13 @@ public class Config
 				{
 					public static ConfigUIComment cullingHeader = new ConfigUIComment.Builder().setParentConfigClass(Culling.class).build();
 					
-					public static ConfigEntry<Double> overdrawPrevention = new ConfigEntry.Builder<Double>()
+					public static ConfigEntry<Float> overdrawPrevention = new ConfigEntry.Builder<Float>()
-							.setMinDefaultMax(0.0, 0.0, 1.0) // TODO change -1 to auto
+							.setMinDefaultMax(-1.0f, -1.0f, 1.0f)
 							.comment(""
 								+ "Determines how far from the camera Distant Horizons will start rendering. \n"
 								+ "Measured as a percentage of the vanilla render distance.\n"
 								+ "\n"
-									+ "0 = auto, overdraw will change based on the vanilla render distance.\n"
+								+ "-1 = auto, overdraw will change based on the vanilla render distance.\n"
 								+ "\n"
 								+ "Higher values will prevent LODs from rendering behind vanilla blocks at a higher distance,\n"
 								+ "but may cause holes in the world. \n"
@@ -712,6 +661,17 @@ public class Config
 								+ "")
 							.build();
 					
+					public static ConfigEntry<Boolean> reduceOverdrawWithFastMovement = new ConfigEntry.Builder<Boolean>()
+						.set(true)
+						.comment(""
+							+ "If set to true the overdraw prevention radius will get closer\n"
+							+ "to the camera when flying/moving quickly.\n"
+							+ "\n"
+							+ "This helps reduce issues where Minecraft can't load or\n"
+							+ "generate chunks fast enough to keep up with DH.\n"
+							+ "")
+						.build();
+					
 					public static ConfigEntry<Boolean> enableCaveCulling = new ConfigEntry.Builder<Boolean>()
 							.set(true)
 							.comment(""
@@ -766,54 +726,56 @@ public class Config
 									+ "Disable this if shadows render incorrectly.")
 							.build();
 					
-					public static ConfigEntry<String> ignoredRenderBlockCsv = new ConfigEntry.Builder<String>() // TODO accept wildcards
+					public static ConfigUISpacer ignoreCsvStartSpacer = new ConfigUISpacer.Builder().build();
+					
+					public static ConfigEntry<String> ignoredRenderBlockCsv = new ConfigEntry.Builder<String>()
 							.set("minecraft:barrier,minecraft:structure_void,minecraft:light,minecraft:tripwire,minecraft:brown_mushroom")
-							.setAppearance(EConfigEntryAppearance.ONLY_IN_FILE) // only shown in file since the UI has a character limit
+							.setAppearance(EConfigEntryAppearance.ALL)
+						.addListener(RenderBlockCacheCsvHandler.INSTANCE)
 							.comment(""
 									+ "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"
 									+ "")
 							.build();
 					
-					public static ConfigEntry<String> ignoredRenderCaveBlockCsv = new ConfigEntry.Builder<String>() // TODO accept wildcards
+					public static ConfigEntry<String> ignoredRenderCaveBlockCsv = new ConfigEntry.Builder<String>()
-							.set("minecraft:glow_lichen,minecraft:rail,minecraft:water,minecraft:lava,minecraft:bubble_column," +
+							.set("")
-									"minecraft:cave_vines_plant,minecraft:vine,minecraft:cave_vines,minecraft:short_grass,minecraft:tall_grass," +
+							.setAppearance(EConfigEntryAppearance.ALL)
-									"minecraft:small_dripleaf,minecraft:big_dripleaf,minecraft:big_dripleaf_stem,minecraft:sculk_vein")
+						.addListener(RenderBlockCacheCsvHandler.INSTANCE)
-							.setAppearance(EConfigEntryAppearance.ONLY_IN_FILE) // only shown in file since the UI has a character limit
 							.comment(""
 									+ "A comma separated list of block resource locations that shouldn't be rendered \n"
 									+ "if they are in a 0 sky light underground area. \n"
 									+ "Air is always included in this list. \n"
-									+ "Requires a restart to change. \n"
+									+ "\n"
+									+ "Defaults to an empty list since most cave blocks will be automatically ignored due to being: \n"
+									+ "transparent, non-solid, or liquids, but new blocks can be added here if needed.\n"
 									+ "")
 							.build();
 					
+					public static ConfigEntry<String> waterSubSurfaceBlockReplacementCsv = new ConfigEntry.Builder<String>()
+						.set("minecraft:kelp,minecraft:tall_seagrass,minecraft:seagrass")
+						.setAppearance(EConfigEntryAppearance.ALL)
+						.addListener(RenderBlockCacheCsvHandler.INSTANCE)
+						.comment(""
+							+ "A comma separated list of block resource locations that will be replaced by water \n"
+							+ "if they're visible on the water's surface. \n"
+							+ "")
+						.build();
 					
-					static
+					public static ConfigEntry<String> waterSurfaceBlockReplacementCsv = new ConfigEntry.Builder<String>()
-					{
+						.set("minecraft:lily_pad")
-						ignoredRenderBlockCsv.addListener(new ConfigChangeListener<String>(ignoredRenderBlockCsv,
+						.setAppearance(EConfigEntryAppearance.ALL)
-								(blockCsv) ->
+						.addListener(RenderBlockCacheCsvHandler.INSTANCE)
-								{
+						.comment(""
-									IWrapperFactory wrapperFactory = SingletonInjector.INSTANCE.get(IWrapperFactory.class);
+							+ "A comma separated list of block resource locations that will be removed \n"
-									if (wrapperFactory != null)
+							+ "when on top of water. \n"
-									{
+							+ "")
-										wrapperFactory.resetRendererIgnoredBlocksSet();
+						.build();
-										DhApi.Delayed.renderProxy.clearRenderDataCache();
-									}
-								}));
 					
-						ignoredRenderCaveBlockCsv.addListener(new ConfigChangeListener<String>(ignoredRenderCaveBlockCsv,
-								(blockCsv) ->
-								{
-									IWrapperFactory wrapperFactory = SingletonInjector.INSTANCE.get(IWrapperFactory.class);
-									if (wrapperFactory != null)
-									{
-										wrapperFactory.resetRendererIgnoredCaveBlocks();
-										DhApi.Delayed.renderProxy.clearRenderDataCache();
-									}
-								}));
-					}
 				}
 				
 				public static class Experimental
@@ -821,7 +783,7 @@ public class Config
 					public static ConfigUIComment experimentalHeader = new ConfigUIComment.Builder().setParentConfigClass(Experimental.class).build();
 					
 					public static ConfigEntry<Integer> earthCurveRatio = new ConfigEntry.Builder<Integer>()
-							.setMinDefaultMax(0, 0, 5000)
+							.setMinDefaultMax(-5000, 0, 5000)
 							.comment(""
 									+ "This is the earth size ratio when applying the curvature shader effect. \n"
 									+ "Note: Enabling this feature may cause rendering bugs. \n"
@@ -831,24 +793,39 @@ public class Config
 									+ "100 = 1 to 100 (63,710 blocks) \n"
 									+ "10000 = 1 to 10000 (637.1 blocks) \n"
 									+ "\n"
-									+ "Note: Due to current limitations, the min value is 50 \n"
+									+ "Note: Due to current limitations, the min value is ["+WorldCurvatureConfigEventHandler.MIN_VALID_CURVE_VALUE+"] \n"
 									+ "and the max value is 5000. Any values outside this range \n"
 									+ "will be set to 0 (disabled).")
 							.addListener(WorldCurvatureConfigEventHandler.INSTANCE)
 							.build();
 					
-					// TODO should be replaced with a better long-term solution
+					public static ConfigEntry<String> ignoredDimensionCsv = new ConfigEntry.Builder<String>()
-					@Deprecated
+						.set("")
-					public static ConfigEntry<Boolean> onlyLoadCenterLods = new ConfigEntry.Builder<Boolean>()
-							.set(false)
 						.comment(""
-									+ "For internal testing:\n"
+							+ "A comma separated list of dimension resource locations where DH won't render. \n"
-									+ "Skips loading adjacent LODs to significantly reduce load times (~5x)\n"
+							+ "\n"
-									+ "but causes lighting on LOD borders to appear as full-bright\n"
+							+ "Example: \"minecraft:the_nether,minecraft:the_end\"\n"
-									+ "and other graphical bugs.\n"
+							+ "\n"
+							+ "Note:\n"
+							+ "Some DH settings will be disabled and/or changed to improve \n"
+							+ "visuals when DH rendering is disabled. \n"
 							+ "")
-							.addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE)
+						.addListener(IgnoredDimensionCsvHandler.INSTANCE)
 						.build();
+					
+					public static ConfigEntry<EDhApiRenderApi> renderingApi = new ConfigEntry.Builder<EDhApiRenderApi>()
+						.set(EDhApiRenderApi.AUTO) 
+						.comment(""
+							+ "Requires a restart to change. \n"
+							+ " \n"
+							+ "Options: \n"
+							+ EDhApiRenderApi.AUTO + " - changes based on the most likely API for that MC version \n"
+							+ EDhApiRenderApi.OPEN_GL + " - Default \n"
+							+ EDhApiRenderApi.BLAZE_3D + " - Only supported on MC 1.21.11 \n"
+							+ "")
+						.build();
+					
+					
 				}
 				
 			}
@@ -910,11 +887,11 @@ public class Config
 								+ "What renderer is active? \n"
 								+ "\n"
 								+ EDhApiRendererMode.DEFAULT + ": Default lod renderer \n"
-								+ EDhApiRendererMode.DEBUG + ": Debug testing renderer \n"
+								+ EDhApiRendererMode.DEBUG_TRIANGLE + ": Debug testing renderer \n"
 								+ EDhApiRendererMode.DISABLED + ": Disable rendering")
 						.build();
 				
-				public static ConfigEntry<EDhApiDebugRendering> debugRendering = new ConfigEntry.Builder<EDhApiDebugRendering>()
+				public static ConfigEntry<EDhApiDebugRendering> debugRenderingColors = new ConfigEntry.Builder<EDhApiDebugRendering>()
 						.set(EDhApiDebugRendering.OFF)
 						.comment(""
 								+ "Should specialized colors/rendering modes be used? \n"
@@ -927,6 +904,13 @@ public class Config
 						.addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE)
 						.build();
 				
+				public static ConfigEntry<Boolean> enableWhiteWorld = new ConfigEntry.Builder<Boolean>()
+					.set(false)
+					.comment(""
+						+ "Stops vertex colors from being passed. \n"
+						+ "Useful for debugging shaders")
+					.build();
+				
 				public static ConfigEntry<Boolean> lodOnlyMode = new ConfigEntry.Builder<Boolean>()
 						.set(false)
 						.comment(""
@@ -944,19 +928,14 @@ public class Config
 								+ "")
 						.build();
 				
-				// TODO add LOD-only mode to this
 				public static ConfigEntry<Boolean> enableDebugKeybindings = new ConfigEntry.Builder<Boolean>()
 					.set(false)
 					.comment(""
-								+ "If true the F8 key can be used to cycle through the different debug modes. \n"
+						+ "If true several keys can be used to toggle debug states. \n"
-								+ "and the F6 key can be used to enable and disable LOD rendering.")
+						+ "F6 - enable/disable LOD rendering \n"
-						.build();
+						+ "F7 - enable/disable LOD only rendering \n"
-				
+						+ "F8 - cycle through the different debug rendering modes \n"
-				public static ConfigEntry<Boolean> enableWhiteWorld = new ConfigEntry.Builder<Boolean>()
+						+ "")
-						.set(false)
-						.comment(""
-								+ "Stops vertex colors from being passed. \n"
-								+ "Useful for debugging shaders")
 					.build();
 				
 				public static ConfigEntry<Boolean> showOverlappingQuadErrors = new ConfigEntry.Builder<Boolean>()
@@ -1019,15 +998,6 @@ public class Config
 							.set(false)
 							.comment("Render LOD section status?")
 							.build();
-					public static ConfigEntry<Boolean> showRenderSectionToggling = new ConfigEntry.Builder<Boolean>()
-							.set(false)
-							.comment("" +
-									"A white box will be drawn when an LOD starts rendering \n" +
-									"and a purple box when an LOD stops rendering. \n" +
-									"\n" +
-									"This can be used to debug Quad Tree holes.\n" +
-									"")
-							.build();
 					
 					public static ConfigEntry<Boolean> showQuadTreeRenderStatus = new ConfigEntry.Builder<Boolean>()
 							.set(false)
@@ -1080,13 +1050,6 @@ public class Config
 									+ "")
 							.build();
 					
-					public static ConfigEntry<EDhApiGpuUploadMethod> glUploadMode = new ConfigEntry.Builder<EDhApiGpuUploadMethod>()
-							.set(EDhApiGpuUploadMethod.AUTO)
-							.comment(""
-									+ "\n"
-									+ "")
-							.build();
-					
 				}
 				
 				public static class ColumnBuilderDebugging
@@ -1153,6 +1116,11 @@ public class Config
 							.comment("Shows info about each thread pool.")
 							.build();
 					
+					public static ConfigEntry<Boolean> showRenderThreadTasks = new ConfigEntry.Builder<Boolean>()
+							.set(false)
+							.comment("Shows info about the render thread tasks.")
+							.build();
+					
 					public static ConfigEntry<Boolean> showCombinedObjectPools = new ConfigEntry.Builder<Boolean>()
 							.set(false)
 							.comment("Shows the combined memory use and array counts for all DH pooled objects.")
@@ -1164,7 +1132,7 @@ public class Config
 					
 					public static ConfigEntry<Boolean> showQueuedChunkUpdateCount = new ConfigEntry.Builder<Boolean>()
 							.set(true)
-							.comment("Shows how many chunks are queud for processing and the max count that can be queued.")
+							.comment("Shows how many chunks are queued for processing and the max count that can be queued.")
 							.build();
 					
 					public static ConfigEntry<Boolean> showLevelStatus = new ConfigEntry.Builder<Boolean>()
@@ -1172,6 +1140,11 @@ public class Config
 							.comment("Shows what levels are loaded and world gen/rendering info about those levels.")
 							.build();
 					
+					public static ConfigEntry<Boolean> onlyShowRenderingLevels = new ConfigEntry.Builder<Boolean>()
+							.set(true)
+							.comment("Only show levels that DH is actively rendering.")
+							.build();
+					
 				}
 				
 				/** This class is used to debug the different features of the config GUI */
@@ -1233,20 +1206,16 @@ public class Config
 					public static ConfigUIButton uiButtonTest = new ConfigUIButton(() ->
 					{
 						// running on a separate thread is necessary to prevent locking
-						new Thread(() -> 
+						new Thread(() -> onButtonPressed()).start();
-						{
-							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();
 					});
+					public static void onButtonPressed()
+					{
+						IMinecraftClientWrapper mcClient = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
+						
+						LOGGER.info("Attempting to show tinyfd message box...");
+						mcClient.showDialog("Button pressed!", "UITester dialog", "ok", "info");
+						LOGGER.info("dialog closed");
+					}
 					
 					public static ConfigCategory categoryTest = new ConfigCategory.Builder().set(CategoryTest.class).build();
 					
@@ -1362,6 +1331,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
@@ -1372,7 +1372,7 @@ public class Config
 					.set(false)
 					// enabling this can be quite detrimental to performance,
 					// so hiding it in the config file should reduce people accidentally enabling it
-					.setAppearance(isRunningInDevEnvironment() ? EConfigEntryAppearance.ALL : EConfigEntryAppearance.ONLY_IN_FILE)
+					.setAppearance(EConfigEntryAppearance.ONLY_IN_FILE)
 					.comment(""
 							+ "Enabling this will drastically increase chunk processing time\n"
 							+ "and you may need to increase your CPU load to handle it.\n"
@@ -1387,7 +1387,7 @@ public class Config
 					.build();
 			
 			public static ConfigEntry<EDhApiDataCompressionMode> dataCompression = new ConfigEntry.Builder<EDhApiDataCompressionMode>()
-					.set(EDhApiDataCompressionMode.Z_STD)
+					.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();
@@ -1553,6 +1553,14 @@ public class Config
 							+ "This can be useful for debugging.")
 					.build();
 			
+			public static ConfigEntry<EDhApiLoggerLevel> logConnectionConfigChangesToFile = new ConfigEntry.Builder<EDhApiLoggerLevel>()
+					.setChatCommandName("logging.logConnectionConfigChanges")
+					.set(EDhApiLoggerLevel.WARN)
+					.comment(""
+							+ "If enabled, config changes sent by the server will be logged. \n"
+							+ "")
+					.build();
+			
 			public static ConfigCategory warning = new ConfigCategory.Builder().set(Warning.class).build();
 			
 			
@@ -1617,6 +1625,24 @@ 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 frame stuttering and/or other issues. \n"
+						+ "")
+					.build();
+				
+				public static ConfigEntry<Boolean> showGarbageCollectorWarning = new ConfigEntry.Builder<Boolean>()
+					.set(true)
+					.comment(""
+						+ "If enabled, a chat message will be displayed if the garbage \n"
+						+ "collector Java is currently using is known \n"
+						+ "to cause frame stuttering and/or other issues. \n"
+						+ "")
+					.build();
+				
 			}
 		}
 		
@@ -1669,6 +1695,15 @@ public class Config
 		
 		
 		// Generation
+		public static ConfigEntry<Boolean> enableServerGeneration = new ConfigEntry.Builder<Boolean>()
+			.set(true)
+			.comment(""
+				+ "When enabled, Distant Horizons will attempt to download missing LODs from the server.\n"
+				+ "\n"
+				+ "Note: the server must have Distant Generation enabled for it to work."
+				+ "")
+			.build();
+		
 		public static ConfigEntry<Integer> generationRequestRateLimit = new ConfigEntry.Builder<Integer>()
 				.setChatCommandName("generation.requestRateLimit")
 				.setMinDefaultMax(1, 20, 100)
@@ -1686,32 +1721,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>()
@@ -1832,6 +1841,8 @@ public class Config
 				ThreadPresetConfigEventHandler.INSTANCE.setUiOnlyConfigValues();
 				RenderQualityPresetConfigEventHandler.INSTANCE.setUiOnlyConfigValues();
 				QuickRenderToggleConfigEventHandler.INSTANCE.setUiOnlyConfigValues();
+				
+				IgnoredDimensionCsvHandler.INSTANCE.onConfigValueSet();
 			}
 			catch (Exception e)
 			{

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

@@ -62,7 +62,7 @@ public class ConfigHandler
 	 * <br> {@link String}
 	 * <br> 
 	 * <br> // Below, "T" should be a value from above
-	 * <br> // Note: This is not checked, so we trust that you are doing the right thing (TODO: Check it)
+	 * <br> // Note: This is not checked, so we trust that you are doing the right thing
 	 * <br> List<T>
 	 * <br> ArrayList<T>
 	 * <br> Map<String, T>
@@ -261,7 +261,6 @@ public class ConfigHandler
 			if (ConfigUIComment.class.isAssignableFrom(entry.getClass())
 				&& ((ConfigUIComment)entry).parentConfigPath != null)
 			{
-				// TODO this could potentially add the same item multiple times
 				entryPrefix = "distanthorizons.config." + ((ConfigUIComment)entry).parentConfigPath;
 			}
 			

core/src/main/java/com/seibel/distanthorizons/core/config/api/DhApiConfigValue.java

@@ -46,6 +46,12 @@ public class DhApiConfigValue<coreType, apiType> implements IDhApiConfigValue<ap
 	private final IConverter<coreType, apiType> configConverter;
 	
 	
+	
+	//==============//
+ 	// constructors //
+	//==============//
+	//region
+	
 	/**
 	 * This constructor should only be called internally. <br>
 	 * There is no reason for API users to create this object. <br><br>
@@ -69,11 +75,29 @@ public class DhApiConfigValue<coreType, apiType> implements IDhApiConfigValue<ap
 		this.configConverter = newConverter;
 	}
 	
+	//endregion
 	
-	public apiType getValue() { return this.configConverter.convertToApiType(this.configBase.get()); }
-	public apiType getTrueValue() { return this.configConverter.convertToApiType(this.configBase.getTrueValue()); }
-	public apiType getApiValue() { return this.configConverter.convertToApiType(this.configBase.getApiValue()); }
 	
+	
+	//===========//
+ 	// overrides //
+	//===========//
+	//region
+	
+	@Override public apiType getValue() { return this.configConverter.convertToApiType(this.configBase.get()); }
+	@Override public apiType getTrueValue() { return this.configConverter.convertToApiType(this.configBase.getTrueValue()); }
+	@Override public apiType getApiValue() 
+	{
+		// if no API value is set, this should return null
+		if (this.configBase.getApiValue() == null)
+		{
+			return null;
+		}
+		
+		return this.configConverter.convertToApiType(this.configBase.getApiValue()); 
+	}
+	
+	@Override
 	public boolean setValue(apiType newValue)
 	{
 		if (this.configBase.getAllowApiOverride())
@@ -87,12 +111,12 @@ public class DhApiConfigValue<coreType, apiType> implements IDhApiConfigValue<ap
 		}
 	}
 	
+	@Override
 	public boolean clearValue()
 	{
 		if (this.configBase.getAllowApiOverride())
 		{
 			// no converter should be used here since null objects may need to be handled differently
-			// TODO the API should just have a bool to keep track of whether the API value is in use instead of using NULL
 			this.configBase.setApiValue(null);
 			return true;
 		}
@@ -102,13 +126,15 @@ public class DhApiConfigValue<coreType, apiType> implements IDhApiConfigValue<ap
 		}
 	}
 	
+	@Override
 	public boolean getCanBeOverrodeByApi() { return this.configBase.getAllowApiOverride(); }
 	
-	public apiType getDefaultValue() { return this.configConverter.convertToApiType(this.configBase.getDefaultValue()); }
+	@Override public apiType getDefaultValue() { return this.configConverter.convertToApiType(this.configBase.getDefaultValue()); }
-	public apiType getMaxValue() { return this.configConverter.convertToApiType(this.configBase.getMax()); }
+	@Override public apiType getMaxValue() { return this.configConverter.convertToApiType(this.configBase.getMax()); }
-	public apiType getMinValue() { return this.configConverter.convertToApiType(this.configBase.getMin()); }
+	@Override public apiType getMinValue() { return this.configConverter.convertToApiType(this.configBase.getMin()); }
 	
 	
+	@Override
 	public void addChangeListener(Consumer<apiType> onValueChangeFunc) 
 	{
 		this.configBase.addValueChangeListener((coreValue) -> 
@@ -118,4 +144,6 @@ public class DhApiConfigValue<coreType, apiType> implements IDhApiConfigValue<ap
 		}); 
 	}
 	
+	//endregion
+	
 }

core/src/main/java/com/seibel/distanthorizons/core/config/api/converters/InvertedBoolConverter.java

@@ -17,31 +17,27 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.distanthorizons.core.generation.tasks;
+package com.seibel.distanthorizons.core.config.api.converters;
 
-import com.seibel.distanthorizons.core.file.fullDatafile.GeneratedFullDataSourceProvider;
+import com.seibel.distanthorizons.api.enums.rendering.EDhApiRendererMode;
-
+import com.seibel.distanthorizons.coreapi.interfaces.config.IConverter;
-import java.util.concurrent.CompletableFuture;
 
 /**
- * @author Leetom
+ * Used to support deprecated config options that may be identical
- * @version 2022-11-25
+ * in implementation but with the On/Off values flipped.
+ *
+ * @author James Seibel
+ * @version 2025-12-22
  */
-public final class WorldGenTask
+public class InvertedBoolConverter implements IConverter<Boolean, Boolean>
 {
-	public final long pos;
-	public final byte dataDetailLevel;
-	public final IWorldGenTaskTracker taskTracker;
-	public final CompletableFuture<WorldGenResult> future;
 	
+	@Override 
+	public Boolean convertToCoreType(Boolean core)
+	{ return !core; }
 	
-	
+	@Override 
-	public WorldGenTask(long pos, byte dataDetail, IWorldGenTaskTracker taskTracker, CompletableFuture<WorldGenResult> future)
+	public Boolean convertToApiType(Boolean api)
-	{
+	{ return !api; }
-		this.dataDetailLevel = dataDetail;
-		this.pos = pos;
-		this.taskTracker = taskTracker;
-		this.future = future;
-	}
 	
 }

core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/IgnoredDimensionCsvHandler.java

@@ -0,0 +1,125 @@
+/*
+ *    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;
+
+import com.seibel.distanthorizons.api.enums.config.EDhApiMcRenderingFadeMode;
+import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiBeforeRenderEvent;
+import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiCancelableEventParam;
+import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiRenderParam;
+import com.seibel.distanthorizons.core.config.Config;
+import com.seibel.distanthorizons.core.config.listeners.IConfigListener;
+import com.seibel.distanthorizons.core.logging.DhLogger;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.coreapi.util.StringUtil;
+
+public class IgnoredDimensionCsvHandler extends DhApiBeforeRenderEvent implements IConfigListener
+{
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	
+	public static IgnoredDimensionCsvHandler INSTANCE = new IgnoredDimensionCsvHandler();
+	
+	private String[] dimensionNames = null;
+	
+	
+	
+	//=============//
+ 	// constructor //
+	//=============//
+	
+	/** private since we only ever need one handler at a time */
+	private IgnoredDimensionCsvHandler() { }
+	
+	
+	
+	//=================//
+	// config handling //
+	//=================//
+	
+	@Override
+	public void onConfigValueSet()
+	{
+		String ignoredDimensionCsvString = Config.Client.Advanced.Graphics.Experimental.ignoredDimensionCsv.get();
+		if (ignoredDimensionCsvString == null 
+			|| ignoredDimensionCsvString.isEmpty())
+		{
+			LOGGER.info("Dimension ignoring disabled, DH will render all dimensions.");
+			this.dimensionNames = null;
+		}
+		else
+		{
+			try
+			{
+				this.dimensionNames = ignoredDimensionCsvString.split(",");
+				LOGGER.info("DH set to ignore dimensions: ["+ StringUtil.join(", ", this.dimensionNames)+"].");
+			}
+			catch (Exception e)
+			{
+				LOGGER.error("Failed to separate ignored dimensions from CSV string, error: ["+e.getMessage()+"].", e);
+				this.dimensionNames = null;
+			}
+		}
+		
+	}
+	
+	
+	
+	//===================//
+	// external handling //
+	//===================//
+	
+	@Override
+	public void beforeRender(DhApiCancelableEventParam<DhApiRenderParam> event)
+	{
+		String dimName = event.value.clientLevelWrapper.getDimensionName();
+		if (IgnoredDimensionCsvHandler.INSTANCE.dimensionNameShouldBeIgnored(dimName))
+		{
+			event.cancelEvent();
+			Config.Client.Advanced.Graphics.Fog.enableVanillaFog.setApiValue(true);
+			Config.Client.Advanced.Graphics.Quality.vanillaFadeMode.setApiValue(EDhApiMcRenderingFadeMode.NONE);
+		}
+		else
+		{
+			Config.Client.Advanced.Graphics.Fog.enableVanillaFog.setApiValue(null);
+			Config.Client.Advanced.Graphics.Quality.vanillaFadeMode.setApiValue(null);
+		}
+	}
+	
+	public boolean dimensionNameShouldBeIgnored(String dimName)
+	{
+		if (this.dimensionNames == null 
+			|| this.dimensionNames.length == 0)
+		{
+			return false;
+		}
+		
+		for (int i = 0; i < this.dimensionNames.length; i++)
+		{
+			String dimNameToIgnore = this.dimensionNames[i];
+			if (dimName.equalsIgnoreCase(dimNameToIgnore))
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	
+}

core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/RenderBlockCacheCsvHandler.java

@@ -0,0 +1,69 @@
+/*
+ *    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;
+
+import com.seibel.distanthorizons.api.DhApi;
+import com.seibel.distanthorizons.api.enums.config.EDhApiMcRenderingFadeMode;
+import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiBeforeRenderEvent;
+import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiCancelableEventParam;
+import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiRenderParam;
+import com.seibel.distanthorizons.core.config.Config;
+import com.seibel.distanthorizons.core.config.listeners.IConfigListener;
+import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
+import com.seibel.distanthorizons.core.logging.DhLogger;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
+import com.seibel.distanthorizons.coreapi.util.StringUtil;
+
+public class RenderBlockCacheCsvHandler implements IConfigListener
+{
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	
+	public static RenderBlockCacheCsvHandler INSTANCE = new RenderBlockCacheCsvHandler();
+	
+	
+	
+	//=============//
+ 	// constructor //
+	//=============//
+	
+	/** private since we only ever need one handler at a time */
+	private RenderBlockCacheCsvHandler() { }
+	
+	
+	
+	//=================//
+	// config handling //
+	//=================//
+	
+	@Override
+	public void onConfigValueSet()
+	{
+		IWrapperFactory wrapperFactory = SingletonInjector.INSTANCE.get(IWrapperFactory.class);
+		if (wrapperFactory != null)
+		{
+			wrapperFactory.resetCachedIgnoredBlocksSets();
+			DhApi.Delayed.renderProxy.clearRenderDataCache();
+		}
+	}
+	
+	
+	
+}

core/src/main/java/com/seibel/distanthorizons/core/config/eventHandlers/WorldCurvatureConfigEventHandler.java

@@ -35,7 +35,7 @@ public class WorldCurvatureConfigEventHandler implements IConfigListener
 {
 	public static WorldCurvatureConfigEventHandler INSTANCE = new WorldCurvatureConfigEventHandler();
 	
-	private static final int MIN_VALID_CURVE_VALUE = 50; 
+	public static final int MIN_VALID_CURVE_VALUE = 50; 
 	
 	
 	/** private since we only ever need one handler at a time */
@@ -52,6 +52,11 @@ public class WorldCurvatureConfigEventHandler implements IConfigListener
 			// shouldn't update the UI, otherwise we may end up fighting the user
 			Config.Client.Advanced.Graphics.Experimental.earthCurveRatio.set(MIN_VALID_CURVE_VALUE);
 		}
+		else if (curveRatio < 0 && curveRatio > -MIN_VALID_CURVE_VALUE)
+		{
+			// same as above, but in the negative direction
+			Config.Client.Advanced.Graphics.Experimental.earthCurveRatio.set(-MIN_VALID_CURVE_VALUE);
+		}
 		
 	}
 	

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

@@ -78,7 +78,7 @@ public class RenderQualityPresetConfigEventHandler extends AbstractPresetConfigE
 				this.put(EDhApiQualityPreset.HIGH, EDhApiTransparency.COMPLETE);
 				this.put(EDhApiQualityPreset.EXTREME, EDhApiTransparency.COMPLETE);
 			}});
-	private final ConfigPresetOptions<EDhApiQualityPreset, Boolean> ssaoEnabled = new ConfigPresetOptions<>(Config.Client.Advanced.Graphics.Ssao.enableSsao,
+	private final ConfigPresetOptions<EDhApiQualityPreset, Boolean> ssaoEnabled = new ConfigPresetOptions<>(Config.Client.Advanced.Graphics.enableSsao,
 			new HashMap<EDhApiQualityPreset, Boolean>()
 			{{
 				this.put(EDhApiQualityPreset.MINIMUM, false);

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;
@@ -239,8 +241,8 @@ public class ConfigFileHandler
 		}
 		else if (entry.getTrueValue() == null)
 		{
-			// TODO when can this happen?
+			// shouldn't happen, but just in case
-			throw new IllegalArgumentException("BlockBiomeWrapperPair [" + entry.getNameAndCategory() + "] is null, this may be a problem with [" + ModInfo.NAME + "]. Please contact the authors.");
+			throw new IllegalArgumentException("ConfigEntry [" + entry.getNameAndCategory() + "] is null, how did this happen?");
 		}
 		
 		workConfig.set(entry.getNameAndCategory(), ConfigTypeConverters.attemptToConvertToString(entry.getType(), entry.getTrueValue()));
@@ -358,7 +360,8 @@ public class ConfigFileHandler
 		{
 			LOGGER.error("File creation failed at ["+this.configPath+"], error: ["+e.getMessage()+"].", e);
 			
-			// TODO is there a reason this is lazily gotten?
+			// delayed MC getter since this object may be created before
+			// the singleton has been bound
 			IMinecraftClientWrapper mc = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
 			mc.crashMinecraft("Loading file and resetting config file failed at path [" + this.configPath + "]. Please check the file is ok and you have the permissions", e);
 		}

core/src/main/java/com/seibel/distanthorizons/core/config/gui/EmbeddedFrameUtil.java

@@ -1,196 +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.gui;
-
-import com.seibel.distanthorizons.core.jar.EPlatform;
-import org.jetbrains.annotations.NotNull;
-import org.lwjgl.system.jawt.JAWT;
-import org.lwjgl.system.macosx.*;
-
-import java.awt.*;
-import java.lang.reflect.*;
-import java.util.regex.*;
-
-import static org.lwjgl.glfw.GLFWNativeCocoa.*;
-import static org.lwjgl.glfw.GLFWNativeWin32.*;
-import static org.lwjgl.glfw.GLFWNativeX11.*;
-import static org.lwjgl.system.JNI.*;
-import static org.lwjgl.system.jawt.JAWTFunctions.*;
-import static org.lwjgl.system.macosx.ObjCRuntime.*;
-
-// Some of the code is from https://github.com/LWJGL/lwjgl3/blob/master/modules/samples/src/test/java/org/lwjgl/demo/system/jawt/EmbeddedFrameUtil.java
-// which is licensed under https://www.lwjgl.org/license
-
-/**
- * Some utils for embedding awt and swing items into lwjgl windows
- *
- * @author Ran
- * @author coolGi
- */
-public final class EmbeddedFrameUtil
-{
-	
-	private static final int JAVA_VERSION;
-	
-	private static final JAWT awt;
-	
-	static
-	{
-		Pattern p = Pattern.compile("^(?:1[.])?([1-9][0-9]*)[.-]");
-		Matcher m = p.matcher(System.getProperty("java.version"));
-		
-		if (!m.find())
-		{
-			throw new IllegalStateException("Failed to parse java.version");
-		}
-		
-		JAVA_VERSION = Integer.parseInt(m.group(1));
-		
-		awt = JAWT.calloc();
-		awt.version(JAVA_VERSION < 9 ? JAWT_VERSION_1_4 : JAWT_VERSION_9);
-		if (!JAWT_GetAWT(awt))
-		{
-			throw new RuntimeException("GetAWT failed");
-		}
-	}
-	
-	private static String getEmbeddedFrameImpl()
-	{
-		switch (EPlatform.get())
-		{
-			case LINUX:
-				return "sun.awt.X11.XEmbeddedFrame";
-			case WINDOWS:
-				return "sun.awt.windows.WEmbeddedFrame";
-			case MACOS:
-				return "sun.lwawt.macosx.CViewEmbeddedFrame";
-			default:
-				throw new IllegalStateException();
-		}
-	}
-	
-	private static long getEmbeddedFrameHandle(long window)
-	{
-		switch (EPlatform.get())
-		{
-			case LINUX:
-				return glfwGetX11Window(window);
-			case WINDOWS:
-				return glfwGetWin32Window(window);
-			case MACOS:
-				long objc_msgSend = ObjCRuntime.getLibrary().getFunctionAddress("objc_msgSend");
-				return invokePPP(glfwGetCocoaWindow(window), sel_getUid("contentView"), objc_msgSend);
-			default:
-				throw new IllegalStateException();
-		}
-	}
-	
-	public static Frame embeddedFrameCreate(long window)
-	{
-		if (JAVA_VERSION < 9)
-		{
-			try
-			{
-				@SuppressWarnings("unchecked")
-				Class<? extends Frame> EmdeddedFrame = (Class<? extends Frame>) Class.forName(getEmbeddedFrameImpl());
-				Constructor<? extends Frame> c = EmdeddedFrame.getConstructor(long.class);
-				
-				return c.newInstance(getEmbeddedFrameHandle(window));
-			}
-			catch (Exception e)
-			{
-				throw new RuntimeException(e);
-			}
-		}
-		else
-		{
-			return nJAWT_CreateEmbeddedFrame(getEmbeddedFrameHandle(window), awt.CreateEmbeddedFrame());
-		}
-	}
-	
-	static void embeddedFrameSynthesizeWindowActivation(Frame embeddedFrame, boolean doActivate)
-	{
-		if (JAVA_VERSION < 9)
-		{
-			try
-			{
-				embeddedFrame
-						.getClass()
-						.getMethod("synthesizeWindowActivation", boolean.class)
-						.invoke(embeddedFrame, doActivate);
-			}
-			catch (Exception e)
-			{
-				throw new RuntimeException(e);
-			}
-		}
-		else
-		{
-			JAWT_SynthesizeWindowActivation(embeddedFrame, doActivate, awt.SynthesizeWindowActivation());
-		}
-	}
-	
-	public static void embeddedFrameSetBounds(Frame embeddedFrame, int x, int y, int width, int height)
-	{
-		if (JAVA_VERSION < 9)
-		{
-			try
-			{
-				Method setLocationPrivate = embeddedFrame
-						.getClass()
-						.getSuperclass()
-						.getDeclaredMethod("setBoundsPrivate", int.class, int.class, int.class, int.class);
-				setLocationPrivate.setAccessible(true);
-				setLocationPrivate.invoke(embeddedFrame, x, y, width, height);
-			}
-			catch (Exception e)
-			{
-				throw new RuntimeException(e);
-			}
-		}
-		else
-		{
-			JAWT_SetBounds(embeddedFrame, x, y, width, height, awt.SetBounds());
-		}
-	}
-	
-	
-	public static void hideFrame(@NotNull Frame embeddedFrame)
-	{
-		embeddedFrame.setVisible(false);
-		embeddedFrameSynthesizeWindowActivation(embeddedFrame, false);
-	}
-	
-	public static void showFrame(@NotNull Frame embeddedFrame)
-	{
-		embeddedFrameSynthesizeWindowActivation(embeddedFrame, true);
-		embeddedFrame.setVisible(true);
-	}
-	public static void placeAtCenter(Frame embeddedFrame, int windowWidth, int windowHeight, int frameWidth, int frameHeight, float scale)
-	{
-		float scaleFactor = (100.0F - scale) / 100.0F;
-		float newWidth = frameWidth * scaleFactor;
-		float newHeight = frameHeight * scaleFactor;
-		float newX = (windowWidth - newWidth) / 2F;
-		float newY = (windowHeight - newHeight) / 2F;
-		embeddedFrameSetBounds(embeddedFrame, Math.round(newX), Math.round(newY), Math.round(newWidth), Math.round(newHeight));
-	}
-	
-}

core/src/main/java/com/seibel/distanthorizons/core/config/gui/JavaScreenHandlerScreen.java

@@ -1,164 +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.gui;
-
-import org.jetbrains.annotations.NotNull;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
-
-/**
- *
- */
-public class JavaScreenHandlerScreen extends AbstractScreen
-{
-	public static Frame frame;
-	public static boolean firstRun = true;
-	public final Component jComponent;
-	
-	
-	
-	static
-	{
-		// Note: this code can cause Mac
-		// to lock up and refuse the load (there's a bug with Java.awt texture loading)
-		
-		// Needs to be called before any Swing code is called, otherwise
-		// Swing will get stuck thinking it's headless
-		System.setProperty("java.awt.headless", "false");
-	}
-	
-	public JavaScreenHandlerScreen(@NotNull Component component)
-	{
-		this.jComponent = component;
-	}
-	
-	@Override
-	public void init()
-	{
-		if (firstRun)
-		{
-			frame = EmbeddedFrameUtil.embeddedFrameCreate(this.minecraftWindow); // Don't call this multiple times
-		}
-		
-		frame.add(this.jComponent);
-		frame.setBackground(new Color(0, 125, 155));
-		
-		JavaScreenHandlerScreen thiss = this;
-		
-		frame.addKeyListener(new KeyListener() 
-		{
-			@Override
-			public void keyPressed(KeyEvent keyEvent)
-			{
-				System.out.println("Key pressed code=" + keyEvent.getKeyCode() + ", char=" + keyEvent.getKeyChar());
-				if (keyEvent.getKeyCode() == KeyEvent.VK_ESCAPE)
-				{
-					thiss.close = true;
-				}
-			}
-			
-			@Override
-			public void keyTyped(KeyEvent keyEvent) { }
-			@Override
-			public void keyReleased(KeyEvent keyEvent) { }
-		});
-		
-		if (firstRun)
-		{
-			EmbeddedFrameUtil.embeddedFrameSetBounds(frame, 0, 0, this.width, this.height);
-			firstRun = false;
-		}
-		
-		EmbeddedFrameUtil.showFrame(frame);
-	}
-	
-	/** A testing/debug screen */
-	public static class ExampleScreen extends JComponent
-	{
-		public ExampleScreen()
-		{
-			this.setLayout(new GridBagLayout());
-			this.setBackground(new Color(255, 0, 0)); // doesn't appear to be used
-			
-			GridBagConstraints helloWorldConstraints = new GridBagConstraints();
-			helloWorldConstraints.weightx = 0.5;
-			helloWorldConstraints.gridx = 0;
-			helloWorldConstraints.gridy = 0;
-			//helloWorldConstraints.fill = GridBagConstraints.BOTH;
-			this.add(new JLabel("Hello World!"), helloWorldConstraints);
-			
-			
-			GridBagConstraints buttonConstraints = new GridBagConstraints();
-			buttonConstraints.weightx = 0.5;
-			buttonConstraints.gridx = 0;
-			buttonConstraints.gridy = 1;
-			//buttonConstraints.fill = GridBagConstraints.BOTH;
-			JButton button = new JButton();
-			button.setBackground(Color.GREEN);
-			button.setFocusable(false); // otherwise we can't use escape to leave
-			button.setAction(new ExampleButtonEventHandler("Button text"));
-			this.add(button, buttonConstraints);
-		}
-		
-		private class ExampleButtonEventHandler extends AbstractAction
-		{
-			public ExampleButtonEventHandler(String text)
-			{
-				super(text);
-				//this.putValue(SHORT_DESCRIPTION, text);
-				//this.putValue(MNEMONIC_KEY, text);
-			}
-			
-			@Override
-			public void actionPerformed(ActionEvent e)
-			{
-				System.out.println("button pressed");
-			}
-		}
-		
-	}
-	
-	
-	@Override
-	public void render(float delta)
-	{
-		// TODO: Make screen only update on this being called
-	}
-	
-	@Override
-	public void onResize()
-	{
-		EmbeddedFrameUtil.embeddedFrameSetBounds(frame, 0, 0, this.width, this.height);
-	}
-	
-	@Override
-	public void onClose()
-	{
-		frame.remove(this.jComponent);
-		EmbeddedFrameUtil.hideFrame(frame);
-	}
-	
-	
-	
-}

core/src/main/java/com/seibel/distanthorizons/core/config/types/AbstractConfigBase.java

@@ -52,11 +52,17 @@ public abstract class AbstractConfigBase<T>
 	protected AbstractConfigBase(EConfigEntryAppearance appearance, T defaultValue)
 	{
 		this.defaultValue = defaultValue;
+		if (this.defaultValue == null)
+		{
+			throw new IllegalArgumentException("defaultValue cannot be null");
+		}
+		
 		this.value = defaultValue;
 		this.appearance = appearance;
 		
 		Class<?> defaultValueClass = defaultValue.getClass();
 		this.isFloatingPointNumber = (defaultValueClass == Double.class || defaultValueClass == Float.class);
+		
 	}
 	
 	

core/src/main/java/com/seibel/distanthorizons/core/config/types/ConfigEntry.java

@@ -60,6 +60,7 @@ public class ConfigEntry<T> extends AbstractConfigBase<T>
 	//=============//
 	// constructor //
 	//=============//
+	//region
 	
 	private ConfigEntry(
 			EConfigEntryAppearance appearance, 
@@ -78,11 +79,14 @@ public class ConfigEntry<T> extends AbstractConfigBase<T>
 		this.listenerList = listenerList;
 	}
 	
+	//endregion
+	
 	
 	
 	//==========================//
 	// property getters/setters //
 	//==========================//
+	//region
 	
 	/** the string used when entering the config into the command line or chat */
 	public String getChatCommandName() { return this.chatCommandName; }
@@ -100,17 +104,23 @@ public class ConfigEntry<T> extends AbstractConfigBase<T>
 	public T getMax() { return this.max; }
 	public void setMax(T newMax) { this.max = newMax; }
 	
+	//endregion
+	
 	
 	
 	//===============//
 	// value setters //
 	//===============//
+	//region
 	
 	public void setApiValue(T newApiValue)
 	{
 		this.apiValue = newApiValue;
+		synchronized (this.listenerList)
+		{
 			this.listenerList.forEach(IConfigListener::onConfigValueSet);
 		}
+	}
 	
 	public boolean apiIsOverriding() 
 	{ 
@@ -129,8 +139,12 @@ public class ConfigEntry<T> extends AbstractConfigBase<T>
 	public void setWithoutSaving(T newValue)
 	{
 		super.set(newValue);
+		
+		synchronized (this.listenerList)
+		{
 			this.listenerList.forEach(IConfigListener::onConfigValueSet);
 		}
+	}
 	@Override
 	public void set(T newValue)
 	{
@@ -141,19 +155,30 @@ public class ConfigEntry<T> extends AbstractConfigBase<T>
 	public void uiSetWithoutSaving(T newValue)
 	{
 		this.setWithoutSaving(newValue);
+		
+		synchronized (this.listenerList)
+		{
 			this.listenerList.forEach(IConfigListener::onUiModify);
 		}
+	}
 	public void uiSet(T newValue)
 	{
 		this.set(newValue);
+		
+		synchronized (this.listenerList)
+		{
 			this.listenerList.forEach(IConfigListener::onUiModify);
 		}
+	}
+	
+	//endregion
 	
 	
 	
 	//===============//
 	// value getters //
 	//===============//
+	//region
 	
 	@Override
 	public T get()
@@ -174,11 +199,14 @@ public class ConfigEntry<T> extends AbstractConfigBase<T>
 	@Nullable
 	public T getApiValue() { return this.apiValue; }
 	
+	//endregion
+	
 	
 	
 	//===========//
 	// listeners //
 	//===========//
+	//region
 	
 	/** Fired whenever the config value changes to a new value. */
 	public void addValueChangeListener(Consumer<T> onValueChangeFunc)
@@ -187,26 +215,38 @@ public class ConfigEntry<T> extends AbstractConfigBase<T>
 		this.addListener(changeListener);
 	}
 	/** Fired whenever the config value is updated, including when the value doesn't change (IE when the UI changes state or the config is reloaded). */
-	public void addListener(IConfigListener newListener) { this.listenerList.add(newListener); }
+	public void addListener(IConfigListener newListener) 
+	{
+		synchronized (this.listenerList)
+		{
+			this.listenerList.add(newListener);
+		}
+	}
 	
-	//public void removeValueChangeListener(Consumer<T> onValueChangeFunc) { } // not currently implemented
+	public void removeListener(IConfigListener oldListener) 
-	public void removeListener(IConfigListener oldListener) { this.listenerList.remove(oldListener); }
+	{
+		synchronized (this.listenerList)
+		{
+			this.listenerList.remove(oldListener);
+		}
+	}
 	
-	public void clearListeners() { this.listenerList.clear(); }
+	public void clearListeners() 
-	public ArrayList<IConfigListener> getListeners() { return this.listenerList; }
+	{
-	/** Replaces the listener list */
+		synchronized (this.listenerList)
-	public void setListeners(ArrayList<IConfigListener> newListeners)
 		{
 			this.listenerList.clear();
-		this.listenerList.addAll(newListeners);
 		}
-	public void setListeners(IConfigListener... newListeners) { this.listenerList.addAll(Arrays.asList(newListeners)); }
+	}
+	
+	//endregion
 	
 	
 	
 	//====================//
 	// min/max validation //
 	//====================//
+	//region
 	
 	/** Checks if this config's current value is valid */
 	public EConfigValidity getValidity() { return this.getValidity(this.value, this.min, this.max); }
@@ -257,22 +297,31 @@ public class ConfigEntry<T> extends AbstractConfigBase<T>
 		}
 	}
 	
+	//endregion
+	
 	
 	
 	//===============//
 	// file handling //
 	//===============//
+	//region
 	
 	/** This should normally not be called since set() automatically calls this */
 	public void save() { ConfigHandler.INSTANCE.configFileHandler.saveEntry(this); }
 	/** This should normally not be called except for special circumstances */
 	public void load() { ConfigHandler.INSTANCE.configFileHandler.loadEntry(this); }
 	
+	//endregion
+	
 	
 	
 	//================//
 	// base overrides //
 	//================//
+	//region
+	
+	@Override 
+	public String toString() { return this.name + ": [" + this.get() + "]"; }
 	
 	public boolean equals(AbstractConfigBase<?> obj) 
 	{
@@ -294,11 +343,14 @@ public class ConfigEntry<T> extends AbstractConfigBase<T>
 		}
 	}
 	
+	//endregion
+	
 	
 	
 	//=========//
 	// builder //
 	//=========//
+	//region
 	
 	public static class Builder<T> extends AbstractConfigBase.Builder<T, Builder<T>>
 	{
@@ -397,4 +449,8 @@ public class ConfigEntry<T> extends AbstractConfigBase<T>
 		
 	}
 	
+	//endregion
+	
+	
+	
 }

core/src/main/java/com/seibel/distanthorizons/core/dataObjects/BlockBiomeWrapperPair.java

@@ -2,11 +2,9 @@ package com.seibel.distanthorizons.core.dataObjects;
 
 import com.seibel.distanthorizons.core.dataObjects.fullData.FullDataPointIdMap;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
-import com.seibel.distanthorizons.core.util.objects.DataCorruptedException;
 import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
 import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
 
 import java.util.concurrent.ConcurrentHashMap;
 
@@ -121,9 +119,9 @@ public class BlockBiomeWrapperPair
 	
 	
 	
-	//=================//
+	//=============//
-	// (de)serializing //
+	// serializing //
-	//=================//
+	//=============//
 	
 	public String serialize() 
 	{
@@ -135,17 +133,6 @@ public class BlockBiomeWrapperPair
 		return this.serialString;
 	}
 	
-	public static BlockBiomeWrapperPair deserialize(String str, ILevelWrapper levelWrapper) throws DataCorruptedException
-	{
-		int separatorIndex = str.indexOf(FullDataPointIdMap.BLOCK_STATE_SEPARATOR_STRING);
-		if (separatorIndex == -1)
-		{
-			throw new DataCorruptedException("Failed to deserialize BiomeBlockStateEntry ["+str+"], unable to find separator.");
-		}
 	
-		IBiomeWrapper biome = WRAPPER_FACTORY.deserializeBiomeWrapperOrGetDefault(str.substring(0, separatorIndex), levelWrapper);
-		IBlockStateWrapper blockState = WRAPPER_FACTORY.deserializeBlockStateWrapperOrGetDefault(str.substring(separatorIndex+FullDataPointIdMap.BLOCK_STATE_SEPARATOR_STRING.length()), levelWrapper);
-		return BlockBiomeWrapperPair.get(blockState, biome);
-	}
 	
 }

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

@@ -20,37 +20,42 @@
 package com.seibel.distanthorizons.core.dataObjects.fullData;
 
 import com.seibel.distanthorizons.core.dataObjects.BlockBiomeWrapperPair;
+import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.util.objects.pooling.PhantomArrayListCheckout;
+import com.seibel.distanthorizons.core.util.objects.pooling.PhantomArrayListPool;
+import com.seibel.distanthorizons.core.util.objects.pooling.StringPool;
 import com.seibel.distanthorizons.core.pos.DhSectionPos;
 import com.seibel.distanthorizons.core.util.LodUtil;
 import com.seibel.distanthorizons.core.util.objects.DataCorruptedException;
 import com.seibel.distanthorizons.core.util.objects.dataStreams.DhDataInputStream;
 import com.seibel.distanthorizons.core.util.objects.dataStreams.DhDataOutputStream;
+import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
 import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
 import com.seibel.distanthorizons.core.logging.DhLogger;
+import it.unimi.dsi.fastutil.chars.CharArrayList;
+import org.jetbrains.annotations.NotNull;
 
 import java.io.*;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
 /**
- * WARNING: This is not THREAD-SAFE! <br><br>
+ * Used to map a numerical IDs to a Biome/BlockState pair. <br>
- * 
+ * Note: This is not thread safe. <br>
- * Used to map a numerical IDs to a Biome/BlockState pair. <br><br>
- * 
- * TODO the serializing of this map might be really big
- *  since it stringifies every block and biome name, which is quite bulky.
- *  It might be worth while to have a biome and block ID that then both get mapped
- *  to the data point ID to reduce file size.
- *  And/or it would be good to dynamically remove IDs that aren't currently in use.
  * 
  * @author Leetom
  */
 public class FullDataPointIdMap
 {
 	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	
+	private static final IWrapperFactory WRAPPER_FACTORY = SingletonInjector.INSTANCE.get(IWrapperFactory.class);
+	
+	public static final PhantomArrayListPool ARRAY_LIST_POOL = new PhantomArrayListPool("IdMap");
+	
 	/**
 	 * Should only be enabled when debugging.
 	 * Has the system check if any duplicate Entries were read/written
@@ -75,14 +80,18 @@ public class FullDataPointIdMap
 	//=============//
 	// constructor //
 	//=============//
+	//region
 	
 	public FullDataPointIdMap(long pos) { this.pos = pos; }
 	
+	//endregion
+	
 	
 	
 	//=========//
 	// getters //
 	//=========//
+	//region
 	
 	/** @see FullDataPointIdMap#getEntry(int) */
 	public IBiomeWrapper getBiomeWrapper(int id) throws IndexOutOfBoundsException { return this.getEntry(id).biome; }
@@ -113,11 +122,14 @@ public class FullDataPointIdMap
 	
 	public long getPos() { return this.pos; }
 	
+	//endregion
+	
 	
 	
 	//=========//
 	// setters //
 	//=========//
+	//region
 	
 	/**
 	 * If an entry with the given values already exists nothing will
@@ -215,11 +227,14 @@ public class FullDataPointIdMap
 		this.cachedHashCode = 0;
 	}
 	
+	//endregion
+	
 	
 	
 	//=============//
 	// serializing //
 	//=============//
+	//region
 	
 	/** Serializes all contained entries into the given stream, formatted in UTF */
 	public void serialize(DhDataOutputStream outputStream) throws IOException
@@ -249,8 +264,9 @@ public class FullDataPointIdMap
 		}
 	}
 	
-	/** Creates a new IdBiomeBlockStateMap from the given UTF formatted stream */
+	/** Clears and populates the given {@link FullDataPointIdMap} from the given UTF formatted stream */
-	public static FullDataPointIdMap deserialize(DhDataInputStream inputStream, long pos, ILevelWrapper levelWrapper) throws IOException, InterruptedException, DataCorruptedException
+	public static void deserialize(@NotNull FullDataPointIdMap map, DhDataInputStream inputStream, long pos, ILevelWrapper levelWrapper) 
+		throws IOException, InterruptedException, DataCorruptedException
 	{
 		int entityCount = inputStream.readInt();
 		if (entityCount < 0)
@@ -258,11 +274,14 @@ public class FullDataPointIdMap
 			throw new DataCorruptedException("FullDataPointIdMap deserialize entry count should have a number greater than or equal to 0, returned value ["+entityCount+"].");
 		}
 		
+		// clearing the old values is necessary so we can re-use the same map multiple times
+		map.clear(pos);
 		
 		// only used when debugging
 		HashMap<String, BlockBiomeWrapperPair> dataPointEntryBySerialization = new HashMap<>();
 		
-		FullDataPointIdMap newMap = new FullDataPointIdMap(pos);
+		try(PhantomArrayListCheckout checkout = ARRAY_LIST_POOL.checkoutArrays(0, 0, 0, 3))
+		{
 			for (int i = 0; i < entityCount; i++)
 			{
 				// necessary to prevent issues with deserializing objects after the level has been closed
@@ -271,13 +290,34 @@ public class FullDataPointIdMap
 					throw new InterruptedException("[" + FullDataPointIdMap.class.getSimpleName() + "] deserializing interrupted.");
 				}
 				
+				int length = inputStream.readUnsignedShort();
+				
+				CharArrayList fullCharList = checkout.getCharArray(0, length);
+				CharArrayList biomeCharList = checkout.getCharArray(1, length);
+				CharArrayList blockCharList = checkout.getCharArray(2, length);
+				
+				// parse the full UTF string
+				for (int stringIndex = 0; stringIndex < length; stringIndex++)
+				{
+					byte b = inputStream.readByte();
+					char c = (char) (b & 0xFF);
+					fullCharList.set(stringIndex, c);
+				}
+				splitCharArray(fullCharList, biomeCharList, blockCharList);
+				
+				String biomeString = StringPool.INSTANCE.getPooledString(biomeCharList);
+				IBiomeWrapper biome = WRAPPER_FACTORY.deserializeBiomeWrapperOrGetDefault(biomeString, levelWrapper);
+				
+				String blockStateString = StringPool.INSTANCE.getPooledString(blockCharList);
+				IBlockStateWrapper blockState = WRAPPER_FACTORY.deserializeBlockStateWrapperOrGetDefault(blockStateString, levelWrapper);
+				
+				BlockBiomeWrapperPair newPair = BlockBiomeWrapperPair.get(blockState, biome);
+				map.blockBiomePairList.add(newPair);
 				
-			String entryString = inputStream.readUTF();
-			BlockBiomeWrapperPair newPair = BlockBiomeWrapperPair.deserialize(entryString, levelWrapper);
-			newMap.blockBiomePairList.add(newPair);
 				
 				if (RUN_SERIALIZATION_DUPLICATE_VALIDATION)
 				{
+					String entryString = StringPool.INSTANCE.getPooledString(fullCharList); 
 					if (dataPointEntryBySerialization.containsKey(entryString))
 					{
 						LOGGER.error("Duplicate deserialized entry found with serial: " + entryString);
@@ -289,21 +329,85 @@ public class FullDataPointIdMap
 					dataPointEntryBySerialization.put(entryString, newPair);
 				}
 			}
+		}
 		
-		if (newMap.size() != entityCount)
+		if (map.size() != entityCount)
 		{
 			// if the mappings are out of sync then the LODs will render incorrectly due to IDs being wrong
-			LodUtil.assertNotReach("ID maps failed to deserialize for pos: ["+ DhSectionPos.toString(pos)+"], incorrect entity count. Expected count ["+entityCount+"], actual count ["+newMap.size()+"]");
+			LodUtil.assertNotReach("ID maps failed to deserialize for pos: ["+ DhSectionPos.toString(pos)+"], incorrect entity count. Expected count ["+entityCount+"], actual count ["+map.size()+"]");
+		}
+	}
+	/**
+	 * Splits up the given input {@link CharArrayList} into the
+	 * necessary biome and blockstate lists based on the location of
+	 * {@link FullDataPointIdMap#BLOCK_STATE_SEPARATOR_STRING}
+	 */
+	private static void splitCharArray(
+		CharArrayList input,
+		CharArrayList biomeString, CharArrayList blockString) throws DataCorruptedException
+	{
+		boolean separatorFound = false;
+		
+		int foundStartIndex = -1;
+		int separatorIndex = 0;
+		for (int inputIndex = 0; inputIndex < input.size(); inputIndex++)
+		{
+			char ch = input.getChar(inputIndex);
+			if (ch == FullDataPointIdMap.BLOCK_STATE_SEPARATOR_STRING.charAt(separatorIndex))
+			{
+				if (!separatorFound)
+				{
+					foundStartIndex = inputIndex;
+				}
+				separatorFound = true;
+				separatorIndex++;
+			}
+			else
+			{
+				separatorFound = false;
+				foundStartIndex = -1;
+				separatorIndex = 0;
 			}
 			
-		return newMap;
+			if (separatorFound
+				&& separatorIndex == FullDataPointIdMap.BLOCK_STATE_SEPARATOR_STRING.length())
+			{
+				break;
 			}
+		}
+		
+		
+		if (foundStartIndex == -1)
+		{
+			throw new DataCorruptedException("Failed to deserialize BiomeBlockStateEntry ["+input.toString()+"], unable to find separator.");
+		}
+		
+		biomeString.clear();
+		for (int i = 0; i < foundStartIndex; i++)
+		{
+			biomeString.push(input.getChar(i));
+		}
+		
+		blockString.clear();
+		for (int i = foundStartIndex + FullDataPointIdMap.BLOCK_STATE_SEPARATOR_STRING.length();
+			i < input.size();
+			i++)
+		{
+			blockString.push(input.getChar(i));
+		}
+	}
+	
+	//endregion
 	
 	
 	
 	//===========//
 	// overrides //
 	//===========//
+	//region
+	
+	@Override 
+	public String toString() { return DhSectionPos.toString(this.pos) + " size: " + this.blockBiomePairList.size(); }
 	
 	@Override
 	public boolean equals(Object other)
@@ -339,6 +443,8 @@ public class FullDataPointIdMap
 		this.cachedHashCode = result;
 	}
 	
+	//endregion
+	
 	
 	
 }

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

@@ -166,8 +166,7 @@ public class FullDataSourceV1
 		this.setDataPoints(dataPoints);
 		
 		
-		FullDataPointIdMap mapping = this.readIdMappings(inputStream, level.getLevelWrapper());
+		this.readIdMappings(this.mapping, inputStream, level.getLevelWrapper());
-		this.setIdMapping(mapping);
 		
 	}
 	
@@ -347,7 +346,7 @@ public class FullDataSourceV1
 		outputStream.writeInt(DATA_GUARD_BYTE);
 		this.mapping.serialize(outputStream);
 	}
-	public FullDataPointIdMap readIdMappings(DhDataInputStream inputStream, ILevelWrapper levelWrapper) throws IOException, InterruptedException, DataCorruptedException
+	public void readIdMappings(FullDataPointIdMap map, DhDataInputStream inputStream, ILevelWrapper levelWrapper) throws IOException, InterruptedException, DataCorruptedException
 	{
 		int guardByte = inputStream.readInt();
 		if (guardByte != DATA_GUARD_BYTE)
@@ -355,9 +354,8 @@ public class FullDataSourceV1
 			throw new IOException("Invalid data content end guard for ID mapping");
 		}
 		
-		return FullDataPointIdMap.deserialize(inputStream, this.pos, levelWrapper);
+		FullDataPointIdMap.deserialize(map, inputStream, this.pos, levelWrapper);
 	}
-	public void setIdMapping(FullDataPointIdMap mappings) { this.mapping.mergeAndReturnRemappedEntityIds(mappings); }
 	
 	
 	

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

@@ -31,10 +31,9 @@ import com.seibel.distanthorizons.core.enums.EDhDirection;
 import com.seibel.distanthorizons.core.file.fullDatafile.V2.FullDataSourceProviderV2;
 import com.seibel.distanthorizons.core.logging.DhLogger;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.pooling.AbstractPhantomArrayList;
+import com.seibel.distanthorizons.core.util.objects.pooling.AbstractPhantomArrayList;
-import com.seibel.distanthorizons.core.pooling.PhantomArrayListCheckout;
+import com.seibel.distanthorizons.core.util.objects.pooling.PhantomArrayListCheckout;
-import com.seibel.distanthorizons.core.pooling.PhantomArrayListPool;
+import com.seibel.distanthorizons.core.util.objects.pooling.PhantomArrayListPool;
-import com.seibel.distanthorizons.core.pos.DhLodPos;
 import com.seibel.distanthorizons.core.pos.DhSectionPos;
 import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos;
 import com.seibel.distanthorizons.core.sql.dto.util.FullDataMinMaxPosUtil;
@@ -44,6 +43,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.Int2IntOpenHashMap;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 import it.unimi.dsi.fastutil.longs.LongArrayList;
 import org.jetbrains.annotations.NotNull;
@@ -78,7 +78,9 @@ public class FullDataSourceV2
 	/** how many chunks wide this datasource is at detail level 0. */
 	public static final int NUMB_OF_CHUNKS_WIDE = WIDTH / LodUtil.CHUNK_WIDTH;
 	
-	public static final PhantomArrayListPool ARRAY_LIST_POOL = new PhantomArrayListPool("FullDataV2");
+	private static final PhantomArrayListPool ARRAY_LIST_POOL = new PhantomArrayListPool("FullDataV2");
+	
+	private static final ThreadLocal<FullDataPointIdMap> DATA_MAP_FOR_REMAPPING_REF = ThreadLocal.withInitial(() -> new FullDataPointIdMap(DhSectionPos.encode((byte)0, 0, 0)));
 	
 	
 	
@@ -121,13 +123,14 @@ public class FullDataSourceV2
 	public Boolean applyToChildren = null;
 	
 	/** should only be used by methods exposed via the DH API */
-	private boolean runApiChunkValidation = false;
+	private boolean runApiSetterValidation = false;
 	
 	
 	
 	//==============//
 	// constructors //
 	//==============//
+	//region
 	
 	public static FullDataSourceV2 createFromChunk(ILevelWrapper levelWrapper, IChunkWrapper chunkWrapper) { return LodDataBuilder.createFromChunk(levelWrapper, chunkWrapper); }
 	
@@ -202,8 +205,9 @@ public class FullDataSourceV2
 	
 	public static FullDataSourceV2 createEmpty(long pos)
 	{
+		FullDataPointIdMap map = new FullDataPointIdMap(pos);
 		return new FullDataSourceV2(
-				pos, new FullDataPointIdMap(pos),
+				pos, map,
 				// data points, genSteps, and columnCompression are all null since
 				// nothing has been generated yet.
 				// Using the default value of all 0's is adequate
@@ -221,7 +225,7 @@ public class FullDataSourceV2
 			byte @Nullable [] columnGenerationSteps, byte @Nullable [] columnWorldCompressionMode,
 			boolean empty)
 	{
-		super(ARRAY_LIST_POOL, 2, 0, WIDTH * WIDTH);
+		super(ARRAY_LIST_POOL, 2, 0, WIDTH * WIDTH, 0);
 		
 		LodUtil.assertTrue(data == null || data.length == WIDTH * WIDTH);
 		
@@ -273,11 +277,14 @@ public class FullDataSourceV2
 		}
 	}
 	
+	//endregion
+	
 	
 	
 	//=========//
 	// getters //
 	//=========//
+	//region
 	
 	public LongArrayList getColumnAtRelPos(int relX, int relZ) throws IndexOutOfBoundsException 
 	{ return this.dataPoints[relativePosToIndex(relX, relZ)]; }
@@ -300,16 +307,11 @@ public class FullDataSourceV2
 	 */
 	public long getDataPointAtBlockPos(int blockPosX, int blockPosY, int blockPosZ, int levelMinY)
 	{
-		DhLodPos requestedPos = new DhLodPos(LodUtil.BLOCK_DETAIL_LEVEL, blockPosX, blockPosZ);
+		long requestedPos = DhSectionPos.encode(LodUtil.BLOCK_DETAIL_LEVEL, blockPosX, blockPosZ);
 		
 		// stop if the requested blockPos is outside this datasource
 		{
-			// get the detail levels for this request
+			long sectionPos =  DhSectionPos.encodeContaining(DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL, new DhBlockPos(blockPosX, blockPosY, blockPosZ));
-			byte requestedDetailLevel = requestedPos.detailLevel;
-			byte requestedSectionDetailLevel = (byte) (requestedDetailLevel + DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL);
-	
-			// get the positions for this request
-			long sectionPos = requestedPos.getSectionPosWithSectionDetailLevel(requestedSectionDetailLevel);
 			if (!DhSectionPos.contains(this.pos, sectionPos))
 			{
 				return FullDataPointUtil.EMPTY_DATA_POINT;
@@ -319,10 +321,10 @@ public class FullDataSourceV2
 		
 		// get the relative data source position
 		byte requestDetailLevel = (byte) (DhSectionPos.getDetailLevel(this.pos) - DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL);
-		DhLodPos relativePos = requestedPos.getDhSectionRelativePositionForDetailLevel(requestDetailLevel);
+		long relativePos = DhSectionPos.getDhSectionRelativePositionForDetailLevel(requestedPos, requestDetailLevel);
 		
 		// get the data column
-		LongArrayList dataColumn = this.getColumnAtRelPos(relativePos.x, relativePos.z);
+		LongArrayList dataColumn = this.getColumnAtRelPos(DhSectionPos.getX(relativePos), DhSectionPos.getZ(relativePos));
 		if (dataColumn == null)
 		{
 			return FullDataPointUtil.EMPTY_DATA_POINT;
@@ -360,11 +362,14 @@ public class FullDataSourceV2
 		return FullDataPointUtil.EMPTY_DATA_POINT;
 	}
 	
+	//endregion
+	
 	
 	
 	//==========//
 	// updating //
 	//==========//
+	//region
 	
 	public boolean updateFromDataSource(@NotNull FullDataSourceV2 inputDataSource)
 	{
@@ -438,6 +443,8 @@ public class FullDataSourceV2
 		}
 		
 		
+		// needed to prevent infinite mapped ID growth
+		this.removeUnusedIdsAndRemap();
 		
 		
 		
@@ -675,13 +682,13 @@ public class FullDataSourceV2
 		
 		return dataChanged;
 	}
+	
 	/** 
 	 * The minimum value is used because we don't want to accidentally record that
 	 * something was generated when it wasn't.
 	 */
 	private static byte determineMinWorldGenStepForTwoByTwoColumn(ByteArrayList columnGenerationSteps, int relX, int relZ)
 	{
-		// TODO merge similar logic with determineHighestWorldCompressionForTwoByTwoColumn
 		byte minWorldGenStepValue = Byte.MAX_VALUE;
 		for (int x = 0; x < 2; x++)
 		{
@@ -700,7 +707,6 @@ public class FullDataSourceV2
 	 */
 	private static byte determineHighestWorldCompressionForTwoByTwoColumn(ByteArrayList columnCompressionMode, int relX, int relZ)
 	{
-		// TODO merge similar logic with determineMinWorldGenStepForTwoByTwoColumn
 		byte minWorldGenStepValue = Byte.MIN_VALUE;
 		for (int x = 0; x < 2; x++)
 		{
@@ -776,7 +782,7 @@ public class FullDataSourceV2
 			return newColumnList;
 		}
 		
-		// sort the transitions from bottom to top // TODO
+		// sort the transitions from bottom to top
 		yTransitions.sort(null);
 		
 		// create index trackers for each column, 
@@ -1128,11 +1134,76 @@ public class FullDataSourceV2
 		return dataChanged;
 	}
 	
+	/**
+	 * Should be run at the end of {@link FullDataSourceV2#updateFromDataSource}
+	 * so the {@link FullDataPointIdMap} will only contain ID's that are actively in use. <br><br>
+	 * 
+	 * This prevents the {@link FullDataPointIdMap} from growing infinitely when merged.
+	 * 
+	 * @see FullDataPointIdMap#mergeAndReturnRemappedEntityIds(FullDataPointIdMap) 
+	 */
+	private void removeUnusedIdsAndRemap()
+	{
+		Int2IntOpenHashMap newIdByOldId = new Int2IntOpenHashMap();
+		FullDataPointIdMap newMap = DATA_MAP_FOR_REMAPPING_REF.get();
+		newMap.clear(this.pos);
+		
+		
+		// find all the IDs that are currently in use
+		for (int x = 0; x < WIDTH; x++)
+		{
+			for (int z = 0; z < WIDTH; z++)
+			{
+				int index = relativePosToIndex(x, z);
+				LongArrayList dataColumn = this.dataPoints[index];
+				for (int i = 0; i < dataColumn.size(); i++)
+				{
+					long dataPoint = dataColumn.getLong(i);
+					int oldId = FullDataPointUtil.getId(dataPoint);
+					
+					int newId = newMap.addIfNotPresentAndGetId(
+						this.mapping.getBiomeWrapper(oldId),
+						this.mapping.getBlockStateWrapper(oldId));
+					
+					newIdByOldId.put(oldId, newId);
+				}
+			}
+		}
+		
+		
+		// replace the old entries to remove any unneeded ones
+		this.mapping.clear(this.pos);
+		this.mapping.addAll(newMap);
+		
+		
+		// remap the data
+		for (int x = 0; x < WIDTH; x++)
+		{
+			for (int z = 0; z < WIDTH; z++)
+			{
+				int index = relativePosToIndex(x, z);
+				LongArrayList dataColumn = this.dataPoints[index];
+				for (int i = 0; i < dataColumn.size(); i++)
+				{
+					long oldDataPoint = dataColumn.getLong(i);
+					int oldId = FullDataPointUtil.getId(oldDataPoint);
+					
+					int newId = newIdByOldId.get(oldId);
+					long newDataPoint = FullDataPointUtil.setId(oldDataPoint, newId);
+					dataColumn.set(i, newDataPoint);
+				}
+			}
+		}
+	}
+	
+	//endregion
+	
 	
 	
 	//===================//
 	// adjacent clearing //
 	//===================//
+	//region
 	
 	/** Removes any non-adjacent data from the given direction. */
 	public void clearAllNonAdjData(EDhDirection direction)
@@ -1161,10 +1232,13 @@ public class FullDataSourceV2
 		}
 	}
 	
+	//endregion
+	
 	
 	//================//
 	// helper methods //
 	//================//
+	//region
 	
 	/** 
 	 * Usually this should just be used internally, but there may be instances
@@ -1256,11 +1330,14 @@ public class FullDataSourceV2
 		}
 	}
 	
+	//endregion
+	
 	
 	
 	//=====================//
 	// setters and getters //
 	//=====================//
+	//region
 	
 	public long getPos() { return this.pos; }
 	
@@ -1290,13 +1367,16 @@ public class FullDataSourceV2
 		}
 	}
 	
+	//endregion
+	
 	
 	
 	//=============//
 	// API methods //
 	//=============//
+	//region
 	
-	public void setRunApiChunkValidation(boolean runValidation) { this.runApiChunkValidation = runValidation; }
+	public void setRunApiSetterValidation(boolean runValidation) { this.runApiSetterValidation = runValidation; }
 	
 	@Override
 	public int getWidthInDataColumns() { return WIDTH; }
@@ -1308,14 +1388,13 @@ public class FullDataSourceV2
 		try
 		{
 			LodDataBuilder.putListInTopDownOrder(columnDataPoints);
-			if (this.runApiChunkValidation)
+			if (this.runApiSetterValidation)
 			{
 				LodDataBuilder.validateOrThrowApiDataColumn(columnDataPoints);
 			}
 			
 			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);
 			
 			return columnDataPoints;
@@ -1343,20 +1422,26 @@ public class FullDataSourceV2
 		return apiList;
 	}
 	
+	//endregion
+	
 	
 	
 	//============//
 	// unit tests //
 	//============//
+	//region
 	
 	public PhantomArrayListCheckout getPhantomArrayCheckoutForUnitTesting()
 	{ return this.pooledArraysCheckout; }
 	
+	//endregion
+	
 	
 	
 	//================//
 	// base overrides //
 	//================//
+	//region
 	
 	@Override
 	public String toString() { return DhSectionPos.toString(this.pos); }
@@ -1403,6 +1488,8 @@ public class FullDataSourceV2
 		}
 	}
 	
+	//endregion
+	
 	
 	
 }

core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/ColumnRenderSource.java

@@ -19,13 +19,12 @@
 
 package com.seibel.distanthorizons.core.dataObjects.render;
 
+import com.seibel.distanthorizons.api.enums.config.EDhApiVerticalQuality;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.pooling.AbstractPhantomArrayList;
+import com.seibel.distanthorizons.core.util.objects.pooling.AbstractPhantomArrayList;
-import com.seibel.distanthorizons.core.pooling.PhantomArrayListPool;
+import com.seibel.distanthorizons.core.util.objects.pooling.PhantomArrayListPool;
 import com.seibel.distanthorizons.core.pos.DhSectionPos;
-import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnArrayView;
+import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnRenderView;
-import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnQuadView;
-import com.seibel.distanthorizons.core.util.ColorUtil;
 import com.seibel.distanthorizons.core.util.RenderDataPointUtil;
 import it.unimi.dsi.fastutil.longs.LongArrayList;
 import com.seibel.distanthorizons.core.logging.DhLogger;
@@ -46,15 +45,16 @@ public class ColumnRenderSource extends AbstractPhantomArrayList
 	
 	
 	
-	/** will be zero if an empty data source was created */
+	/** 
-	public int verticalDataCount;
+	 * will be zero if an empty data source was created 
+	 * @see EDhApiVerticalQuality#calculateMaxNumberOfVerticalSlicesAtDetailLevel(byte) 
+	 */
+	public int maxVerticalSliceCount;
 	public long pos;
 	public int yOffset;
 	
 	public final LongArrayList renderDataContainer;
 	
-	public final DebugSourceFlag[] debugSourceFlags;
-	
 	private boolean isEmpty = true;
 	
 	
@@ -62,64 +62,67 @@ public class ColumnRenderSource extends AbstractPhantomArrayList
 	//==============//
 	// constructors //
 	//==============//
+	//region
 	
-	public static ColumnRenderSource createEmpty(long pos, int maxVerticalSize, int yOffset)
+	public static ColumnRenderSource createEmpty(long pos, int maxVertSliceCount, int yOffset)
-	{ return new ColumnRenderSource(pos, maxVerticalSize, yOffset); }
+	{ return new ColumnRenderSource(pos, maxVertSliceCount, yOffset); }
 	/**
 	 * Creates an empty ColumnRenderSource.
 	 *
 	 * @param pos the relative position of the container
-	 * @param maxVerticalSize the maximum vertical size of the container
+	 * @param maxVertSliceCount the maximum vertical size of the container
 	 */
-	private ColumnRenderSource(long pos, int maxVerticalSize, int yOffset)
+	private ColumnRenderSource(long pos, int maxVertSliceCount, int yOffset)
 	{
-		super(ARRAY_LIST_POOL, 0, 0, 1);
+		super(ARRAY_LIST_POOL, 0, 0, 1, 0);
 		
 		this.pos = pos;
 		this.yOffset = yOffset;
 		
-		this.verticalDataCount = maxVerticalSize;
+		this.maxVerticalSliceCount = maxVertSliceCount;
 		
-		this.renderDataContainer = this.pooledArraysCheckout.getLongArray(0, WIDTH * WIDTH * this.verticalDataCount);
+		this.renderDataContainer = this.pooledArraysCheckout.getLongArray(0, WIDTH * WIDTH * this.maxVerticalSliceCount);
-		
-		this.debugSourceFlags = new DebugSourceFlag[WIDTH * WIDTH];
 	}
 	
+	//endregion
+	
 	
 	
 	//========================//
 	// datapoint manipulation //
 	//========================//
+	//region
 	
-	public long getDataPoint(int posX, int posZ, int verticalIndex) { return this.renderDataContainer.getLong(posX * WIDTH * this.verticalDataCount + posZ * this.verticalDataCount + verticalIndex); }
+	public long getDataPoint(int posX, int posZ, int verticalIndex) { return this.renderDataContainer.getLong(posX * WIDTH * this.maxVerticalSliceCount + posZ * this.maxVerticalSliceCount + verticalIndex); }
 	
-	public ColumnArrayView getVerticalDataPointView(int posX, int posZ)
+	public void populateColumnView(ColumnRenderView view, int posX, int posZ) throws IllegalArgumentException
 	{
-		int offset = posX * WIDTH * this.verticalDataCount + posZ * this.verticalDataCount;
+		int offset = posX * WIDTH * this.maxVerticalSliceCount + posZ * this.maxVerticalSliceCount;
 		
 		// don't allow returning views that are outside this render source's bounds
 		if (offset >= this.renderDataContainer.size())
 		{
-			return null;
+			throw new IllegalArgumentException("Column View offset ["+offset+"] greater than parent render data container ["+DhSectionPos.toString(this.pos)+"] size ["+this.renderDataContainer.size()+"].");
 		}
 		else if (posX < 0 || posX >= WIDTH
 				|| posZ < 0 || posZ >= WIDTH)
 		{
-			return null;
+			throw new IllegalArgumentException("Column View pos outside valid range ["+posX+","+posZ+"].");
 		}
 		
-		return new ColumnArrayView(this.renderDataContainer, this.verticalDataCount,
+		view.populate(
-				offset, this.verticalDataCount);
+			this.renderDataContainer, this.maxVerticalSliceCount,
+			offset, this.maxVerticalSliceCount);
 	}
 	
-	public ColumnQuadView getFullQuadView() { return this.getQuadViewOverRange(0, 0, WIDTH, WIDTH); }
+	//endregion
-	public ColumnQuadView getQuadViewOverRange(int quadX, int quadZ, int quadXSize, int quadZSize) { return new ColumnQuadView(this.renderDataContainer, WIDTH, this.verticalDataCount, quadX, quadZ, quadXSize, quadZSize); }
 	
 	
 	
 	//=====================//
 	// data helper methods //
 	//=====================//
+	//region
 	
 	public Long getPos() { return this.pos; }
 	public Long getKey() { return this.pos; }
@@ -137,15 +140,16 @@ public class ColumnRenderSource extends AbstractPhantomArrayList
 			return false;
 		}
 		
-		
+		try (ColumnRenderView columnView = ColumnRenderView.getPooled())
+		{
 			for (int x = 0; x < WIDTH; x++)
 			{
 				for (int z = 0; z < WIDTH; z++)
 				{
-				ColumnArrayView columnArrayView = this.getVerticalDataPointView(x,z);
+					this.populateColumnView(columnView, x, z);
-				for (int i = 0; i < columnArrayView.size; i++)
+					for (int i = 0; i < columnView.size; i++)
 					{
-					long dataPoint = columnArrayView.get(i);
+						long dataPoint = columnView.get(i);
 						if (!RenderDataPointUtil.hasZeroHeight(dataPoint))
 						{
 							return true;
@@ -153,35 +157,19 @@ public class ColumnRenderSource extends AbstractPhantomArrayList
 					}
 				}
 			}
+		}
 		
 		return false;
 	}
 	
-	
+	//endregion
-	
-	//=======//
-	// debug //
-	//=======//
-	
-	/** Sets the debug flag for the given area */
-	public void fillDebugFlag(int xStart, int zStart, int xWidth, int zWidth, DebugSourceFlag flag)
-	{
-		for (int x = xStart; x < xStart + xWidth; x++)
-		{
-			for (int z = zStart; z < zStart + zWidth; z++)
-			{
-				this.debugSourceFlags[x * WIDTH + z] = flag;
-			}
-		}
-	}
-	
-	public DebugSourceFlag debugGetFlag(int ox, int oz) { return this.debugSourceFlags[ox * WIDTH + oz]; }
 	
 	
 	
 	//==============//
 	// base methods //
 	//==============//
+	//region
 	
 	@Override
 	public String toString()
@@ -199,11 +187,11 @@ public class ColumnRenderSource extends AbstractPhantomArrayList
 		{
 			for (int x = 0; x < size; x++)
 			{
-				for (int y = 0; y < this.verticalDataCount; y++)
+				for (int y = 0; y < this.maxVerticalSliceCount; y++)
 				{
 					//Converting the dataToHex
 					stringBuilder.append(Long.toHexString(this.getDataPoint(x, z, y)));
-					if (y != this.verticalDataCount - 1)
+					if (y != this.maxVerticalSliceCount - 1)
 						stringBuilder.append(SUBDATA_DELIMITER);
 				}
 				
@@ -217,21 +205,8 @@ public class ColumnRenderSource extends AbstractPhantomArrayList
 		return stringBuilder.toString();
 	}
 	
+	//endregion
 	
 	
-	//==============//
-	// helper enums //
-	//==============//
-	
-	public enum DebugSourceFlag
-	{
-		FULL(ColorUtil.BLUE),
-		DIRECT(ColorUtil.WHITE),
-		FILE(ColorUtil.BROWN);
-		
-		public final int color;
-		
-		DebugSourceFlag(int color) { this.color = color; }
-	}
 	
 }

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

@@ -47,7 +47,7 @@ public final class BufferQuad
 	
 	public short widthEastWest;
 	/** This is both North/South and Up/Down since the merging logic is the same either way */
-	public short widthNorthSouthOrUpDown;
+	public short widthNorthSouthOrHeight;
 	
 	public final int color;
 	/** used by the Iris shader mod to determine how each LOD should be rendered */
@@ -62,20 +62,24 @@ public final class BufferQuad
 	
 	
 	BufferQuad(
-			short x, short y, short z, short widthEastWest, short widthNorthSouthOrUpDown,
+			short x, short y, short z, short widthEastWest, short widthNorthSouthOrHeight,
 			int color, byte irisBlockMaterialId, byte skylight, byte blockLight,
 			EDhDirection direction)
 	{
-		if (widthEastWest == 0 || widthNorthSouthOrUpDown == 0)
+		if (widthEastWest == 0 || widthNorthSouthOrHeight == 0)
+		{
 			throw new IllegalArgumentException("Size 0 quad!");
-		if (widthEastWest < 0 || widthNorthSouthOrUpDown < 0)
+		}
+		if (widthEastWest < 0 || widthNorthSouthOrHeight < 0)
+		{
 			throw new IllegalArgumentException("Negative sized quad!");
+		}
 		
 		this.x = x;
 		this.y = y;
 		this.z = z;
 		this.widthEastWest = widthEastWest;
-		this.widthNorthSouthOrUpDown = widthNorthSouthOrUpDown;
+		this.widthNorthSouthOrHeight = widthNorthSouthOrHeight;
 		this.color = color;
 		this.irisBlockMaterialId = irisBlockMaterialId;
 		this.skyLight = skylight;
@@ -238,17 +242,17 @@ public final class BufferQuad
 		if (mergeDirection == BufferMergeDirectionEnum.EastWest)
 		{
 			thisPerpendicularCompareWidth = this.widthEastWest;
-			thisParallelCompareWidth = this.widthNorthSouthOrUpDown;
+			thisParallelCompareWidth = this.widthNorthSouthOrHeight;
 			
 			otherPerpendicularCompareWidth = quad.widthEastWest;
-			otherParallelCompareWidth = quad.widthNorthSouthOrUpDown;
+			otherParallelCompareWidth = quad.widthNorthSouthOrHeight;
 		}
 		else
 		{
-			thisPerpendicularCompareWidth = this.widthNorthSouthOrUpDown;
+			thisPerpendicularCompareWidth = this.widthNorthSouthOrHeight;
 			thisParallelCompareWidth = this.widthEastWest;
 			
-			otherPerpendicularCompareWidth = quad.widthNorthSouthOrUpDown;
+			otherPerpendicularCompareWidth = quad.widthNorthSouthOrHeight;
 			otherParallelCompareWidth = quad.widthEastWest;
 		}
 		
@@ -318,7 +322,7 @@ public final class BufferQuad
 		// merge the two quads
 		if (mergeDirection == BufferMergeDirectionEnum.NorthSouthOrUpDown)
 		{
-			this.widthNorthSouthOrUpDown += quad.widthNorthSouthOrUpDown;
+			this.widthNorthSouthOrHeight += quad.widthNorthSouthOrHeight;
 		}
 		else // if (mergeDirection == MergeDirection.EastWest)
 		{

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

@@ -23,19 +23,19 @@ import com.seibel.distanthorizons.core.config.Config;
 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.util.objects.pooling.PhantomArrayListCheckout;
-import com.seibel.distanthorizons.core.util.ColorUtil;
+import com.seibel.distanthorizons.coreapi.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.ColumnRenderView;
-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
@@ -54,7 +54,7 @@ public class ColumnBox
 			short width, short yHeight,
 			short minX, short minY, short minZ,
 			int color, byte irisBlockMaterialId, byte skyLight, byte blockLight,
-			long topData, long bottomData, ColumnArrayView[] adjData, boolean[] isAdjDataSameDetailLevel)
+			long topData, long bottomData, ColumnRenderView[] adjData, boolean[] isAdjDataSameDetailLevel)
 	{
 		//================//
 		// variable setup //
@@ -122,7 +122,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, ColorUtil.applyShade(color, MC_RENDER.getShade(EDhDirection.UP)), irisBlockMaterialId, skyLightTop, blockLight);
 			}
 		}
 		
@@ -133,7 +133,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, ColorUtil.applyShade(color, MC_RENDER.getShade(EDhDirection.DOWN)), irisBlockMaterialId, skyLightBot, blockLight);
 			}
 		}
 		
@@ -145,7 +145,7 @@ public class ColumnBox
 		
 		// NORTH face
 		{
-			ColumnArrayView adjCol = adjData[EDhDirection.NORTH.compassIndex];
+			ColumnRenderView adjCol = adjData[EDhDirection.NORTH.compassIndex];
 			boolean adjSameDetailLevel = isAdjDataSameDetailLevel[EDhDirection.NORTH.compassIndex];
 			// if the adjacent column is null that generally means the adjacent area hasn't been generated yet
 			if (adjCol == null)
@@ -172,7 +172,7 @@ public class ColumnBox
 		
 		// SOUTH face
 		{
-			ColumnArrayView adjCol = adjData[EDhDirection.SOUTH.compassIndex];
+			ColumnRenderView adjCol = adjData[EDhDirection.SOUTH.compassIndex];
 			boolean adjSameDetailLevel = isAdjDataSameDetailLevel[EDhDirection.SOUTH.compassIndex];
 			if (adjCol == null)
 			{
@@ -197,7 +197,7 @@ public class ColumnBox
 		
 		// WEST face
 		{
-			ColumnArrayView adjCol = adjData[EDhDirection.WEST.compassIndex];
+			ColumnRenderView adjCol = adjData[EDhDirection.WEST.compassIndex];
 			boolean adjSameDetailLevel = isAdjDataSameDetailLevel[EDhDirection.WEST.compassIndex];
 			if (adjCol == null)
 			{
@@ -222,7 +222,7 @@ public class ColumnBox
 		
 		// EAST face
 		{
-			ColumnArrayView adjCol = adjData[EDhDirection.EAST.compassIndex];
+			ColumnRenderView adjCol = adjData[EDhDirection.EAST.compassIndex];
 			boolean adjSameDetailLevel = isAdjDataSameDetailLevel[EDhDirection.EAST.compassIndex];
 			if (adjCol == null)
 			{
@@ -248,7 +248,7 @@ public class ColumnBox
 	
 	private static void makeAdjVerticalQuad(
 		LodQuadBuilder builder, PhantomArrayListCheckout phantomArrayCheckout,
-		@NotNull ColumnArrayView adjColumnView, boolean adjacentIsSameDetailLevel, int caveCullingMaxY, EDhDirection direction,
+		@NotNull ColumnRenderView adjColumnView, boolean adjacentIsSameDetailLevel, int caveCullingMaxY, EDhDirection direction,
 		short x, short yMin, short z, short horizontalWidth, short ySize,
 		int color, byte irisBlockMaterialId, byte blockLight)
 	{
@@ -263,7 +263,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)))
@@ -283,7 +283,7 @@ public class ColumnBox
 		short yMax = (short) (yMin + ySize);
 		
 		
-		int adjCount = adjColumnView.size();
+		int adjCount = adjColumnView.size;
 		
 		// Start with the entire range at max light
 		segments.add(YSegmentUtil.encode(yMin, yMax, LodUtil.MAX_MC_LIGHT));

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

@@ -27,15 +27,14 @@ import com.seibel.distanthorizons.core.dataObjects.render.ColumnRenderSource;
 import com.seibel.distanthorizons.core.level.IDhClientLevel;
 import com.seibel.distanthorizons.core.logging.DhLogger;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.pooling.PhantomArrayListCheckout;
+import com.seibel.distanthorizons.core.util.objects.pooling.PhantomArrayListCheckout;
-import com.seibel.distanthorizons.core.pooling.PhantomArrayListPool;
+import com.seibel.distanthorizons.core.util.objects.pooling.PhantomArrayListPool;
 import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos;
 import com.seibel.distanthorizons.core.pos.DhSectionPos;
-import com.seibel.distanthorizons.core.render.glObject.GLProxy;
+import com.seibel.distanthorizons.coreapi.util.ColorUtil;
-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.dataObjects.render.columnViews.ColumnArrayView;
+import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnRenderView;
 
 import java.util.concurrent.CompletableFuture;
 
@@ -65,7 +64,7 @@ public class ColumnRenderBufferBuilder
 	{
 		DhBlockPos minBlockPos = new DhBlockPos(DhSectionPos.getMinCornerBlockX(pos), clientLevel.getLevelWrapper().getMinHeight(), DhSectionPos.getMinCornerBlockZ(pos));
 		LodBufferContainer bufferContainer = new LodBufferContainer(pos, minBlockPos);
-		CompletableFuture<LodBufferContainer> uploadFuture = bufferContainer.makeAndUploadBuffersAsync(quadBuilder);
+		CompletableFuture<LodBufferContainer> uploadFuture = bufferContainer.tryMakeAndUploadBuffersAsync(quadBuilder);
 		uploadFuture.whenComplete((uploadedBuffer, exception) -> 
 		{
 			// clean up if not uploaded
@@ -108,16 +107,29 @@ public class ColumnRenderBufferBuilder
 		//===================//
 		
 		// pooled arrays for ColumnBox use
-		try (PhantomArrayListCheckout phantomArrayCheckout = ARRAY_LIST_POOL.checkoutArrays(0, 0, 2))
+		try (PhantomArrayListCheckout phantomArrayCheckout = ARRAY_LIST_POOL.checkoutLongArrays(2);
+			ColumnRenderView columnRenderData = ColumnRenderView.getPooled();
+			ColumnRenderView northAdjView = ColumnRenderView.getPooled();
+			ColumnRenderView southAdjView = ColumnRenderView.getPooled();
+			ColumnRenderView eastAdjView = ColumnRenderView.getPooled();
+			ColumnRenderView westAdjView = ColumnRenderView.getPooled())
 		{
+			ColumnRenderView[] adjColumnViews = new ColumnRenderView[EDhDirection.CARDINAL_COMPASS.length];
+			adjColumnViews[EDhDirection.NORTH.compassIndex] = northAdjView;
+			adjColumnViews[EDhDirection.SOUTH.compassIndex] = southAdjView;
+			adjColumnViews[EDhDirection.EAST.compassIndex] = eastAdjView;
+			adjColumnViews[EDhDirection.WEST.compassIndex] = westAdjView;
+			
+			
 			byte thisDetailLevel = renderSource.getDataDetailLevel();
 			for (int relX = 0; relX < ColumnRenderSource.WIDTH; relX++)
 			{
 				for (int relZ = 0; relZ < ColumnRenderSource.WIDTH; relZ++)
 				{
-					// ignore empty/null columns
+					renderSource.populateColumnView(columnRenderData, relX, relZ);
-					ColumnArrayView columnRenderData = renderSource.getVerticalDataPointView(relX, relZ);
+					
-					if (columnRenderData.size() == 0
+					// ignore empty columns
+					if (columnRenderData.size == 0
 						|| !RenderDataPointUtil.doesDataPointExist(columnRenderData.get(0))
 						|| RenderDataPointUtil.hasZeroHeight(columnRenderData.get(0)))
 					{
@@ -125,7 +137,6 @@ public class ColumnRenderBufferBuilder
 					}
 					
 					
-					
 					//=============//
 					// debug limit //
 					//=============//
@@ -152,7 +163,12 @@ public class ColumnRenderBufferBuilder
 					// get adjacent render data columns //
 					//==================================//
 					
-					ColumnArrayView[] adjColumnViews = new ColumnArrayView[EDhDirection.CARDINAL_COMPASS.length];
+					// clear the old data so we can handle if one of the adjacent columns is missing/empty
+					adjColumnViews[EDhDirection.NORTH.compassIndex].clear();
+					adjColumnViews[EDhDirection.SOUTH.compassIndex].clear();
+					adjColumnViews[EDhDirection.EAST.compassIndex].clear();
+					adjColumnViews[EDhDirection.WEST.compassIndex].clear();
+					
 					for (EDhDirection direction : EDhDirection.CARDINAL_COMPASS)
 					{
 						try
@@ -160,8 +176,8 @@ public class ColumnRenderBufferBuilder
 							int xAdj = relX + direction.normal.x;
 							int zAdj = relZ + direction.normal.z;
 							boolean isCrossRenderSourceBoundary =
-									(xAdj < 0 || xAdj >= ColumnRenderSource.WIDTH) ||
+								(xAdj < 0 || xAdj >= ColumnRenderSource.WIDTH)
-											(zAdj < 0 || zAdj >= ColumnRenderSource.WIDTH);
+								|| (zAdj < 0 || zAdj >= ColumnRenderSource.WIDTH);
 							
 							ColumnRenderSource adjRenderSource;
 							byte adjDetailLevel;
@@ -230,7 +246,7 @@ public class ColumnRenderBufferBuilder
 								LodUtil.assertNotReach("Mismatch between adjacent detail level ["+adjDetailLevel+"] and this render source's detail level ["+thisDetailLevel+"]. Detail levels should be adj >= this.");
 							}
 							
-							adjColumnViews[direction.compassIndex] = adjRenderSource.getVerticalDataPointView(xAdj, zAdj);
+							adjRenderSource.populateColumnView(adjColumnViews[direction.compassIndex], xAdj, zAdj);
 						}
 						catch (RuntimeException e)
 						{
@@ -244,9 +260,7 @@ public class ColumnRenderBufferBuilder
 					// build this render column //
 					//==========================//
 					
-					ColumnRenderSource.DebugSourceFlag debugSourceFlag = renderSource.debugGetFlag(relX, relZ);
+					for (int i = 0; i < columnRenderData.size; i++)
-					
-					for (int i = 0; i < columnRenderData.size(); i++)
 					{
 						// can be uncommented to limit which vertical LOD is generated
 						if (Config.Client.Advanced.Debugging.ColumnBuilderDebugging.columnBuilderDebugEnable.get())
@@ -269,16 +283,15 @@ public class ColumnRenderBufferBuilder
 						}
 						
 						long topDataPoint = (i - 1) >= 0 ? columnRenderData.get(i - 1) : RenderDataPointUtil.EMPTY_DATA;
-						long bottomDataPoint = (i + 1) < columnRenderData.size() ? columnRenderData.get(i + 1) : RenderDataPointUtil.EMPTY_DATA;
+						long bottomDataPoint = (i + 1) < columnRenderData.size ? columnRenderData.get(i + 1) : RenderDataPointUtil.EMPTY_DATA;
 						
 						addRenderDataPointToBuilder(
 							clientLevel, phantomArrayCheckout,
 							data, topDataPoint, bottomDataPoint,
 							adjColumnViews, isSameDetailLevel,
 							thisDetailLevel, relX, relZ,
-								quadBuilder, debugSourceFlag);
+							quadBuilder);
 					}
-					
 				}// for z
 			}// for x
 		}// phantom checkout
@@ -288,9 +301,9 @@ public class ColumnRenderBufferBuilder
 	private static void addRenderDataPointToBuilder(
 			IDhClientLevel clientLevel, PhantomArrayListCheckout phantomArrayCheckout,
 			long renderData, long topRenderData, long bottomRenderData, 
-			ColumnArrayView[] adjColumnViews, boolean[] isSameDetailLevel,
+			ColumnRenderView[] adjColumnViews, boolean[] isSameDetailLevel,
 			byte detailLevel, int renderSourceOffsetPosX, int renderSourceOffsetPosZ, 
-			LodQuadBuilder quadBuilder, ColumnRenderSource.DebugSourceFlag debugSource)
+			LodQuadBuilder quadBuilder)
 	{
 		long sectionPos = DhSectionPos.encode(detailLevel, renderSourceOffsetPosX, renderSourceOffsetPosZ);
 		
@@ -315,13 +328,13 @@ public class ColumnRenderBufferBuilder
 		
 		int color;
 		boolean fullBright = false;
-		EDhApiDebugRendering debugging = Config.Client.Advanced.Debugging.debugRendering.get();
+		EDhApiDebugRendering debugging = Config.Client.Advanced.Debugging.debugRenderingColors.get();
 		switch (debugging)
 		{
 			case OFF:
 			{
-				float saturationMultiplier = Config.Client.Advanced.Graphics.Quality.saturationMultiplier.get().floatValue();
+				float saturationMultiplier = Config.Client.Advanced.Graphics.Quality.saturationMultiplier.get();
-				float brightnessMultiplier = Config.Client.Advanced.Graphics.Quality.brightnessMultiplier.get().floatValue();
+				float brightnessMultiplier = Config.Client.Advanced.Graphics.Quality.brightnessMultiplier.get();
 				if (saturationMultiplier == 1.0 && brightnessMultiplier == 1.0)
 				{
 					color = RenderDataPointUtil.getColor(renderData);
@@ -407,12 +420,6 @@ public class ColumnRenderBufferBuilder
 				fullBright = true;
 				break;
 			}
-			case SHOW_RENDER_SOURCE_FLAG:
-			{
-				color = debugSource == null ? ColorUtil.RED : debugSource.color;
-				fullBright = true;
-				break;
-			}
 			default:
 				throw new IllegalArgumentException("Unknown debug mode: " + debugging);
 		}

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

@@ -0,0 +1,92 @@
+package com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding;
+
+import org.lwjgl.system.MemoryUtil;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+public class IndexBufferBuilder
+{
+	
+	
+	//==========//
+	// building //
+	//==========//
+	//region
+	
+	/** Buffer should be freed by {@link MemoryUtil#memFree} */
+	public static ByteBuffer createBuffer(int quadCount)
+	{
+		int indexCount = quadCount * 6; // 2 triangles per quad
+		ByteBuffer buffer = MemoryUtil.memAlloc(indexCount * Integer.BYTES);
+		buffer.order(ByteOrder.nativeOrder());
+		buildBufferInt(quadCount, buffer);
+		
+		return buffer;
+	}
+	private static void buildBufferByte(int quadCount, ByteBuffer buffer)
+	{
+		for (int i = 0; i < quadCount; i++)
+		{
+			int vIndex = i * 4;
+			// First triangle
+			buffer.put((byte) (vIndex));
+			buffer.put((byte) (vIndex + 1));
+			buffer.put((byte) (vIndex + 2));
+			// Second triangle
+			buffer.put((byte) (vIndex + 2));
+			buffer.put((byte) (vIndex + 3));
+			buffer.put((byte) (vIndex));
+		}
+		if (buffer.hasRemaining())
+		{
+			throw new IllegalStateException("QuadElementBuffer is not full somehow after building");
+		}
+		buffer.rewind();
+	}
+	private static void buildBufferShort(int quadCount, ByteBuffer buffer)
+	{
+		for (int i = 0; i < quadCount; i++)
+		{
+			int vIndex = i * 4;
+			// First triangle
+			buffer.putShort((short) (vIndex));
+			buffer.putShort((short) (vIndex + 1));
+			buffer.putShort((short) (vIndex + 2));
+			// Second triangle
+			buffer.putShort((short) (vIndex + 2));
+			buffer.putShort((short) (vIndex + 3));
+			buffer.putShort((short) (vIndex));
+		}
+		if (buffer.hasRemaining())
+		{
+			throw new IllegalStateException("QuadElementBuffer is not full somehow after building");
+		}
+		buffer.rewind();
+	}
+	private static void buildBufferInt(int quadCount, ByteBuffer buffer)
+	{
+		for (int i = 0; i < quadCount; i++)
+		{
+			int vIndex = i * 4;
+			// First triangle
+			buffer.putInt(vIndex);
+			buffer.putInt(vIndex + 1);
+			buffer.putInt(vIndex + 2);
+			// Second triangle
+			buffer.putInt(vIndex + 2);
+			buffer.putInt(vIndex + 3);
+			buffer.putInt(vIndex);
+		}
+		if (buffer.hasRemaining())
+		{
+			throw new IllegalStateException("QuadElementBuffer is not full somehow after building");
+		}
+		buffer.rewind();
+	}
+	
+	//endregion
+	
+	
+	
+}

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

@@ -19,19 +19,25 @@
 
 package com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding;
 
+import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.logging.DhLogger;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.pos.DhSectionPos;
 import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos;
-import com.seibel.distanthorizons.core.render.glObject.GLProxy;
+import com.seibel.distanthorizons.core.render.RenderThreadTaskHandler;
-import com.seibel.distanthorizons.core.render.glObject.buffer.GLVertexBuffer;
+import com.seibel.distanthorizons.core.util.ExceptionUtil;
 import com.seibel.distanthorizons.core.util.LodUtil;
-import com.seibel.distanthorizons.core.util.objects.StatsMap;
+import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
-import com.seibel.distanthorizons.api.enums.config.EDhApiGpuUploadMethod;
+import com.seibel.distanthorizons.core.wrapperInterfaces.render.AbstractDhRenderApiDefinition;
+import com.seibel.distanthorizons.core.wrapperInterfaces.render.objects.ILodContainerUniformBufferWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.render.objects.IVertexBufferWrapper;
+import org.jetbrains.annotations.Nullable;
 import org.lwjgl.system.MemoryUtil;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * Java representation of one or more OpenGL buffers for rendering.
@@ -42,12 +48,8 @@ public class LodBufferContainer implements AutoCloseable
 {
 	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
-	/** number of bytes a single quad takes */
+	private static final IWrapperFactory WRAPPER_FACTORY = SingletonInjector.INSTANCE.get(IWrapperFactory.class);
-	public static final int QUADS_BYTE_SIZE = LodUtil.LOD_VERTEX_FORMAT.getByteSize() * 4;
+	private static final AbstractDhRenderApiDefinition RENDER_DEF = SingletonInjector.INSTANCE.get(AbstractDhRenderApiDefinition.class);
-	/** how big a single VBO can be in bytes */
-	public static final int MAX_VBO_BYTE_SIZE = 10 * 1024 * 1024; // 10 MB
-	public static final int MAX_QUADS_PER_BUFFER = MAX_VBO_BYTE_SIZE / QUADS_BYTE_SIZE;
-	public static final int FULL_SIZED_BUFFER = MAX_QUADS_PER_BUFFER * QUADS_BYTE_SIZE;
 	
 	
 	/** the position closest to minimum X/Z infinity and the level's lowest Y */
@@ -56,117 +58,224 @@ public class LodBufferContainer implements AutoCloseable
 	
 	public boolean buffersUploaded = false;
 	
-	public GLVertexBuffer[] vbos;
+	public IVertexBufferWrapper[] vboOpaqueWrappers;
-	public GLVertexBuffer[] vbosTransparent;
+	public IVertexBufferWrapper[] vboTransparentWrappers;
 	
-	private CompletableFuture<LodBufferContainer> uploadFuture = null;
+	public ILodContainerUniformBufferWrapper uniformContainer = WRAPPER_FACTORY.createLodContainerUniformWrapper();
+	
+	private final AtomicReference<CompletableFuture<LodBufferContainer>> uploadFutureRef = new AtomicReference<>(null);
 	
 	
 	
 	//==============//
 	// constructors //
 	//==============//
+	//region
 	
 	public LodBufferContainer(long pos, DhBlockPos minCornerBlockPos)
 	{
 		this.pos = pos;
 		this.minCornerBlockPos = minCornerBlockPos;
-		this.vbos = new GLVertexBuffer[0];
+		this.vboOpaqueWrappers = new IVertexBufferWrapper[0];
-		this.vbosTransparent = new GLVertexBuffer[0];
+		this.vboTransparentWrappers = new IVertexBufferWrapper[0];
+		
+		this.uniformContainer.createUniformData(this);
 	}
 	
+	//endregion
+	
 	
 	
 	//==================//
 	// buffer uploading //
 	//==================//
+	//region
 	
 	/** Should be run on a DH thread. */
-	public synchronized CompletableFuture<LodBufferContainer> makeAndUploadBuffersAsync(LodQuadBuilder builder)
+	public synchronized CompletableFuture<LodBufferContainer> tryMakeAndUploadBuffersAsync(LodQuadBuilder builder)
 	{
+		//================//
+		// handle futures //
+		//================//
+		//region
+		
 		// separate variable to prevent race condition when checking null
-		CompletableFuture<LodBufferContainer> future = this.uploadFuture;
+		CompletableFuture<LodBufferContainer> oldFuture = this.uploadFutureRef.get();
-		if (future != null)
+		if (oldFuture != null)
 		{
 			// upload already in process
-			return future;
+			return oldFuture;
 		}
 		
 		// new upload needed
-		future = new CompletableFuture<>();
+		CompletableFuture<LodBufferContainer> future = new CompletableFuture<>();
-		this.uploadFuture = future;
+		future.handle((lodBufferContainer, throwable) -> 
+		{
+			if (!this.uploadFutureRef.compareAndSet(future, null))
+			{
+				LOGGER.warn("upload future ref changed for pos ["+DhSectionPos.toString(this.pos)+"].");
+			}
+			
+			return null;
+		});
+		
+		if (!this.uploadFutureRef.compareAndSet(null, future))
+		{
+			oldFuture = this.uploadFutureRef.get();
+			LodUtil.assertTrue(oldFuture != null, "Concurrency error");
+			return oldFuture;
+		}
+		
+		//endregion
 		
 		
 		
-		// make the buffers
+		//================//
+		// create buffers //
+		//================//
+		//region
+		
 		ArrayList<ByteBuffer> opaqueBuffers = builder.makeOpaqueVertexBuffers();
 		ArrayList<ByteBuffer> transparentBuffers = builder.makeTransparentVertexBuffers();
 		
-		this.vbos = resizeBuffer(this.vbos, opaqueBuffers.size());
+		this.vboOpaqueWrappers = resizeWrapperArray(this.vboOpaqueWrappers, opaqueBuffers.size());
-		this.vbosTransparent = resizeBuffer(this.vbosTransparent, transparentBuffers.size());
+		this.vboTransparentWrappers = resizeWrapperArray(this.vboTransparentWrappers, transparentBuffers.size());
+		
+		// mac requires separate IBO objects for each VBO when using OpenGL,
+		// all other OS's can share a single IBO for quicker loading times
+		boolean useSingleIbo = RENDER_DEF.useSingleIbo();
+		@Nullable ArrayList<ByteBuffer> opaqueIndexBuffers = useSingleIbo ? null : this.createIndexBuffers(opaqueBuffers);
+		@Nullable ArrayList<ByteBuffer> transparentIndexBuffers = useSingleIbo ? null : this.createIndexBuffers(transparentBuffers);
+		
+		//endregion
 		
 		
-		// upload on MC's render thread
+		
-		GLProxy.getInstance().queueRunningOnRenderThread(() ->
+		//================//
-		{
+		// upload buffers //
+		//================//
+		//region
+		
 		try
 		{
-				// skip this event if requested
+			//=============//
-				if (Thread.interrupted() 
+			// create VBOs //
-					|| this.uploadFuture.isCancelled())
+			//=============//
+			
+			CompletableFuture<Void> createOpaqueFuture = createBufferWrappersAsync(future, this.vboOpaqueWrappers, opaqueBuffers);
+			CompletableFuture<Void> createTransparentFuture = createBufferWrappersAsync(future, this.vboTransparentWrappers, transparentBuffers);
+			
+			CompletableFuture<Void> createFuture = CompletableFuture.allOf(createOpaqueFuture, createTransparentFuture);
+			createFuture.exceptionally((Throwable e) ->
 			{
-					throw new InterruptedException();
+				// create VBOs failed //
+				
+				if (!ExceptionUtil.isShutdownException(e))
+				{
+					LOGGER.error("Unexpected issue creating buffer [" + this.minCornerBlockPos + "], error: [" + e.getMessage() + "].", e);
 				}
+				future.completeExceptionally(e);
+				return null;
+			});
+			createFuture.thenRun(() ->
+			{
+				//=============//
+				// upload VBOs //
+				//=============//
 				
-				EDhApiGpuUploadMethod gpuUploadMethod = GLProxy.getInstance().getGpuUploadMethod();
+				CompletableFuture<Void> opaqueFuture = uploadBuffersAsync(future, this.vboOpaqueWrappers, opaqueBuffers, opaqueIndexBuffers);
+				CompletableFuture<Void> transparentFuture = uploadBuffersAsync(future, this.vboTransparentWrappers, transparentBuffers, transparentIndexBuffers);
+				
+				CompletableFuture<Void> uploadFuture = CompletableFuture.allOf(opaqueFuture, transparentFuture);
+				uploadFuture.exceptionally((Throwable e) ->
+				{
+					// upload failed //
+					
+					if (!ExceptionUtil.isShutdownException(e))
+					{
+						LOGGER.error("Unexpected issue uploading buffer [" + this.minCornerBlockPos + "], error: [" + e.getMessage() + "].", e);
+					}
+					future.completeExceptionally(e);
+					return null;
+				});
+				uploadFuture.thenRun(() ->
+				{
+					// upload success /
 					
-				// upload on the render thread
-				uploadBuffersDirect(this.vbos, opaqueBuffers, gpuUploadMethod);
-				uploadBuffersDirect(this.vbosTransparent, transparentBuffers, gpuUploadMethod);
 					this.buffersUploaded = true;
-				
+					future.complete(this);
-				// success
+				});
-				this.uploadFuture.complete(this);
+			});
-				this.uploadFuture = null;
-			}
-			catch (InterruptedException ignore) 
-			{
-				this.uploadFuture.complete(this);
-				this.uploadFuture = null;
 		}
 		catch (Exception e)
 		{
-				LOGGER.error("Unexpected issue uploading buffer ["+this.minCornerBlockPos +"], error: ["+e.getMessage()+"].", e);
+			if (!ExceptionUtil.isShutdownException(e))
-				
+			{
-				this.uploadFuture.completeExceptionally(e);
+				LOGGER.error("Unexpected issue prepping buffer uploading [" + this.minCornerBlockPos + "], error: [" + e.getMessage() + "].", e);
-				this.uploadFuture = null;
 			}
-			finally
+			future.completeExceptionally(e);
+		}
+		
+		
+		//================//
+		// buffer cleanup //
+		//================//
+		
+		future.whenComplete((LodBufferContainer lodBufferContainer, Throwable throwable) -> 
 		{
 			// all the buffers must be manually freed to prevent memory leaks
 			
-				for (ByteBuffer buffer : opaqueBuffers)
+			tryFreeByteBufferList(opaqueBuffers);
-				{
+			tryFreeByteBufferList(transparentBuffers);
-					MemoryUtil.memFree(buffer);
+			
-				}
+			tryFreeByteBufferList(opaqueIndexBuffers);
+			tryFreeByteBufferList(transparentIndexBuffers);
 			
-				for (ByteBuffer buffer : transparentBuffers)
-				{
-					MemoryUtil.memFree(buffer);
-				}
-			}
 		});
 		
+		//endregion
+		
+		
+		
 		return future;
 	}
-	private static GLVertexBuffer[] resizeBuffer(GLVertexBuffer[] vbos, int newSize)
+	private static void tryFreeByteBufferList(@Nullable ArrayList<ByteBuffer> list)
+	{
+		if (list != null) 
+		{
+			for (ByteBuffer buffer : list) 
+			{
+				MemoryUtil.memFree(buffer);
+			} 
+		}
+	}
+	
+	
+	private ArrayList<ByteBuffer> createIndexBuffers(ArrayList<ByteBuffer> vertexBuffers)
+	{
+		ArrayList<ByteBuffer> indexBuffers = new ArrayList<>();
+		
+		for (int i = 0; i < vertexBuffers.size(); i++)
+		{
+			ByteBuffer buffer = vertexBuffers.get(i);
+			int size = buffer.limit() - buffer.position();
+			int maxVertexCount = size / LodQuadBuilder.BYTES_PER_VERTEX;
+			int quadCount = (maxVertexCount / 4);
+			ByteBuffer indexBuffer = IndexBufferBuilder.createBuffer(quadCount);
+			indexBuffers.add(indexBuffer);
+		}
+		
+		return indexBuffers;
+	}
+	
+	private static IVertexBufferWrapper[] resizeWrapperArray(IVertexBufferWrapper[] vbos, int newSize)
 	{
 		if (vbos.length == newSize)
 		{
 			return vbos;
 		}
 		
-		GLVertexBuffer[] newVbos = new GLVertexBuffer[newSize];
+		IVertexBufferWrapper[] newVbos = new IVertexBufferWrapper[newSize];
 		System.arraycopy(vbos, 0, newVbos, 0, Math.min(vbos.length, newSize));
 		if (newSize < vbos.length)
 		{
@@ -180,109 +289,235 @@ public class LodBufferContainer implements AutoCloseable
 		}
 		return newVbos;
 	}
-	private static void uploadBuffersDirect(
+	
-			GLVertexBuffer[] vbos, ArrayList<ByteBuffer> byteBuffers, 
+	private static CompletableFuture<Void> createBufferWrappersAsync(
-			EDhApiGpuUploadMethod uploadMethod) throws InterruptedException
+		CompletableFuture<LodBufferContainer> parentFuture, 
+		IVertexBufferWrapper[] vboWrappers, ArrayList<ByteBuffer> vertexBuffers)
 	{
+		ArrayList<CompletableFuture<Void>> createVboFutureList = new ArrayList<>();
+		for (int i = 0; i < vertexBuffers.size(); i++)
+		{
+			if (i >= vboWrappers.length)
+			{
+				throw new RuntimeException("Too many vertex buffers!!");
+			}
+			
+			if (vboWrappers[i] == null)
+			{
+				final int finalVboIndex = i;
+				
+				CompletableFuture<Void> future = new CompletableFuture<>();
+				createVboFutureList.add(future);
+				
+				RenderThreadTaskHandler.INSTANCE.queueRunningOnRenderThread("LodBufferContainer Setup", () ->
+				{
+					try
+					{
+						// skip this event if requested
+						if (Thread.interrupted()
+							|| parentFuture.isCancelled())
+						{
+							throw new InterruptedException();
+						}
+						
+						
+						vboWrappers[finalVboIndex] = WRAPPER_FACTORY.createVboWrapper("distantHorizons:McLodRenderer");
+						future.complete(null);
+					}
+					catch (Exception e)
+					{
+						future.completeExceptionally(e);
+					}
+				});
+			}
+		}
+		
+		if (createVboFutureList.size() == 0)
+		{
+			return CompletableFuture.completedFuture(null);
+		}
+		
+		CompletableFuture<?>[] futureArray = new CompletableFuture[createVboFutureList.size()];
+		for (int i = 0; i < createVboFutureList.size(); i++)
+		{
+			futureArray[i] = createVboFutureList.get(i);
+		}
+		return CompletableFuture.allOf(futureArray);
+	}
+	
+	/** Index buffers should be null if {@link AbstractDhRenderApiDefinition#useSingleIbo()} returns true. */
+	private static CompletableFuture<Void> uploadBuffersAsync(
+		CompletableFuture<LodBufferContainer> parentFuture,
+		IVertexBufferWrapper[] vboWrappers, 
+		ArrayList<ByteBuffer> vertexBuffers, @Nullable ArrayList<ByteBuffer> indexBuffers
+		)
+	{
+		ArrayList<CompletableFuture<Void>> uploadFutureList = new ArrayList<>();
 		int vboIndex = 0;
-		for (int i = 0; i < byteBuffers.size(); i++)
+		for (int i = 0; i < vertexBuffers.size(); i++)
 		{
-			if (vboIndex >= vbos.length)
+			if (vboIndex >= vboWrappers.length)
 			{
 				throw new RuntimeException("Too many vertex buffers!!");
 			}
 			
 			
-			// get or create the VBO
+			
-			if (vbos[vboIndex] == null)
+			// final variables for use in lambdas //
+			
+			final int finalVboIndex = vboIndex;
+			
+			final IVertexBufferWrapper finalVboWrapper = vboWrappers[vboIndex];
+			
+			final ByteBuffer finalVertexBuffer = vertexBuffers.get(vboIndex);
+			// index buffers are optional
+			@Nullable final ByteBuffer finalIndexBuffer = (indexBuffers != null) ? indexBuffers.get(vboIndex) : null;
+			
+			final int finalVertexCount = vertexByteBufferToVertexCount(finalVertexBuffer);
+			
+			
+			
+			//===============//
+			// vertex upload //
+			//===============//
+			//region
+			
+			CompletableFuture<Void> vertexUploadFuture = new CompletableFuture<>();
+			uploadFutureList.add(vertexUploadFuture);
+			
+			RenderThreadTaskHandler.INSTANCE.queueRunningOnRenderThread("LodBufferContainer VBO Upload", () ->
 			{
-				vbos[vboIndex] = new GLVertexBuffer(uploadMethod.useBufferStorage);
+				try
+				{
+					// skip this event if requested
+					if (Thread.interrupted()
+						|| parentFuture.isCancelled())
+					{
+						throw new InterruptedException();
 					}
-			GLVertexBuffer vbo = vbos[vboIndex];
 					
 					
-			ByteBuffer buffer = byteBuffers.get(i);
-			int size = buffer.limit() - buffer.position();
-			
 					try
 					{
-				vbo.bind();
+						finalVboWrapper.uploadVertexBuffer(finalVertexBuffer, finalVertexCount);
-				vbo.uploadBuffer(buffer, size / LodUtil.LOD_VERTEX_FORMAT.getByteSize(), uploadMethod, FULL_SIZED_BUFFER);
+						vertexUploadFuture.complete(null);
 					}
 					catch (Exception e)
 					{
-				vbos[vboIndex] = null;
+						vboWrappers[finalVboIndex] = null;
-				vbo.close();
+						finalVboWrapper.close();
 						LOGGER.error("Failed to upload buffer. Error: [" + e.getMessage() + "].", e);
 					}
+				}
+				catch (Exception e)
+				{
+					vertexUploadFuture.completeExceptionally(e);
+				}
+			});
+			
+			//endregion
+			
+			
+			
+			//==============//
+			// index upload //
+			//==============//
+			//region
+			
+			if (finalIndexBuffer != null)
+			{
+				CompletableFuture<Void> indexUploadFuture = new CompletableFuture<>();
+				uploadFutureList.add(indexUploadFuture);
+				
+				RenderThreadTaskHandler.INSTANCE.queueRunningOnRenderThread("LodBufferContainer IBO Upload", () ->
+				{
+					try
+					{
+						// skip this event if requested
+						if (Thread.interrupted()
+							|| parentFuture.isCancelled())
+						{
+							throw new InterruptedException();
+						}
+						
+						finalVboWrapper.uploadIndexBuffer(finalIndexBuffer, finalVertexCount);
+						indexUploadFuture.complete(null);
+					}
+					catch (Exception e)
+					{
+						indexUploadFuture.completeExceptionally(e);
+					}
+				});
+			}
+			//endregion
+			
+			
 			
 			vboIndex++;
 		}
 		
-		if (vboIndex < vbos.length)
+		if (vboIndex < vboWrappers.length)
 		{
 			throw new RuntimeException("Too few vertex buffers!!");
 		}
+		
+		
+		
+		// merge futures //
+		
+		CompletableFuture<?>[] futureArray = new CompletableFuture[uploadFutureList.size()];
+		for (int i = 0; i < uploadFutureList.size(); i++)
+		{
+			futureArray[i] = uploadFutureList.get(i);
 		}
+		return CompletableFuture.allOf(futureArray);
+	}
+	
+	//endregion
 	
 	
 	
 	//================//
 	// helper methods //
 	//================//
+	//region
+	
+	private static int vertexByteBufferToVertexCount(ByteBuffer buffer)
+	{
+		int size = buffer.limit() - buffer.position();
+		int vertexCount = size / LodQuadBuilder.BYTES_PER_VERTEX;
+		return vertexCount;
+	}
 	
 	/** can be used when debugging */
-	public boolean hasNonNullVbos() { return this.vbos != null || this.vbosTransparent != null; }
+	public boolean hasNonNullVbos() { return this.vboOpaqueWrappers != null || this.vboTransparentWrappers != null; }
 	
 	/** can be used when debugging */
 	public int vboBufferCount() 
 	{
 		int count = 0;
 		
-		if (this.vbos != null)
+		if (this.vboOpaqueWrappers != null)
 		{
-			count += this.vbos.length;
+			count += this.vboOpaqueWrappers.length;
 		}
 		
-		if (this.vbosTransparent != null)
+		if (this.vboTransparentWrappers != null)
 		{
-			count += this.vbosTransparent.length;
+			count += this.vboTransparentWrappers.length;
 		}
 		
 		return count;
 	}
 	
-	public boolean uploadInProgress() { return this.uploadFuture != null; }
+	//endregion
-	
-	public void debugDumpStats(StatsMap statsMap)
-	{
-		statsMap.incStat("RenderBuffers");
-		statsMap.incStat("SimpleRenderBuffers");
-		for (GLVertexBuffer vertexBuffer : vbos)
-		{
-			if (vertexBuffer != null)
-			{
-				statsMap.incStat("VBOs");
-				if (vertexBuffer.getSize() == FULL_SIZED_BUFFER)
-				{
-					statsMap.incStat("FullsizedVBOs");
-				}
-				
-				if (vertexBuffer.getSize() == 0)
-				{
-					GLProxy.LOGGER.warn("VBO with size 0");
-				}
-				statsMap.incBytesStat("TotalUsage", vertexBuffer.getSize());
-			}
-		}
-	}
-	
 	
 	
 	
 	//================//
 	// base overrides //
 	//================//
+	//region
 	
 	/**
 	 * This method is called when object is no longer in use.
@@ -295,24 +530,30 @@ public class LodBufferContainer implements AutoCloseable
 	{
 		this.buffersUploaded = false;
 		
-		GLProxy.getInstance().queueRunningOnRenderThread(() ->
+		RenderThreadTaskHandler.INSTANCE.queueRunningOnRenderThread("LodBufferContainer Close", () -> 
 		{
-			for (GLVertexBuffer buffer : this.vbos)
+			for (IVertexBufferWrapper buffer : this.vboOpaqueWrappers)
 			{
 				if (buffer != null)
 				{
-					buffer.destroyAsync();
+					buffer.close();
 				}
 			}
 			
-			for (GLVertexBuffer buffer : this.vbosTransparent)
+			for (IVertexBufferWrapper buffer : this.vboTransparentWrappers)
 			{
 				if (buffer != null)
 				{
-					buffer.destroyAsync();
+					buffer.close();
 				}
 			}
+			
+			this.uniformContainer.close();
 		});
 	}
 	
+	//endregion
+	
+	
+	
 }

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

@@ -30,10 +30,9 @@ import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.enums.EDhDirection;
 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.coreapi.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 +43,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];
@@ -57,8 +56,12 @@ public class LodQuadBuilder
 	private final EDhApiDebugRendering debugRenderingMode;
 	private final EDhApiGrassSideRendering grassSideRenderingMode;
 	
+	/** the number of bytes for a single vertex */
+	public static final int BYTES_PER_VERTEX = 16;
+	public static final int BYTES_PER_QUAD = BYTES_PER_VERTEX * 4;
 	
 	public static final int[][][] DIRECTION_VERTEX_IBO_QUAD = new int[][][]
+	///region
 		{
 			// X,Z //
 			{ // UP
@@ -106,6 +109,7 @@ public class LodQuadBuilder
 				{0, 0}, // 3
 			},
 		};
+	///endregion
 	
 	private int premergeCount = 0;
 	
@@ -114,6 +118,7 @@ public class LodQuadBuilder
 	//=============//
 	// constructor //
 	//=============//
+	//region
 	
 	public LodQuadBuilder(boolean doTransparency, IClientLevelWrapper clientLevelWrapper)
 	{
@@ -126,21 +131,24 @@ public class LodQuadBuilder
 		
 		this.clientLevelWrapper = clientLevelWrapper;
 		
-		this.debugRenderingMode = Config.Client.Advanced.Debugging.debugRendering.get();
+		this.debugRenderingMode = Config.Client.Advanced.Debugging.debugRenderingColors.get();
 		this.grassSideRenderingMode = Config.Client.Advanced.Graphics.Quality.grassSideRendering.get();
 		
 	}
 	
+	//endregion
+	
 	
 	
 	//===========//
 	// add quads //
 	//===========//
+	///region
 	
 	public void addQuadAdj(
 			EDhDirection dir, 
 			short x, short y, short z,
-			short widthEastWest, short widthNorthSouthOrUpDown,
+			short width, short height,
 			int color, byte irisBlockMaterialId, byte skyLight, byte blockLight)
 	{
 		if (dir == EDhDirection.DOWN)
@@ -159,7 +167,7 @@ public class LodQuadBuilder
 			quadList = this.opaqueQuads[dir.ordinal()]; 
 		}
 		
-		BufferQuad quad = new BufferQuad(x, y, z, widthEastWest, widthNorthSouthOrUpDown, color, irisBlockMaterialId, skyLight, blockLight, dir);
+		BufferQuad quad = new BufferQuad(x, y, z, width, height, color, irisBlockMaterialId, skyLight, blockLight, dir);
 		if (!quadList.isEmpty()
 			&& (
 				quadList.get(quadList.size() - 1).tryMerge(quad, BufferMergeDirectionEnum.EastWest)
@@ -174,32 +182,35 @@ public class LodQuadBuilder
 	}
 	
 	// XZ
-	public void addQuadUp(short minX, short maxY, short minZ, short widthEastWest, short widthNorthSouthOrUpDown, int color, byte irisBlockMaterialId, byte skylight, byte blocklight) // TODO argument names are wrong
+	public void addQuadUp(short minX, short maxY, short minZ, short width, int color, byte irisBlockMaterialId, byte skylight, byte blocklight)
 	{
 		boolean isTransparent = (this.doTransparency && ColorUtil.getAlpha(color) < 255);
 		ArrayList<BufferQuad> quadList = isTransparent 
 				? this.transparentQuads[EDhDirection.UP.ordinal()] 
 				: this.opaqueQuads[EDhDirection.UP.ordinal()];
 		
-		BufferQuad quad = new BufferQuad(minX, maxY, minZ, widthEastWest, widthNorthSouthOrUpDown, color, irisBlockMaterialId, skylight, blocklight, EDhDirection.UP);
+		BufferQuad quad = new BufferQuad(minX, maxY, minZ, width, width, color, irisBlockMaterialId, skylight, blocklight, EDhDirection.UP);
 		quadList.add(quad);
 	}
 	
-	public void addQuadDown(short x, short y, short z, short width, short wz, int color, byte irisBlockMaterialId, byte skylight, byte blocklight)
+	public void addQuadDown(short x, short y, short z, short width, int color, byte irisBlockMaterialId, byte skylight, byte blocklight)
 	{
 		ArrayList<BufferQuad> quadArray = (this.doTransparency && ColorUtil.getAlpha(color) < 255)
 				? this.transparentQuads[EDhDirection.DOWN.ordinal()]
 				: this.opaqueQuads[EDhDirection.DOWN.ordinal()];
 		
-		BufferQuad quad = new BufferQuad(x, y, z, width, wz, color, irisBlockMaterialId, skylight, blocklight, EDhDirection.DOWN);
+		BufferQuad quad = new BufferQuad(x, y, z, width, width, color, irisBlockMaterialId, skylight, blocklight, EDhDirection.DOWN);
 		quadArray.add(quad);
 	}
 	
+	///endregion
+	
 	
 	
 	//=================//
 	// data finalizing //
 	//=================//
+	///region
 	
 	/** Uses Greedy meshing to merge this builder's Quads. */
 	public void mergeQuads()
@@ -268,11 +279,14 @@ public class LodQuadBuilder
 		return mergeCount;
 	}
 	
+	///endregion
+	
 	
 	
 	//==============//
 	// buffer setup //
 	//==============//
+	///region
 	
 	public ArrayList<ByteBuffer> makeOpaqueVertexBuffers() { return this.makeVertexBuffers(this.opaqueQuads); }
 	public ArrayList<ByteBuffer> makeTransparentVertexBuffers() { return this.makeVertexBuffers(this.transparentQuads); }
@@ -294,9 +308,10 @@ public class LodQuadBuilder
 			{
 				// if this is the first iteration or the buffer is full, 
 				// create a new buffer
-				if (buffer == null || !buffer.hasRemaining())
+				if (buffer == null 
+					|| buffer.remaining() < BYTES_PER_QUAD)
 				{
-					buffer = MemoryUtil.memAlloc(LodBufferContainer.FULL_SIZED_BUFFER);
+					buffer = MemoryUtil.memAlloc(getMaxBufferByteSize());
 					byteBufferList.add(buffer);
 				}
 				
@@ -318,7 +333,7 @@ public class LodQuadBuilder
 	{
 		int[][] quadBase = DIRECTION_VERTEX_IBO_QUAD[quad.direction.ordinal()];
 		short widthEastWest = quad.widthEastWest;
-		short widthNorthSouth = quad.widthNorthSouthOrUpDown;
+		short widthNorthSouth = quad.widthNorthSouthOrHeight;
 		byte normalIndex = (byte) quad.direction.ordinal();
 		EDhDirection.Axis axis = quad.direction.axis;
 		for (int i = 0; i < quadBase.length; i++)
@@ -379,7 +394,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));
 							}
 						}
 					}
@@ -398,31 +413,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;
+			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) mirco |= mx > 0 ? 0b01 : 0b11;
+			if (mx != 0) { mircoOffset |= (byte) (mx > 0 ? 0b01 : 0b11); }
-		if (my != 0) mirco |= my > 0 ? 0b0100 : 0b1100;
+			if (my != 0) { mircoOffset |= (byte) (my > 0 ? 0b0100 : 0b1100); }
-		if (mz != 0) mirco |= mz > 0 ? 0b010000 : 0b110000;
+			if (mz != 0) { mircoOffset |= (byte) (mz > 0 ? 0b010000 : 0b110000); }
-		meta |= mirco << 8;
+			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);
@@ -434,11 +451,14 @@ public class LodQuadBuilder
 		bb.putShort((short) 0); // padding to make sure the vertex format as a whole is a multiple of 4
 	}
 	
+	///endregion
+	
 	
 	
 	//=========//
 	// getters //
 	//=========//
+	///region
 	
 	public int getCurrentOpaqueQuadsCount()
 	{
@@ -466,17 +486,35 @@ public class LodQuadBuilder
 		return i;
 	}
 	
-	/** Returns how many GpuBuffers will be needed to render opaque quads in this builder. */
+	private static int maxBufferByteSize = -1;
-	public int getCurrentNeededOpaqueVertexBufferCount() { return MathUtil.ceilDiv(this.getCurrentOpaqueQuadsCount(), LodBufferContainer.MAX_QUADS_PER_BUFFER); }
+	/** 
-	/** Returns how many GpuBuffers will be needed to render transparent quads in this builder. */
+	 * The max number of bytes we allow for a single Vertex buffer.
-	public int getCurrentNeededTransparentVertexBufferCount()
+	 * If an LOD has more data than this it will be split
+	 * up into multiple buffers.
+	 */
+	public static int getMaxBufferByteSize()
 	{
-		if (!this.doTransparency)
+		if (maxBufferByteSize != -1)
 		{
-			return 0;
+			return maxBufferByteSize;
 		}
 		
-		return MathUtil.ceilDiv(this.getCurrentTransparentQuadsCount(), LodBufferContainer.MAX_QUADS_PER_BUFFER);
+		// 2 MB
+		// note: this is relatively small (10 MB was the previous max) to reduce stuttering
+		// during the upload process by having smaller upload steps
+		int maxVboByteSize = 2 * 1024 * 1024; 
+		
+		int maxQuadsPerBuffer = maxVboByteSize / BYTES_PER_QUAD;
+		// integer truncation to remove decimal component
+		int fullSizedBuffer = maxQuadsPerBuffer * BYTES_PER_QUAD;
+		
+		maxBufferByteSize = fullSizedBuffer;
+		
+		return fullSizedBuffer;
 	}
 	
+	///endregion
+	
+	
+	
 }

core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/columnViews/ColumnArrayView.java

@@ -1,241 +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.dataObjects.render.columnViews;
-
-
-import com.seibel.distanthorizons.core.dataObjects.render.ColumnRenderSource;
-import com.seibel.distanthorizons.core.util.RenderDataPointUtil;
-import it.unimi.dsi.fastutil.longs.LongArrayList;
-
-import java.util.Arrays;
-import java.util.ConcurrentModificationException;
-
-public final class ColumnArrayView implements IColumnDataView
-{
-	public final LongArrayList data;
-	
-	/** 
-	 * How many data points are currently being represented by this view. <br>
-	 * Will be equal to or less than {@link ColumnArrayView#verticalSize}.
-	 */
-	public final int size;
-	/** 
-	 * Vertical size in data points. <Br>
-	 * Can be 0 if this column was created for an empty data source.
-	 */
-	public final int verticalSize;
-	
-	/**
-	 * Where the relative starting index is in the {@link ColumnArrayView#data} array
-	 * if this view is representing part of a {@link ColumnRenderSource}.
-	 */
-	public final int offset;
-	
-	
-	
-	//=============//
-	// constructor //
-	//=============//
-	
-	/** @throws IllegalArgumentException if the offset is greater than the data's size */
-	public ColumnArrayView(LongArrayList data, int size, int offset, int verticalSize) throws IllegalArgumentException
-	{
-		this.data = data;
-		this.size = size;
-		this.offset = offset;
-		this.verticalSize = verticalSize;
-		
-		if (this.data.size() < this.offset)
-		{
-			throw new IllegalArgumentException("data size ["+this.data.size()+"] is shorter than offset ["+this.offset+"].");
-		}
-	}
-	
-	
-	
-	//=====================//
-	// getters and setters //
-	//=====================//
-	
-	@Override
-	public long get(int index) 
-	{
-		try
-		{
-			return this.data.getLong(index + this.offset);
-		}
-		catch (IndexOutOfBoundsException e)
-		{
-			// we can fairly confidently say this is a concurrent exception over an actual
-			// index out of bounds, since we're generally iterating over the whole
-			// array any time we use this getter.
-			throw new ConcurrentModificationException("Potential concurrent modification detected. Make sure the parent ColumnRenderSource isn't being closed before the ColumnArrayView processing is complete.", e);
-		}
-	}
-	public void set(int index, long value) { data.set(index + offset, value); }
-	
-	@Override
-	public int size() { return size; }
-	@Override
-	public int verticalSize() { return verticalSize; }
-	
-	@Override
-	public int dataCount() { return (this.verticalSize != 0) ? (this.size / this.verticalSize) : 0; } // TODO what does the divide by mean?
-	
-	@Override
-	public ColumnArrayView subView(int dataIndexStart, int dataCount)
-	{ return new ColumnArrayView(data, dataCount * verticalSize, offset + dataIndexStart * verticalSize, verticalSize); }
-	
-	public void fill(long value) { Arrays.fill(data.elements(), offset, offset + size, value); }
-	
-	public void copyFrom(IColumnDataView source) { copyFrom(source, 0); }
-	public void copyFrom(IColumnDataView source, int outputDataIndexOffset)
-	{
-		if (source.verticalSize() > verticalSize)
-		{
-			throw new IllegalArgumentException("source verticalSize must be <= self's verticalSize to copy");
-		}
-		else if (source.dataCount() + outputDataIndexOffset > dataCount())
-		{
-			throw new IllegalArgumentException("dataIndexStart + source.dataCount() must be <= self.dataCount() to copy");
-		}
-		else if (source.verticalSize() != verticalSize)
-		{
-			for (int i = 0; i < source.dataCount(); i++)
-			{
-				int outputOffset = offset + outputDataIndexOffset * verticalSize + i * verticalSize;
-				source.subView(i, 1).copyTo(data.elements(), outputOffset, source.verticalSize());
-				Arrays.fill(data.elements(), outputOffset + source.verticalSize(),
-						outputOffset + verticalSize, 0);
-			}
-		}
-		else
-		{
-			source.copyTo(data.elements(), offset + outputDataIndexOffset * verticalSize, source.size());
-		}
-	}
-	
-	@Override
-	public void copyTo(long[] target, int offset, int size) { System.arraycopy(data.elements(), this.offset, target, offset, size); }
-	
-	public boolean mergeWith(ColumnArrayView source, boolean override)
-	{
-		if (size != source.size)
-		{
-			throw new IllegalArgumentException("Cannot merge views of different sizes");
-		}
-		if (verticalSize != source.verticalSize)
-		{
-			throw new IllegalArgumentException("Cannot merge views of different vertical sizes");
-		}
-		boolean anyChange = false;
-		for (int o = 0; o < (source.size() * verticalSize); o += verticalSize)
-		{
-			if (override)
-			{
-				if (RenderDataPointUtil.compareDatapointPriority(source.get(o), get(o)) >= 0)
-				{
-					anyChange = true;
-					System.arraycopy(source.data, source.offset + o, data, offset + o, verticalSize);
-				}
-			}
-			else
-			{
-				if (RenderDataPointUtil.compareDatapointPriority(source.get(o), get(o)) > 0)
-				{
-					anyChange = true;
-					System.arraycopy(source.data, source.offset + o, data, offset + o, verticalSize);
-				}
-			}
-		}
-		return anyChange;
-	}
-	
-	public void changeVerticalSizeFrom(IColumnDataView source)
-	{
-		if (this.dataCount() != source.dataCount())
-		{
-			throw new IllegalArgumentException("Cannot copy and resize to views with different dataCounts");
-		}
-		
-		if (this.verticalSize >= source.verticalSize())
-		{
-			this.copyFrom(source);
-		}
-		else
-		{
-			for (int i = 0; i < this.dataCount(); i++)
-			{
-				RenderDataPointUtil.mergeMultiData(source.subView(i, 1), this.subView(i, 1));
-			}
-		}
-	}
-	
-	
-	
-	//================//
-	// base overrides //
-	//================//
-	
-	@Override
-	public String toString()
-	{
-		StringBuilder sb = new StringBuilder();
-		sb.append("S:").append(this.size);
-		sb.append(" V:").append(this.verticalSize);
-		sb.append(" O:").append(this.offset);
-		
-		sb.append(" [");
-		for (int i = 0; i < this.size; i++)
-		{
-			sb.append(RenderDataPointUtil.toString(this.data.getLong(this.offset + i)));
-			if (i < this.size - 1)
-			{
-				sb.append(",\n");
-			}
-		}
-		sb.append("]");
-		
-		return sb.toString();
-	}
-	
-	
-	public int getDataHash() { return arrayHash(this.data, this.offset, this.size); }
-	private static int arrayHash(LongArrayList a, int offset, int length)
-	{
-		if (a == null)
-		{
-			return 0;
-		}
-		
-		int result = 1;
-		int end = offset + length;
-		for (int i = offset; i < end; i++)
-		{
-			long element = a.getLong(i);
-			int elementHash = (int) (element ^ (element >>> 32));
-			result = 31 * result + elementHash;
-		}
-		return result;
-	}
-	
-	
-	
-}

core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/columnViews/ColumnQuadView.java

@@ -1,143 +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.dataObjects.render.columnViews;
-
-import it.unimi.dsi.fastutil.longs.LongArrayList;
-
-public class ColumnQuadView implements IColumnDataView
-{
-	private final LongArrayList data;
-	private final int perColumnOffset; // per column (of columns of data) offset in longs
-	private final int xSize; // x size in datapoints
-	private final int zSize; // x size in datapoints
-	private final int offset; // offset in longs
-	private final int vertSize; // vertical size in longs
-	
-	public ColumnQuadView(LongArrayList data, int dataZWidth, int dataVertSize, int viewXOffset, int viewZOffset, int xSize, int zSize)
-	{
-		if (viewXOffset + xSize > (data.size() / (dataZWidth * dataVertSize)) || viewZOffset + zSize > dataZWidth)
-		{
-			throw new IllegalArgumentException("View is out of bounds");
-		}
-		
-		this.data = data;
-		this.xSize = xSize;
-		this.zSize = zSize;
-		this.vertSize = dataVertSize;
-		this.perColumnOffset = dataZWidth * dataVertSize;
-		this.offset = viewXOffset * perColumnOffset + viewZOffset * dataVertSize;
-	}
-	private ColumnQuadView(LongArrayList data, int perColumnOffset, int offset, int vertSize, int xSize, int zSize)
-	{
-		this.data = data;
-		this.perColumnOffset = perColumnOffset;
-		this.offset = offset;
-		this.vertSize = vertSize;
-		this.xSize = xSize;
-		this.zSize = zSize;
-	}
-	
-	@Override
-	public long get(int index)
-	{
-		int x = index / perColumnOffset;
-		int z = (index % perColumnOffset) / vertSize;
-		int v = index % vertSize;
-		return get(x, z, v);
-	}
-	
-	public long get(int x, int z, int v)
-	{
-		return data.getLong(offset + x * perColumnOffset + z * vertSize + v);
-	}
-	
-	public long set(int x, int z, int v, long value)
-	{
-		return data.set(offset + x * perColumnOffset + z * vertSize + v, value);
-	}
-	
-	public ColumnArrayView get(int x, int z)
-	{
-		return new ColumnArrayView(data, vertSize, offset + x * perColumnOffset + z * vertSize, vertSize);
-	}
-	
-	public ColumnArrayView getRow(int x)
-	{
-		return new ColumnArrayView(data, zSize * vertSize, offset + x * perColumnOffset, vertSize);
-	}
-	
-	public void set(int x, int z, IColumnDataView singleColumn)
-	{
-		if (singleColumn.verticalSize() != vertSize) throw new IllegalArgumentException("Vertical size of singleColumn must be equal to vertSize");
-		if (singleColumn.dataCount() != 1) throw new IllegalArgumentException("SingleColumn must contain exactly one data point");
-		singleColumn.copyTo(data.elements(), offset + x * perColumnOffset + z * vertSize, singleColumn.size());
-	}
-	
-	@Override
-	public int size()
-	{
-		return xSize * zSize * vertSize;
-	}
-	
-	@Override
-	public int verticalSize()
-	{
-		return vertSize;
-	}
-	
-	@Override
-	public int dataCount()
-	{
-		return xSize * zSize;
-	}
-	
-	@Override
-	public IColumnDataView subView(int dataIndexStart, int dataCount)
-	{
-		if (dataCount != 1) throw new UnsupportedOperationException("Fixme: subView for QUadView only support one data point!");
-		int x = dataIndexStart / xSize;
-		int z = dataIndexStart % xSize;
-		return new ColumnArrayView(data, vertSize * dataCount, offset + x * perColumnOffset + z * vertSize, vertSize);
-	}
-	
-	public ColumnQuadView subView(int xOffset, int zOffset, int xSize, int zSize)
-	{
-		if (xOffset + xSize > this.xSize || zOffset + zSize > this.zSize) throw new IllegalArgumentException("SubView is out of bounds");
-		return new ColumnQuadView(data, perColumnOffset, offset + xOffset * perColumnOffset + zOffset * vertSize, vertSize, xSize, zSize);
-	}
-	
-	@Override
-	public void copyTo(long[] target, int offset, int size)
-	{
-		if (size != this.size() && size > zSize * vertSize) throw new UnsupportedOperationException("Not supported yet");
-		if (size <= xSize * vertSize)
-		{
-			System.arraycopy(data, this.offset, target, offset, size);
-		}
-		else
-		{
-			for (int x = 0; x < xSize; x++)
-			{
-				System.arraycopy(data, this.offset + x * perColumnOffset, target, offset + x * xSize * vertSize, xSize * vertSize);
-			}
-		}
-	}
-	
-}

core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/columnViews/ColumnRenderView.java

@@ -0,0 +1,309 @@
+/*
+ *    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.dataObjects.render.columnViews;
+
+
+import com.seibel.distanthorizons.api.enums.config.EDhApiVerticalQuality;
+import com.seibel.distanthorizons.core.dataObjects.render.ColumnRenderSource;
+import com.seibel.distanthorizons.core.util.RenderDataPointReducingList;
+import com.seibel.distanthorizons.core.util.RenderDataPointUtil;
+import it.unimi.dsi.fastutil.longs.LongArrayList;
+
+import java.util.Arrays;
+import java.util.ConcurrentModificationException;
+import java.util.concurrent.ConcurrentLinkedQueue;
+
+/**
+ * Maps to part of a {@link ColumnRenderSource} for easier handling.
+ * 
+ * @see ColumnRenderSource
+ */
+public final class ColumnRenderView implements AutoCloseable
+{
+	private static final ConcurrentLinkedQueue<ColumnRenderView> POOL = new ConcurrentLinkedQueue<>();
+	
+	
+	public LongArrayList data;
+	
+	/** 
+	 * How many data points are currently being represented by this view. <br>
+	 * Will be equal to or less than {@link ColumnRenderView#maxVerticalSliceCount}.
+	 */
+	public int size;
+	/** 
+	 * Vertical size in data points. <Br>
+	 * Can be 0 if this column was created for an empty data source.
+	 * @see EDhApiVerticalQuality#calculateMaxNumberOfVerticalSlicesAtDetailLevel(byte)
+	 */
+	public int maxVerticalSliceCount;
+	
+	/**
+	 * Where the relative starting index is in the {@link ColumnRenderView#data} array
+	 * if this view is representing part of a {@link ColumnRenderSource}.
+	 */
+	public int offset;
+	
+	
+	
+	//=============//
+	// constructor //
+	//=============//
+	//region
+	
+	private ColumnRenderView() { }
+	
+	/** 
+	 * returns an un-populated view. <br>
+	 * {@link ColumnRenderView#populate(LongArrayList, int, int, int)} must be called before the
+	 * view can be used.s
+	 */
+	public static ColumnRenderView getPooled() { return getPooled(null, 0, 0, 0); }
+	public static ColumnRenderView getPooled(LongArrayList data, int size, int offset, int maxVerticalSliceCount) throws IllegalArgumentException
+	{
+		// try getting an existing pooled object first
+		ColumnRenderView view = POOL.poll();
+		if (view == null)
+		{
+			// no pooled object 
+			view = new ColumnRenderView();
+		}
+		
+		// data will be null if the object will be populated at a later date
+		if (data != null)
+		{
+			view.populate(data, size, offset, maxVerticalSliceCount);
+		}
+		
+		return view;
+	}
+	
+	/**
+	 * Mutates this object so the necessary data is visible.  
+	 * @throws IllegalArgumentException if the offset is greater than the data's size 
+	 */
+	public void populate(LongArrayList data, int size, int offset, int maxVerticalSliceCount) throws IllegalArgumentException
+	{
+		this.data = data;
+		this.size = size;
+		this.offset = offset;
+		this.maxVerticalSliceCount = maxVerticalSliceCount;
+		
+		if (this.data.size() < this.offset)
+		{
+			throw new IllegalArgumentException("data size ["+this.data.size()+"] is shorter than offset ["+this.offset+"].");
+		}
+	}
+	
+	public void clear()
+	{
+		this.data = null;
+		this.size = 0;
+		this.offset = 0;
+		this.maxVerticalSliceCount = 0;
+	}
+	
+	//endregion
+	
+	
+	
+	//=====================//
+	// getters and setters //
+	//=====================//
+	//region
+	
+	public long get(int index) 
+	{
+		try
+		{
+			return this.data.getLong(index + this.offset);
+		}
+		catch (IndexOutOfBoundsException e)
+		{
+			// we can fairly confidently say this is a concurrent exception over an actual
+			// index out of bounds, since we're generally iterating over the whole
+			// array any time we use this getter.
+			throw new ConcurrentModificationException("Potential concurrent modification detected. Make sure the parent ColumnRenderSource isn't being closed before the ColumnRenderView processing is complete.", e);
+		}
+	}
+	public void set(int index, long value) { this.data.set(index + this.offset, value); }
+	
+	public void fill(long value) { Arrays.fill(this.data.elements(), this.offset, this.offset + this.size, value); }
+	
+	//endregion
+	
+	
+	//=========//
+	// subview //
+	//=========//
+	//region
+	
+	/** should be called in a try-finally block for automatic cleanup */
+	public ColumnRenderView subView(int dataIndexStart, int dataCount)
+	{
+		return ColumnRenderView.getPooled(
+			this.data,
+			dataCount * this.maxVerticalSliceCount,
+			this.offset + dataIndexStart * this.maxVerticalSliceCount,
+			this.maxVerticalSliceCount);
+	}
+	
+	
+	/** can be used to determine sub-view starting indexes */
+	public int subViewCount() { return (this.maxVerticalSliceCount != 0) ? (this.size / this.maxVerticalSliceCount) : 0; }
+	
+	//endregion
+	
+	
+	
+	//======================//
+	// change vertical size //
+	//======================//
+	//region
+	
+	public void changeVerticalSizeFrom(ColumnRenderView source, RenderDataPointReducingList reducingList)
+	{
+		if (this.subViewCount() != source.subViewCount())
+		{
+			throw new IllegalArgumentException("Cannot copy and resize to views with different dataCounts");
+		}
+		
+		if (this.maxVerticalSliceCount >= source.maxVerticalSliceCount)
+		{
+			this.copyFrom(source, 0);
+		}
+		else
+		{
+			for (int i = 0; i < this.subViewCount(); i++)
+			{
+				try(ColumnRenderView sourceSubView = source.subView(i, 1);
+					ColumnRenderView thisSubView = this.subView(i, 1))
+				{
+					mergeMultiData(sourceSubView, reducingList, thisSubView);
+				}
+			}
+		}
+	}
+	private void copyFrom(ColumnRenderView source, int outputDataIndexOffset)
+	{
+		if (source.maxVerticalSliceCount > this.maxVerticalSliceCount)
+		{
+			throw new IllegalArgumentException("source verticalSize must be <= self's verticalSize to copy");
+		}
+		else if (source.subViewCount() + outputDataIndexOffset > this.subViewCount())
+		{
+			throw new IllegalArgumentException("dataIndexStart + source.dataCount() must be <= self.dataCount() to copy");
+		}
+		else if (source.maxVerticalSliceCount != this.maxVerticalSliceCount)
+		{
+			for (int i = 0; i < source.subViewCount(); i++)
+			{
+				int outputOffset = this.offset + (outputDataIndexOffset * this.maxVerticalSliceCount) + (i * this.maxVerticalSliceCount);
+				try(ColumnRenderView subView = source.subView(i, 1))
+				{
+					subView.copyTo(this.data.elements(), outputOffset, source.maxVerticalSliceCount);
+					Arrays.fill(this.data.elements(),
+						outputOffset + source.maxVerticalSliceCount,
+						outputOffset + this.maxVerticalSliceCount,
+						0);
+				}
+			}
+		}
+		else
+		{
+			source.copyTo(this.data.elements(), this.offset + outputDataIndexOffset * this.maxVerticalSliceCount, source.size);
+		}
+	}
+	private void copyTo(long[] target, int offset, int size) { System.arraycopy(this.data.elements(), this.offset, target, offset, size); }
+	/**
+	 * This method merge column of multiple data together
+	 *
+	 * @param sourceData one or more columns of data
+	 * @param output one column of space for the result to be written to
+	 */
+	private static void mergeMultiData(ColumnRenderView sourceData, RenderDataPointReducingList reducingList, ColumnRenderView output)
+	{
+		int target = output.maxVerticalSliceCount;
+		if (target <= 0)
+		{
+			// I expect this to never be the case,
+			// but RenderDataPointReducingList handles it sanely,
+			// so I might as well handle it sanely here too.
+			output.fill(RenderDataPointUtil.EMPTY_DATA);
+		}
+		else if (target == 1)
+		{
+			output.set(0, RenderDataPointReducingList.reduceToOne(sourceData));
+			for (int index = 1, size = output.size; index < size; index++)
+			{
+				output.set(index, RenderDataPointUtil.EMPTY_DATA);
+			}
+		}
+		else
+		{
+			reducingList.populate(sourceData);
+			reducingList.reduce(output.maxVerticalSliceCount);
+			reducingList.copyTo(output);
+		}
+	}
+	
+	//endregion
+	
+	
+	
+	//================//
+	// base overrides //
+	//================//
+	//region
+	
+	@Override
+	public String toString()
+	{
+		StringBuilder sb = new StringBuilder();
+		sb.append("S:").append(this.size);
+		sb.append(" V:").append(this.maxVerticalSliceCount);
+		sb.append(" O:").append(this.offset);
+		
+		sb.append(" [");
+		for (int i = 0; i < this.size; i++)
+		{
+			sb.append(RenderDataPointUtil.toString(this.data.getLong(this.offset + i)));
+			if (i < this.size - 1)
+			{
+				sb.append(",\n");
+			}
+		}
+		sb.append("]");
+		
+		return sb.toString();
+	}
+	
+	@Override
+	public void close() 
+	{
+		// no validation is done to make sure this object is only added to the pool once
+		// please only use this object in a try-finally so the close is handled implicitly
+		POOL.add(this); 
+	}
+	
+	//endregion
+	
+	
+	
+}

core/src/main/java/com/seibel/distanthorizons/core/dataObjects/render/columnViews/IColumnDataView.java

@@ -1,59 +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.dataObjects.render.columnViews;
-
-import it.unimi.dsi.fastutil.longs.LongIterator;
-
-import java.util.Iterator;
-
-public interface IColumnDataView
-{
-	long get(int index);
-	
-	// FIXME probably horizontal size in blocks?
-	int size();
-	
-	default LongIterator iterator()
-	{
-		return new LongIterator()
-		{
-			private int index = 0;
-			private final int size = IColumnDataView.this.size();
-			
-			@Override
-			public boolean hasNext() { return this.index < this.size; }
-			
-			@Override
-			public long nextLong() { return IColumnDataView.this.get(this.index++); }
-			
-		};
-	}
-	
-	// FIXME measured in blocks?
-	int verticalSize();
-	
-	// FIXME how many datapoints in this LOD?
-	int dataCount();
-	
-	IColumnDataView subView(int dataIndexStart, int dataCount);
-	
-	void copyTo(long[] target, int offset, int count);
-	
-}

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

@@ -24,22 +24,24 @@ import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.dataObjects.fullData.FullDataPointIdMap;
 import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
 import com.seibel.distanthorizons.core.dataObjects.render.ColumnRenderSource;
-import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnArrayView;
+import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnRenderView;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-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.util.objects.pooling.PhantomArrayListCheckout;
+import com.seibel.distanthorizons.core.util.objects.pooling.PhantomArrayListPool;
+import com.seibel.distanthorizons.core.pos.DhSectionPos;
 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.world.IBiomeWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import com.seibel.distanthorizons.coreapi.util.BitShiftUtil;
+import com.seibel.distanthorizons.coreapi.util.ColorUtil;
 import it.unimi.dsi.fastutil.longs.LongArrayList;
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
 import com.seibel.distanthorizons.core.logging.DhLogger;
+import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.HashSet;
@@ -108,11 +110,11 @@ public class FullDataToRenderDataTransformer
  		final long pos = fullDataSource.getPos();
 		final byte dataDetail = fullDataSource.getDataDetailLevel();
 		
-		final int vertSize = Config.Client.Advanced.Graphics.Quality.verticalQuality.get().calculateMaxVerticalData(fullDataSource.getDataDetailLevel());
+		final int maxVertSliceCount = Config.Client.Advanced.Graphics.Quality.verticalQuality.get().calculateMaxNumberOfVerticalSlicesAtDetailLevel(fullDataSource.getDataDetailLevel());
 		
 		
 		
-		final ColumnRenderSource columnSource = ColumnRenderSource.createEmpty(pos, vertSize, levelWrapper.getMinHeight());
+		final ColumnRenderSource columnSource = ColumnRenderSource.createEmpty(pos, maxVertSliceCount, levelWrapper.getMinHeight());
 		if (fullDataSource.isEmpty)
 		{
 			return columnSource;
@@ -122,32 +124,40 @@ public class FullDataToRenderDataTransformer
 		int baseX = DhSectionPos.getMinCornerBlockX(pos);
 		int baseZ = DhSectionPos.getMinCornerBlockZ(pos);
 		
+		try(ColumnRenderView columnArrayView = ColumnRenderView.getPooled();
+			PhantomArrayListCheckout phantomCheckout = ARRAY_LIST_POOL.checkoutLongArrays(1);
+			ColumnRenderView tempExpandingColumnView = ColumnRenderView.getPooled();
+			RenderDataPointReducingList reducingList = new RenderDataPointReducingList())
+		{
 			for (int x = 0; x < FullDataSourceV2.WIDTH; x++)
 			{
 				for (int z = 0; z < FullDataSourceV2.WIDTH; z++)
 				{
-				ColumnArrayView columnArrayView = columnSource.getVerticalDataPointView(x, z);
+					columnSource.populateColumnView(columnArrayView, x, z);
 					LongArrayList dataColumn = fullDataSource.getColumnAtRelPos(x, z);
 					
 					updateOrReplaceRenderDataViewColumnWithFullDataColumn(
 						levelWrapper, fullDataSource,
 						// bit shift is to account for LODs with a detail level greater than 0 so the block pos is correct
 						baseX + BitShiftUtil.pow(x, dataDetail), baseZ + BitShiftUtil.pow(z, dataDetail),
-						columnArrayView, dataColumn);
+						columnArrayView, dataColumn,
+						// pooled references so we don't need to re-allocate/get them 4000 times per render source
+						phantomCheckout, tempExpandingColumnView, reducingList);
+				}
 			}
 		}
-		
-		columnSource.fillDebugFlag(0, 0, ColumnRenderSource.WIDTH, ColumnRenderSource.WIDTH, ColumnRenderSource.DebugSourceFlag.FULL);
 		
 		return columnSource;
 	}
 	
-	/** Updates the given {@link ColumnArrayView} to match the incoming Full data {@link LongArrayList} */
+	/** Updates the given {@link ColumnRenderView} to match the incoming Full data {@link LongArrayList} */
 	public static void updateOrReplaceRenderDataViewColumnWithFullDataColumn(
 			IClientLevelWrapper levelWrapper,
 			FullDataSourceV2 fullDataSource, int blockX, int blockZ, 
-			ColumnArrayView columnArrayView, 
+			ColumnRenderView columnArrayView, 
-			LongArrayList fullDataColumn)
+			LongArrayList fullDataColumn,
+			// pooled references
+			PhantomArrayListCheckout phantomCheckout, ColumnRenderView tempExpandingColumnView, RenderDataPointReducingList reducingList)
 	{
 		// we can't do anything if the full data is missing or empty
 		if (fullDataColumn == null 
@@ -157,34 +167,26 @@ public class FullDataToRenderDataTransformer
 		}
 		
 		int fullDataLength = fullDataColumn.size();
-		if (fullDataLength <= columnArrayView.verticalSize())
+		if (fullDataLength <= columnArrayView.maxVerticalSliceCount)
 		{
 			// Directly use the arrayView since it fits.
 			setRenderColumnView(levelWrapper, fullDataSource, blockX, blockZ, columnArrayView, fullDataColumn);
 		}
 		else
 		{
-			PhantomArrayListCheckout checkout = ARRAY_LIST_POOL.checkoutArrays(0, 0, 1);
+			LongArrayList dataArrayList = phantomCheckout.getLongArray(0, fullDataLength);
-			LongArrayList dataArrayList = checkout.getLongArray(0, fullDataLength);
 			
-			try
-			{
 			// expand the ColumnArrayView to fit the new larger max vertical size
-				ColumnArrayView newColumnArrayView = new ColumnArrayView(dataArrayList, fullDataLength, 0, fullDataLength);
+			tempExpandingColumnView.populate(dataArrayList, fullDataLength, 0, fullDataLength);
-				setRenderColumnView(levelWrapper, fullDataSource, blockX, blockZ, newColumnArrayView, fullDataColumn);
+			setRenderColumnView(levelWrapper, fullDataSource, blockX, blockZ, tempExpandingColumnView, fullDataColumn);
 			
-				columnArrayView.changeVerticalSizeFrom(newColumnArrayView);
+			columnArrayView.changeVerticalSizeFrom(tempExpandingColumnView, reducingList);
-			}
-			finally
-			{
-				ARRAY_LIST_POOL.returnCheckout(checkout);
-			}
 		}
 	}
 	private static void setRenderColumnView(
 			IClientLevelWrapper levelWrapper, FullDataSourceV2 fullDataSource,
 			int blockX, int blockZ,
-			ColumnArrayView renderColumnData, LongArrayList fullColumnData)
+			ColumnRenderView renderColumnData, LongArrayList fullColumnData)
 	{
 		//===============//
 		// config values //
@@ -193,8 +195,12 @@ public class FullDataToRenderDataTransformer
 		boolean ignoreNonCollidingBlocks = (Config.Client.Advanced.Graphics.Quality.blocksToIgnore.get() == EDhApiBlocksToAvoid.NON_COLLIDING);
 		boolean colorBelowWithAvoidedBlocks = Config.Client.Advanced.Graphics.Quality.tintWithAvoidedBlocks.get();
 		
-		HashSet<IBlockStateWrapper> blockStatesToIgnore = WRAPPER_FACTORY.getRendererIgnoredBlocks(levelWrapper);
+		final ObjectOpenHashSet<IBlockStateWrapper> blockStatesToIgnore = WRAPPER_FACTORY.getRendererIgnoredBlocks(levelWrapper);
-		HashSet<IBlockStateWrapper> caveBlockStatesToIgnore = WRAPPER_FACTORY.getRendererIgnoredCaveBlocks(levelWrapper);
+		final ObjectOpenHashSet<IBlockStateWrapper> caveBlockStatesToIgnore = WRAPPER_FACTORY.getRendererIgnoredCaveBlocks(levelWrapper);
+		final ObjectOpenHashSet<IBlockStateWrapper> waterSubsurfaceReplacementBlocks = WRAPPER_FACTORY.getWaterSubsurfaceReplacementBlocks(levelWrapper);
+		final ObjectOpenHashSet<IBlockStateWrapper> waterSurfaceReplacementBlocks = WRAPPER_FACTORY.getWaterSurfaceReplacementBlocks(levelWrapper);
+		final IBlockStateWrapper water = WRAPPER_FACTORY.getWaterBlockStateWrapper(levelWrapper);
+		
 		
 		// build snow block cache if needed
 		if (snowLayerBlockStates == null)
@@ -222,6 +228,7 @@ public class FullDataToRenderDataTransformer
 		int colorToApplyToNextBlock = -1;
 		int lastColor = 0;
 		int lastBottom = -10_000;
+		IBlockStateWrapper lastBlock = null;
 		
 		int skylightToApplyToNextBlock = -1;
 		int blocklightToApplyToNextBlock = -1;
@@ -282,9 +289,19 @@ public class FullDataToRenderDataTransformer
 			// cave culling check //
 			//====================//
 			
+			if (waterSubsurfaceReplacementBlocks.contains(block)
+				&& (lastBlock == null || lastBlock.isAir()))
+			{
+				block = water;
+			}
+			
 			boolean ignoreBlock = blockStatesToIgnore.contains(block);
-			boolean caveBlock = caveBlockStatesToIgnore.contains(block); // TODO caves should also ignore transparent/non-solid blocks (IE grass and plants) wthout each being defined
+			boolean caveBlock = caveBlockStatesToIgnore.contains(block);
-			if (caveBlock)
+			if (caveBlock
+				// caves also ignore transparent/non-solid blocks (IE grass and plants) without each being defined
+				|| !block.isSolid()
+				|| block.isLiquid()
+				|| block.getOpacity() < LodUtil.BLOCK_FULLY_OPAQUE)
 			{
 				if (caveCullingEnabled
 					// assume this data point is underground if it has no sky-light
@@ -323,6 +340,9 @@ public class FullDataToRenderDataTransformer
 			else if (ignoreBlock)
 			{
 				// this is an ignored block, but shouldn't be merged like a cave block
+				
+				// applying this sky light to the next block should prevent black spots for opaque covering blocks 
+				skylightToApplyToNextBlock = skyLight;
 				continue;
 			}
 			
@@ -338,34 +358,67 @@ public class FullDataToRenderDataTransformer
 				&& !block.isLiquid()
 				&& block.getOpacity() != LodUtil.BLOCK_FULLY_OPAQUE;
 			
-			// merge snow into the block below it
+			// handle height reduction
-			if (snowLayerBlockStates.contains(block))
+			boolean isSnowLayer = snowLayerBlockStates.contains(block);
+			boolean isWaterSurfaceReplacement = waterSurfaceReplacementBlocks.contains(block);
+			if (isSnowLayer || isWaterSurfaceReplacement)
 			{
-				// sometimes a snow datapoint will be multiple blocks tall,
+				if (isWaterSurfaceReplacement)
+				{
+					// replace the block with water
+					block = WRAPPER_FACTORY.getWaterBlockStateWrapper(levelWrapper);
+				}
+				
+				// sometimes a 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
+					// this block was entirely removed, just color the block below it
 					ignoreNonSolidBlock = true;
+					
+					
+					if (isSnowLayer)
+					{
+						// snow is a special case where it should always tint the block
+						// below it, if not done grass will appear as gray
+						int snowColor = levelWrapper.getBlockColor(mutableBlockPos, biome, fullDataSource, block);
+						colorToApplyToNextBlock = ColorUtil.setAlpha(snowColor, 255);
+					}
+					else //if (isWaterSurfaceReplacement)
+					{
+						colorToApplyToNextBlock = levelWrapper.getBlockColor(mutableBlockPos, biome, fullDataSource, block);
+					}
 				}
 			}
 			
 			if (ignoreNonSolidBlock)
 			{
+				int ignoredColor = levelWrapper.getBlockColor(mutableBlockPos, biome, fullDataSource, block);
+				int ignoredAlpha = ColorUtil.getAlpha(ignoredColor);
+				
 				if (colorBelowWithAvoidedBlocks)
 				{
-					int tempColor = levelWrapper.getBlockColor(mutableBlockPos, biome, fullDataSource, block);
-					
 					// don't transfer the color when alpha is 0
 					// this prevents issues if grass is transparent
-					if (ColorUtil.getAlpha(tempColor) != 0)
+					if (ignoredAlpha != 0)
 					{
-						colorToApplyToNextBlock = ColorUtil.setAlpha(tempColor, 255);
+						colorToApplyToNextBlock = ColorUtil.setAlpha(ignoredColor, 255);
+					}
+				}
+				
+				// Don't transfer the lighting when alpha is 0
+				// (the block below should have its own lighting).
+				if (ignoredAlpha != 0)
+				{
+					// Lighting is transferred even when "colorBelowWithAvoidedBlocks"
+					// is false, since otherwise the blocks underneath may have a light value of "0"
+					// which makes things look darker than they should.
+					// This can specifically manifest as grid lines on LOD borders
+					// (not entire sure why grid lines on LOD borders, maybe it has to do with the fact that those LODs aren't occluded?).
 					skylightToApplyToNextBlock = skyLight;
 					blocklightToApplyToNextBlock = blockLight;
 				}
-				}
 				
 				// skip this non-colliding block
 				continue;
@@ -377,6 +430,20 @@ public class FullDataToRenderDataTransformer
 			{
 				// use this block's color
 				color = levelWrapper.getBlockColor(mutableBlockPos, biome, fullDataSource, block);
+				
+				// use the skylight override if present
+				if (skylightToApplyToNextBlock != -1)
+				{
+					skyLight = skylightToApplyToNextBlock;
+					// remove the override so we don't accidentally override the next datapoint
+					skylightToApplyToNextBlock = -1;
+				}
+				
+				if (blocklightToApplyToNextBlock != -1)
+				{
+					blockLight = blocklightToApplyToNextBlock;
+					blocklightToApplyToNextBlock = -1;
+				}
 			}
 			else
 			{
@@ -413,6 +480,7 @@ public class FullDataToRenderDataTransformer
 			}
 			lastBottom = bottomY;
 			lastColor = color;
+			lastBlock = block;
 		}
 		
 		

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

@@ -154,7 +154,7 @@ public class LodDataBuilder
 					IBlockStateWrapper currentBlockState = AIR;
 					int mappedId = dataSource.mapping.addIfNotPresentAndGetId(currentBiome, currentBlockState);
 					
-					// Determine lighting (we are at the height limit. There are no torches here, and sky is not obscured.) // TODO: Per face lighting someday?
+					// Determine lighting (we are at the height limit. There are no torches here, and sky is not obscured.)
 					byte blockLight = LodUtil.MIN_MC_LIGHT;
 					byte skyLight = LodUtil.MAX_MC_LIGHT;
 					
@@ -321,8 +321,6 @@ public class LodDataBuilder
 				
 				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
 				dataSource.setSingleColumn(
 						packedDataPoints,
 						relBlockX + relSourceBlockX, relBlockZ + relSourceBlockZ,

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

@@ -0,0 +1,35 @@
+package com.seibel.distanthorizons.core.enums;
+
+/**
+ * might be deprecated in the future? in that case we'll probably want a wrapper 
+ * function to handle colors for new MC versions
+ * <br><br>
+ * source: https://minecraft.wiki/w/Formatting_codes
+ */
+public class MinecraftTextFormat
+{
+	public static final String BLACK = "\u00A70";
+	public static final String DARK_BLUE = "\u00A71";
+	public static final String DARK_GREEN = "\u00A72";
+	public static final String DARK_AQUA = "\u00A73";
+	public static final String DARK_RED = "\u00A74";
+	public static final String DARK_PURPLE = "\u00A75";
+	public static final String ORANGE = "\u00A76";
+	public static final String GRAY = "\u00A77";
+	public static final String DARK_GRAY = "\u00A78";
+	public static final String BLUE = "\u00A79";
+	public static final String GREEN = "\u00A7a";
+	public static final String AQUA = "\u00A7b";
+	public static final String RED = "\u00A7c";
+	public static final String LIGHT_PURPLE = "\u00A7d";
+	public static final String YELLOW = "\u00A7e";
+	public static final String WHITE = "\u00A7f";
+	
+	public static final String OBFUSCATED = "\u00A7k";
+	public static final String BOLD = "\u00A7l";
+	public static final String STRIKETHROUGH = "\u00A7m";
+	public static final String UNDERLINE = "\u00A7n";
+	public static final String ITALIC = "\u00A7o";
+	public static final String CLEAR_FORMATTING = "\u00A7r";
+	
+}