Add proof-of-concept dynamic fade

2026-01-17 10:16:35 -06:00
348 changed files with 20006 additions and 16492 deletions
@@ -2,63 +2,48 @@ 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()
+
+shadowJar {
+    // required for basic shadowJar setup
+    configurations = [project.configurations.shadow]
 }

-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"
-}
-
-java {
-    withSourcesJar()
-}
-
-task createReleaseApiJar(type: ShadowJar) {
-
-    mustRunAfter sourcesJar
-    dependsOn shadowJar
+task addSourcesToCompiledJar(type: ShadowJar) {
    
-    // the compiled "-all" jar is used since it's available at the time this task is run 
-    def compiledJarPath = "build/libs/DistantHorizonsApi-${rootProject.api_version}-all.jar"
-    def compiledJarFile = file(compiledJarPath)
+    def sourceJarPath = "build/libs/DistantHorizons-api-${rootProject.versionStr}-sources.jar"
+    def secondJarFile = file(sourceJarPath)
    
    // doFirst is so these only run when the task is actually executed
    doFirst {
-        System.out.println("Adding class files from: \n" +
-                "[" + compiledJarPath + "] to source API jar: \n" +
-                "[" + shadowJar.archiveFile.get().asFile + "]")
+        System.out.println("Adding source files from: \n" +
+                "[" + sourceJarPath + "] to compiled API jar: \n" +
+                "[" + shadowJar.archivePath + "]")
        
        // Validate the input JAR file
-        if (!compiledJarFile.exists()) {
-            throw new GradleException("Compiled JAR file not found: [${compiledJarFile}]")
+        if (!secondJarFile.exists()) {
+            throw new GradleException("Second JAR file not found: [${secondJarFile}]")
        }
    }
    
-    archiveFileName.set("DistantHorizonsApi-${rootProject.api_version}-combined.jar") // jar name
-    destinationDirectory = file('build/libs/') // jar location
+    // Set the name of the combined JAR file
+    archiveFileName.set("DistantHorizonsApi-${rootProject.api_version}.jar")
+    
+    // Set the destination directory for the combined JAR file
+    destinationDirectory = file('build/libs/merged/')
    
    // Set the input JAR files to be combined
    from sourceSets.main.allJava
    from {
-        project.configurations.shadow.collect { it.isDirectory() ? it : zipTree(it) }
+        configurations.shadow.collect { it.isDirectory() ? it : zipTree(it) }
    }
    
-    // add the class files
-    from zipTree(compiledJarFile)
+    // set the jars to merge
+    from shadowJar.archivePath
+    from secondJarFile
    
    // alternative method to Include the source files in the combined JAR
    // and/or see which files are being included
@@ -92,13 +77,6 @@ task createReleaseApiJar(type: ShadowJar) {
    }
    
 }
-// always create a combined jar for easy deployment
-assemble.dependsOn(createReleaseApiJar)
-
-shadowJar {
-    // required for basic shadowJar setup
-    configurations = [project.configurations.shadow]
-}

 javadoc {
    options {
@@ -109,17 +87,3 @@ javadoc {
        addStringOption('Xdoclint:all,-missing', '-quiet')
    }
 }
-
-// set the jar name
-def configureJar = { task ->
-    // outputs in the format:
-    // "DistantHorizonsApi-6.0.0.jar"
-    // "DistantHorizonsApi-6.0.0-sources.jar"
-    task.archiveBaseName = rootProject.api_name
-    task.archiveVersion = rootProject.api_version
-}
-configureJar(tasks.named("jar").get())
-configureJar(tasks.named("sourcesJar").get())
-configureJar(tasks.named("shadowJar").get())
-
-
@@ -35,12 +35,29 @@ 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
+	//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);
 	
@@ -1,17 +0,0 @@
-package com.seibel.distanthorizons.api.enums.config;
-
-/**
- * VULKAN, <br>
- * OPEN_GL, <br>
- *
- * @see EDhApiRenderingEngine
- * 
- * @since API 7.0.0
- * @version 2026-3-10
- */
-public enum EDhApiRenderingApi
-{
-	VULKAN,
-	OPEN_GL;
-	
-}
@@ -1,19 +0,0 @@
-package com.seibel.distanthorizons.api.enums.config;
-
-/**
- * AUTO, <br>
- * OPEN_GL, <br>
- * BLAZE_3D, <br><br>
- *
- * @see EDhApiRenderingApi
- * 
- * @since API 7.0.0
- * @version 2026-3-10
- */
-public enum EDhApiRenderingEngine
-{
-	AUTO,
-	OPEN_GL,
-	BLAZE_3D;
-	
-}
@@ -17,18 +17,35 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package com.seibel.distanthorizons.core.wrapperInterfaces.render.objects;
-
-import com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding.LodBufferContainer;
+package com.seibel.distanthorizons.api.enums.config;

 /**
- * @see LodBufferContainer
+ * NEVER, 	<br>
+ * DYNAMIC, <br>
+ * ALWAYS	<br> <br>
+ *
+ * This represents how far the LODs should overlap with
+ * the vanilla Minecraft terrain.
+ *
+ * @author James Seibel
+ * @since API 2.0.0
+ * @version 2024-4-6
 */
-public interface ILodContainerUniformBufferWrapper extends AutoCloseable
+@Deprecated // not currently in use, if the config this enum represents is re-implemented, the deprecated flag can be removed
+public enum EDhApiVanillaOverdraw
 {
-	/** does nothing if the buffer has already been uploaded */
-	void tryUpload(LodBufferContainer bufferContainer);
+	/**
+	 * Don't draw LODs where a minecraft chunk could be.
+	 * Use Overdraw Offset to tweak the border thickness.
+	 */
+	NEVER,
 	
-	@Override void close();
+	/**
+	 * Draw LODs over the farther minecraft chunks.
+	 * Dynamically decides the border thickness
+	 */
+	DYNAMIC,
 	
-}
+	/** Draw LODs over all minecraft chunks. */
+	ALWAYS,
+}
@@ -53,7 +53,7 @@ public enum EDhApiVerticalQuality
 	
 	
 	
-	public int calculateMaxNumberOfVerticalSlicesAtDetailLevel(byte dataDetail)
+	public int calculateMaxVerticalData(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);
@@ -43,7 +43,11 @@ 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)
 	{
@@ -56,7 +60,7 @@ public enum EDhApiDebugRendering
 			case SHOW_BLOCK_MATERIAL:
 				return SHOW_OVERLAPPING_QUADS;
 			case SHOW_OVERLAPPING_QUADS:
-				return OFF;
+				return SHOW_RENDER_SOURCE_FLAG;
 			default:
 				return OFF;
 		}
@@ -67,6 +71,8 @@ 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;
@@ -20,17 +20,17 @@
 package com.seibel.distanthorizons.api.enums.rendering;

 /**
- * DEFAULT <br>
- * DEBUG_TRIANGLE <br>
- * DISABLED <br>
+ * Default <br>
+ * Debug <br>
+ * Disabled <br>
 *
 * @since API 2.0.0
- * @version 2026-03-23
+ * @version 2024-4-6
 */
 public enum EDhApiRendererMode
 {
 	DEFAULT,
-	DEBUG_TRIANGLE,
+	DEBUG,
 	DISABLED;
 	
 	
@@ -40,8 +40,8 @@ public enum EDhApiRendererMode
 		switch (type)
 		{
 			case DEFAULT:
-				return DEBUG_TRIANGLE;
-			case DEBUG_TRIANGLE:
+				return DEBUG;
+			case DEBUG:
 				return DISABLED;
 			default:
 				return DEFAULT;
@@ -55,10 +55,10 @@ public enum EDhApiRendererMode
 		{
 			case DEFAULT:
 				return DISABLED;
-			case DEBUG_TRIANGLE:
+			case DEBUG:
 				return DEFAULT;
 			default:
-				return DEBUG_TRIANGLE;
+				return DEBUG;
 		}
 	}
 	
@@ -21,13 +21,25 @@ package com.seibel.distanthorizons.api.enums.rendering;

 /**
 * DISABLED,					<br>
+ * FAKE,						<br>
 * COMPLETE,					<br>
 * 
 * @since API 2.0.0
- * @version 2026-05-19
+ * @version 2024-4-6
 */
 public enum EDhApiTransparency
 {
-	DISABLED,
-	COMPLETE;
+	DISABLED(false, false),
+	FAKE(true, true),
+	COMPLETE(true, false);
+	
+	public final boolean transparencyEnabled;
+	public final boolean fakeTransparencyEnabled;
+	
+	EDhApiTransparency(boolean transparencyEnabled, boolean fakeTransparencyEnabled)
+	{
+		this.transparencyEnabled = transparencyEnabled;
+		this.fakeTransparencyEnabled = fakeTransparencyEnabled;
+	}
+	
 }
@@ -19,8 +19,6 @@

 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).
@@ -40,11 +38,7 @@ 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. <br><br>
-	 * 
-	 * Note:<br>
-	 * This method may return null in some cases, IE {@link IDhApiBlockStateWrapper}
-	 * when it is wrapping air.
+	 * the specific version of Minecraft you are developing for.
 	 */
 	Object getWrappedMcObject();
 	
@@ -23,10 +23,7 @@ import com.seibel.distanthorizons.api.enums.rendering.EDhApiBlockMaterial;
 import com.seibel.distanthorizons.api.interfaces.IDhApiUnsafeWrapper;

 /**
- * 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.
+ * A Minecraft version independent way of handling Blocks.
 *
 * @author James Seibel
 * @version 2023-6-11
@@ -42,12 +39,6 @@ public interface IDhApiBlockStateWrapper extends IDhApiUnsafeWrapper
 	/** @since API 1.0.0 */
 	boolean isLiquid();
 	
-	/**
-	 * Returns a value between 0 (fully transparent) and 16 (fully opaque).
-	 * @since 6.1.0 
-	 */
-	int getOpacity();
-	
 	/**
 	 * Returns the full serialized form of the given block
 	 * as defined by DH's serialization methods.
@@ -23,10 +23,10 @@ import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigGroup;
 import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;

 /**
- * Distant Horizons' SSAO configuration. <br><br>
+ * Distant Horizons' fog configuration. <br><br>
 *
 * @author James Seibel
- * @version 2026-02-05
+ * @version 2022-9-6
 * @since API 1.0.0
 */
 public interface IDhApiAmbientOcclusionConfig extends IDhApiConfigGroup
@@ -34,4 +34,32 @@ 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();
+	
 }
@@ -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<Float> farFogStartDistance();
+	IDhApiConfigValue<Double> 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<Float> farFogEndDistance();
+	IDhApiConfigValue<Double> farFogEndDistance();
 	
 	/** Defines how opaque the fog is at its thinnest point. */
-	IDhApiConfigValue<Float> farFogMinThickness();
+	IDhApiConfigValue<Double> farFogMinThickness();
 	
 	/** Defines how opaque the fog is at its thickest point. */
-	IDhApiConfigValue<Float> farFogMaxThickness();
+	IDhApiConfigValue<Double> farFogMaxThickness();
 	
 	/** Defines how the fog changes in thickness. */
 	IDhApiConfigValue<EDhApiFogFalloff> farFogFalloff();
 	
 	/** Defines the fog density. */
-	IDhApiConfigValue<Float> farFogDensity();
+	IDhApiConfigValue<Double> farFogDensity();
 	
 }
@@ -85,18 +85,6 @@ public interface IDhApiGraphicsConfig extends IDhApiConfigGroup
 	/** Modifies the quadratic function fake chunks use for horizontal quality drop-off. */
 	IDhApiConfigValue<EDhApiHorizontalQuality> horizontalQuality();
 	
-	/** 
-	 * If true DH will try to use the camera position when
-	 * determining LOD quality drop-off. <br>
-	 * If false DH will use the player's position.
-	 * <br><br>
-	 * Enabling helps free-cam mods render correctly. <br>
-	 * Disabling helps multi-camera mods render correctly (ie Immersive Portals or camera mods).
-	 * 
-	 * @since API 7.0.0
-	 */
-	IDhApiConfigValue<Boolean> useCameraPositionForQualityDropOff();
-	
 	IDhApiConfigValue<EDhApiTransparency> transparency();
 	
 	/** Defines what blocks won't be rendered as LODs. */
@@ -136,19 +124,19 @@ public interface IDhApiGraphicsConfig extends IDhApiConfigGroup
 	 * 
 	 * @since API 2.0.0
 	 */
-	IDhApiConfigValue<Float> overdrawPreventionRadius();
+	IDhApiConfigValue<Double> overdrawPreventionRadius();
 	
 	/**
 	 * Modifies how bright fake chunks are. <br>
 	 * This is done when generating the vertex data and is applied before any shaders.
 	 */
-	IDhApiConfigValue<Float> brightnessMultiplier();
+	IDhApiConfigValue<Double> brightnessMultiplier();
 	
 	/**
 	 * Modifies how saturated fake chunks are. <br>
 	 * This is done when generating the vertex data and is applied before any shaders.
 	 */
-	IDhApiConfigValue<Float> saturationMultiplier();
+	IDhApiConfigValue<Double> saturationMultiplier();
 	
 	/** Defines if Distant Horizons should attempt to cull fake chunk cave geometry. */
 	IDhApiConfigValue<Boolean> caveCullingEnabled();
@@ -162,6 +150,12 @@ 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.
 	 *
@@ -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<Float> heightFogBaseHeight();
+	IDhApiConfigValue<Double> heightFogBaseHeight();
 	
 	/** Defines the height fog's starting height as a percent of the world height. */
-	IDhApiConfigValue<Float> heightFogStartingHeightPercent();
+	IDhApiConfigValue<Double> heightFogStartingHeightPercent();
 	
 	/** Defines the height fog's ending height as a percent of the world height. */
-	IDhApiConfigValue<Float> heightFogEndingHeightPercent();
+	IDhApiConfigValue<Double> heightFogEndingHeightPercent();
 	
 	/** Defines how opaque the height fog is at its thinnest point. */
-	IDhApiConfigValue<Float> heightFogMinThickness();
+	IDhApiConfigValue<Double> heightFogMinThickness();
 	
 	/** Defines how opaque the height fog is at its thickest point. */
-	IDhApiConfigValue<Float> heightFogMaxThickness();
+	IDhApiConfigValue<Double> heightFogMaxThickness();
 	
 	/** Defines how the height fog changes in thickness. */
 	IDhApiConfigValue<EDhApiFogFalloff> heightFogFalloff();
 	
 	/** Defines the height fog's density. */
-	IDhApiConfigValue<Float> heightFogDensity();
+	IDhApiConfigValue<Double> heightFogDensity();
 	
 }
@@ -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, between 0.0 and 1.0. */
-	IDhApiConfigValue<Float> noiseIntensity();
+	/** Defines how intense the noise will be. */
+	IDhApiConfigValue<Double> noiseIntensity();
 	
 	/**
 	 * Defines how far should the noise texture render before it fades away. (in blocks) <br>
@@ -1,18 +1,15 @@
 package com.seibel.distanthorizons.api.interfaces.data;

 /**
- * 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.
- * 
+ * Can be used to drastically speed up repeat read operations in {@link IDhApiTerrainDataRepo}.
+ *
 * @see IDhApiTerrainDataRepo
 * 
 * @author James Seibel
- * @version 2026-1-29
+ * @version 2024-7-14
 * @since API 3.0.0
 */
-public interface IDhApiTerrainDataCache extends AutoCloseable
+public interface IDhApiTerrainDataCache // TODO should this be AutoClosable?
 {
 	/**
 	 * Removes any data that's currently stored in this cache.
@@ -24,10 +21,4 @@ public interface IDhApiTerrainDataCache extends AutoCloseable
 	 */
 	void clear();
 	
-	// override without an exception
-	@Override
-	void close();
-	
-	
-	
 }
@@ -32,7 +32,7 @@ import com.seibel.distanthorizons.api.objects.data.DhApiTerrainDataPoint;
 * @see IDhApiTerrainDataCache
 * 
 * @author James Seibel
- * @version 2026-02-03
+ * @version 2023-6-22
 * @since API 1.0.0
 */
 public interface IDhApiTerrainDataRepo
@@ -42,17 +42,24 @@ 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>
 	 *
@@ -64,6 +71,8 @@ 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>
 	 *
@@ -75,6 +84,8 @@ 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).
@@ -90,6 +101,21 @@ 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>
@@ -40,7 +40,8 @@ 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 DH Devs: Don't try adding a generic type to IDhApiEvent, the constructor won't accept it
+	// Note to self: Don't try adding a generic type to IDhApiEvent, the constructor won't accept it
+	// TODO why are we removing the class instead of an instance?
 	boolean unbind(Class<? extends IDhApiEvent> dependencyInterface, Class<? extends IDhApiEvent> dependencyClassToRemove) throws IllegalArgumentException;
 	
 	
@@ -19,21 +19,9 @@

 package com.seibel.distanthorizons.api.interfaces.override.rendering;

-import com.seibel.distanthorizons.api.enums.config.EDhApiRenderingEngine;
 import com.seibel.distanthorizons.api.interfaces.override.IDhApiOverrideable;
-import com.seibel.distanthorizons.api.interfaces.render.IDhApiRenderProxy;

 /**
- * <b>Note: </b><br>
- * This is only used if Distant Horizons' 
- * {@link IDhApiRenderProxy#getRenderingApi()} returns {@link EDhApiRenderingEngine#OPEN_GL}
- * and {@link IDhApiRenderProxy#isNativeRenderer()} returns true.
- * ie this is only used when DH is doing native OpenGL rendering,
- * if DH is using Blaze3D this interface will be ignored.
- * 
- * @see IDhApiRenderProxy#getRenderingApi()
- * @see IDhApiRenderProxy#isNativeRenderer()
- * 
 * @author James Seibel
 * @version 2024-1-24
 * @since API 2.0.0
@@ -19,9 +19,7 @@

 package com.seibel.distanthorizons.api.interfaces.override.rendering;

-import com.seibel.distanthorizons.api.enums.config.EDhApiRenderingEngine;
 import com.seibel.distanthorizons.api.interfaces.override.IDhApiOverrideable;
-import com.seibel.distanthorizons.api.interfaces.render.IDhApiRenderProxy;
 import com.seibel.distanthorizons.api.interfaces.render.IDhApiRenderableBoxGroup;
 import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiRenderParam;
 import com.seibel.distanthorizons.api.objects.math.DhApiVec3d;
@@ -29,16 +27,7 @@ import com.seibel.distanthorizons.api.objects.render.DhApiRenderableBox;
 import com.seibel.distanthorizons.api.objects.render.DhApiRenderableBoxGroupShading;

 /**
- * <b>Note: </b><br>
- * This is only used if Distant Horizons' 
- * {@link IDhApiRenderProxy#getRenderingApi()} returns {@link EDhApiRenderingEngine#OPEN_GL}
- * and {@link IDhApiRenderProxy#isNativeRenderer()} returns true.
- * ie this is only used when DH is doing native OpenGL rendering,
- * if DH is using Blaze3D this interface will be ignored.
- *
 * @see IDhApiShaderProgram
- * @see IDhApiRenderProxy#getRenderingApi() 
- * @see IDhApiRenderProxy#isNativeRenderer()
 * 
 * @author James Seibel
 * @version 2024-7-11
@@ -19,23 +19,12 @@

 package com.seibel.distanthorizons.api.interfaces.override.rendering;

-import com.seibel.distanthorizons.api.enums.config.EDhApiRenderingEngine;
 import com.seibel.distanthorizons.api.interfaces.override.IDhApiOverrideable;
-import com.seibel.distanthorizons.api.interfaces.render.IDhApiRenderProxy;
 import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiRenderParam;
 import com.seibel.distanthorizons.api.objects.math.DhApiVec3f;

 /**
- * <b>Note: </b><br>
- * This is only used if Distant Horizons' 
- * {@link IDhApiRenderProxy#getRenderingApi()} returns {@link EDhApiRenderingEngine#OPEN_GL}
- * and {@link IDhApiRenderProxy#isNativeRenderer()} returns true.
- * ie this is only used when DH is doing native OpenGL rendering,
- * if DH is using Blaze3D this interface will be ignored.
- *
 * @see IDhApiGenericObjectShaderProgram
- * @see IDhApiRenderProxy#getRenderingApi()
- * @see IDhApiRenderProxy#isNativeRenderer()
 * 
 * @author James Seibel
 * @version 2024-1-24
@@ -3,7 +3,6 @@ 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;

@@ -19,7 +18,7 @@ import java.util.List;
 * @version 2024-7-3
 * @since API 3.0.0
 */
-public interface IDhApiCustomRenderObjectFactory extends IBindable
+public interface IDhApiCustomRenderObjectFactory
 {
 	/**
 	 * Creates a {@link IDhApiRenderableBoxGroup} from for the given {@link DhApiRenderableBox}
@@ -19,9 +19,6 @@

 package com.seibel.distanthorizons.api.interfaces.render;

-import com.seibel.distanthorizons.api.enums.config.EDhApiRenderingApi;
-import com.seibel.distanthorizons.api.enums.config.EDhApiRenderingEngine;
-import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiAfterDhInitEvent;
 import com.seibel.distanthorizons.api.objects.DhApiResult;


@@ -47,33 +44,6 @@ public interface IDhApiRenderProxy
 	 */
 	DhApiResult<Boolean> clearRenderDataCache();
 	
-	/**
-	 * Returns which specific {@link EDhApiRenderingApi}
-	 * Distant Horizons will use for rendering. <br><br>
-	 * 
-	 * @throws IllegalStateException if no renderer has been bound yet, 
-	 *      wait till after {@link DhApiAfterDhInitEvent} has been fired
-	 * 
-	 * @see DhApiAfterDhInitEvent
-	 * @since API 7.0.0
-	 */
-	EDhApiRenderingApi getRenderingApi() throws IllegalStateException;
-	/**
-	 * Returns true if the current renderer
-	 * is calling the base rendering API's method calls. <br>
-	 * ie GL.drawArrays() for OpenGL. <Br><br>
-	 *
-	 * If DH is using a rendering interpretation layer like Blaze3D (Mojang's rendering API) 
-	 * this will return false.
-	 *
-	 * @throws IllegalStateException if no renderer has been bound yet, 
-	 *      wait till after {@link DhApiAfterDhInitEvent} has been fired
-	 *
-	 * @see DhApiAfterDhInitEvent
-	 * @since API 7.0.0
-	 */
-	boolean isNativeRenderer() throws IllegalStateException;
-	
 	
 	
 	//=======================//
@@ -81,16 +51,14 @@ public interface IDhApiRenderProxy
 	//=======================//
 	
 	/**
-	 * 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
-	 * or a rendering API other than OpenGL is in use.
+	 * Returns the 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.
 	 */
 	DhApiResult<Integer> getDhDepthTextureId();
 	
 	/**
-	 * 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
-	 * or a rendering API other than OpenGL is in use
+	 * Returns the 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.
 	 */
 	DhApiResult<Integer> getDhColorTextureId();
 	
@@ -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);
+	void setPostRenderFunc(Consumer<DhApiRenderParam> renderEventParam); // TODO name?
 	
 	/**
 	 * If a cube's color, position, or other property is changed this method
@@ -21,14 +21,8 @@ package com.seibel.distanthorizons.api.interfaces.world;

 import com.seibel.distanthorizons.api.interfaces.IDhApiUnsafeWrapper;
 import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiLevelType;
-import com.seibel.distanthorizons.api.interfaces.block.IDhApiBiomeWrapper;
-import com.seibel.distanthorizons.api.interfaces.block.IDhApiBlockStateWrapper;
 import com.seibel.distanthorizons.api.interfaces.render.IDhApiCustomRenderRegister;
-import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiBlockColorOverrideEvent;
-import com.seibel.distanthorizons.api.objects.DhApiResult;
-import com.seibel.distanthorizons.api.objects.data.IDhApiFullDataSource;

-import java.awt.*;
 import java.io.File;

 /**
@@ -96,26 +90,6 @@ public interface IDhApiLevelWrapper extends IDhApiUnsafeWrapper
 	 */
 	File getDhSaveFolder();
 	
-	/**
-	 * Returns the color DH would use for the given block/biome
-	 * pair at the given world position before any API color overrides
-	 * are considered. <br>
-	 * API color overrides are ignored to prevent infinite
-	 * loops if this event is triggered inside said API override.
-	 * <br><br>
-	 * 
-	 * Returns {@link DhApiResult#success} = false if {@link IDhApiLevelWrapper#getLevelType()} returns a {@link EDhApiLevelType#SERVER_LEVEL}
-	 * (server levels have no concept of textures or colors).
-	 * 
-	 * @see DhApiBlockColorOverrideEvent
-	 * @since API 7.0.0
-	 */
-	DhApiResult<Color> getBlockColorPreApi(
-		IDhApiBlockStateWrapper blockStateWrapper,
-		IDhApiBiomeWrapper biomeWrapper,
-		int blockWorldPosX, int blockWorldPosY, int blockWorldPosZ,
-		IDhApiFullDataSource dataSource);
-	
 	
 	
 }
@@ -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 canceled, use {@link DhApiBeforeRenderEvent} if you want to cancel rendering.
+ * This event cannot be cancelled, use {@link DhApiBeforeRenderEvent} if you want to cancel rendering.
 * 
 * @author James Seibel
 * @version 2023-1-31
@@ -59,25 +59,23 @@ public abstract class DhApiBeforeBufferRenderEvent implements IDhApiEvent<DhApiB
 		 * Measured in blocks.
 		 * Should be applied to the model view matrix to move the buffer into its proper place. 
 		 */
-		public DhApiVec3f modelPos;
+		public final DhApiVec3f modelPos;
 		
 		
-		
-		public EventParam() { }
-		
-		public void update(DhApiRenderParam parent, DhApiVec3f modelPos)
+		public EventParam(DhApiRenderParam parent, DhApiVec3f modelPos)
 		{
-			super.update(parent);
+			super(parent);
 			this.modelPos = modelPos;
 		}
 		
 		
-		
-		@Override 
-		public boolean getCopyBeforeFire() { return false; }
-		
 		@Override
-		public EventParam copy() { return this; }
+		public EventParam copy()
+		{
+			return new EventParam(
+					this, this.modelPos.copy()
+			);
+		}
 	}
 	
 }
@@ -31,10 +31,7 @@ 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. */
@@ -1,128 +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.api.methods.events.abstractEvents;
-
-import com.seibel.distanthorizons.api.interfaces.block.IDhApiBiomeWrapper;
-import com.seibel.distanthorizons.api.interfaces.block.IDhApiBlockStateWrapper;
-import com.seibel.distanthorizons.api.interfaces.world.IDhApiLevelWrapper;
-import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiCancelableEvent;
-import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEventParam;
-import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiCancelableEventParam;
-import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiFogRenderParam;
-import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiMutableFogRenderParam;
-import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiRenderParam;
-import com.seibel.distanthorizons.api.objects.data.IDhApiFullDataSource;
-import com.seibel.distanthorizons.coreapi.util.ColorUtil;
-
-/**
- * Fired before DH renders its fog.
- * Canceling this event disables fog for that frame.
- * 
- * @author James Seibel
- * @version 2026-05-20
- * @since API 7.0.0
- */
-public abstract class DhApiBeforeFogRenderEvent implements IDhApiCancelableEvent<DhApiBeforeFogRenderEvent.EventParam>
-{
-	/** Fired before fog is generated. */
-	public abstract void beforeRender(DhApiCancelableEventParam<DhApiBeforeFogRenderEvent.EventParam> event);
-	
-	
-	//=========================//
-	// internal DH API methods //
-	//=========================//
-	
-	@Override
-	public final void fireEvent(DhApiCancelableEventParam<DhApiBeforeFogRenderEvent.EventParam> event) { this.beforeRender(event); }
-	
-	
-	
-	//==================//
-	// parameter object //
-	//==================//
-	
-	public static class EventParam implements IDhApiEventParam
-	{
-		private DhApiRenderParam renderParam;
-		private DhApiFogRenderParam originalFogRenderParam;
-		private DhApiMutableFogRenderParam fogRenderParam;
-		
-		
-		
-		//=============//
-		// constructor //
-		//=============//
-		//region
-		
-		public EventParam() {}
-		
-		public void update(DhApiRenderParam renderParam, DhApiFogRenderParam fogRenderParam)
-		{
-			this.renderParam = renderParam;
-			this.originalFogRenderParam = fogRenderParam;
-			this.fogRenderParam = new DhApiMutableFogRenderParam(fogRenderParam);
-		}
-		
-		//endregion
-		
-		
-		
-		//=================//
-		// getters/setters //
-		//=================//
-		//region
-		
-		public DhApiRenderParam getRenderParam() { return this.renderParam; }
-		
-		/** immutable, stores what DH would do without API intervention so API users have a reference point */
-		public DhApiFogRenderParam getOriginalFogRenderParam() { return this.originalFogRenderParam; }
-		/** mutable, can be modified by API users */
-		public DhApiMutableFogRenderParam getFogRenderParam() { return this.fogRenderParam; }
-		
-		//endregion
-		
-		
-		
-		//==========================//
-		// base api event overrides //
-		//==========================//
-		//region
-		
-		/**
-		 * 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 DhApiBeforeFogRenderEvent.EventParam copy() { return this; }
-		
-		@Override
-		public boolean getCopyBeforeFire() { return false; }
-		
-		//endregion
-		
-		
-		
-	}
-	
-	
-}
@@ -54,45 +54,44 @@ public abstract class DhApiBeforeGenericObjectRenderEvent implements IDhApiCance
 	
 	public static class EventParam extends DhApiRenderParam implements IDhApiEventParam
 	{
-		public long boxGroupId;
-		public String resourceLocationNamespace;
-		public String resourceLocationPath;
+		public final long boxGroupId;
+		public final String resourceLocationNamespace;
+		public final String resourceLocationPath;
 		
 		
-		
-		//==============//
-		// constructors //
-		//==============//
-		//region
-		
-		public EventParam() { }
-		
-		/** internal DH method */
-		public void update(DhApiRenderParam renderParam, IDhApiRenderableBoxGroup boxGroup)
+		public EventParam(
+				DhApiRenderParam renderParam,
+				IDhApiRenderableBoxGroup boxGroup
+			) 
 		{
-			super.update(renderParam);
+			super(renderParam); 
 			
 			this.boxGroupId = boxGroup.getId();
 			this.resourceLocationNamespace = boxGroup.getResourceLocationNamespace();
 			this.resourceLocationPath = boxGroup.getResourceLocationPath();
 		}
-		
-		//endregion
+		public EventParam(
+				DhApiRenderParam renderParam,
+				long boxGroupId, String resourceLocationNamespace, String resourceLocationPath
+			)
+		{
+			super(renderParam);
+			
+			this.boxGroupId = boxGroupId;
+			this.resourceLocationNamespace = resourceLocationNamespace;
+			this.resourceLocationPath = resourceLocationPath;
+		}
 		
 		
 		
-		//================//
-		// base overrides //
-		//================//
-		//region
-		
 		@Override
-		public EventParam copy() { return this; }
-		
-		//endregion
-		
-		
-		
+		public EventParam copy()
+		{
+			return new EventParam(
+				this, 
+				this.boxGroupId, this.resourceLocationNamespace, this.resourceLocationPath
+			);
+		}
 	}
 	
 }
@@ -1,187 +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.api.methods.events.abstractEvents;
-
-import com.seibel.distanthorizons.api.interfaces.block.IDhApiBiomeWrapper;
-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.api.objects.data.IDhApiFullDataSource;
-import com.seibel.distanthorizons.coreapi.util.ColorUtil;
-
-/**
- * Performance note: this event will be fired millions of times on concurrent threads, 
- * make it thread safe and as fast as possible. <br> 
- * (If every LOD block goes through this event, On a 512 render distance world, 
- * at the medium quality preset, it will be triggered around 40,000,000 times.)
- * <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-05-18
- * @since API 6.0.0
- * @see IDhApiBlockStateWrapper
- */
-public abstract class DhApiBlockColorOverrideEvent implements IDhApiEvent<DhApiBlockColorOverrideEvent.EventParam>
-{
-	public abstract void onBlockColorOverridden(DhApiEventParam<EventParam> event);
-	
-	
-	
-	//=========================//
-	// internal DH API methods //
-	//=========================//
-	
-	@Override
-	public final void fireEvent(DhApiEventParam<EventParam> event) { this.onBlockColorOverridden(event); }
-	
-	
-	
-	//==================//
-	// parameter object //
-	//==================//
-	
-	public static class EventParam implements IDhApiEventParam
-	{
-		private IDhApiLevelWrapper levelWrapper;
-		private IDhApiFullDataSource dataSource;
-		private IDhApiBlockStateWrapper blockStateWrapper = null;
-		private IDhApiBiomeWrapper biomeWrapper = null;
-		private int colorAsInt = -1;
-		private int blockPosX = 0, blockPosY = 0, blockPosZ = 0;
-		
-		
-		
-		//=============//
-		// constructor //
-		//=============//
-		//region
-		
-		public EventParam() {}
-		
-		public void update(
-			IDhApiLevelWrapper levelWrapper,
-			IDhApiFullDataSource dataSource,
-			IDhApiBlockStateWrapper blockStateWrapper,
-			IDhApiBiomeWrapper biomeWrapper,
-			int colorAsInt,
-			int blockPosX, int blockPosY, int blockPosZ)
-		{
-			this.levelWrapper = levelWrapper;
-			this.dataSource = dataSource;
-			this.blockStateWrapper = blockStateWrapper;
-			this.biomeWrapper = biomeWrapper;
-			this.colorAsInt = colorAsInt;
-			
-			this.blockPosX = blockPosX;
-			this.blockPosY = blockPosY;
-			this.blockPosZ = blockPosZ;
-		}
-		
-		//endregion
-		
-		
-		
-		//=================//
-		// getters/setters //
-		//=================//
-		//region
-		
-		public IDhApiBlockStateWrapper getBlockStateWrapper() { return this.blockStateWrapper; }
-		/** @since API 7.0.0 */
-		public IDhApiBiomeWrapper getBiomeWrapper() { return this.biomeWrapper; }
-		
-		/** the level DH is resolving this block's color in. */
-		public IDhApiLevelWrapper getLevelWrapper() { return this.levelWrapper; }
-		/** 
-		 * The DH datasource that contains this block's position. Can be used to access adjacent
-		 * {@link IDhApiBlockStateWrapper}'s and {@link IDhApiBiomeWrapper}'s for adjacent aware tinting.
-		 * @since API 7.0.0
-		 */
-		public IDhApiFullDataSource getDataSource() { return this.dataSource; }
-		
-		public int getColorAsInt() { return this.colorAsInt; }
-		public int getAlpha() { return ColorUtil.getAlpha(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 { this.setColor(this.getAlpha(), red, green, blue); }
-		/** 
-		 * Note: when if you set a partially transparent alpha channel the underlying {@link IDhApiBlockStateWrapper#getOpacity()}
-		 * method should also return a non-opaque value.
-		 * Otherwise LODs may behave incorrectly.
-		 */
-		public void setColor(int alpha, int red, int green, int blue) throws IllegalArgumentException
-		{
-			ColorUtil.throwIfColorValueOutOfIntRange("alpha", alpha);
-			ColorUtil.throwIfColorValueOutOfIntRange("red", red);
-			ColorUtil.throwIfColorValueOutOfIntRange("green", green);
-			ColorUtil.throwIfColorValueOutOfIntRange("blue", blue);
-			
-			this.colorAsInt = ColorUtil.argbToInt(alpha, 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; }
-		
-		//endregion
-		
-		
-		
-		//==========================//
-		// base api event overrides //
-		//==========================//
-		//region
-		
-		/** 
-		 * 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; }
-		
-		//endregion
-		
-		
-		
-	}
-	
-}
@@ -1,131 +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.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; }
-		
-	}
-	
-}
@@ -34,7 +34,6 @@ import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhAp
 * @author James Seibel
 * @version 2023-6-23
 * @see IDhApiTerrainDataRepo
- * @see DhApiChunkProcessingEvent
 * @since API 1.0.0
 */
 public abstract class DhApiChunkModifiedEvent implements IDhApiEvent<DhApiChunkModifiedEvent.EventParam>
@@ -51,7 +51,6 @@ import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhAp
 *
 * @author James Seibel
 * @version 2025-09-29
- * @see DhApiChunkModifiedEvent
 * @since API 4.1.0
 */
 public abstract class DhApiChunkProcessingEvent implements IDhApiEvent<DhApiChunkProcessingEvent.EventParam>
@@ -31,9 +31,7 @@ import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhAp
 * @author James Seibel
 * @version 2024-3-2
 * @since API 2.0.0
- * @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 Replaced by {@link DhApiBeforeColorDepthTextureCreatedEvent} since this event's name isn't obvious when it fires.
 */
@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>
@@ -1,202 +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.api.methods.events.sharedParameterObjects;
-
-import com.seibel.distanthorizons.api.enums.rendering.EDhApiFogFalloff;
-import com.seibel.distanthorizons.api.enums.rendering.EDhApiHeightFogDirection;
-import com.seibel.distanthorizons.api.enums.rendering.EDhApiHeightFogMixMode;
-import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiFarFogConfig;
-import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiFogConfig;
-import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiHeightFogConfig;
-import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEventParam;
-
-import java.awt.*;
-
-/**
- * Contains all the information needed to render Distant Horizons' fog.
- * 
- * @see IDhApiFogConfig
- * @see IDhApiFarFogConfig
- * @see IDhApiHeightFogConfig
- * 
- * @author James Seibel
- * @version 2026-05-20
- * @since API 7.0.0
- */
-public class DhApiFogRenderParam implements IDhApiEventParam
-{
-	protected Color fogColor;
-	public Color getFogColor() { return this.fogColor; }
-	
-	// far fog //
-	//region
-	
-	protected EDhApiFogFalloff farFogFalloff;
-	/** @see IDhApiFarFogConfig#farFogFalloff() */
-	public EDhApiFogFalloff getFarFogFalloff() { return this.farFogFalloff; }
-	
-	protected float farFogStartPercent;
-	/** @see IDhApiFarFogConfig#farFogStartDistance() */
-	public float getFarFogStartPercent() { return this.farFogStartPercent; }
-	
-	protected float farFogEndPercent;
-	/** @see IDhApiFarFogConfig#farFogEndDistance() */
-	public float getFarFogEndPercent() { return this.farFogEndPercent; }
-	
-	protected float farFogMinThickness;
-	/** @see IDhApiFarFogConfig#farFogMinThickness() */
-	public float getFarFogMinThickness() { return this.farFogMinThickness; }
-	
-	protected float farFogMaxThickness;
-	/** @see IDhApiFarFogConfig#farFogMaxThickness() */
-	public float getFarFogMaxThickness() { return this.farFogMaxThickness; }
-	
-	protected float farFogDensity;
-	/** @see IDhApiFarFogConfig#farFogDensity() */
-	public float getFarFogDensity() { return this.farFogDensity; }
-	
-	//endregion
-	
-	// height fog //
-	//region
-	
-	protected EDhApiFogFalloff heightFogFalloff;
-	/** @see IDhApiHeightFogConfig#heightFogFalloff() */
-	public EDhApiFogFalloff getHeightFogFalloff() { return this.heightFogFalloff; }
-	
-	protected EDhApiHeightFogMixMode heightFogMixingMode;
-	/** @see IDhApiHeightFogConfig#heightFogMixMode() */
-	public EDhApiHeightFogMixMode getHeightFogMixingMode() { return this.heightFogMixingMode; }
-	
-	protected EDhApiHeightFogDirection heightFogDirection;
-	/** @see IDhApiHeightFogConfig#heightFogDirection() */
-	public EDhApiHeightFogDirection getHeightFogDirection() { return this.heightFogDirection; }
-	
-	protected float heightFogBaseHeight;
-	/** @see IDhApiHeightFogConfig#heightFogBaseHeight() */
-	public float getHeightFogBaseHeight() { return this.heightFogBaseHeight; }
-	
-	protected float heightFogStartPercent;
-	/** @see IDhApiHeightFogConfig#heightFogStartingHeightPercent() */
-	public float getHeightFogStartPercent() { return this.heightFogStartPercent; }
-	
-	protected float heightFogEndPercent;
-	/** @see IDhApiHeightFogConfig#heightFogEndingHeightPercent() */
-	public float getHeightFogEndPercent() { return this.heightFogEndPercent; }
-	
-	protected float heightFogMinThickness;
-	/** @see IDhApiHeightFogConfig#heightFogMinThickness() */
-	public float getHeightFogMinThickness() { return this.heightFogMinThickness; }
-	
-	protected float heightFogMaxThickness;
-	/** @see IDhApiHeightFogConfig#heightFogMaxThickness() */
-	public float getHeightFogMaxThickness() { return this.heightFogMaxThickness; }
-	
-	protected float heightFogDensity;
-	/** @see IDhApiHeightFogConfig#heightFogDensity() */
-	public float getHeightFogDensity() { return this.heightFogDensity; }
-	
-	//endregion
-	
-	
-	
-	//==============//
-	// constructors //
-	//==============//
-	//region
-	
-	public DhApiFogRenderParam(DhApiFogRenderParam parent)
-	{
-		this(
-			parent.fogColor,
-			
-			// far fog
-			parent.farFogFalloff,
-			parent.farFogStartPercent, parent.farFogEndPercent,
-			parent.farFogMinThickness, parent.farFogEndPercent,
-			parent.farFogDensity,
-			
-			// height fog
-			parent.heightFogFalloff,
-			parent.heightFogMixingMode, parent.heightFogDirection,
-			parent.heightFogBaseHeight,
-			parent.heightFogStartPercent, parent.heightFogEndPercent,
-			parent.heightFogMinThickness, parent.heightFogMaxThickness,
-			parent.heightFogDensity
-		);
-	}
-	public DhApiFogRenderParam(
-		Color fogColor,
-		
-		// far fog
-		EDhApiFogFalloff farFogFalloff,
-		float farFogStartPercent, float farFogEndPercent,
-		float farFogMinThickness, float farFogMaxThickness,
-		float farFogDensity,
-		
-		// height fog
-		EDhApiFogFalloff heightFogFalloff,
-		EDhApiHeightFogMixMode heightFogMixingMode, EDhApiHeightFogDirection heightFogDirection,
-		float heightFogBaseHeight,
-		float heightFogStartPercent, float heightFogEndPercent,
-		float heightFogMinThickness, float heightFogMaxThickness,
-		float heightFogDensity
-	)
-	{
-		this.fogColor = fogColor;
-		
-		// far fog
-		this.farFogFalloff = farFogFalloff;
-		this.farFogStartPercent = farFogStartPercent;
-		this.farFogEndPercent = farFogEndPercent;
-		this.farFogMinThickness = farFogMinThickness;
-		this.farFogMaxThickness = farFogMaxThickness;
-		this.farFogDensity = farFogDensity;
-		
-		// height fog
-		this.heightFogFalloff = heightFogFalloff;
-		this.heightFogMixingMode = heightFogMixingMode;
-		this.heightFogDirection = heightFogDirection;
-		this.heightFogBaseHeight = heightFogBaseHeight;
-		this.heightFogStartPercent = heightFogStartPercent;
-		this.heightFogEndPercent = heightFogEndPercent;
-		this.heightFogMinThickness = heightFogMinThickness;
-		this.heightFogMaxThickness = heightFogMaxThickness;
-		this.heightFogDensity = heightFogDensity;
-	}
-	
-	//endregion
-	
-	
-	
-	//================//
-	// base overrides //
-	//================//
-	//region
-	
-	@Override
-	public DhApiFogRenderParam copy() { return new DhApiFogRenderParam(this); }
-	
-	//endregion
-	
-	
-	
-	
-}
@@ -1,117 +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.api.methods.events.sharedParameterObjects;
-
-import com.seibel.distanthorizons.api.enums.rendering.EDhApiFogFalloff;
-import com.seibel.distanthorizons.api.enums.rendering.EDhApiHeightFogDirection;
-import com.seibel.distanthorizons.api.enums.rendering.EDhApiHeightFogMixMode;
-import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiFarFogConfig;
-import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiFogConfig;
-import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiHeightFogConfig;
-
-import java.awt.*;
-
-/**
- * A mutable version of {@link DhApiFogRenderParam} to allow
- * API modification of DH's fog rendering.
- *
- * @see IDhApiFogConfig
- * @see IDhApiFarFogConfig
- * @see IDhApiHeightFogConfig
- * @see DhApiFogRenderParam
- * 
- * @author James Seibel
- * @version 2026-05-20
- * @since API 7.0.0
- */
-public class DhApiMutableFogRenderParam extends DhApiFogRenderParam
-{
-	public void setFogColor(Color fogColor) { this.fogColor = fogColor; }
-	
-	// far fog //
-	//region
-	
-	/** @see IDhApiFarFogConfig#farFogFalloff() */
-	public void setFarFogFalloff(EDhApiFogFalloff farFogFalloff) { this.farFogFalloff = farFogFalloff; }
-	/** @see IDhApiFarFogConfig#farFogStartDistance() */
-	public void setFarFogStartPercent(float farFogStartPercent) { this.farFogStartPercent = farFogStartPercent; }
-	/** @see IDhApiFarFogConfig#farFogEndDistance() */
-	public void setFarFogEndPercent(float farFogEndPercent) { this.farFogEndPercent = farFogEndPercent; }
-	/** @see IDhApiFarFogConfig#farFogMinThickness() */
-	public void setFarFogMinThickness(float farFogMinThickness) { this.farFogMinThickness = farFogMinThickness; }
-	/** @see IDhApiFarFogConfig#farFogMaxThickness() */
-	public void setFarFogMaxThickness(float farFogMaxThickness) { this.farFogMaxThickness = farFogMaxThickness; }
-	/** @see IDhApiFarFogConfig#farFogDensity() */
-	public void setFarFogDensity(float farFogDensity) { this.farFogDensity = farFogDensity; }
-	
-	//endregion
-	
-	// height fog //
-	//region
-	
-	/** @see IDhApiHeightFogConfig#heightFogFalloff() */
-	public void setHeightFogFalloff(EDhApiFogFalloff heightFogFalloff) { this.heightFogFalloff = heightFogFalloff; }
-	/** @see IDhApiHeightFogConfig#heightFogMixMode() */
-	public void setHeightFogMixingMode(EDhApiHeightFogMixMode heightFogMixingMode) { this.heightFogMixingMode = heightFogMixingMode; }
-	/** @see IDhApiHeightFogConfig#heightFogDirection() */
-	public void setHeightFogDirection(EDhApiHeightFogDirection heightFogDirection) { this.heightFogDirection = heightFogDirection; }
-	/** @see IDhApiHeightFogConfig#heightFogBaseHeight() */
-	public void setHeightFogBaseHeight(float heightFogBaseHeight) { this.heightFogBaseHeight = heightFogBaseHeight; }
-	/** @see IDhApiHeightFogConfig#heightFogStartingHeightPercent() */
-	public void setHeightFogStartPercent(float heightFogStartPercent) { this.heightFogStartPercent = heightFogStartPercent; }
-	/** @see IDhApiHeightFogConfig#heightFogEndingHeightPercent() */
-	public void setHeightFogEndPercent(float heightFogEnd) { this.heightFogEndPercent = heightFogEnd; }
-	/** @see IDhApiHeightFogConfig#heightFogMinThickness() */
-	public void setHeightFogMinThickness(float heightFogMinThickness) { this.heightFogMinThickness = heightFogMinThickness; }
-	/** @see IDhApiHeightFogConfig#heightFogMaxThickness() */
-	public void setHeightFogMaxThickness(float heightFogMaxThickness) { this.heightFogMaxThickness = heightFogMaxThickness; }
-	/** @see IDhApiHeightFogConfig#heightFogDensity() */
-	public void setHeightFogDensity(float heightFogDensity) { this.heightFogDensity = heightFogDensity; }
-	
-	//endregion
-	
-	
-	
-	//==============//
-	// constructors //
-	//==============//
-	//region
-	
-	public DhApiMutableFogRenderParam(DhApiFogRenderParam parent)
-	{ super(parent); }
-	
-	//endregion
-	
-	
-	
-	//================//
-	// base overrides //
-	//================//
-	//region
-	
-	@Override
-	public DhApiMutableFogRenderParam copy() { return new DhApiMutableFogRenderParam(this); }
-	
-	//endregion
-	
-	
-	
-	
-}
@@ -35,69 +35,60 @@ import com.seibel.distanthorizons.api.objects.math.DhApiMat4f;
 public class DhApiRenderParam implements IDhApiEventParam
 {
 	/** Indicates what render pass DH is currently rendering */
-	public EDhApiRenderPass renderPass;
+	public final EDhApiRenderPass renderPass;
 	
 	/** Indicates how far into this tick the frame is. */
-	public float partialTicks;
+	public final float partialTicks;
 	
 	/**
 	 * Indicates DH's near clip plane, measured in blocks. 
 	 * Note: this may change based on time, player speed, and other factors. 
 	 */
-	public float nearClipPlane;
+	public final float nearClipPlane;
 	/**
 	 * Indicates DH's far clip plane, measured in blocks. 
 	 * Note: this may change based on time, player speed, and other factors. 
 	 */
-	public float farClipPlane;
+	public final float farClipPlane;
 	
 	/** The projection matrix Minecraft is using to render this frame. */
-	public final DhApiMat4f mcProjectionMatrix = new DhApiMat4f();
+	public final DhApiMat4f mcProjectionMatrix;
 	/** The model view matrix Minecraft is using to render this frame. */
-	public final DhApiMat4f mcModelViewMatrix = new DhApiMat4f();
-	public final DhApiMat4f mcInverseMvmProjectionMatrix = new DhApiMat4f();
+	public final DhApiMat4f mcModelViewMatrix;
 	
 	/** The projection matrix Distant Horizons is using to render this frame. */
-	public final DhApiMat4f dhProjectionMatrix = new DhApiMat4f();
+	public final DhApiMat4f dhProjectionMatrix;
 	/** The model view matrix Distant Horizons is using to render this frame. */
-	public final DhApiMat4f dhModelViewMatrix = new DhApiMat4f();
-	/** combination of the MVM and projection matrices */
-	public final DhApiMat4f dhMvmProjMatrix = new DhApiMat4f();
-	public final DhApiMat4f dhInverseMvmProjectionMatrix = new DhApiMat4f();
+	public final DhApiMat4f dhModelViewMatrix;
 	
-	public int worldYOffset;
+	public final int worldYOffset;
 	
 	/**
 	 * The level currently being rendered.
 	 * 
 	 * @since API 5.1.0 
 	 */
-	public IDhApiLevelWrapper clientLevelWrapper;
+	public final IDhApiLevelWrapper clientLevelWrapper;
 	
 	
 	
 	//==============//
 	// constructors //
 	//==============//
-	//region
 	
-	public DhApiRenderParam() {}
-	
-	/** Internal DH method */
-	public void update(DhApiRenderParam param) 
+	public DhApiRenderParam(DhApiRenderParam parent)
 	{
-		this.update(
-			param.renderPass,
-			param.partialTicks,
-			param.nearClipPlane, param.farClipPlane,
-			param.mcProjectionMatrix, param.mcModelViewMatrix,
-			param.dhProjectionMatrix, param.mcModelViewMatrix, 
-			param.worldYOffset,
-			param.clientLevelWrapper
+		this(
+			parent.renderPass,
+			parent.partialTicks,
+			parent.nearClipPlane, parent.farClipPlane,
+			parent.mcProjectionMatrix.copy(), parent.mcModelViewMatrix.copy(),
+			parent.dhProjectionMatrix.copy(), parent.dhModelViewMatrix.copy(),
+			parent.worldYOffset,
+			parent.clientLevelWrapper
 		);
 	}
-	/** Internal DH method */
-	public void update(
+	public DhApiRenderParam(
 			EDhApiRenderPass renderPass,
 			float newPartialTicks,
 			float nearClipPlane, float farClipPlane,
@@ -114,51 +105,25 @@ public class DhApiRenderParam implements IDhApiEventParam
 		this.farClipPlane = farClipPlane;
 		this.nearClipPlane = nearClipPlane;
 		
-		// mc matricies
-		{
-			this.mcProjectionMatrix.set(newMcProjectionMatrix);
-			this.mcModelViewMatrix.set(newMcModelViewMatrix);
-			
-			// inverse mvm Proj
-			this.mcInverseMvmProjectionMatrix.set(newMcProjectionMatrix);
-			this.mcInverseMvmProjectionMatrix.invert();
-		}
+		this.mcProjectionMatrix = newMcProjectionMatrix;
+		this.mcModelViewMatrix = newMcModelViewMatrix;
 		
-		// dh matricies
-		{
-			this.dhProjectionMatrix.set(newDhProjectionMatrix);
-			this.dhModelViewMatrix.set(newDhModelViewMatrix);
-			
-			// proj
-			this.dhMvmProjMatrix.set(this.dhProjectionMatrix);
-			this.dhMvmProjMatrix.multiply(this.dhModelViewMatrix);
-			
-			// inverse mvm Proj
-			this.dhInverseMvmProjectionMatrix.set(this.dhMvmProjMatrix);
-			this.dhInverseMvmProjectionMatrix.invert();
-		}
+		this.dhProjectionMatrix = newDhProjectionMatrix;
+		this.dhModelViewMatrix = newDhModelViewMatrix;
 		
 		this.worldYOffset = worldYOffset;
 		this.clientLevelWrapper = clientLevelWrapper;
 		
 	}
 	
-	//endregion
-	
 	
 	
 	//================//
 	// base overrides //
 	//================//
-	//region
 	
 	@Override
-	public boolean getCopyBeforeFire() { return false; }
-	
-	@Override
-	public DhApiRenderParam copy() { return this; }
-	
-	//endregion
+	public DhApiRenderParam copy() { return new DhApiRenderParam(this); }
 	
 	
 	
@@ -46,7 +46,7 @@ public class DhApiResult<T>
 	
 	
 	
-	// these constructors are private because the create methods below are easier to understand
+	// these constructors are private because the create... methods below are easier to understand
 	private DhApiResult(boolean success, String message) { this(success, message, null); }
 	private DhApiResult(boolean success, String message, T payload)
 	{
@@ -21,8 +21,6 @@ package com.seibel.distanthorizons.api.objects.math;

 import com.seibel.distanthorizons.api.interfaces.util.IDhApiCopyable;

-import java.nio.FloatBuffer;
-
 /**
 * An (almost) exact copy of Minecraft's 1.16.5
 * implementation of a 4x4 float matrix. <br><br>
@@ -35,7 +33,7 @@ import java.nio.FloatBuffer;
 * </code>
 * 
 * @author James Seibel
- * @version 2026-05-22
+ * @version 2024-6-30
 */
 public class DhApiMat4f implements IDhApiCopyable
 {
@@ -64,7 +62,6 @@ public class DhApiMat4f implements IDhApiCopyable
 	//==============//
 	// constructors //
 	//==============//
-	//region
 	
 	public DhApiMat4f() { /* all values are 0 */ }
 	
@@ -74,17 +71,14 @@ public class DhApiMat4f implements IDhApiCopyable
 		this.m01 = sourceMatrix.m01;
 		this.m02 = sourceMatrix.m02;
 		this.m03 = sourceMatrix.m03;
-		
 		this.m10 = sourceMatrix.m10;
 		this.m11 = sourceMatrix.m11;
 		this.m12 = sourceMatrix.m12;
 		this.m13 = sourceMatrix.m13;
-		
 		this.m20 = sourceMatrix.m20;
 		this.m21 = sourceMatrix.m21;
 		this.m22 = sourceMatrix.m22;
 		this.m23 = sourceMatrix.m23;
-		
 		this.m30 = sourceMatrix.m30;
 		this.m31 = sourceMatrix.m31;
 		this.m32 = sourceMatrix.m32;
@@ -115,74 +109,12 @@ public class DhApiMat4f implements IDhApiCopyable
 		this.m33 = values[15];
 	}
 	
-	//endregion
 	
 	
 	
 	//=========//
 	// methods //
 	//=========//
-	//region
-	
-	/** Returns the values of this matrix in row major order (AKA rows then columns) */
-	public float[] getValuesAsArray()
-	{
-		float[] array = new float[16];
-		this.putValuesInArray(array);
-		return array;
-	}
-	
-	/** 
-	 * Returns the values of this matrix in row major order (AKA rows then columns) 
-	 * @since API 7.0.0
-	 */
-	public void putValuesInArray(float[] array)
-	{
-		array[0] = this.m00;
-		array[1] = this.m01;
-		array[2] = this.m02;
-		array[3] = this.m03;
-		
-		array[4] = this.m10;
-		array[5] = this.m11;
-		array[6] = this.m12;
-		array[7] = this.m13;
-		
-		array[8] = this.m20;
-		array[9] = this.m21;
-		array[10] = this.m22;
-		array[11] = this.m23;
-		
-		array[12] = this.m30;
-		array[13] = this.m31;
-		array[14] = this.m32;
-		array[15] = this.m33;
-	}
-	
-	
-	/** @since API 7.0.0 */
-	public void set(DhApiMat4f mat)
-	{
-		this.m00 = mat.m00;
-		this.m01 = mat.m01;
-		this.m02 = mat.m02;
-		this.m03 = mat.m03;
-		
-		this.m10 = mat.m10;
-		this.m11 = mat.m11;
-		this.m12 = mat.m12;
-		this.m13 = mat.m13;
-		
-		this.m20 = mat.m20;
-		this.m21 = mat.m21;
-		this.m22 = mat.m22;
-		this.m23 = mat.m23;
-		
-		this.m30 = mat.m30;
-		this.m31 = mat.m31;
-		this.m32 = mat.m32;
-		this.m33 = mat.m33;
-	}
 	
 	public void setIdentity()
 	{
@@ -347,14 +279,47 @@ public class DhApiMat4f implements IDhApiCopyable
 		this.m33 *= scalar;
 	}
 	
-	//endregion
+	
+	
+	
+	//==================//
+	// Distant Horizons //
+	//      methods     //
+	//==================//
+	
+	private static int getArrayIndex(int xIndex, int zIndex) { return (zIndex * 4) + xIndex; }
+	
+	/** Returns the values of this matrix in row major order (AKA rows then columns) */
+	public float[] getValuesAsArray()
+	{
+		return new float[]{
+				this.m00,
+				this.m01,
+				this.m02,
+				this.m03,
+				
+				this.m10,
+				this.m11,
+				this.m12,
+				this.m13,
+				
+				this.m20,
+				this.m21,
+				this.m22,
+				this.m23,
+				
+				this.m30,
+				this.m31,
+				this.m32,
+				this.m33,
+		};
+	}
 	
 	
 	
 	//================//
 	// base overrides //
 	//================//
-	//region
 	
 	@Override
 	public boolean equals(Object obj)
@@ -423,8 +388,4 @@ public class DhApiMat4f implements IDhApiCopyable
 	@Override
 	public DhApiMat4f copy() { return new DhApiMat4f(this); }
 	
-	//endregion
-	
-	
-	
 }
@@ -23,7 +23,6 @@ public class DhApiRenderableBox
 	public DhApiVec3d maxPos;
 	
 	public Color color;
-	/** @see EDhApiBlockMaterial */
 	public byte material;
 	
 	
@@ -35,19 +35,7 @@ import java.util.Map;
 */
 public class DependencyInjector<BindableType extends IBindable> implements IDependencyInjector<BindableType> // Note to self: Don't try adding a generic type to IDhApiEvent, the constructor won't accept it
 {
-	/** 
-	 * empty list is to reduce GC pressure slightly in the common path
-	 * that {@link DependencyInjector#getInternalLogic(Class, boolean)} is called
-	 * when nothing has been bound.
-	 */
-	private static final ArrayList<?> EMPTY_GET_ALL_LIST = new ArrayList<>();
-	static
-	{
-		EMPTY_GET_ALL_LIST.add(null);
-	}
-	
-	
-	protected final HashMap<Class<? extends BindableType>, ArrayList<BindableType>> dependencies = new HashMap<>();
+	protected final Map<Class<? extends BindableType>, ArrayList<BindableType>> dependencies = new HashMap<>();
 	
 	/** Internal class reference to BindableType since we can't get it any other way. */
 	protected final Class<? extends BindableType> bindableInterface;
@@ -55,11 +43,9 @@ public class DependencyInjector<BindableType extends IBindable> implements IDepe
 	protected final boolean allowDuplicateBindings;
 	
 	
-	
 	//==============//
 	// constructors //
 	//==============//
-	//region
 	
 	public DependencyInjector(Class<BindableType> newBindableInterface, boolean newAllowDuplicateBindings)
 	{
@@ -67,14 +53,11 @@ 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
@@ -86,11 +69,6 @@ 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) ||
@@ -153,27 +131,13 @@ 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
@@ -210,27 +174,30 @@ 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,
@@ -258,10 +225,11 @@ public class DependencyInjector<BindableType extends IBindable> implements IDepe
 		
 		
 		// return an empty list to prevent null pointers
-		return (ArrayList<T>)EMPTY_GET_ALL_LIST;
+		ArrayList<T> emptyList = new ArrayList<T>();
+		emptyList.add(null);
+		return emptyList;
 	}
 	
-	//endregion
 	
 	
 	/** Removes all bound dependencies. */
@@ -31,31 +31,26 @@ public final class ModInfo
 	public static final String DEDICATED_SERVER_INITIAL_PATH = "dedicated_server_initial";
 	
 	/** Incremented every time any packets are added, changed or removed, with a few exceptions. */
-	public static final int PROTOCOL_VERSION = 15;
-
-	/** 
-	 * The full plugin channel name (RESOURCE_NAMESPACE:WRAPPER_PACKET_PATH) 
-	 * must be 20 characters or fewer for compatibility with MC 1.13 and older. 
-	 */
-	public static final String WRAPPER_PACKET_PATH = "msg";
+	public static final int PROTOCOL_VERSION = 13;
+	public static final String WRAPPER_PACKET_PATH = "message";
 	
 	/** The internal mod name */
 	public static final String NAME = "DistantHorizons";
 	/** Human-readable version of NAME */
 	public static final String READABLE_NAME = "Distant Horizons";
-	public static final String VERSION = "3.0.4-b-dev";
+	public static final String VERSION = "2.4.6-b-dev";
 	/** 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 = 7;
+	public static final int API_MAJOR_VERSION = 5;
 	/** This version should be updated whenever new methods are added to the DH API */
-	public static final int API_MINOR_VERSION = 0;
+	public static final int API_MINOR_VERSION = 1;
 	/** 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 = 4;
+	public static final int CONFIG_FILE_VERSION = 3;
 	
 	/** All DH owned threads should start with this string to allow for easier debugging and profiling. */
 	public static final String THREAD_NAME_PREFIX = "DH-";
@@ -1,23 +1,18 @@
 plugins {
    id "java"
-    id "com.gradleup.shadow"
+    id "com.github.johnrengelman.shadow" version '8.1.1' apply false // Set this to true if you're using the standalone Core project
 }

-repositories {
-    mavenCentral()
-    maven { url "https://repo.enonic.com/public/" }
-}
+apply plugin: "application"

-tasks.withType(JavaCompile).configureEach {
-    options.release = 8
-    options.encoding = "UTF-8"
+application {
+    mainClass.set("com.seibel.distanthorizons.core.jar.JarMain")
 }

 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;
@@ -25,45 +20,36 @@ 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 {
-    // API project dependency
-    implementation project(":api")
+dependencies { // All of these dependencies are in Vanilla Minecraft, but we need to depend on it as we arent importing Minecraft in the core
+    // Imports most of lwjgl's libraries (well, only the ones that we need)
+    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

-    // MC-provided libraries (available at runtime via Minecraft)
-    compileOnly platform("org.lwjgl:lwjgl-bom:${rootProject.lwjgl_version}")
-    compileOnly "org.lwjgl:lwjgl"
-    compileOnly "org.lwjgl:lwjgl-assimp"
-    compileOnly "org.lwjgl:lwjgl-glfw"
-    compileOnly "org.lwjgl:lwjgl-stb"
-    compileOnly "org.lwjgl:lwjgl-tinyfd"
-    testRuntimeOnly platform("org.lwjgl:lwjgl-bom:${rootProject.lwjgl_version}")
-    testRuntimeOnly "org.lwjgl:lwjgl::$lwjglNatives"
-    testRuntimeOnly "org.lwjgl:lwjgl-assimp::$lwjglNatives"
-    testRuntimeOnly "org.lwjgl:lwjgl-glfw::$lwjglNatives"
-    testRuntimeOnly "org.lwjgl:lwjgl-stb::$lwjglNatives"
-    testRuntimeOnly "org.lwjgl:lwjgl-tinyfd::$lwjglNatives"
+    // REMEMBER: Dont shadow stuff here, these are just the libs that are included in Minecraft so that the core can use
+    implementation "org.lwjgl:lwjgl"
+    implementation "org.lwjgl:lwjgl-assimp"
+    implementation "org.lwjgl:lwjgl-glfw"
+    implementation "org.lwjgl:lwjgl-openal"
+    implementation "org.lwjgl:lwjgl-opengl"
+    implementation "org.lwjgl:lwjgl-stb"
+    implementation "org.lwjgl:lwjgl-tinyfd"
+    runtimeOnly "org.lwjgl:lwjgl::$lwjglNatives"
+    runtimeOnly "org.lwjgl:lwjgl-assimp::$lwjglNatives"
+    runtimeOnly "org.lwjgl:lwjgl-glfw::$lwjglNatives"
+    runtimeOnly "org.lwjgl:lwjgl-openal::$lwjglNatives"
+    runtimeOnly "org.lwjgl:lwjgl-opengl::$lwjglNatives"
+    runtimeOnly "org.lwjgl:lwjgl-stb::$lwjglNatives"
+    runtimeOnly "org.lwjgl:lwjgl-tinyfd::$lwjglNatives"

-    compileOnly("org.apache.logging.log4j:log4j-api:${rootProject.log4j_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.guava:guava:31.1-jre")
+    // FIXME for some reason this line doesn't actually shade in the library
+//    shade "it.unimi.dsi:fastutil:${rootProject.fastutil_version}" // Add our own fastutil version

-    // 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}")

-    // JUnit (core tests only)
-    compileOnly("junit:junit:4.13")
-    compileOnly("org.junit.jupiter:junit-jupiter:5.8.2")
-    compileOnly("org.junit.jupiter:junit-jupiter-engine:5.8.2")
+    // Some other dependencies
+    implementation("org.jetbrains:annotations:16.0.2")
+    implementation("com.google.code.findbugs:jsr305:3.0.2")
+    implementation("com.google.common:google-collect:0.5")
+    implementation("com.google.guava:guava:31.1-jre")
+    
 }

 artifacts {
@@ -20,14 +20,12 @@
 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.world.DhApiWorldProxy;
@@ -36,6 +34,7 @@ import com.seibel.distanthorizons.core.api.external.methods.data.DhApiTerrainDat
 import com.seibel.distanthorizons.api.DhApi;
 import com.seibel.distanthorizons.core.render.DhApiRenderProxy;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
+import com.seibel.distanthorizons.coreapi.util.StringUtil;
 import net.jpountz.lz4.LZ4FrameOutputStream;
 import com.seibel.distanthorizons.core.logging.DhLogger;
 import org.sqlite.SQLiteJDBCLoader;
@@ -54,13 +53,8 @@ public class Initializer
 	
 	
 	
-	public static void preConfigInit()
+	public static void init()
 	{
-		//============================//
-		// check referenced libraries //
-		//============================//
-		//region
-		
 		LOGGER.info("Running library validation...");
 		
 		// confirm that all referenced libraries are available to use
@@ -100,15 +94,7 @@ public class Initializer
 			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);
 		}
 		
-		//endregion
-		
-		
-		
-		//==========================//
-		// check resource directory //
-		//==========================//
-		//region
-		
+		// confirm the resource directory is present
 		try
 		{
 			int scriptCount = DatabaseUpdater.getAutoUpdateScriptCount();
@@ -122,15 +108,6 @@ public class Initializer
 			MC_CLIENT.crashMinecraft("Critical programmer error: Can't read SQL Scripts resource folder is either missing or malformed. Error: [" + e.getMessage() + "].", 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)
@@ -147,48 +124,18 @@ 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)
 		{
-			MC_CLIENT.crashMinecraft("Programmer Error: No ["+IWrapperFactory.class.getSimpleName()+"] assigned to the DhApi.", new Exception());
+			LOGGER.error("Programmer Error: No ["+IWrapperFactory.class.getSimpleName()+"] assigned to the DhApi.");
 		}
 		
-		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
-		
-	}
-	
-	/** fired after DH's config has been set up */
-	public static void postConfigInit()
-	{
-		
-		
-		//==============================//
-		// G1 Garbage collector warning //
-		//==============================//
-		//region
-		
 		// log a warning if G1GC is being used
 		// (this garbage collector is known to cause stuttering)
 		{
@@ -213,37 +160,21 @@ public class Initializer
 			LOGGER.info("Garbage collectors: ["+garbageCollectorNames+"]");
 			
 			
-			if (g1GcInUse)
+			if (g1GcInUse
+				&& Config.Common.Logging.Warning.logGarbageCollectorWarning.get())
 			{
-				String warningMessageHeader = "Distant Horizons: G1 Garbage collector detected.";
-				String warningMessageBody = 
-					"This can cause FPS stuttering. \n" +
+				LOGGER.warn(
+					"Distant Horizons: G1 Garbage collector detected. \n" +
+					"This garbage collector can cause FPS stuttering. \n" +
 					"It's recommended to use a concurrent garbage collector \n" +
-					"like ZGC (Java 21+) or Shenandoah (Java 8 through 17) \n" +
-					"for a smoother experience."
-					;
+					"like ZGC (Java 21+) or Shenandoah (Java 8 through 17) for a smoother experience. \n" +
+					"");
 				
-				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
+		DhApi.events.bind(DhApiBeforeRenderEvent.class, IgnoredDimensionCsvHandler.INSTANCE);
 		
 	}
 	
-	
 }
@@ -35,6 +35,30 @@ public class DhApiAmbientOcclusionConfig implements IDhApiAmbientOcclusionConfig
 	
 	@Override
 	public IDhApiConfigValue<Boolean> enabled()
-	{ return new DhApiConfigValue<Boolean, Boolean>(Config.Client.Advanced.Graphics.enableSsao); }
+	{ return new DhApiConfigValue<Boolean, Boolean>(Config.Client.Advanced.Graphics.Ssao.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); }
 	
 }
@@ -34,7 +34,7 @@ public class DhApiDebuggingConfig implements IDhApiDebuggingConfig
 	
 	
 	public IDhApiConfigValue<EDhApiDebugRendering> debugRendering()
-	{ return new DhApiConfigValue<EDhApiDebugRendering, EDhApiDebugRendering>(Config.Client.Advanced.Debugging.debugRenderingColors); }
+	{ return new DhApiConfigValue<EDhApiDebugRendering, EDhApiDebugRendering>(Config.Client.Advanced.Debugging.debugRendering); }
 	
 	public IDhApiConfigValue<Boolean> debugKeybindings()
 	{ return new DhApiConfigValue<Boolean, Boolean>(Config.Client.Advanced.Debugging.enableDebugKeybindings); }
@@ -34,27 +34,27 @@ public class DhApiFarFogConfig implements IDhApiFarFogConfig
 	
 	
 	@Override
-	public IDhApiConfigValue<Float> farFogStartDistance()
-	{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Fog.farFogStart); }
+	public IDhApiConfigValue<Double> farFogStartDistance()
+	{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Fog.farFogStart); }
 	
 	@Override
-	public IDhApiConfigValue<Float> farFogEndDistance()
-	{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Fog.farFogEnd); }
+	public IDhApiConfigValue<Double> farFogEndDistance()
+	{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Fog.farFogEnd); }
 	
 	@Override
-	public IDhApiConfigValue<Float> farFogMinThickness()
-	{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Fog.farFogMin); }
+	public IDhApiConfigValue<Double> farFogMinThickness()
+	{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Fog.farFogMin); }
 	
 	@Override
-	public IDhApiConfigValue<Float> farFogMaxThickness()
-	{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Fog.farFogMax); }
+	public IDhApiConfigValue<Double> farFogMaxThickness()
+	{ return new DhApiConfigValue<Double, Double>(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<Float> farFogDensity()
-	{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Fog.farFogDensity); }
+	public IDhApiConfigValue<Double> farFogDensity()
+	{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Fog.farFogDensity); }
 	
 }
@@ -85,21 +85,17 @@ public class DhApiGraphicsConfig implements IDhApiGraphicsConfig
 	public IDhApiConfigValue<EDhApiHorizontalQuality> horizontalQuality()
 	{ return new DhApiConfigValue<EDhApiHorizontalQuality, EDhApiHorizontalQuality>(Config.Client.Advanced.Graphics.Quality.horizontalQuality); }
 	
-	@Override
-	public IDhApiConfigValue<Boolean> useCameraPositionForQualityDropOff()
-	{ return new DhApiConfigValue<Boolean, Boolean>(Config.Client.Advanced.Graphics.Quality.useCameraPositionForQualityDropOff); }
-	
 	@Override
 	public IDhApiConfigValue<EDhApiTransparency> transparency()
 	{ return new DhApiConfigValue<EDhApiTransparency, EDhApiTransparency>(Config.Client.Advanced.Graphics.Quality.transparency); }
 	
 	@Override
 	public IDhApiConfigValue<EDhApiBlocksToAvoid> blocksToAvoid()
-	{ return new DhApiConfigValue<EDhApiBlocksToAvoid, EDhApiBlocksToAvoid>(Config.Client.Advanced.Graphics.Culling.blocksToIgnore); }
+	{ return new DhApiConfigValue<EDhApiBlocksToAvoid, EDhApiBlocksToAvoid>(Config.Client.Advanced.Graphics.Quality.blocksToIgnore); }
 	
 	@Override
 	public IDhApiConfigValue<Boolean> tintWithAvoidedBlocks()
-	{ return new DhApiConfigValue<Boolean, Boolean>(Config.Client.Advanced.Graphics.Culling.tintWithAvoidedBlocks); }
+	{ return new DhApiConfigValue<Boolean, Boolean>(Config.Client.Advanced.Graphics.Quality.tintWithAvoidedBlocks); }
 	
 	@Override
 	public IDhApiConfigValue<Integer> getBiomeBlending()
@@ -112,16 +108,16 @@ public class DhApiGraphicsConfig implements IDhApiGraphicsConfig
 	//===========================//

 	@Override
-	public IDhApiConfigValue<Float> overdrawPreventionRadius()
-	{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Culling.overdrawPrevention); }
+	public IDhApiConfigValue<Double> overdrawPreventionRadius()
+	{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Culling.overdrawPrevention); }
 	
 	@Override
-	public IDhApiConfigValue<Float> brightnessMultiplier()
-	{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Quality.brightnessMultiplier); }
+	public IDhApiConfigValue<Double> brightnessMultiplier()
+	{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Quality.brightnessMultiplier); }
 	
 	@Override
-	public IDhApiConfigValue<Float> saturationMultiplier()
-	{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Quality.saturationMultiplier); }
+	public IDhApiConfigValue<Double> saturationMultiplier()
+	{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Quality.saturationMultiplier); }
 	
 	@Override
 	public IDhApiConfigValue<Boolean> caveCullingEnabled()
@@ -139,6 +135,10 @@ 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); }
@@ -44,31 +44,31 @@ public class DhApiHeightFogConfig implements IDhApiHeightFogConfig
 	{ return new DhApiConfigValue<EDhApiHeightFogDirection, EDhApiHeightFogDirection>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogDirection); }
 	
 	@Override
-	public IDhApiConfigValue<Float> heightFogBaseHeight()
-	{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogBaseHeight); }
+	public IDhApiConfigValue<Double> heightFogBaseHeight()
+	{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogBaseHeight); }
 	
 	@Override
-	public IDhApiConfigValue<Float> heightFogStartingHeightPercent()
-	{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogStart); }
+	public IDhApiConfigValue<Double> heightFogStartingHeightPercent()
+	{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogStart); }
 	
 	@Override
-	public IDhApiConfigValue<Float> heightFogEndingHeightPercent()
-	{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogEnd); }
+	public IDhApiConfigValue<Double> heightFogEndingHeightPercent()
+	{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogEnd); }
 	
 	@Override
-	public IDhApiConfigValue<Float> heightFogMinThickness()
-	{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogMin); }
+	public IDhApiConfigValue<Double> heightFogMinThickness()
+	{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogMin); }
 	
 	@Override
-	public IDhApiConfigValue<Float> heightFogMaxThickness()
-	{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogMax); }
+	public IDhApiConfigValue<Double> heightFogMaxThickness()
+	{ return new DhApiConfigValue<Double, Double>(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<Float> heightFogDensity()
-	{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogDensity); }
+	public IDhApiConfigValue<Double> heightFogDensity()
+	{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.Fog.HeightFog.heightFogDensity); }
 	
 }
@@ -41,8 +41,8 @@ public class DhApiNoiseTextureConfig implements IDhApiNoiseTextureConfig
 	{ return new DhApiConfigValue<Integer, Integer>(Config.Client.Advanced.Graphics.NoiseTexture.noiseSteps); }
 	
 	@Override
-	public IDhApiConfigValue<Float> noiseIntensity()
-	{ return new DhApiConfigValue<Float, Float>(Config.Client.Advanced.Graphics.NoiseTexture.noiseIntensity); }
+	public IDhApiConfigValue<Double> noiseIntensity()
+	{ return new DhApiConfigValue<Double, Double>(Config.Client.Advanced.Graphics.NoiseTexture.noiseIntensity); }
 	
 	@Override
 	public IDhApiConfigValue<Integer> noiseDropoff()
@@ -13,7 +13,7 @@ import java.lang.ref.SoftReference;
 public class DhApiTerrainDataCache implements IDhApiTerrainDataCache
 {
 	private final Object modificationLock = new Object();
-	private final Long2ReferenceOpenHashMap<SoftReference<FullDataSourceV2>> posToFullDataRef = new Long2ReferenceOpenHashMap<>();
+	private Long2ReferenceOpenHashMap<SoftReference<FullDataSourceV2>> posToFullDataRef = new Long2ReferenceOpenHashMap<>();
 	
 	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
@@ -22,7 +22,6 @@ public class DhApiTerrainDataCache implements IDhApiTerrainDataCache
 	//==================//
 	// internal methods //
 	//==================//
-	//region
 	
 	public void add(long pos, FullDataSourceV2 dataSource)
 	{
@@ -49,14 +48,11 @@ public class DhApiTerrainDataCache implements IDhApiTerrainDataCache
 		}
 	}
 	
-	//endregion
-	
 	
 	
 	//=============//
 	// API methods //
 	//=============//
-	//region
 	
 	@Override 
 	public void clear()
@@ -86,23 +82,6 @@ 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
-	
 	
 	
 }
@@ -32,22 +32,22 @@ 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.DhChunkPos;
+import com.seibel.distanthorizons.core.pos.DhLodPos;
 import com.seibel.distanthorizons.core.pos.DhSectionPos;
-import com.seibel.distanthorizons.core.render.renderer.AbstractDebugWireframeRenderer;
+import com.seibel.distanthorizons.core.render.renderer.DebugRenderer;
 import com.seibel.distanthorizons.core.util.DhApiTerrainDataPointUtil;
 import com.seibel.distanthorizons.core.util.FullDataPointUtil;
 import com.seibel.distanthorizons.core.util.LodUtil;
 import com.seibel.distanthorizons.core.util.RayCastUtil;
-import com.seibel.distanthorizons.core.util.math.DhVec3f;
+import com.seibel.distanthorizons.core.util.math.Vec3f;
 import com.seibel.distanthorizons.core.world.AbstractDhWorld;
 import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
 import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
 import com.seibel.distanthorizons.coreapi.util.BitShiftUtil;
-import com.seibel.distanthorizons.core.util.math.DhVec3d;
-import com.seibel.distanthorizons.core.util.math.DhVec3i;
+import com.seibel.distanthorizons.core.util.math.Vec3d;
+import com.seibel.distanthorizons.core.util.math.Vec3i;
 import it.unimi.dsi.fastutil.longs.LongArrayList;
 import com.seibel.distanthorizons.core.logging.DhLogger;
 import org.jetbrains.annotations.Nullable;
@@ -66,62 +66,53 @@ 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();
-	private static DhApiVec3i currentDebugVec3i = new DhVec3i();
+	private static DhApiVec3i currentDebugVec3i = new Vec3i();
 	
 	
 	
 	//=============//
 	// constructor //
 	//=============//
-	//region
 	
 	private DhApiTerrainDataRepo()
 	{
 		
 	}
 	
-	//endregion
-	
 	
 	
 	//================//
 	// Getter Methods //
 	//================//
-	//region
 	
 	@Override
-	public DhApiResult<DhApiTerrainDataPoint> getSingleDataPointAtBlockPos(IDhApiLevelWrapper levelWrapper, int blockPosX, int blockPosY, int blockPosZ, IDhApiTerrainDataCache dataCache)
-	{ return getTerrainDataAtBlockYPos(levelWrapper, DhSectionPos.encode(LodUtil.BLOCK_DETAIL_LEVEL, blockPosX, blockPosZ), blockPosY, dataCache); }
+	public DhApiResult<DhApiTerrainDataPoint> getSingleDataPointAtBlockPos(IDhApiLevelWrapper levelWrapper, int blockPosX, int blockPosY, int blockPosZ, @Nullable IDhApiTerrainDataCache dataCache)
+	{ return getTerrainDataAtBlockYPos(levelWrapper, new DhLodPos(LodUtil.BLOCK_DETAIL_LEVEL, blockPosX, blockPosZ), blockPosY, dataCache); }
 	@Override
-	public DhApiResult<DhApiTerrainDataPoint[]> getColumnDataAtBlockPos(IDhApiLevelWrapper levelWrapper, int blockPosX, int blockPosZ, IDhApiTerrainDataCache dataCache)
-	{ return getTerrainDataColumnArray(levelWrapper, DhSectionPos.encode(LodUtil.BLOCK_DETAIL_LEVEL, blockPosX, blockPosZ), null, dataCache); }
+	public DhApiResult<DhApiTerrainDataPoint[]> getColumnDataAtBlockPos(IDhApiLevelWrapper levelWrapper, int blockPosX, int blockPosZ, @Nullable IDhApiTerrainDataCache dataCache)
+	{ return getTerrainDataColumnArray(levelWrapper, new DhLodPos(LodUtil.BLOCK_DETAIL_LEVEL, blockPosX, blockPosZ), null, dataCache); }
 	
 	@Override
-	public DhApiResult<DhApiTerrainDataPoint[][][]> getAllTerrainDataAtChunkPos(IDhApiLevelWrapper levelWrapper, int chunkPosX, int chunkPosZ, IDhApiTerrainDataCache dataCache)
-	{ return getTerrainDataOverAreaForPositionDetailLevel(levelWrapper, DhSectionPos.encode(LodUtil.CHUNK_DETAIL_LEVEL, chunkPosX, chunkPosZ), dataCache); }
+	public DhApiResult<DhApiTerrainDataPoint[][][]> getAllTerrainDataAtChunkPos(IDhApiLevelWrapper levelWrapper, int chunkPosX, int chunkPosZ, @Nullable IDhApiTerrainDataCache dataCache)
+	{ return getTerrainDataOverAreaForPositionDetailLevel(levelWrapper, new DhLodPos(LodUtil.CHUNK_DETAIL_LEVEL, chunkPosX, chunkPosZ), dataCache); }
 	
 	@Override
-	public DhApiResult<DhApiTerrainDataPoint[][][]> getAllTerrainDataAtRegionPos(IDhApiLevelWrapper levelWrapper, int regionPosX, int regionPosZ, IDhApiTerrainDataCache dataCache)
-	{ return getTerrainDataOverAreaForPositionDetailLevel(levelWrapper, DhSectionPos.encode(LodUtil.REGION_DETAIL_LEVEL, regionPosX, regionPosZ), dataCache); }
+	public DhApiResult<DhApiTerrainDataPoint[][][]> getAllTerrainDataAtRegionPos(IDhApiLevelWrapper levelWrapper, int regionPosX, int regionPosZ, @Nullable IDhApiTerrainDataCache dataCache)
+	{ return getTerrainDataOverAreaForPositionDetailLevel(levelWrapper, new DhLodPos(LodUtil.REGION_DETAIL_LEVEL, regionPosX, regionPosZ), dataCache); }
 	
 	@Override
-	public DhApiResult<DhApiTerrainDataPoint[][][]> getAllTerrainDataAtDetailLevelAndPos(IDhApiLevelWrapper levelWrapper, byte detailLevel, int posX, int posZ, IDhApiTerrainDataCache dataCache)
-	{ return getTerrainDataOverAreaForPositionDetailLevel(levelWrapper, DhSectionPos.encode(detailLevel, posX, posZ), dataCache); }
-	
-	//endregion
+	public DhApiResult<DhApiTerrainDataPoint[][][]> getAllTerrainDataAtDetailLevelAndPos(IDhApiLevelWrapper levelWrapper, byte detailLevel, int posX, int posZ, @Nullable IDhApiTerrainDataCache dataCache)
+	{ return getTerrainDataOverAreaForPositionDetailLevel(levelWrapper, new DhLodPos(detailLevel, posX, posZ), dataCache); }
 	
 	
 	
 	// private getters //
-	//region
 	
 	/** Returns a single API terrain datapoint that contains the given Y block position */
-	private static DhApiResult<DhApiTerrainDataPoint> getTerrainDataAtBlockYPos(IDhApiLevelWrapper levelWrapper, long requestedColumnPos, Integer blockYPos, IDhApiTerrainDataCache dataCache)
+	private static DhApiResult<DhApiTerrainDataPoint> getTerrainDataAtBlockYPos(IDhApiLevelWrapper levelWrapper, DhLodPos requestedColumnPos, Integer blockYPos, @Nullable IDhApiTerrainDataCache dataCache)
 	{
 		DhApiResult<DhApiTerrainDataPoint[]> result = getTerrainDataColumnArray(levelWrapper, requestedColumnPos, blockYPos, dataCache);
 		if (result.success && result.payload.length > 0)
@@ -135,7 +126,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 	}
 	
 	/**
-	 * Returns all the block columns represented by the given {@link DhSectionPos}. <br>
+	 * Returns all the block columns represented by the given {@link DhLodPos}. <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>
@@ -144,14 +135,11 @@ 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, long requestedAreaPos, 
-			IDhApiTerrainDataCache dataCache)
+			IDhApiLevelWrapper levelWrapper, DhLodPos requestedAreaPos, 
+			@Nullable IDhApiTerrainDataCache dataCache)
 	{
-		byte requestedDetailLevel = DhSectionPos.getDetailLevel(requestedAreaPos);
-		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);
+		DhLodPos startingBlockPos = requestedAreaPos.getCornerLodPos(LodUtil.BLOCK_DETAIL_LEVEL);
+		int widthOfAreaInBlocks = BitShiftUtil.powerOfTwo(requestedAreaPos.detailLevel);
 		
 		DhApiTerrainDataPoint[][][] returnArray = new DhApiTerrainDataPoint[widthOfAreaInBlocks][widthOfAreaInBlocks][];
 		int dataColumnsReturned = 0;
@@ -161,7 +149,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 		{
 			for (int z = 0; z < widthOfAreaInBlocks; z++)
 			{
-				long blockColumnPos = DhSectionPos.encode(LodUtil.BLOCK_DETAIL_LEVEL, DhSectionPos.getX(startingBlockPos) + x, DhSectionPos.getZ(startingBlockPos) + z);
+				DhLodPos blockColumnPos = new DhLodPos(LodUtil.BLOCK_DETAIL_LEVEL, startingBlockPos.x + x, startingBlockPos.z + z);
 				DhApiResult<DhApiTerrainDataPoint[]> result = getTerrainDataColumnArray(levelWrapper, blockColumnPos, null, dataCache);
 				if (result.success)
 				{
@@ -187,8 +175,8 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 	 */
 	private static DhApiResult<DhApiTerrainDataPoint[]> getTerrainDataColumnArray(
 			IDhApiLevelWrapper levelWrapper, 
-			long requestedColumnPos, Integer nullableBlockYPos, 
-			IDhApiTerrainDataCache apiDataCache)
+			DhLodPos requestedColumnPos, Integer nullableBlockYPos, 
+			@Nullable IDhApiTerrainDataCache apiDataCache)
 	{
 		//============//
 		// validation //
@@ -209,14 +197,9 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 		ILevelWrapper coreLevelWrapper = (ILevelWrapper) levelWrapper;
 		
 		
-		// require a data cache to prevent horrible performance (especially on ray-casts)
-		if (apiDataCache == null)
-		{
-			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))
+		// the data cache can be null, but must be our own implementation
+		if (apiDataCache != null
+			&& !(apiDataCache instanceof DhApiTerrainDataCache))
 		{
 			return DhApiResult.createFail("Unsupported [" + IDhApiTerrainDataCache.class.getSimpleName() + "] implementation, only the core class [" + DhApiTerrainDataCache.class.getSimpleName() + "] is a valid parameter.");
 		}
@@ -230,12 +213,12 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 		}
 		
 		// get the detail levels for this request
-		byte requestedDetailLevel = DhSectionPos.getDetailLevel(requestedColumnPos);
+		byte requestedDetailLevel = requestedColumnPos.detailLevel;
 		byte sectionDetailLevel = (byte) (requestedDetailLevel + DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL);
 		
 		// get the positions for this request
-		long sectionPos = DhSectionPos.convertToDetailLevel(requestedColumnPos, sectionDetailLevel);
-		long relativePos = DhSectionPos.getDhSectionRelativePositionForDetailLevel(requestedColumnPos, DhSectionPos.getDetailLevel(requestedColumnPos));
+		long sectionPos = requestedColumnPos.getSectionPosWithSectionDetailLevel(sectionDetailLevel);
+		DhLodPos relativePos = requestedColumnPos.getDhSectionRelativePositionForDetailLevel();
 		
 		
 		
@@ -275,7 +258,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 			//===============================//
 			
 			FullDataPointIdMap mapping = dataSource.mapping;
-			LongArrayList dataColumn = dataSource.getColumnAtRelPos(DhSectionPos.getX(relativePos), DhSectionPos.getZ(relativePos));
+			LongArrayList dataColumn = dataSource.getColumnAtRelPos(relativePos.x, relativePos.z);
 			if (dataColumn != null)
 			{
 				int dataColumnIndexCount = dataColumn.size();
@@ -347,14 +330,11 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 		}
 	}
 	
-	//endregion
-	
 	
 	
 	//====================//
 	// raycasting methods //
 	//====================//
-	//region
 	
 	@Override
 	public DhApiResult<DhApiRaycastResult> raycast(
@@ -366,8 +346,8 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 			IDhApiTerrainDataCache dataCache)
 	{
 		return this.raycastLodData(levelWrapper, 
-				new DhVec3d(rayOriginX, rayOriginY, rayOriginZ), 
-				new DhVec3f(rayDirectionX, rayDirectionY, rayDirectionZ), 
+				new Vec3d(rayOriginX, rayOriginY, rayOriginZ), 
+				new Vec3f(rayDirectionX, rayDirectionY, rayDirectionZ), 
 				maxRayBlockLength, dataCache);
 	}
 	
@@ -379,7 +359,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 	 */
 	private DhApiResult<DhApiRaycastResult> raycastLodData(
 			IDhApiLevelWrapper levelWrapper, 
-			DhVec3d rayOrigin, DhVec3f rayDirection, 
+			Vec3d rayOrigin, Vec3f rayDirection, 
 			int maxRayBlockLength,
 			@Nullable
 			IDhApiTerrainDataCache dataCache)
@@ -396,9 +376,9 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 		int currentLength = 0;
 		
 		// the exact position of this step
-		DhVec3d exactPos = new DhVec3d(rayOrigin.x, rayOrigin.y, rayOrigin.z);
+		Vec3d exactPos = new Vec3d(rayOrigin.x, rayOrigin.y, rayOrigin.z);
 		// the block position for this step
-		DhVec3i blockPos = new DhVec3i((int) Math.round(rayOrigin.x), (int) Math.round(rayOrigin.y), (int) Math.round(rayOrigin.z));
+		Vec3i blockPos = new Vec3i((int) Math.round(rayOrigin.x), (int) Math.round(rayOrigin.y), (int) Math.round(rayOrigin.z));
 		
 		DhApiRaycastResult closetFoundDataPoint = null;
 		
@@ -408,8 +388,8 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 				&& currentLength <= maxRayBlockLength)
 		{
 			// get the LOD columns around this position
-			ArrayList<DhVec3i> columnPositions = getIntersectingColumnsAtPosition(blockPos, rayDirection);
-			for (DhVec3i columnPos : columnPositions)
+			ArrayList<Vec3i> columnPositions = getIntersectingColumnsAtPosition(blockPos, rayDirection);
+			for (Vec3i columnPos : columnPositions)
 			{
 				// check each column
 				DhApiResult<DhApiTerrainDataPoint[]> result = this.getColumnDataAtBlockPos(levelWrapper, columnPos.x, columnPos.z, dataCache);
@@ -426,7 +406,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 					if (dataPoint.blockStateWrapper != null && !dataPoint.blockStateWrapper.isAir())
 					{
 						// does this LOD contain the given Y position?
-						DhVec3i dataPointPos = new DhVec3i(columnPos.x, dataPoint.bottomYBlockPos, columnPos.z);
+						Vec3i dataPointPos = new Vec3i(columnPos.x, dataPoint.bottomYBlockPos, columnPos.z);
 						if (exactPos.y >= dataPoint.bottomYBlockPos 
 							&& exactPos.y <= dataPoint.topYBlockPos)
 						{
@@ -479,15 +459,15 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 	 *
 	 * Used to make sure the raycast step doesn't accidentally walk over any adjacent data.
 	 */
-	private static ArrayList<DhVec3i> getIntersectingColumnsAtPosition(DhVec3i rayEndingPos, DhVec3f rayDirection)
+	private static ArrayList<Vec3i> getIntersectingColumnsAtPosition(Vec3i rayEndingPos, Vec3f rayDirection)
 	{
-		ArrayList<DhVec3i> returnList = new ArrayList<>(9);
+		ArrayList<Vec3i> returnList = new ArrayList<>(9);
 		
 		for (int x = -1; x <= 1; x++)
 		{
 			for (int z = -1; z <= 1; z++)
 			{
-				DhVec3i pos = new DhVec3i(rayEndingPos.x + x, rayEndingPos.y, rayEndingPos.z + z);
+				Vec3i pos = new Vec3i(rayEndingPos.x + x, rayEndingPos.y, rayEndingPos.z + z);
 				
 				// check if this column is intersected by the ray
 				if (RayCastUtil.rayIntersectsSquare(rayEndingPos.x, rayEndingPos.z, rayDirection.x, rayDirection.z, pos.x, pos.z, 1))
@@ -500,14 +480,11 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 		return returnList;
 	}
 	
-	//endregion
-	
 	
 	
 	//================//
 	// setter methods //
 	//================//
-	//region
 	
 	@Override
 	public DhApiResult<Void> overwriteChunkDataAsync(IDhApiLevelWrapper levelWrapper, Object[] chunkObjectArray) throws ClassCastException
@@ -531,32 +508,26 @@ 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());
+		SharedApi.INSTANCE.applyChunkUpdate(chunk, dhLevel.getLevelWrapper(), true, true);
 		
 		
 		return DhApiResult.createSuccess();
 	}
 	
-	//endregion
-	
 	
 	
 	//=============//
 	// API helpers //
 	//=============//
-	//region
 	
 	@Override
 	public IDhApiTerrainDataCache createSoftCache() { return new DhApiTerrainDataCache(); }
 	
-	//endregion
-	
 	
 	
 	//===============//
 	// debug methods //
 	//===============//
-	//region
 	
 	/**
 	 * This method is here for debugging the repo and isn't intended for normal use.
@@ -570,10 +541,10 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 			Thread thread = new Thread(() -> {
 				try
 				{
-					DhApiResult<DhApiTerrainDataPoint> single = getTerrainDataAtBlockYPos(levelWrapper, DhSectionPos.encode(LodUtil.BLOCK_DETAIL_LEVEL, blockPosX, blockPosZ), blockPosY, debugDataCache);
-					DhApiResult<DhApiTerrainDataPoint[]> column = getTerrainDataColumnArray(levelWrapper, DhSectionPos.encode(LodUtil.BLOCK_DETAIL_LEVEL, blockPosX, blockPosZ), null, debugDataCache);
+					DhApiResult<DhApiTerrainDataPoint> single = getTerrainDataAtBlockYPos(levelWrapper, new DhLodPos(LodUtil.BLOCK_DETAIL_LEVEL, blockPosX, blockPosZ), blockPosY, debugDataCache);
+					DhApiResult<DhApiTerrainDataPoint[]> column = getTerrainDataColumnArray(levelWrapper, new DhLodPos(LodUtil.BLOCK_DETAIL_LEVEL, blockPosX, blockPosZ), null, debugDataCache);
 					
-					long chunkPos = DhSectionPos.encodeContaining(LodUtil.CHUNK_DETAIL_LEVEL, new DhChunkPos(blockPosX, blockPosZ));
+					DhLodPos chunkPos = new DhLodPos(LodUtil.BLOCK_DETAIL_LEVEL, blockPosX, blockPosZ).convertToDetailLevel(LodUtil.CHUNK_DETAIL_LEVEL);
 					DhApiResult<DhApiTerrainDataPoint[][][]> area = getTerrainDataOverAreaForPositionDetailLevel(levelWrapper, chunkPos, debugDataCache);
 					
 					
@@ -609,9 +580,9 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 					if (rayCast.success 
 						&& rayCast.payload != null)
 					{
-						DEBUG_RENDERER.makeParticle(
-							new AbstractDebugWireframeRenderer.BoxParticle(
-								new AbstractDebugWireframeRenderer.Box(
+						DebugRenderer.makeParticle(
+							new DebugRenderer.BoxParticle(
+								new DebugRenderer.Box(
 									DhSectionPos.encode((byte) 0, rayCast.payload.pos.x, rayCast.payload.pos.z), 
 										rayCast.payload.dataPoint.bottomYBlockPos, 
 										rayCast.payload.dataPoint.topYBlockPos, 
@@ -637,8 +608,5 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 		}
 	}
 	
-	//endregion
-	
-	
 	
 }
@@ -23,37 +23,29 @@ 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.api.objects.DhApiResult;
 import com.seibel.distanthorizons.core.api.internal.rendering.DhRenderState;
-import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector;
 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.RenderParams;
-import com.seibel.distanthorizons.core.render.RenderThreadTaskHandler;
 import com.seibel.distanthorizons.core.render.renderer.*;
 import com.seibel.distanthorizons.core.util.TimerUtil;
-import com.seibel.distanthorizons.core.util.math.DhVec3d;
+import com.seibel.distanthorizons.core.util.math.Mat4f;
 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.modAccessor.IImmersivePortalsAccessor;
-import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IIrisAccessor;
-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;
 import com.seibel.distanthorizons.core.network.session.NetworkSession;
 import com.seibel.distanthorizons.coreapi.ModInfo;
-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.world.AbstractDhWorld;
 import com.seibel.distanthorizons.core.world.DhClientWorld;
 import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
@@ -63,14 +55,23 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapp
 import com.seibel.distanthorizons.core.logging.DhLogger;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.joml.Matrix4f;
+import org.joml.Vector4f;
 import org.lwjgl.glfw.GLFW;
+import org.lwjgl.opengl.GL32;
+import org.lwjgl.opengl.GL46;

+import javax.imageio.ImageIO;
+import java.awt.*;
+import java.awt.image.BufferedImage;
 import java.io.File;
+import java.io.IOException;
+import java.text.NumberFormat;
 import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.RejectedExecutionException;
 import java.util.concurrent.ThreadPoolExecutor;
+import java.util.function.Function;

 /**
 * This holds the methods that should be called
@@ -80,19 +81,15 @@ import java.util.concurrent.ThreadPoolExecutor;
 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);
 	
-	/** Delayed accessing is necessary since this object will be created before the mod accessors are bound. */
-	private static class DelayedAccessors 
-	{
-		public static final IImmersivePortalsAccessor IMMERSIVE_PORTALS = ModAccessorInjector.INSTANCE.get(IImmersivePortalsAccessor.class);
-	}
-	
 	/** this includes the is dev build message and low allocated memory warning */
 	private static final int MS_BETWEEN_STATIC_STARTUP_MESSAGES = 4_000;
 	
@@ -105,18 +102,6 @@ public class ClientApi
 	 * Only downside is making sure each variable is populated before rendering.
 	 */
 	public static final DhRenderState RENDER_STATE = new DhRenderState();
-	/** 
-	 * static variable so we don't have to re-create it each frame,
-	 * reducing GC pressure.
-	 */
-	private static final RenderParams RENDER_PARAMS = new RenderParams();
-	
-	/**
-	 * 50ms = 20 FPS
-	 * @link https://fpstoms.com/ 
-	 * @see ClientApi#cameraSpeedRollingAverage
-	 */
-	private static final long MIN_MS_BETWEEN_SPEED_CHECKS = 50;
 	
 	
 	private boolean isDevBuildMessagePrinted = false;
@@ -130,40 +115,21 @@ public class ClientApi
 	
 	public boolean rendererDisabledBecauseOfExceptions = false;
 	
+	private final ClientPluginChannelApi pluginChannelApi = new ClientPluginChannelApi(this::clientLevelLoadEvent, this::clientLevelUnloadEvent);
+	
+	/** Delay loading the first level to give the server some time to respond with level to actually load */
+	private Timer firstLevelLoadTimer;
+	private static final long FIRST_LEVEL_LOAD_DELAY_IN_MS = 1_000;
+	
 	/** Holds any levels that were loaded before the {@link ClientApi#onClientOnlyConnected} was fired. */
 	public final HashSet<IClientLevelWrapper> waitingClientLevels = new HashSet<>();
-	/** Holds any chunks that were found before the client levels are loaded. */
-	public final Map<Pair<IClientLevelWrapper, DhChunkPos>, IChunkWrapper> waitingChunkByClientLevelAndPos = new ConcurrentHashMap<>();
+	/** 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
-	 */
-	private final RollingAverage cameraSpeedRollingAverage = new RollingAverage(40);
-	private DhVec3d lastCameraPosForSpeedCheck = new DhVec3d();
-	private long msSinceLastSpeedCheck = 0L;
-	public double getAvgCameraSpeed() { return cameraSpeedRollingAverage.getAverage(); }
-	
-	/** 
-	 * keeping track of this is necessary to fix
-	 * out-of-date LODs from rendering when the shading
-	 * is changed by Iris, causing LODs to often
-	 * lack the side shading, which looks pretty bad
-	 * when shaders are disabled.
-	 */
-	private boolean irisShadersEnabledLastFrame = false;
-	
-	
 	
 	//==============//
 	// constructors //
@@ -176,11 +142,10 @@ public class ClientApi
 	//==============//
 	// world events //
 	//==============//
-	//region world events
 	
 	/**
 	 * May be fired slightly before or after the associated
-	 * level is loaded
+	 * {@link ClientApi#clientLevelLoadEvent(IClientLevelWrapper)} event
 	 * depending on how the host mod loader functions. <br><br>
 	 * 
 	 * Synchronized shouldn't be necessary, but is present to match {@see onClientOnlyDisconnected} and prevent any unforeseen issues. 
@@ -206,20 +171,39 @@ public class ClientApi
 					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(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 message can be disabled in DH's config under Advanced -> Logging.");
+					MC_CLIENT.sendChatMessage("This 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);
+			
+			this.pluginChannelApi.onJoinServer(world.networkState.getSession());
+			world.networkState.sendConfigMessage();
+			
+			LOGGER.info("Loading [" + this.waitingClientLevels.size() + "] waiting client level wrappers.");
+			for (IClientLevelWrapper level : this.waitingClientLevels)
+			{
+				this.clientLevelLoadEvent(level);
+			}
+			
+			this.waitingClientLevels.clear();
 		}
 	}
 	
 	/** Synchronized to prevent a rare issue where multiple disconnect events are triggered on top of each other. */
 	public synchronized void onClientOnlyDisconnected()
 	{
+		// clear the first time timer
+		if (this.firstLevelLoadTimer != null)
+		{
+			this.firstLevelLoadTimer.cancel();
+			this.firstLevelLoadTimer = null;
+		}
+		
 		AbstractDhWorld world = SharedApi.getAbstractDhWorld();
 		if (world != null)
 		{
@@ -229,20 +213,102 @@ public class ClientApi
 			SharedApi.setDhWorld(null);
 		}
 		
+		this.pluginChannelApi.reset();
+		
 		// remove any waiting items
 		this.waitingChunkByClientLevelAndPos.clear();
+		this.waitingClientLevels.clear();
 	}
 	
-	//endregion
-	
 	
 	
 	//==============//
 	// level events //
 	//==============//
-	//region
 	
-	public void loadWaitingChunksForLevel(IClientLevelWrapper level)
+	public void clientLevelUnloadEvent(IClientLevelWrapper level)
+	{
+		try
+		{
+			LOGGER.info("Unloading client level [" + level.getClass().getSimpleName() + "]-[" + level.getDhIdentifier() + "].");
+			
+			if (level instanceof IServerKeyedClientLevel)
+			{
+				this.pluginChannelApi.onClientLevelUnload();
+			}
+			
+			AbstractDhWorld world = SharedApi.getAbstractDhWorld();
+			if (world != null)
+			{
+				world.unloadLevel(level);
+				SharedApi.INSTANCE.clearQueuedChunkUpdates();
+				ApiEventInjector.INSTANCE.fireAllEvents(DhApiLevelUnloadEvent.class, new DhApiLevelUnloadEvent.EventParam(level));
+			}
+			else
+			{
+				this.waitingClientLevels.remove(level);
+			}
+		}
+		catch (Exception e)
+		{
+			// handle errors here to prevent blowing up a mixin or API up stream
+			LOGGER.error("Unexpected error in ClientApi.clientLevelUnloadEvent(), error: "+e.getMessage(), e);
+		}
+	}
+	
+	public void clientLevelLoadEvent(@Nullable IClientLevelWrapper levelWrapper)
+	{
+		// wait a moment before loading the level to give the server a chance to handle the client's login request
+		if (MC_CLIENT.clientConnectedToDedicatedServer())
+		{
+			if (this.firstLevelLoadTimer == null)
+			{
+				this.firstLevelLoadTimer = TimerUtil.CreateTimer("FirstLevelLoadTimer");
+				this.firstLevelLoadTimer.schedule(new TimerTask()
+				{
+					@Override
+					public void run() { ClientApi.this.clientLevelLoadEvent(levelWrapper); }
+				}, FIRST_LEVEL_LOAD_DELAY_IN_MS);
+				return;
+			}
+			this.firstLevelLoadTimer.cancel();
+		}
+		
+		
+		try
+		{
+			LOGGER.info("Loading client level [" + levelWrapper + "]-[" + levelWrapper.getDhIdentifier() + "].");
+			
+			AbstractDhWorld world = SharedApi.getAbstractDhWorld();
+			if (world != null)
+			{
+				if (!this.pluginChannelApi.allowLevelLoading(levelWrapper))
+				{
+					LOGGER.info("Levels in this connection are managed by the server, skipping auto-load.");
+					
+					// Instead of attempting to load themselves, send the config and wait for a server provided level key.
+					((DhClientWorld) world).networkState.sendConfigMessage();
+					return;
+				}
+				
+				
+				world.getOrLoadLevel(levelWrapper);
+				ApiEventInjector.INSTANCE.fireAllEvents(DhApiLevelLoadEvent.class, new DhApiLevelLoadEvent.EventParam(levelWrapper));
+				
+				this.loadWaitingChunksForLevel(levelWrapper);
+			}
+			else
+			{
+				this.waitingClientLevels.add(levelWrapper);
+			}
+		}
+		catch (Exception e)
+		{
+			// handle errors here to prevent blowing up a mixin or API up stream
+			LOGGER.error("Unexpected error in ClientApi.clientLevelLoadEvent(), error: "+e.getMessage(), e);
+		}
+	}
+	private void loadWaitingChunksForLevel(IClientLevelWrapper level)
 	{
 		HashSet<Pair<IClientLevelWrapper, DhChunkPos>> keysToRemove = new HashSet<>();
 		for (Pair<IClientLevelWrapper, DhChunkPos> levelChunkPair : this.waitingChunkByClientLevelAndPos.keySet())
@@ -252,7 +318,7 @@ public class ClientApi
 			if (levelWrapper.equals(level))
 			{
 				IChunkWrapper chunkWrapper = this.waitingChunkByClientLevelAndPos.get(levelChunkPair);
-				SharedApi.INSTANCE.applyChunkUpdate(chunkWrapper, levelWrapper);
+				SharedApi.INSTANCE.chunkLoadEvent(chunkWrapper, levelWrapper);
 				keysToRemove.add(levelChunkPair);
 			}
 		}
@@ -264,14 +330,11 @@ public class ClientApi
 		}
 	}
 	
-	//endregion
-	
 	
 	
 	//============//
 	// networking //
 	//============//
-	//region networking
 	
 	/**
 	 * Forwards a decoded message into the registered handlers.
@@ -291,8 +354,7 @@ public class ClientApi
 		{
 			executor.execute(() ->
 			{
-				DhClientWorld world = (DhClientWorld) Objects.requireNonNull(SharedApi.tryGetDhClientWorld());
-				NetworkSession networkSession = world.pluginChannelApi.networkSession;
+				NetworkSession networkSession = this.pluginChannelApi.networkSession;
 				if (networkSession != null)
 				{
 					networkSession.tryHandleMessage(message);
@@ -305,14 +367,11 @@ public class ClientApi
 		}
 	}
 	
-	//endregion
-	
 	
 	
 	//===============//
 	// LOD rendering //
 	//===============//
-	//region lod rendering
 	
 	/** Should be called before {@link ClientApi#renderDeferredLodsForShaders} */
 	public void renderLods() { this.renderLodLayer(false); }
@@ -325,295 +384,190 @@ public class ClientApi
 	
 	private void renderLodLayer(boolean renderingDeferredLayer)
 	{
+		//=========//
+		// logging //
+		//=========//
+		
+		this.sendQueuedChatMessages();
+		
 		IProfilerWrapper profiler = MC_CLIENT.getProfiler();
-		try (IProfilerWrapper.IProfileBlock dhRender_profile = profiler.push("DH-RenderLevel"))
+		profiler.pop(); // get out of "terrain"
+		profiler.push("DH-RenderLevel");
+		
+		
+		
+		//=====================//
+		// render thread tasks //
+		//=====================//
+		
+		// only run these tasks once per frame
+		if (!renderingDeferredLayer)
 		{
-			
-			
-			
-			//===========//
-			// debugging //
-			//===========//
-			//region
-			
-			// only run these tasks once per frame
-			if (!renderingDeferredLayer)
-			{
-				//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)
-			{
-				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
-						RenderThreadTaskHandler.INSTANCE.runRenderThreadTasks();
-					}
-					catch (Exception e)
-					{
-						LOGGER.error("Unexpected issue running render thread tasks, error: [" + e.getMessage() + "].", e);
-					}
-					
-					//endregion
-					
-					
-					
-					//==============//
-					// camera speed //
-					//==============//
-					//region
-					
-					long nowMs = System.currentTimeMillis();
-					if (this.msSinceLastSpeedCheck + MIN_MS_BETWEEN_SPEED_CHECKS < nowMs 
-						// don't track camera speed for dimensions the player isn't in
-						&& (DelayedAccessors.IMMERSIVE_PORTALS == null 
-							|| !DelayedAccessors.IMMERSIVE_PORTALS.isRenderingPortal()))
-					{
-						// calc time since last check
-						double secSinceLastCheck = (nowMs - this.msSinceLastSpeedCheck) / 1_000.0;
-						this.msSinceLastSpeedCheck = nowMs;
-						
-						// get the distance traveled since last frame
-						DhVec3d 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
-					
-					
-					
-					//====================//
-					// Iris data re-build //
-					//====================//
-					//region
-					
-					// delayed getter since ClientApi is created before this accessor is bound
-					IIrisAccessor irisAccessor = ModAccessorInjector.INSTANCE.get(IIrisAccessor.class);
-					if (irisAccessor != null)
-					{
-						boolean shadersActive = irisAccessor.isShaderPackInUse();
-						if (this.irisShadersEnabledLastFrame != shadersActive)
-						{
-							this.irisShadersEnabledLastFrame = shadersActive;
-							DhApi.Delayed.renderProxy.clearRenderDataCache();
-						}
-					}
-					
-					//endregion
-				}
-			}
-			
-			//endregion
-			
-			
-			
-			
-			//=================//
-			// parameter setup //
-			//=================//
-			//region
-			
-			EDhApiRenderPass renderPass;
-			if (DhApiRenderProxy.INSTANCE.getDeferTransparentRendering())
-			{
-				if (renderingDeferredLayer)
-				{
-					renderPass = EDhApiRenderPass.TRANSPARENT;
-				}
-				else
-				{
-					renderPass = EDhApiRenderPass.OPAQUE;
-				}
-			}
-			else
-			{
-				renderPass = EDhApiRenderPass.OPAQUE_AND_TRANSPARENT;
-			}
-			
-			// A global render state variable is used since MC has split up their
-			// 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
-			RENDER_PARAMS.update(renderPass, RENDER_STATE);
-			
-			//endregion
-			
-			
-			
-			//============//
-			// validation //
-			//============//
-			//region
-			
-			String validationMessage = RENDER_PARAMS.getValidationErrorMessage();
-			if (validationMessage != null)
-			{
-				// store the error message so it can be seen on the F3 screen
-				this.lastRenderParamValidationMessage = validationMessage;
-				return;
-			}
-			else
-			{
-				this.lastRenderParamValidationMessage = null;
-			}
-			
-			if (this.rendererDisabledBecauseOfExceptions)
-			{
-				// re-enable rendering if the user toggles DH rendering
-				if (!Config.Client.quickEnableRendering.get())
-				{
-					LOGGER.info("DH Renderer re-enabled after exception. Some rendering issues may occur. Please reboot Minecraft if you see any rendering issues.");
-					this.rendererDisabledBecauseOfExceptions = false;
-					Config.Client.quickEnableRendering.set(true);
-				}
-				
-				return;
-			}
-			
-			if (Config.Client.Advanced.Debugging.rendererMode.get() == EDhApiRendererMode.DISABLED)
-			{
-				return;
-			}
-			
-			//endregion
-			
-			
-			
-			//===========//
-			// rendering //
-			//===========//
-			//region
+			profiler.push("DH render thread tasks");
 			
 			try
 			{
-				// render pass //
-				if (Config.Client.Advanced.Debugging.rendererMode.get() == EDhApiRendererMode.DEFAULT)
-				{
-					if (!renderingDeferredLayer)
-					{
-						boolean renderingCancelled = ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeRenderEvent.class, RENDER_PARAMS);
-						if (!renderingCancelled)
-						{
-							LodRenderer.INSTANCE.render(RENDER_PARAMS, profiler);
-						}
-						
-						if (!DhApi.Delayed.renderProxy.getDeferTransparentRendering())
-						{
-							ApiEventInjector.INSTANCE.fireAllEvents(DhApiAfterRenderEvent.class, null);
-						}
-					}
-					else
-					{
-						boolean renderingCancelled = ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeDeferredRenderEvent.class, RENDER_PARAMS);
-						if (!renderingCancelled)
-						{
-							LodRenderer.INSTANCE.renderDeferred(RENDER_PARAMS, profiler);
-						}
-						
-						
-						if (DhApi.Delayed.renderProxy.getDeferTransparentRendering())
-						{
-							ApiEventInjector.INSTANCE.fireAllEvents(DhApiAfterRenderEvent.class, null);
-						}
-					}
-				}
-				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(RENDER_PARAMS);
-							
-							testRenderer.render(RENDER_PARAMS);
-							
-							metaRenderer.runRenderPassCleanup(RENDER_PARAMS);
-						}
-						else
-						{
-							RATE_LIMITED_LOGGER.warn("Unable to find singleton [" + IDhTestTriangleRenderer.class.getSimpleName() + "]");
-						}
-					}
-				}
+				// make sure the GLProxy is created for future use
+				GLProxy.getInstance();
+				
+				// these tasks always need to be called, regardless of whether the renderer is enabled or not to prevent memory leaks
+				GLProxy.runRenderThreadTasks();
 			}
 			catch (Exception e)
 			{
-				this.rendererDisabledBecauseOfExceptions = true;
-				LOGGER.error("Unexpected Renderer error in render pass [" + renderPass + "]. Error: " + e.getMessage(), e);
-				
-				MC_CLIENT.sendChatMessage(MinecraftTextFormat.DARK_RED + "" + MinecraftTextFormat.BOLD + "ERROR: Distant Horizons renderer has encountered an exception!" + MinecraftTextFormat.CLEAR_FORMATTING);
-				MC_CLIENT.sendChatMessage(MinecraftTextFormat.DARK_RED + "Renderer disabled to try preventing GL state corruption." + MinecraftTextFormat.CLEAR_FORMATTING);
-				MC_CLIENT.sendChatMessage(MinecraftTextFormat.DARK_RED + "Toggle DH rendering via the config UI to re-activate DH rendering." + MinecraftTextFormat.CLEAR_FORMATTING);
-				MC_CLIENT.sendChatMessage(MinecraftTextFormat.DARK_RED + "Error: " + MinecraftTextFormat.CLEAR_FORMATTING + e);
+				LOGGER.error("Unexpected issue running render thread tasks, error: [" + e.getMessage() + "].", e);
 			}
 			
-			//endregion
+			profiler.pop();
 		}
+		
+		
+		
+		//=================//
+		// parameter setup //
+		//=================//
+		
+		EDhApiRenderPass renderPass;
+		if (DhApiRenderProxy.INSTANCE.getDeferTransparentRendering())
+		{
+			if (renderingDeferredLayer)
+			{
+				renderPass = EDhApiRenderPass.TRANSPARENT;
+			}
+			else
+			{
+				renderPass = EDhApiRenderPass.OPAQUE;
+			}
+		}
+		else
+		{
+			renderPass = EDhApiRenderPass.OPAQUE_AND_TRANSPARENT;
+		}
+		
+		// A global render state variable is used since MC has split up their
+		// 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 =
+			new RenderParams(
+				renderPass,
+				RENDER_STATE.frameTime,
+				RENDER_STATE.mcProjectionMatrix, RENDER_STATE.mcModelViewMatrix,
+				RENDER_STATE.clientLevelWrapper
+			);
+		
+		
+		
+		//============//
+		// validation //
+		//============//
+		
+		// TODO write this message to the F3 menu so people can see when a different mod screws with the lightmap
+		String validationMessage = renderParams.getValidationErrorMessage();
+		if (validationMessage != null)
+		{
+			this.lastRenderParamValidationMessage = validationMessage;
+			return;
+		}
+		else
+		{
+			this.lastRenderParamValidationMessage = null;
+		}
+		
+		if (this.rendererDisabledBecauseOfExceptions)
+		{
+			// re-enable rendering if the user toggles DH rendering
+			if (!Config.Client.quickEnableRendering.get())
+			{
+				LOGGER.info("DH Renderer re-enabled after exception. Some rendering issues may occur. Please reboot Minecraft if you see any rendering issues.");
+				this.rendererDisabledBecauseOfExceptions = false;
+				Config.Client.quickEnableRendering.set(true);
+			}
+			
+			return;
+		}
+		
+		
+		
+		//===========//
+		// rendering //
+		//===========//
+		
+		try
+		{
+			// render pass //
+			
+			if (!renderingDeferredLayer)
+			{
+				if (Config.Client.Advanced.Debugging.rendererMode.get() == EDhApiRendererMode.DEFAULT)
+				{
+					boolean renderingCancelledForThisFrame = ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeRenderEvent.class, renderParams);
+					if (!renderingCancelledForThisFrame)
+					{
+						LodRenderer.INSTANCE.render(renderParams, profiler);
+					}
+					
+					if (!DhApi.Delayed.renderProxy.getDeferTransparentRendering())
+					{
+						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);
+				if (!renderingCancelled)
+				{
+					LodRenderer.INSTANCE.renderDeferred(renderParams, profiler);
+				}
+				
+				
+				if (DhApi.Delayed.renderProxy.getDeferTransparentRendering())
+				{
+					ApiEventInjector.INSTANCE.fireAllEvents(DhApiAfterRenderEvent.class, null);
+				}
+			}
+		}
+		catch (Exception e)
+		{
+			this.rendererDisabledBecauseOfExceptions = true;
+			LOGGER.error("Unexpected Renderer error in render pass [" + renderPass + "]. Error: " + e.getMessage(), e);
+			
+			MC_CLIENT.sendChatMessage(MinecraftTextFormat.DARK_RED + "" + MinecraftTextFormat.BOLD + "ERROR: Distant Horizons renderer has encountered an exception!" + MinecraftTextFormat.CLEAR_FORMATTING);
+			MC_CLIENT.sendChatMessage(MinecraftTextFormat.DARK_RED + "Renderer disabled to try preventing GL state corruption." + MinecraftTextFormat.CLEAR_FORMATTING);
+			MC_CLIENT.sendChatMessage(MinecraftTextFormat.DARK_RED + "Toggle DH rendering via the config UI to re-activate DH rendering." + MinecraftTextFormat.CLEAR_FORMATTING);
+			MC_CLIENT.sendChatMessage(MinecraftTextFormat.DARK_RED + "Error: " + MinecraftTextFormat.CLEAR_FORMATTING + e);
+		}
+		
+		
+		
+		profiler.pop(); // end LOD
+		profiler.push("terrain"); // go back into "terrain"
 	}
 	
-	//endregion
-	
 	
 	
 	//================//
 	// fade rendering //
 	//================//
-	//region fade rendering
 	
 	/** 
 	 * The first fade pass.
 	 * Called after MC finishes rendering the opaque passes. 
 	 */
-	public void renderFadeOpaque()
+	public void renderFadeOpaque() // TODO this is actually the transparent pass
 	{
-		IDhVanillaFadeRenderer fadeRenderer = SingletonInjector.INSTANCE.get(IDhVanillaFadeRenderer.class);
-		if (fadeRenderer == null)
-		{
-			return;
-		}
+		DepthCalculator.INSTANCE.getMcTransparentDepthTexture();
+		DepthCalculator.INSTANCE.tryCalculateAsync();
 		
 		// only fade when DH is rendering
-		if (Config.Client.Advanced.Debugging.rendererMode.get() != EDhApiRendererMode.DISABLED
+		if (Config.Client.Advanced.Debugging.rendererMode.get() == EDhApiRendererMode.DEFAULT
 			&&
 			(
 				// only fade when requested
@@ -621,10 +575,10 @@ public class ClientApi
 				// or if LOD-only mode is enabled (fading is used to remove the MC render pass)
 				|| Config.Client.Advanced.Debugging.lodOnlyMode.get()
 			)
-			&& shouldRenderFade())
+			// don't fade when Iris shaders are active, otherwise the rendering can get weird
+			&& !DhApiRenderProxy.INSTANCE.getDeferTransparentRendering())
 		{
-			RENDER_PARAMS.update(EDhApiRenderPass.OPAQUE, RENDER_STATE);
-			fadeRenderer.render(RENDER_PARAMS);
+			VanillaFadeRenderer.INSTANCE.render(RENDER_STATE.mcModelViewMatrix, RENDER_STATE.mcProjectionMatrix, RENDER_STATE.frameTime, RENDER_STATE.clientLevelWrapper);
 		}
 	}
 	/** 
@@ -632,16 +586,12 @@ public class ClientApi
 	 * Called after MC finishes rendering both opaque
 	 * and transparent passes. 
 	 */
-	public void renderFadeTransparent()
+	public void renderFadeTransparent() // TODO this is actually the opaque pass
 	{
-		IDhVanillaFadeRenderer fadeRenderer = SingletonInjector.INSTANCE.get(IDhVanillaFadeRenderer.class);
-		if (fadeRenderer == null)
-		{
-			return;
-		}
+		DepthCalculator.INSTANCE.getMcOpaqueDepthTexture();
 		
 		// only fade when DH is rendering
-		if (Config.Client.Advanced.Debugging.rendererMode.get() != EDhApiRendererMode.DISABLED)
+		if (Config.Client.Advanced.Debugging.rendererMode.get() == EDhApiRendererMode.DEFAULT)
 		{
 			boolean renderFade =
 				(
@@ -650,79 +600,51 @@ public class ClientApi
 					// or if LOD-only mode is enabled (fading is used to remove the MC render pass)
 					|| Config.Client.Advanced.Debugging.lodOnlyMode.get()
 				)
-				&& shouldRenderFade();
+				// don't fade when Iris shaders are active, otherwise the rendering can get weird
+				&& !DhApiRenderProxy.INSTANCE.getDeferTransparentRendering();
 			if (renderFade)
 			{
-				RENDER_PARAMS.update(EDhApiRenderPass.TRANSPARENT, RENDER_STATE);
-				fadeRenderer.render(RENDER_PARAMS);
+				VanillaFadeRenderer.INSTANCE.render(RENDER_STATE.mcModelViewMatrix, RENDER_STATE.mcProjectionMatrix, RENDER_STATE.frameTime, RENDER_STATE.clientLevelWrapper);
 			}
 		}
 	}
 	
-	private static boolean shouldRenderFade()
-	{
-		// don't fade when Iris shaders are active, otherwise the rendering can get weird
-		if (DhApiRenderProxy.INSTANCE.getDeferTransparentRendering())
-		{
-			return false;
-		}
-		
-		// Don't render fade through immersive portals, this causes the fade to apply incorrectly
-		IImmersivePortalsAccessor immersivePortals = ModAccessorInjector.INSTANCE.get(IImmersivePortalsAccessor.class);
-		if (immersivePortals != null 
-			&& immersivePortals.isRenderingPortal())
-		{
-			return false;
-		}
-		
-		return true;
-	}
-	
-	//endregion
 	
 	
-	
-	//==========//
-	// keyboard //
-	//==========//
-	//region keyboard
+	//=================//
+	//    DEBUG USE    //
+	//=================//
 	
 	/** Trigger once on key press, with CLIENT PLAYER. */
 	public void keyPressedEvent(int glfwKey)
 	{
-		if (!Config.Client.Advanced.Debugging.enableDebugKeybindings.get())
-		{
-			// keybindings are disabled
-			return;
-		}
+		//if (!Config.Client.Advanced.Debugging.enableDebugKeybindings.get())
+		//{
+		//	// keybindings are disabled
+		//	return;
+		//}
 		
 		
-		if (glfwKey == GLFW.GLFW_KEY_F6)
+		if (glfwKey == GLFW.GLFW_KEY_F8)
 		{
-			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());
+			DepthCalculator.INSTANCE.pause = true;
+			//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_F7)
+		else if (glfwKey == GLFW.GLFW_KEY_F6)
 		{
-			Config.Client.Advanced.Debugging.lodOnlyMode.set(!Config.Client.Advanced.Debugging.lodOnlyMode.get());
-			MC_CLIENT.sendChatMessage("F7: Set LOD only mode to " + Config.Client.Advanced.Debugging.lodOnlyMode.get());
+			DepthCalculator.INSTANCE.pause = true;
+			//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_F8)
+		else if (glfwKey == GLFW.GLFW_KEY_P)
 		{
-			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());
+			DepthCalculator.INSTANCE.pause = true;
+			//prefLoggerEnabled = !prefLoggerEnabled;
+			//MC_CLIENT.sendChatMessage("P: Debug Pref Logger is " + (prefLoggerEnabled ? "enabled" : "disabled"));
 		}
 	}
 	
-	//endregion
-	
-	
-	
-	//======//
-	// chat //
-	//======//
-	//region chat
-	
 	private void sendQueuedChatMessages()
 	{
 		// this includes if the current build is a dev build
@@ -855,8 +777,6 @@ public class ClientApi
 	 */
 	public void showOverlayMessageNextFrame(String message) { this.overlayMessageQueueForNextFrame.add(message); }
 	
-	//endregion
-	
 	
 	
 }
@@ -9,14 +9,14 @@ 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.world.AbstractDhWorld;
+import com.seibel.distanthorizons.core.render.glObject.GLProxy;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;

 import java.util.Objects;
+import java.util.function.Consumer;

 /**
 * This class is used to manage the level keys.
@@ -30,6 +30,9 @@ public class ClientPluginChannelApi
 	private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
 	private static final IKeyedClientLevelManager KEYED_CLIENT_LEVEL_MANAGER = SingletonInjector.INSTANCE.get(IKeyedClientLevelManager.class);
 	
+	private final Consumer<IServerKeyedClientLevel> levelLoadHandler;
+	private final Consumer<IClientLevelWrapper> levelUnloadHandler;
+	
 	@Nullable
 	public NetworkSession networkSession;
 	
@@ -39,8 +42,10 @@ public class ClientPluginChannelApi
 	// constructor //
 	//=============//
 	
-	public ClientPluginChannelApi()
+	public ClientPluginChannelApi(Consumer<IServerKeyedClientLevel> levelLoadHandler, Consumer<IClientLevelWrapper> levelUnloadHandler)
 	{
+		this.levelLoadHandler = levelLoadHandler;
+		this.levelUnloadHandler = levelUnloadHandler;
 	}
 	
 	
@@ -83,27 +88,38 @@ public class ClientPluginChannelApi
 			throw new IllegalArgumentException("Server sent invalid level key.");
 		}
 		
-		LOGGER.info("Level init received for [" + msg.dimensionResourceLocation + "]: server key [" + msg.serverKey + "], level key [" + msg.levelKey + "]");
+		LOGGER.info("Server level key received: [" + msg.levelKey + "].");
 		
-		RenderThreadTaskHandler.INSTANCE.queueRunningOnRenderThread("ClientPluginChannelApi onLevelInitMessage", () -> 
+		GLProxy.queueRunningOnRenderThread(() -> 
 		{
 			IClientLevelWrapper clientLevel = MC.getWrappedClientLevel(true);
-			IServerKeyedClientLevel existingKeyedClientLevel = KEYED_CLIENT_LEVEL_MANAGER.getServerKeyedLevel(clientLevel);
+			IServerKeyedClientLevel existingKeyedClientLevel = KEYED_CLIENT_LEVEL_MANAGER.getServerKeyedLevel();
+
+			if (existingKeyedClientLevel != null)
+			{
+				if (!existingKeyedClientLevel.getServerLevelKey().equals(msg.levelKey))
+				{
+					LOGGER.info("Unloading previous level with key: [" + existingKeyedClientLevel.getServerLevelKey() + "].");
+					this.levelUnloadHandler.accept(existingKeyedClientLevel);
+				}
+				else
+				{
+					LOGGER.info("Level key matches the previous level key, ignoring the message.");
+				}
+			}
+			else
+			{
+				LOGGER.info("Unloading non-keyed level: [" + clientLevel.getDhIdentifier() + "].");
+				this.levelUnloadHandler.accept(clientLevel);
+			}
 			
 			if (existingKeyedClientLevel == null
-				|| !existingKeyedClientLevel.getServerKey().equals(msg.serverKey)
-				|| !existingKeyedClientLevel.getServerLevelKey().equals(msg.levelKey))
+					|| !existingKeyedClientLevel.getServerKey().equals(msg.serverKey)
+					|| !existingKeyedClientLevel.getServerLevelKey().equals(msg.levelKey))
 			{
 				LOGGER.info("Loading level with key: [" + msg.levelKey + "].");
-				
-				IServerKeyedClientLevel keyedLevel = KEYED_CLIENT_LEVEL_MANAGER.setServerKeyedLevel(clientLevel, msg.dimensionResourceLocation, msg.serverKey, msg.levelKey);
-				
-				if (keyedLevel != null) {
-					AbstractDhWorld world = SharedApi.getAbstractDhWorld();
-					if (world != null) {
-						world.getOrLoadLevel(keyedLevel);
-					}
-				}
+				IServerKeyedClientLevel keyedLevel = KEYED_CLIENT_LEVEL_MANAGER.setServerKeyedLevel(clientLevel, msg.serverKey, msg.levelKey);
+				this.levelLoadHandler.accept(keyedLevel);
 			}
 		});
 	}
@@ -19,10 +19,13 @@

 package com.seibel.distanthorizons.core.api.internal;

+import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiLevelLoadEvent;
+import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiLevelUnloadEvent;
 import com.seibel.distanthorizons.core.network.messages.AbstractNetworkMessage;
 import com.seibel.distanthorizons.core.network.messages.MessageRegistry;
 import com.seibel.distanthorizons.core.world.*;
 import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IServerPlayerWrapper;
+import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
@@ -74,6 +77,7 @@ public class ServerApi
 	}
 	
 	
+	
 	//==============//
 	// level events //
 	//==============//
@@ -86,6 +90,7 @@ public class ServerApi
 		if (serverWorld != null)
 		{
 			serverWorld.getOrLoadLevel(levelWrapper);
+			ApiEventInjector.INSTANCE.fireAllEvents(DhApiLevelLoadEvent.class, new DhApiLevelLoadEvent.EventParam(levelWrapper));
 		}
 	}
 	public void serverLevelUnloadEvent(IServerLevelWrapper level)
@@ -96,16 +101,19 @@ public class ServerApi
 		if (serverWorld != null)
 		{
 			serverWorld.unloadLevel(level);
+			SharedApi.INSTANCE.clearQueuedChunkUpdates();
+			ApiEventInjector.INSTANCE.fireAllEvents(DhApiLevelUnloadEvent.class, new DhApiLevelUnloadEvent.EventParam(level));
 		}
 	}
 	
 	
+	
 	//=======================//
 	// chunk modified events //
 	//=======================//
 	
-	public void serverChunkLoadEvent(IChunkWrapper chunkWrapper, ILevelWrapper level) { SharedApi.INSTANCE.applyChunkUpdate(chunkWrapper, level); }
-	public void serverChunkSaveEvent(IChunkWrapper chunkWrapper, ILevelWrapper level) { SharedApi.INSTANCE.applyChunkUpdate(chunkWrapper, level); }
+	public void serverChunkLoadEvent(IChunkWrapper chunkWrapper, ILevelWrapper level) { SharedApi.INSTANCE.applyChunkUpdate(chunkWrapper, level, false, false); }
+	public void serverChunkSaveEvent(IChunkWrapper chunkWrapper, ILevelWrapper level) { SharedApi.INSTANCE.applyChunkUpdate(chunkWrapper, level, true, false); }
 	
 	
 	
@@ -115,7 +123,7 @@ public class ServerApi
 	
 	public void serverPlayerJoinEvent(IServerPlayerWrapper player)
 	{
-		if (DhApiWorldProxy.INSTANCE.tryGetReadOnly())
+		if (DhApiWorldProxy.INSTANCE.worldLoaded() && DhApiWorldProxy.INSTANCE.getReadOnly())
 		{
 			return;
 		}
@@ -129,7 +137,7 @@ public class ServerApi
 	}
 	public void serverPlayerDisconnectEvent(IServerPlayerWrapper player)
 	{
-		if (DhApiWorldProxy.INSTANCE.tryGetReadOnly())
+		if (DhApiWorldProxy.INSTANCE.worldLoaded() && DhApiWorldProxy.INSTANCE.getReadOnly())
 		{
 			return;
 		}
@@ -143,7 +151,7 @@ public class ServerApi
 	}
 	public void serverPlayerLevelChangeEvent(IServerPlayerWrapper player, IServerLevelWrapper originLevel, IServerLevelWrapper destinationLevel)
 	{
-		if (DhApiWorldProxy.INSTANCE.tryGetReadOnly())
+		if (DhApiWorldProxy.INSTANCE.worldLoaded() && DhApiWorldProxy.INSTANCE.getReadOnly())
 		{
 			return;
 		}
@@ -163,7 +171,7 @@ public class ServerApi
 	 */
 	public void pluginMessageReceived(IServerPlayerWrapper player, @NotNull AbstractNetworkMessage message)
 	{
-		if (DhApiWorldProxy.INSTANCE.tryGetReadOnly())
+		if (DhApiWorldProxy.INSTANCE.worldLoaded() && DhApiWorldProxy.INSTANCE.getReadOnly())
 		{
 			return;
 		}
@@ -24,22 +24,27 @@ 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.api.internal.chunkUpdating.WorldChunkUpdateManager;
+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.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.RenderThreadTaskHandler;
-import com.seibel.distanthorizons.core.render.renderer.AbstractDebugWireframeRenderer;
+import com.seibel.distanthorizons.core.render.renderer.DebugRenderer;
 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;
@@ -58,81 +63,82 @@ 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 WorldChunkUpdateManager WORLD_CHUNK_UPDATE_MANAGER = WorldChunkUpdateManager.INSTANCE; // local fariable for quick access
+	public static final ChunkUpdateQueueManager CHUNK_UPDATE_QUEUE_MANAGER = new ChunkUpdateQueueManager();
+	/** 
+	 * 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 final Object worldLockObject = new Object();
+	private static int lastWorldGenTickDelta = 0;
 	
 	
 	
 	//=============//
 	// constructor //
 	//=============//
-	//region
 	
 	private SharedApi() { }
-	
-	//endregion
+	public static void init() { Initializer.init(); }
 	
 	
 	
 	//===============//
 	// 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)
 		{
-			AbstractDhWorld oldWorld = currentWorld;
-			if (oldWorld != null)
-			{
-				oldWorld.close();
-			}
-			currentWorld = newWorld;
+			oldWorld.close();
+		}
+		currentWorld = newWorld;
+		
+		// starting and stopping the DataRenderTransformer is necessary to prevent attempting to
+		// access the MC level at inappropriate times, which can cause exceptions
+		if (currentWorld != null)
+		{
+			ThreadPoolUtil.setupThreadPools();
 			
-			// starting and stopping the DataRenderTransformer is necessary to prevent attempting to
-			// access the MC level at inappropriate times, which can cause exceptions
-			if (currentWorld != null)
+			ApiEventInjector.INSTANCE.fireAllEvents(DhApiWorldLoadEvent.class, new DhApiWorldLoadEvent.EventParam());
+		}
+		else
+		{
+			ThreadPoolUtil.shutdownThreadPools();
+			DebugRenderer.clearRenderables();
+			
+			if (MC_RENDER != null)
 			{
-				ThreadPoolUtil.setupThreadPools();
-				
-				ApiEventInjector.INSTANCE.fireAllEvents(DhApiWorldLoadEvent.class, new DhApiWorldLoadEvent.EventParam());
-			}
-			else
-			{
-				ThreadPoolUtil.shutdownThreadPools();
-				
-				// 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)
-				{
-					MC_RENDER.clearTargetFrameBuffer();
-				}
-				
-				// 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
-				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();
-				
-				ApiEventInjector.INSTANCE.fireAllEvents(DhApiWorldUnloadEvent.class, new DhApiWorldUnloadEvent.EventParam());
-				
-				// fired after the unload event so API users can't change the read-only for any new worlds
-				DhApiWorldProxy.INSTANCE.setReadOnly(false, false);
+				MC_RENDER.clearTargetFrameBuffer();
 			}
+			
+			// 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();
+			
+			// recommend that the garbage collector cleans up any objects from the old world and thread pools
+			System.gc();
+			
+			ApiEventInjector.INSTANCE.fireAllEvents(DhApiWorldUnloadEvent.class, new DhApiWorldUnloadEvent.EventParam());
+			
+			// fired after the unload event so API users can't change the read-only for any new worlds
+			DhApiWorldProxy.INSTANCE.setReadOnly(false, false);
 		}
 	}
 	
@@ -147,44 +153,39 @@ 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(ILevelWrapper levelWrapper, int blockPosX, int blockPosZ)
-	{
-		ChunkUpdateQueueManager manager = WORLD_CHUNK_UPDATE_MANAGER.getByLevelWrapper(levelWrapper);
-		if (manager == null)
-		{
-			return true;
-		}
-		
-		return manager.contains(new DhChunkPos(new DhBlockPos2D(blockPosX, blockPosZ))); 
-	}
+	public static boolean isChunkAtBlockPosAlreadyUpdating(int blockPosX, int blockPosZ)
+	{ return CHUNK_UPDATE_QUEUE_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 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(); }
 	
 	
 	
-	public void applyChunkUpdate(IChunkWrapper chunkWrapper, ILevelWrapper levelWrapper)
+	/** 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, boolean newlyLoaded)
 	{
 		//===================//
 		// validation checks //
@@ -199,32 +200,32 @@ public class SharedApi
 		AbstractDhWorld dhWorld = SharedApi.getAbstractDhWorld();
 		if (dhWorld == null)
 		{
-			if (levelWrapper instanceof IClientLevelWrapper)
+			if (level 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) levelWrapper;
-				ClientApi.INSTANCE.waitingChunkByClientLevelAndPos.put(new Pair<>(clientLevel, chunkWrapper.getChunkPos()), chunkWrapper);
+				IClientLevelWrapper clientLevel = (IClientLevelWrapper) level;
+				ClientApi.INSTANCE.waitingChunkByClientLevelAndPos.replace(new Pair<>(clientLevel, chunkWrapper.getChunkPos()), chunkWrapper);
 			}
 			
 			return;
 		}
 		
 		// ignore updates if the world is read-only
-		if (DhApiWorldProxy.INSTANCE.tryGetReadOnly())
+		if (DhApiWorldProxy.INSTANCE.getReadOnly())
 		{
 			return;
 		}
 		
 		// only continue if the level is loaded
-		IDhLevel dhLevel = dhWorld.getLevel(levelWrapper);
+		IDhLevel dhLevel = dhWorld.getLevel(level);
 		if (dhLevel == null)
 		{
-			if (levelWrapper instanceof IClientLevelWrapper)
+			if (level instanceof IClientLevelWrapper)
 			{
 				// the client level isn't loaded yet
-				IClientLevelWrapper clientLevel = (IClientLevelWrapper) levelWrapper;
-				ClientApi.INSTANCE.waitingChunkByClientLevelAndPos.put(new Pair<>(clientLevel, chunkWrapper.getChunkPos()), chunkWrapper);
+				IClientLevelWrapper clientLevel = (IClientLevelWrapper) level;
+				ClientApi.INSTANCE.waitingChunkByClientLevelAndPos.replace(new Pair<>(clientLevel, chunkWrapper.getChunkPos()), chunkWrapper);
 			}
 			
 			return;
@@ -246,23 +247,21 @@ public class SharedApi
 			return;
 		}
 		
-		ChunkUpdateQueueManager chunkManager = WORLD_CHUNK_UPDATE_MANAGER.getByLevelWrapper(levelWrapper);
-		// ignore the wrong level wrapper type or
-		// if the chunk is already queued for handling
-		if (chunkManager == null 
-			|| chunkManager.contains(chunkWrapper.getChunkPos()))
+		// shouldn't normally happen, but just in case
+		if (CHUNK_UPDATE_QUEUE_MANAGER.contains(chunkWrapper.getChunkPos()))
 		{
+			// TODO this will prevent some LODs from updating across dimensions if multiple levels are loaded
 			return;
 		}
 		
 		
-		queueChunkUpdate(chunkManager, chunkWrapper, dhLevel);
+		queueChunkUpdate(chunkWrapper, dhLevel);
 	}
 	
-	private static void queueChunkUpdate(ChunkUpdateQueueManager chunkManager, IChunkWrapper chunkWrapper, IDhLevel dhLevel)
+	private static void queueChunkUpdate(IChunkWrapper chunkWrapper, IDhLevel dhLevel)
 	{
 		// return if the chunk is already queued
-		if (chunkManager.contains(chunkWrapper.getChunkPos()))
+		if (CHUNK_UPDATE_QUEUE_MANAGER.contains(chunkWrapper.getChunkPos()))
 		{
 			return;
 		}
@@ -270,16 +269,19 @@ public class SharedApi
 		
 		// add chunk update data to preUpdate queue
 		ChunkUpdateData updateData = new ChunkUpdateData(chunkWrapper, dhLevel);
-		chunkManager.addItemToPreUpdateQueue(chunkWrapper.getChunkPos(), updateData);
+		CHUNK_UPDATE_QUEUE_MANAGER.addItemToPreUpdateQueue(chunkWrapper.getChunkPos(), updateData);
 		
 		
-		// queue the next position if there are still positions to process
-		AbstractExecutorService executor = ThreadPoolUtil.getChunkToLodBuilderExecutor();
-		if (executor != null)
+		// 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(WORLD_CHUNK_UPDATE_MANAGER::processEachQueue);
+				executor.execute(SharedApi::processQueue);
 			}
 			catch (RejectedExecutionException ignore)
 			{
@@ -288,18 +290,167 @@ public class SharedApi
 		}
 	}
 	
-	//endregion
+	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) //
+		//===============================//
+		
+		processQueuedChunkPreUpdate();
+		processQueuedChunkUpdate();
+		
+		// queue the next position if there are still positions to process
+		AbstractExecutorService executor = ThreadPoolUtil.getChunkToLodBuilderExecutor();
+		if (executor != null && !CHUNK_UPDATE_QUEUE_MANAGER.isEmpty())
+		{
+			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 processQueuedChunkPreUpdate()
+	{
+		ChunkUpdateData preUpdateData = CHUNK_UPDATE_QUEUE_MANAGER.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;
+				}
+			}
+			
+			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()
+	{
+		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
+		ArrayList<IChunkWrapper> nearbyChunkList  = 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);
+		}
+		
+		CHUNK_UPDATE_QUEUE_MANAGER.queuedChunkWrapperByChunkPos.remove(updateData.chunkWrapper.getChunkPos());
+	}
+	private static 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 = CHUNK_UPDATE_QUEUE_MANAGER.tryGetChunk(neighborPos);
+					if (neighborChunk != null)
+					{
+						neighborChunkList.add(neighborChunk);
+					}
+				}
+			}
+		}
+		return neighborChunkList;
+	}
 	
 	
 	
 	//=========//
 	// F3 Menu //
 	//=========//
-	//region
 	
-	public ArrayList<String> getDebugMenuString() { return WORLD_CHUNK_UPDATE_MANAGER.getDebugMenuString(); }
-	
-	//endregion
+	public String 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);
+		
+		return "Queued chunk updates: "+"( "+preUpdatingCountStr+" + "+updatingCountStr+" )  [ "+queuedCountStr+" / "+maxUpdateCountStr+" ]";
+	}
 	
 	
 	
@@ -4,58 +4,28 @@ 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.*;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.TimeUnit;

-
-/**
- * @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)
@@ -65,15 +35,13 @@ public class ChunkUpdateQueueManager
 	/** dynamically changes based on the number of threads currently available */
 	public int maxSize = 500;
 	
-	/** used to prevent flickering */
-	public long lastMsTimeShownActiveInF3Screen = System.currentTimeMillis();
+	private static long lastOverloadedLogMessageMsTime = 0;
 	
 	
 	
 	//=============//
 	// constructor //
 	//=============//
-	//region
 	
 	public ChunkUpdateQueueManager()
 	{
@@ -81,14 +49,11 @@ public class ChunkUpdateQueueManager
 		this.preUpdateQueue = new ChunkPosQueue();
 	}
 	
-	//endregion
-	
 	
 	
 	//==================//
 	// list/set methods //
 	//==================//
-	//region
 	
 	public boolean contains(DhChunkPos pos) 
 	{ 
@@ -104,8 +69,7 @@ public class ChunkUpdateQueueManager
 		this.ignoredChunkPosSet.clear();
 	}
 	public int getQueuedCount() { return this.updateQueue.getQueuedCount() + this.preUpdateQueue.getQueuedCount(); }
-	
-	public boolean updateQueuesEmpty()
+	public boolean isEmpty()
 	{
 		return this.updateQueue.isEmpty()
 				&& this.preUpdateQueue.isEmpty();
@@ -150,14 +114,14 @@ public class ChunkUpdateQueueManager
 	{
 		// limit how often an overloaded message can be sent
 		long msBetweenLastLog = System.currentTimeMillis() - lastOverloadedLogMessageMsTime;
-		if (msBetweenLastLog >= MIN_MS_BETWEEN_OVERLOADED_LOG_MESSAGE)
+		if (msBetweenLastLog >= SharedApi.MIN_MS_BETWEEN_OVERLOADED_LOG_MESSAGE)
 		{
 			lastOverloadedLogMessageMsTime = System.currentTimeMillis();
 			
 			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 [" + this.maxSize + "] ([" + MAX_UPDATING_CHUNK_COUNT_PER_THREAD_AND_PLAYER + "] per thread+players).";
+					"\nMax queue count [" + SharedApi.CHUNK_UPDATE_QUEUE_MANAGER.maxSize + "] ([" + SharedApi.MAX_UPDATING_CHUNK_COUNT_PER_THREAD_AND_PLAYER + "] per thread+players).";
 			
 			boolean showWarningInChat = Config.Common.Logging.Warning.showUpdateQueueOverloadedChatWarning.get();
 			if (showWarningInChat)
@@ -195,180 +159,20 @@ public class ChunkUpdateQueueManager
 		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)
 	{
@@ -376,33 +180,5 @@ 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
-	
-	
 	
 }
@@ -1,190 +0,0 @@
-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
-	
-	
-	
-}
@@ -1,8 +1,7 @@
 package com.seibel.distanthorizons.core.api.internal.rendering;

 import com.seibel.distanthorizons.core.api.internal.ClientApi;
-import com.seibel.distanthorizons.core.util.math.DhMat4f;
-import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
+import com.seibel.distanthorizons.core.util.math.Mat4f;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;

 /**
@@ -12,34 +11,11 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapp
 */
 public class DhRenderState
 {
-	public DhMat4f mcModelViewMatrix = null;
-	public DhMat4f mcProjectionMatrix = null;
-	/** 
-	 * 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 Mat4f mcModelViewMatrix = null;
+	public Mat4f mcProjectionMatrix = null;
+	public float frameTime = -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;
-	
 	
 	
 	//========//
@@ -62,7 +38,7 @@ public class DhRenderState
 			errorReasons += "no Projection Matrix, ";
 		}
 		
-		if (this.partialTickTime == -1)
+		if (this.frameTime == -1)
 		{
 			errorReasons += "no Frame Time, ";
 		}
@@ -75,6 +51,13 @@ 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();
@@ -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
+	 * <br> // Note: This is not checked, so we trust that you are doing the right thing (TODO: Check it)
 	 * <br> List<T>
 	 * <br> ArrayList<T>
 	 * <br> Map<String, T>
@@ -261,6 +261,7 @@ 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;
 			}
 			
@@ -46,12 +46,6 @@ 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>
@@ -75,29 +69,11 @@ 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())
@@ -111,12 +87,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;
 		}
@@ -126,15 +102,13 @@ public class DhApiConfigValue<coreType, apiType> implements IDhApiConfigValue<ap
 		}
 	}
 	
-	@Override
 	public boolean getCanBeOverrodeByApi() { return this.configBase.getAllowApiOverride(); }
 	
-	@Override public apiType getDefaultValue() { return this.configConverter.convertToApiType(this.configBase.getDefaultValue()); }
-	@Override public apiType getMaxValue() { return this.configConverter.convertToApiType(this.configBase.getMax()); }
-	@Override public apiType getMinValue() { return this.configConverter.convertToApiType(this.configBase.getMin()); }
+	public apiType getDefaultValue() { return this.configConverter.convertToApiType(this.configBase.getDefaultValue()); }
+	public apiType getMaxValue() { return this.configConverter.convertToApiType(this.configBase.getMax()); }
+	public apiType getMinValue() { return this.configConverter.convertToApiType(this.configBase.getMin()); }
 	
 	
-	@Override
 	public void addChangeListener(Consumer<apiType> onValueChangeFunc) 
 	{
 		this.configBase.addValueChangeListener((coreValue) -> 
@@ -144,6 +118,4 @@ public class DhApiConfigValue<coreType, apiType> implements IDhApiConfigValue<ap
 		}); 
 	}
 	
-	//endregion
-	
 }
@@ -1,84 +0,0 @@
-package com.seibel.distanthorizons.core.config.eventHandlers;
-
-import com.seibel.distanthorizons.core.config.listeners.IConfigListener;
-import com.seibel.distanthorizons.core.util.TimerUtil;
-
-import java.util.Timer;
-import java.util.TimerTask;
-
-public abstract class AbstractDelayedConfigEventHandler implements IConfigListener
-{
-	public static final long DEFAULT_TIMEOUT_IN_MS = 2_000L;
-	
-	/** how long to wait in milliseconds before applying the config changes */
-	private final long timeoutInMs;
-	private Timer timer;
-	
-	
-	
-	//=============//
-	// constructor //
-	//=============//
-	//region
-	
-	public AbstractDelayedConfigEventHandler(long timeoutInMs) { this.timeoutInMs = timeoutInMs; }
-	
-	//endregion
-	
-	
-	
-	//==================//
-	// abstract methods //
-	//==================//
-	//region
-	
-	public abstract void onConfigTimeout();
-	
-	//endregion
-	
-	
-	
-	//========//
-	// events //
-	//========//
-	//region
-	
-	@Override
-	public void onConfigValueSet()
-	{
-		if (this.timeoutInMs > 0)
-		{
-			this.refreshRenderDataAfterTimeout();
-		}
-		else
-		{
-			this.onConfigTimeout();
-		}
-	}
-	
-	/** Calling this method multiple times will reset the timer */
-	private synchronized void refreshRenderDataAfterTimeout() // synchronized to prevent potential threading issues when adding/removing the timer
-	{
-		// stop the previous timer if one exists
-		if (this.timer != null)
-		{
-			this.timer.cancel();
-		}
-		
-		// create a new timer task
-		TimerTask timerTask = new TimerTask()
-		{
-			public void run()
-			{
-				AbstractDelayedConfigEventHandler.this.onConfigTimeout();
-			}
-		};
-		this.timer = TimerUtil.CreateTimer("AbstractDelayedConfigTimer");
-		this.timer.schedule(timerTask, this.timeoutInMs);
-	}
-	
-	//endregion
-	
-	
-	
-}
@@ -27,36 +27,72 @@ import com.seibel.distanthorizons.core.util.TimerUtil;
 import java.util.Timer;
 import java.util.TimerTask;

-public class ReloadLodsConfigEventHandler extends AbstractDelayedConfigEventHandler
+public class ReloadLodsConfigEventHandler implements IConfigListener
 {
 	/** 
 	 * should be used for user facing UI options
 	 * this allows the user a second to click through options before they're applied
 	 */
-	public static ReloadLodsConfigEventHandler DELAYED_INSTANCE = new ReloadLodsConfigEventHandler(AbstractDelayedConfigEventHandler.DEFAULT_TIMEOUT_IN_MS);
+	public static ReloadLodsConfigEventHandler DELAYED_INSTANCE = new ReloadLodsConfigEventHandler(2_000L);
 	/** should be used for debug options so their change can be seen instantly */
 	public static ReloadLodsConfigEventHandler INSTANT_INSTANCE = new ReloadLodsConfigEventHandler(0);
 	
+	/** how long to wait in milliseconds before applying the config changes */
+	private final long timeoutInMs;
+	private Timer cacheClearingTimer;
+	
 	
 	
 	//=============//
 	// constructor //
 	//=============//
-	//region
 	
-	public ReloadLodsConfigEventHandler(long timeoutInMs) { super(timeoutInMs); }
-	
-	//endregion
+	public ReloadLodsConfigEventHandler(long timeoutInMs)
+	{
+		this.timeoutInMs = timeoutInMs;
+	}
 	
 	
 	
 	//========//
 	// events //
 	//========//
-	//region
 	
 	@Override
-	public void onConfigTimeout()
+	public void onConfigValueSet()
+	{ 
+		if (this.timeoutInMs > 0)
+		{
+			this.refreshRenderDataAfterTimeout();
+		}
+		else
+		{
+			clearRenderDataCache();
+		}
+	}
+	
+	/** Calling this method multiple times will reset the timer */
+	private synchronized void refreshRenderDataAfterTimeout() // synchronized to prevent potential threading issues when adding/removing the timer
+	{
+		// stop the previous timer if one exists
+		if (this.cacheClearingTimer != null)
+		{
+			this.cacheClearingTimer.cancel();
+		}
+		
+		// create a new timer task
+		TimerTask timerTask = new TimerTask()
+		{
+			public void run()
+			{
+				clearRenderDataCache();
+			}
+		};
+		this.cacheClearingTimer = TimerUtil.CreateTimer("RenderCacheClearConfigTimer");
+		this.cacheClearingTimer.schedule(timerTask, this.timeoutInMs);
+	}
+	
+	private static void clearRenderDataCache()
 	{
 		IDhApiRenderProxy renderProxy = DhApi.Delayed.renderProxy;
 		if (renderProxy != null)
@@ -65,8 +101,5 @@ public class ReloadLodsConfigEventHandler extends AbstractDelayedConfigEventHand
 		}
 	}
 	
-	//endregion
-	
-	
 	
 }
@@ -1,77 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.core.config.eventHandlers;
-
-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;
-
-import java.util.Timer;
-
-public class RenderBlockCacheCsvHandler extends AbstractDelayedConfigEventHandler
-{
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
-	
-	public static RenderBlockCacheCsvHandler INSTANCE = new RenderBlockCacheCsvHandler();
-	
-	
-	
-	//=============//
- 	// constructor //
-	//=============//
-	//region
-	
-	/** private since we only ever need one handler at a time */
-	private RenderBlockCacheCsvHandler() { super(AbstractDelayedConfigEventHandler.DEFAULT_TIMEOUT_IN_MS); }
-	
-	//endregion
-	
-	
-	
-	//=================//
-	// config handling //
-	//=================//
-	//region
-	
-	@Override
-	public void onConfigTimeout()
-	{
-		IWrapperFactory wrapperFactory = SingletonInjector.INSTANCE.get(IWrapperFactory.class);
-		if (wrapperFactory != null)
-		{
-			wrapperFactory.resetCachedIgnoredBlocksSets();
-			DhApi.Delayed.renderProxy.clearRenderDataCache();
-		}
-	}
-	
-	//endregion
-	
-	
-	
-}
@@ -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.enableSsao,
+	private final ConfigPresetOptions<EDhApiQualityPreset, Boolean> ssaoEnabled = new ConfigPresetOptions<>(Config.Client.Advanced.Graphics.Ssao.enableSsao,
 			new HashMap<EDhApiQualityPreset, Boolean>()
 			{{
 				this.put(EDhApiQualityPreset.MINIMUM, false);
@@ -241,8 +241,8 @@ public class ConfigFileHandler
 		}
 		else if (entry.getTrueValue() == null)
 		{
-			// shouldn't happen, but just in case
-			throw new IllegalArgumentException("ConfigEntry [" + entry.getNameAndCategory() + "] is null, how did this happen?");
+			// TODO when can this happen?
+			throw new IllegalArgumentException("BlockBiomeWrapperPair [" + entry.getNameAndCategory() + "] is null, this may be a problem with [" + ModInfo.NAME + "]. Please contact the authors.");
 		}
 		
 		workConfig.set(entry.getNameAndCategory(), ConfigTypeConverters.attemptToConvertToString(entry.getType(), entry.getTrueValue()));
@@ -360,8 +360,7 @@ public class ConfigFileHandler
 		{
 			LOGGER.error("File creation failed at ["+this.configPath+"], error: ["+e.getMessage()+"].", e);
 			
-			// delayed MC getter since this object may be created before
-			// the singleton has been bound
+			// TODO is there a reason this is lazily gotten?
 			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);
 		}
@@ -0,0 +1,196 @@
+/*
+ *    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));
+	}
+	
+}
@@ -0,0 +1,164 @@
+/*
+ *    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);
+	}
+	
+	
+	
+}
@@ -52,17 +52,11 @@ 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);
-		
 	}
 	
 	
@@ -55,22 +55,11 @@ public class ConfigEntry<T> extends AbstractConfigBase<T>
 	@Nullable
 	private T apiValue;
 	
-	/** 
-	 * Will be null if un-set. <br> <br>
-	 * 
-	 * Some options aren't supported on all Minecraft versions,
-	 * in those cases this value will be set to override the 
-	 * config file option.
-	 */
-	@Nullable
-	private T mcVersionOverrideValue;
-	
 	
 	
 	//=============//
 	// constructor //
 	//=============//
-	//region
 	
 	private ConfigEntry(
 			EConfigEntryAppearance appearance, 
@@ -89,14 +78,11 @@ 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; }
@@ -114,22 +100,16 @@ 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);
-		}
+		this.listenerList.forEach(IConfigListener::onConfigValueSet);
 	}
 	
 	public boolean apiIsOverriding() 
@@ -137,14 +117,7 @@ public class ConfigEntry<T> extends AbstractConfigBase<T>
 		return this.allowApiOverride 
 				&& this.apiValue != null; 
 	}
-	
-	/** setting to null will allow the config to be used normally */
-	public void setMcVersionOverrideValue(@Nullable T value)
-	{ this.mcVersionOverrideValue = value; }
-	
-	public boolean mcVersionOverridePresent()
-	{ return this.mcVersionOverrideValue != null; }
-	
+		
 	/** 
 	 * Should only be used when loading the config from file. <Br>
 	 * Sets the value without informing the rest of the code (ie, it doesn't call listeners, or saving the value to file).
@@ -156,11 +129,7 @@ public class ConfigEntry<T> extends AbstractConfigBase<T>
 	public void setWithoutSaving(T newValue)
 	{
 		super.set(newValue);
-		
-		synchronized (this.listenerList)
-		{
-			this.listenerList.forEach(IConfigListener::onConfigValueSet);
-		}
+		this.listenerList.forEach(IConfigListener::onConfigValueSet);
 	}
 	@Override
 	public void set(T newValue)
@@ -172,40 +141,23 @@ public class ConfigEntry<T> extends AbstractConfigBase<T>
 	public void uiSetWithoutSaving(T newValue)
 	{
 		this.setWithoutSaving(newValue);
-		
-		synchronized (this.listenerList)
-		{
-			this.listenerList.forEach(IConfigListener::onUiModify);
-		}
+		this.listenerList.forEach(IConfigListener::onUiModify);
 	}
 	public void uiSet(T newValue)
 	{
 		this.set(newValue);
-		
-		synchronized (this.listenerList)
-		{
-			this.listenerList.forEach(IConfigListener::onUiModify);
-		}
+		this.listenerList.forEach(IConfigListener::onUiModify);
 	}
 	
-	//endregion
-	
 	
 	
 	//===============//
 	// value getters //
 	//===============//
-	//region
 	
 	@Override
 	public T get()
 	{
-		// always use the MC version specific option if defined
-		if (this.mcVersionOverrideValue != null)
-		{
-			return this.mcVersionOverrideValue;
-		}
-		
 		if (this.allowApiOverride 
 			&& this.apiValue != null)
 		{
@@ -222,14 +174,11 @@ 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)
@@ -238,38 +187,26 @@ 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) 
-	{
-		synchronized (this.listenerList)
-		{
-			this.listenerList.add(newListener);
-		}
-	}
+	public void addListener(IConfigListener newListener) { this.listenerList.add(newListener); }
 	
-	public void removeListener(IConfigListener oldListener) 
-	{
-		synchronized (this.listenerList)
-		{
-			this.listenerList.remove(oldListener);
-		}
-	}
+	//public void removeValueChangeListener(Consumer<T> onValueChangeFunc) { } // not currently implemented
+	public void removeListener(IConfigListener oldListener) { this.listenerList.remove(oldListener); }
 	
-	public void clearListeners() 
+	public void clearListeners() { this.listenerList.clear(); }
+	public ArrayList<IConfigListener> getListeners() { return this.listenerList; }
+	/** Replaces the listener list */
+	public void setListeners(ArrayList<IConfigListener> newListeners)
 	{
-		synchronized (this.listenerList)
-		{
-			this.listenerList.clear();
-		}
+		this.listenerList.clear();
+		this.listenerList.addAll(newListeners);
 	}
-	
-	//endregion
+	public void setListeners(IConfigListener... newListeners) { this.listenerList.addAll(Arrays.asList(newListeners)); }
 	
 	
 	
 	//====================//
 	// 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); }
@@ -320,31 +257,22 @@ 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) 
 	{
@@ -366,14 +294,11 @@ public class ConfigEntry<T> extends AbstractConfigBase<T>
 		}
 	}
 	
-	//endregion
-	
 	
 	
 	//=========//
 	// builder //
 	//=========//
-	//region
 	
 	public static class Builder<T> extends AbstractConfigBase.Builder<T, Builder<T>>
 	{
@@ -472,8 +397,4 @@ public class ConfigEntry<T> extends AbstractConfigBase<T>
 		
 	}
 	
-	//endregion
-	
-	
-	
 }
@@ -2,9 +2,11 @@ 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;

@@ -119,9 +121,9 @@ public class BlockBiomeWrapperPair
 	
 	
 	
-	//=============//
-	// serializing //
-	//=============//
+	//=================//
+	// (de)serializing //
+	//=================//
 	
 	public String serialize() 
 	{
@@ -133,6 +135,17 @@ 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);
+	}
 	
 }
@@ -20,42 +20,37 @@
 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;

 /**
- * Used to map a numerical IDs to a Biome/BlockState pair. <br>
- * Note: This is not thread safe. <br>
+ * WARNING: This is not THREAD-SAFE! <br><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
@@ -80,18 +75,14 @@ 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; }
@@ -122,14 +113,11 @@ public class FullDataPointIdMap
 	
 	public long getPos() { return this.pos; }
 	
-	//endregion
-	
 	
 	
 	//=========//
 	// setters //
 	//=========//
-	//region
 	
 	/**
 	 * If an entry with the given values already exists nothing will
@@ -227,14 +215,11 @@ 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
@@ -264,9 +249,8 @@ public class FullDataPointIdMap
 		}
 	}
 	
-	/** Clears and populates the given {@link FullDataPointIdMap} from the given UTF formatted stream */
-	public static void deserialize(@NotNull FullDataPointIdMap map, DhDataInputStream inputStream, long pos, ILevelWrapper levelWrapper) 
-		throws IOException, InterruptedException, DataCorruptedException
+	/** Creates a new IdBiomeBlockStateMap from the given UTF formatted stream */
+	public static FullDataPointIdMap deserialize(DhDataInputStream inputStream, long pos, ILevelWrapper levelWrapper) throws IOException, InterruptedException, DataCorruptedException
 	{
 		int entityCount = inputStream.readInt();
 		if (entityCount < 0)
@@ -274,140 +258,52 @@ 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<>();
 		
-		try(PhantomArrayListCheckout checkout = ARRAY_LIST_POOL.checkoutArrays(0, 0, 0, 3))
+		FullDataPointIdMap newMap = new FullDataPointIdMap(pos);
+		for (int i = 0; i < entityCount; i++)
 		{
-			for (int i = 0; i < entityCount; i++)
+			// necessary to prevent issues with deserializing objects after the level has been closed
+			if (Thread.interrupted())
 			{
-				// necessary to prevent issues with deserializing objects after the level has been closed
-				if (Thread.interrupted())
-				{
-					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);
-				
-				
-				if (RUN_SERIALIZATION_DUPLICATE_VALIDATION)
-				{
-					String entryString = StringPool.INSTANCE.getPooledString(fullCharList); 
-					if (dataPointEntryBySerialization.containsKey(entryString))
-					{
-						LOGGER.error("Duplicate deserialized entry found with serial: " + entryString);
-					}
-					if (dataPointEntryBySerialization.containsValue(newPair))
-					{
-						LOGGER.error("Duplicate deserialized entry found with value: " + newPair.serialize());
-					}
-					dataPointEntryBySerialization.put(entryString, newPair);
-				}
-			}
-		}
-		
-		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 ["+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;
+				throw new InterruptedException("[" + FullDataPointIdMap.class.getSimpleName() + "] deserializing interrupted.");
 			}
 			
-			if (separatorFound
-				&& separatorIndex == FullDataPointIdMap.BLOCK_STATE_SEPARATOR_STRING.length())
+			
+			String entryString = inputStream.readUTF();
+			BlockBiomeWrapperPair newPair = BlockBiomeWrapperPair.deserialize(entryString, levelWrapper);
+			newMap.blockBiomePairList.add(newPair);
+			
+			if (RUN_SERIALIZATION_DUPLICATE_VALIDATION)
 			{
-				break;
+				if (dataPointEntryBySerialization.containsKey(entryString))
+				{
+					LOGGER.error("Duplicate deserialized entry found with serial: " + entryString);
+				}
+				if (dataPointEntryBySerialization.containsValue(newPair))
+				{
+					LOGGER.error("Duplicate deserialized entry found with value: " + newPair.serialize());
+				}
+				dataPointEntryBySerialization.put(entryString, newPair);
 			}
 		}
 		
-		
-		if (foundStartIndex == -1)
+		if (newMap.size() != entityCount)
 		{
-			throw new DataCorruptedException("Failed to deserialize BiomeBlockStateEntry ["+input.toString()+"], unable to find separator.");
+			// 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()+"]");
 		}
 		
-		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));
-		}
+		return newMap;
 	}
 	
-	//endregion
-	
 	
 	
 	//===========//
 	// overrides //
 	//===========//
-	//region
-	
-	@Override 
-	public String toString() { return DhSectionPos.toString(this.pos) + " size: " + this.blockBiomePairList.size(); }
 	
 	@Override
 	public boolean equals(Object other)
@@ -443,8 +339,6 @@ public class FullDataPointIdMap
 		this.cachedHashCode = result;
 	}
 	
-	//endregion
-	
 	
 	
 }
@@ -166,7 +166,8 @@ public class FullDataSourceV1
 		this.setDataPoints(dataPoints);
 		
 		
-		this.readIdMappings(this.mapping, inputStream, level.getLevelWrapper());
+		FullDataPointIdMap mapping = this.readIdMappings(inputStream, level.getLevelWrapper());
+		this.setIdMapping(mapping);
 		
 	}
 	
@@ -346,7 +347,7 @@ public class FullDataSourceV1
 		outputStream.writeInt(DATA_GUARD_BYTE);
 		this.mapping.serialize(outputStream);
 	}
-	public void readIdMappings(FullDataPointIdMap map, DhDataInputStream inputStream, ILevelWrapper levelWrapper) throws IOException, InterruptedException, DataCorruptedException
+	public FullDataPointIdMap readIdMappings(DhDataInputStream inputStream, ILevelWrapper levelWrapper) throws IOException, InterruptedException, DataCorruptedException
 	{
 		int guardByte = inputStream.readInt();
 		if (guardByte != DATA_GUARD_BYTE)
@@ -354,8 +355,9 @@ public class FullDataSourceV1
 			throw new IOException("Invalid data content end guard for ID mapping");
 		}
 		
-		FullDataPointIdMap.deserialize(map, inputStream, this.pos, levelWrapper);
+		return FullDataPointIdMap.deserialize(inputStream, this.pos, levelWrapper);
 	}
+	public void setIdMapping(FullDataPointIdMap mappings) { this.mapping.mergeAndReturnRemappedEntityIds(mappings); }
 	
 	
 	
@@ -31,9 +31,10 @@ 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.util.objects.pooling.AbstractPhantomArrayList;
-import com.seibel.distanthorizons.core.util.objects.pooling.PhantomArrayListCheckout;
-import com.seibel.distanthorizons.core.util.objects.pooling.PhantomArrayListPool;
+import com.seibel.distanthorizons.core.pooling.AbstractPhantomArrayList;
+import com.seibel.distanthorizons.core.pooling.PhantomArrayListCheckout;
+import com.seibel.distanthorizons.core.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;
@@ -43,7 +44,6 @@ 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,9 +78,7 @@ 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;
 	
-	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)));
+	public static final PhantomArrayListPool ARRAY_LIST_POOL = new PhantomArrayListPool("FullDataV2");
 	
 	
 	
@@ -130,7 +128,6 @@ public class FullDataSourceV2
 	//==============//
 	// constructors //
 	//==============//
-	//region
 	
 	public static FullDataSourceV2 createFromChunk(ILevelWrapper levelWrapper, IChunkWrapper chunkWrapper) { return LodDataBuilder.createFromChunk(levelWrapper, chunkWrapper); }
 	
@@ -225,7 +222,7 @@ public class FullDataSourceV2
 			byte @Nullable [] columnGenerationSteps, byte @Nullable [] columnWorldCompressionMode,
 			boolean empty)
 	{
-		super(ARRAY_LIST_POOL, 2, 0, WIDTH * WIDTH, 0);
+		super(ARRAY_LIST_POOL, 2, 0, WIDTH * WIDTH);
 		
 		LodUtil.assertTrue(data == null || data.length == WIDTH * WIDTH);
 		
@@ -277,14 +274,11 @@ public class FullDataSourceV2
 		}
 	}
 	
-	//endregion
-	
 	
 	
 	//=========//
 	// getters //
 	//=========//
-	//region
 	
 	public LongArrayList getColumnAtRelPos(int relX, int relZ) throws IndexOutOfBoundsException 
 	{ return this.dataPoints[relativePosToIndex(relX, relZ)]; }
@@ -307,11 +301,16 @@ public class FullDataSourceV2
 	 */
 	public long getDataPointAtBlockPos(int blockPosX, int blockPosY, int blockPosZ, int levelMinY)
 	{
-		long requestedPos = DhSectionPos.encode(LodUtil.BLOCK_DETAIL_LEVEL, blockPosX, blockPosZ);
+		DhLodPos requestedPos = new DhLodPos(LodUtil.BLOCK_DETAIL_LEVEL, blockPosX, blockPosZ);
 		
 		// stop if the requested blockPos is outside this datasource
 		{
-			long sectionPos =  DhSectionPos.encodeContaining(DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL, new DhBlockPos(blockPosX, blockPosY, blockPosZ));
+			// get the detail levels for this request
+			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;
@@ -321,10 +320,10 @@ public class FullDataSourceV2
 		
 		// get the relative data source position
 		byte requestDetailLevel = (byte) (DhSectionPos.getDetailLevel(this.pos) - DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL);
-		long relativePos = DhSectionPos.getDhSectionRelativePositionForDetailLevel(requestedPos, requestDetailLevel);
+		DhLodPos relativePos = requestedPos.getDhSectionRelativePositionForDetailLevel(requestDetailLevel);
 		
 		// get the data column
-		LongArrayList dataColumn = this.getColumnAtRelPos(DhSectionPos.getX(relativePos), DhSectionPos.getZ(relativePos));
+		LongArrayList dataColumn = this.getColumnAtRelPos(relativePos.x, relativePos.z);
 		if (dataColumn == null)
 		{
 			return FullDataPointUtil.EMPTY_DATA_POINT;
@@ -362,14 +361,11 @@ public class FullDataSourceV2
 		return FullDataPointUtil.EMPTY_DATA_POINT;
 	}
 	
-	//endregion
-	
 	
 	
 	//==========//
 	// updating //
 	//==========//
-	//region
 	
 	public boolean updateFromDataSource(@NotNull FullDataSourceV2 inputDataSource)
 	{
@@ -443,8 +439,6 @@ public class FullDataSourceV2
 		}
 		
 		
-		// needed to prevent infinite mapped ID growth
-		this.removeUnusedIdsAndRemap();
 		
 		
 		
@@ -682,13 +676,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++)
 		{
@@ -707,6 +701,7 @@ 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++)
 		{
@@ -782,7 +777,7 @@ public class FullDataSourceV2
 			return newColumnList;
 		}
 		
-		// sort the transitions from bottom to top
+		// sort the transitions from bottom to top // TODO
 		yTransitions.sort(null);
 		
 		// create index trackers for each column, 
@@ -1134,76 +1129,11 @@ 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)
@@ -1232,13 +1162,10 @@ public class FullDataSourceV2
 		}
 	}
 	
-	//endregion
-	
 	
 	//================//
 	// helper methods //
 	//================//
-	//region
 	
 	/** 
 	 * Usually this should just be used internally, but there may be instances
@@ -1330,14 +1257,11 @@ public class FullDataSourceV2
 		}
 	}
 	
-	//endregion
-	
 	
 	
 	//=====================//
 	// setters and getters //
 	//=====================//
-	//region
 	
 	public long getPos() { return this.pos; }
 	
@@ -1367,14 +1291,11 @@ public class FullDataSourceV2
 		}
 	}
 	
-	//endregion
-	
 	
 	
 	//=============//
 	// API methods //
 	//=============//
-	//region
 	
 	public void setRunApiSetterValidation(boolean runValidation) { this.runApiSetterValidation = runValidation; }
 	
@@ -1395,6 +1316,7 @@ public class FullDataSourceV2
 			
 			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;
@@ -1422,26 +1344,20 @@ 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); }
@@ -1488,8 +1404,6 @@ public class FullDataSourceV2
 		}
 	}
 	
-	//endregion
-	
 	
 	
 }
@@ -19,12 +19,13 @@

 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.util.objects.pooling.AbstractPhantomArrayList;
-import com.seibel.distanthorizons.core.util.objects.pooling.PhantomArrayListPool;
+import com.seibel.distanthorizons.core.pooling.AbstractPhantomArrayList;
+import com.seibel.distanthorizons.core.pooling.PhantomArrayListPool;
 import com.seibel.distanthorizons.core.pos.DhSectionPos;
-import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnRenderView;
+import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnArrayView;
+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;
@@ -45,16 +46,15 @@ public class ColumnRenderSource extends AbstractPhantomArrayList
 	
 	
 	
-	/** 
-	 * will be zero if an empty data source was created 
-	 * @see EDhApiVerticalQuality#calculateMaxNumberOfVerticalSlicesAtDetailLevel(byte) 
-	 */
-	public int maxVerticalSliceCount;
+	/** will be zero if an empty data source was created */
+	public int verticalDataCount;
 	public long pos;
 	public int yOffset;
 	
 	public final LongArrayList renderDataContainer;
 	
+	public final DebugSourceFlag[] debugSourceFlags;
+	
 	private boolean isEmpty = true;
 	
 	
@@ -62,67 +62,64 @@ public class ColumnRenderSource extends AbstractPhantomArrayList
 	//==============//
 	// constructors //
 	//==============//
-	//region
 	
-	public static ColumnRenderSource createEmpty(long pos, int maxVertSliceCount, int yOffset)
-	{ return new ColumnRenderSource(pos, maxVertSliceCount, yOffset); }
+	public static ColumnRenderSource createEmpty(long pos, int maxVerticalSize, int yOffset)
+	{ return new ColumnRenderSource(pos, maxVerticalSize, yOffset); }
 	/**
 	 * Creates an empty ColumnRenderSource.
 	 *
 	 * @param pos the relative position of the container
-	 * @param maxVertSliceCount the maximum vertical size of the container
+	 * @param maxVerticalSize the maximum vertical size of the container
 	 */
-	private ColumnRenderSource(long pos, int maxVertSliceCount, int yOffset)
+	private ColumnRenderSource(long pos, int maxVerticalSize, int yOffset)
 	{
-		super(ARRAY_LIST_POOL, 0, 0, 1, 0);
+		super(ARRAY_LIST_POOL, 0, 0, 1);
 		
 		this.pos = pos;
 		this.yOffset = yOffset;
 		
-		this.maxVerticalSliceCount = maxVertSliceCount;
+		this.verticalDataCount = maxVerticalSize;
 		
-		this.renderDataContainer = this.pooledArraysCheckout.getLongArray(0, WIDTH * WIDTH * this.maxVerticalSliceCount);
+		this.renderDataContainer = this.pooledArraysCheckout.getLongArray(0, WIDTH * WIDTH * this.verticalDataCount);
+		
+		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.maxVerticalSliceCount + posZ * this.maxVerticalSliceCount + verticalIndex); }
+	public long getDataPoint(int posX, int posZ, int verticalIndex) { return this.renderDataContainer.getLong(posX * WIDTH * this.verticalDataCount + posZ * this.verticalDataCount + verticalIndex); }
 	
-	public void populateColumnView(ColumnRenderView view, int posX, int posZ) throws IllegalArgumentException
+	public ColumnArrayView getVerticalDataPointView(int posX, int posZ)
 	{
-		int offset = posX * WIDTH * this.maxVerticalSliceCount + posZ * this.maxVerticalSliceCount;
+		int offset = posX * WIDTH * this.verticalDataCount + posZ * this.verticalDataCount;
 		
 		// don't allow returning views that are outside this render source's bounds
 		if (offset >= this.renderDataContainer.size())
 		{
-			throw new IllegalArgumentException("Column View offset ["+offset+"] greater than parent render data container ["+DhSectionPos.toString(this.pos)+"] size ["+this.renderDataContainer.size()+"].");
+			return null;
 		}
 		else if (posX < 0 || posX >= WIDTH
 				|| posZ < 0 || posZ >= WIDTH)
 		{
-			throw new IllegalArgumentException("Column View pos outside valid range ["+posX+","+posZ+"].");
+			return null;
 		}
 		
-		view.populate(
-			this.renderDataContainer, this.maxVerticalSliceCount,
-			offset, this.maxVerticalSliceCount);
+		return new ColumnArrayView(this.renderDataContainer, this.verticalDataCount,
+				offset, this.verticalDataCount);
 	}
 	
-	//endregion
+	public ColumnQuadView getFullQuadView() { return this.getQuadViewOverRange(0, 0, WIDTH, WIDTH); }
+	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; }
@@ -140,20 +137,18 @@ public class ColumnRenderSource extends AbstractPhantomArrayList
 			return false;
 		}
 		
-		try (ColumnRenderView columnView = ColumnRenderView.getPooled())
+		
+		for (int x = 0; x < WIDTH; x++)
 		{
-			for (int x = 0; x < WIDTH; x++)
+			for (int z = 0; z < WIDTH; z++)
 			{
-				for (int z = 0; z < WIDTH; z++)
+				ColumnArrayView columnArrayView = this.getVerticalDataPointView(x,z);
+				for (int i = 0; i < columnArrayView.size; i++)
 				{
-					this.populateColumnView(columnView, x, z);
-					for (int i = 0; i < columnView.size; i++)
+					long dataPoint = columnArrayView.get(i);
+					if (!RenderDataPointUtil.hasZeroHeight(dataPoint))
 					{
-						long dataPoint = columnView.get(i);
-						if (!RenderDataPointUtil.hasZeroHeight(dataPoint))
-						{
-							return true;
-						}
+						return true;
 					}
 				}
 			}
@@ -162,14 +157,31 @@ 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()
@@ -187,11 +199,11 @@ public class ColumnRenderSource extends AbstractPhantomArrayList
 		{
 			for (int x = 0; x < size; x++)
 			{
-				for (int y = 0; y < this.maxVerticalSliceCount; y++)
+				for (int y = 0; y < this.verticalDataCount; y++)
 				{
 					//Converting the dataToHex
 					stringBuilder.append(Long.toHexString(this.getDataPoint(x, z, y)));
-					if (y != this.maxVerticalSliceCount - 1)
+					if (y != this.verticalDataCount - 1)
 						stringBuilder.append(SUBDATA_DELIMITER);
 				}
 				
@@ -205,8 +217,21 @@ 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; }
+	}
 	
 }
@@ -41,102 +41,104 @@ public final class BufferQuad
 	public static final int MAX_QUAD_WIDTH_FOR_EARTH_CURVATURE = LodUtil.CHUNK_WIDTH;
 	
 	
-	public short x;
-	public short y;
-	public short z;
+	public final short x;
+	public final short y;
+	public final short z;
 	
 	public short widthEastWest;
 	/** This is both North/South and Up/Down since the merging logic is the same either way */
-	public short widthNorthSouthOrHeight;
+	public short widthNorthSouthOrUpDown;
 	
-	public int color;
+	public final int color;
 	/** used by the Iris shader mod to determine how each LOD should be rendered */
-	public byte irisBlockMaterialId;
+	public final byte irisBlockMaterialId;
 	
-	public byte skyLight;
-	public byte blockLight;
-	public EDhDirection direction;
+	public final byte skyLight;
+	public final byte blockLight;
+	public final EDhDirection direction;
 	
 	public boolean hasError = false;
 	
-	// Pre-computed sort keys to avoid recomputing on every comparison
-	// Slight increase in memory for reduction in cpu usage
-	public long sortKeyEastWest;
-	public long sortKeyNorthSouth;
 	
 	
-	
-	//=============//
-	// constructor //
-	//=============//
-	//region
-	
-	public BufferQuad() {}
-	
-	public void set(short x, short y, short z, short widthEastWest, short widthNorthSouthOrHeight,
-		int color, byte irisBlockMaterialId, byte skylight, byte blockLight,
-		EDhDirection direction)
+	BufferQuad(
+			short x, short y, short z, short widthEastWest, short widthNorthSouthOrUpDown,
+			int color, byte irisBlockMaterialId, byte skylight, byte blockLight,
+			EDhDirection direction)
 	{
-		if (widthEastWest == 0 || widthNorthSouthOrHeight == 0)
-		{
+		if (widthEastWest == 0 || widthNorthSouthOrUpDown == 0)
 			throw new IllegalArgumentException("Size 0 quad!");
-		}
-		
-		if (widthEastWest < 0 || widthNorthSouthOrHeight < 0)
-		{
+		if (widthEastWest < 0 || widthNorthSouthOrUpDown < 0)
 			throw new IllegalArgumentException("Negative sized quad!");
-		}
 		
 		this.x = x;
 		this.y = y;
 		this.z = z;
 		this.widthEastWest = widthEastWest;
-		this.widthNorthSouthOrHeight = widthNorthSouthOrHeight;
+		this.widthNorthSouthOrUpDown = widthNorthSouthOrUpDown;
 		this.color = color;
 		this.irisBlockMaterialId = irisBlockMaterialId;
 		this.skyLight = skylight;
 		this.blockLight = blockLight;
 		this.direction = direction;
-		this.sortKeyEastWest = computeSortKey(direction, true);
-		this.sortKeyNorthSouth = computeSortKey(direction, false);
 	}
-	private long computeSortKey(EDhDirection dir, boolean eastWest)
+	
+	
+	
+	/** a rough but fast calculation */
+	double calculateDistance(double relativeX, double relativeY, double relativeZ)
 	{
-		if (eastWest)
-		{
-			switch (dir.axis)
-			{
-				case X: return (long) x << 48 | (long) y << 32 | (long) z << 16;
-				case Y: return (long) y << 48 | (long) z << 32 | (long) x << 16;
-				case Z: return (long) z << 48 | (long) y << 32 | (long) x << 16;
-				default: throw new IllegalArgumentException("Invalid Axis enum: [" + dir.axis + "].");
-			}
-		}
-		else
-		{
-			switch (dir.axis)
-			{
-				case X: return (long) x << 48 | (long) z << 32 | (long) y << 16;
-				case Y: return (long) y << 48 | (long) x << 32 | (long) z << 16;
-				case Z: return (long) z << 48 | (long) x << 32 | (long) y << 16;
-				default: throw new IllegalArgumentException("Invalid Axis enum: [" + dir.axis + "].");
-			}
-		}
+		return Math.pow(relativeX - this.x, 2) + Math.pow(relativeY - this.y, 2) + Math.pow(relativeZ - this.z, 2);
 	}
 	
-	//endregion
-	
-	
-	
-	/** compares this quad's position to the given quad using pre-computed sort keys */
+	/** compares this quad's position to the given quad */
 	public int compare(BufferQuad quad, BufferMergeDirectionEnum compareDirection)
 	{
 		if (this.direction != quad.direction)
 			throw new IllegalArgumentException("The other quad is not in the same direction: " + quad.direction + " vs " + this.direction);
 		
-		return compareDirection == BufferMergeDirectionEnum.EastWest
-			? Long.compare(this.sortKeyEastWest, quad.sortKeyEastWest)
-			: Long.compare(this.sortKeyNorthSouth, quad.sortKeyNorthSouth);
+		if (compareDirection == BufferMergeDirectionEnum.EastWest)
+		{
+			switch (this.direction.axis)
+			{
+				case X:
+					return threeDimensionalCompare(this.x, this.y, this.z, quad.x, quad.y, quad.z);
+				case Y:
+					return threeDimensionalCompare(this.y, this.z, this.x, quad.y, quad.z, quad.x);
+				case Z:
+					return threeDimensionalCompare(this.z, this.y, this.x, quad.z, quad.y, quad.x);
+				
+				default:
+					throw new IllegalArgumentException("Invalid Axis enum: [" + this.direction.axis + "].");
+			}
+		}
+		else
+		{
+			switch (this.direction.axis)
+			{
+				case X:
+					return threeDimensionalCompare(this.x, this.z, this.y, quad.x, quad.z, quad.y);
+				case Y:
+					return threeDimensionalCompare(this.y, this.x, this.z, quad.y, quad.x, quad.z);
+				case Z:
+					return threeDimensionalCompare(this.z, this.x, this.y, quad.z, quad.x, quad.y);
+				
+				default:
+					throw new IllegalArgumentException("Invalid Axis enum: [" + this.direction.axis + "].");
+			}
+		}
+	}
+	/**
+	 * Compares two 3D points A and B. <br>
+	 * The X, Y, and Z coordinates can be passed into parameters 0, 1, and 2 in any order
+	 * provided they are in the same order for both A and B. <br>
+	 * With the 0th parameter being the most significant when comparing.
+	 */
+	private static int threeDimensionalCompare(short a0, short a1, short a2, short b0, short b1, short b2)
+	{
+		long a = (long) a0 << 48 | (long) a1 << 32 | (long) a2 << 16;
+		long b = (long) b0 << 48 | (long) b1 << 32 | (long) b2 << 16;
+		return Long.compare(a, b);
 	}
 	
 	
@@ -148,15 +150,11 @@ public final class BufferQuad
 	public boolean tryMerge(BufferQuad quad, BufferMergeDirectionEnum mergeDirection)
 	{
 		if (quad.hasError || this.hasError)
-		{
 			return false;
-		}
 		
 		// only merge quads that are in the same direction
 		if (this.direction != quad.direction)
-		{
 			return false;
-		}
 		
 		// make sure these quads share the same perpendicular axis
 		if ((mergeDirection == BufferMergeDirectionEnum.EastWest && this.y != quad.y)
@@ -173,6 +171,7 @@ public final class BufferQuad
 		short otherParallelCompareStartPos;
 		switch (this.direction.axis)
 		{
+			default: // shouldn't normally happen, just here to make the compiler happy
 			case X:
 				if (mergeDirection == BufferMergeDirectionEnum.EastWest)
 				{
@@ -229,9 +228,6 @@ public final class BufferQuad
 					otherParallelCompareStartPos = quad.z;
 				}
 				break;
-			
-			default: // shouldn't normally happen, just here to make the compiler happy
-				throw new IllegalArgumentException("Unsupported axis: ["+this.direction.axis+"]");
 		}
 		
 		// get the width of this quad in the relevant axis
@@ -242,17 +238,17 @@ public final class BufferQuad
 		if (mergeDirection == BufferMergeDirectionEnum.EastWest)
 		{
 			thisPerpendicularCompareWidth = this.widthEastWest;
-			thisParallelCompareWidth = this.widthNorthSouthOrHeight;
+			thisParallelCompareWidth = this.widthNorthSouthOrUpDown;
 			
 			otherPerpendicularCompareWidth = quad.widthEastWest;
-			otherParallelCompareWidth = quad.widthNorthSouthOrHeight;
+			otherParallelCompareWidth = quad.widthNorthSouthOrUpDown;
 		}
 		else
 		{
-			thisPerpendicularCompareWidth = this.widthNorthSouthOrHeight;
+			thisPerpendicularCompareWidth = this.widthNorthSouthOrUpDown;
 			thisParallelCompareWidth = this.widthEastWest;
 			
-			otherPerpendicularCompareWidth = quad.widthNorthSouthOrHeight;
+			otherPerpendicularCompareWidth = quad.widthNorthSouthOrUpDown;
 			otherParallelCompareWidth = quad.widthEastWest;
 		}
 		
@@ -322,7 +318,7 @@ public final class BufferQuad
 		// merge the two quads
 		if (mergeDirection == BufferMergeDirectionEnum.NorthSouthOrUpDown)
 		{
-			this.widthNorthSouthOrHeight += quad.widthNorthSouthOrHeight;
+			this.widthNorthSouthOrUpDown += quad.widthNorthSouthOrUpDown;
 		}
 		else // if (mergeDirection == MergeDirection.EastWest)
 		{
@@ -333,6 +329,4 @@ public final class BufferQuad
 		return true;
 	}
 	
-	
-	
 }
@@ -19,18 +19,16 @@

 package com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding;

-import com.seibel.distanthorizons.api.enums.rendering.EDhApiTransparency;
 import com.seibel.distanthorizons.core.config.Config;
-import com.seibel.distanthorizons.core.dataObjects.render.ColumnRenderSource;
 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.util.objects.pooling.PhantomArrayListCheckout;
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
-import com.seibel.distanthorizons.coreapi.util.ColorUtil;
+import com.seibel.distanthorizons.core.pooling.PhantomArrayListCheckout;
+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.ColumnRenderView;
+import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
+import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnArrayView;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
 import com.seibel.distanthorizons.coreapi.util.MathUtil;
 import it.unimi.dsi.fastutil.longs.LongArrayList;
@@ -54,28 +52,23 @@ public class ColumnBox
 	
 	public static void addBoxQuadsToBuilder(
 			LodQuadBuilder builder, PhantomArrayListCheckout phantomArrayCheckout, IDhClientLevel clientLevel,
-			short blockWidth, short yHeight,
+			short width, short yHeight,
 			short minX, short minY, short minZ,
 			int color, byte irisBlockMaterialId, byte skyLight, byte blockLight,
-			long topData, long bottomData, ColumnRenderView[] adjData, boolean[] isAdjDataSameDetailLevel)
+			long topData, long bottomData, ColumnArrayView[] adjData, boolean[] isAdjDataSameDetailLevel)
 	{
 		//================//
 		// variable setup //
 		//================//
 		
-		IClientLevelWrapper clientLevelWrapper = clientLevel.getClientLevelWrapper();
-		if (clientLevelWrapper == null)
-		{
-			LodUtil.assertNotReach("addBoxQuadsToBuilder getClientLevelWrapper should always succeed");
-		}
-		
-		short maxX = (short) (minX + blockWidth);
+		short maxX = (short) (minX + width);
 		short maxY = (short) (minY + yHeight);
-		short maxZ = (short) (minZ + blockWidth);
+		short maxZ = (short) (minZ + width);
 		byte skyLightTop = skyLight;
 		byte skyLightBot = RenderDataPointUtil.doesDataPointExist(bottomData) ? RenderDataPointUtil.getLightSky(bottomData) : 0;
 		
-		boolean transparencyEnabled = Config.Client.Advanced.Graphics.Quality.transparency.get() == EDhApiTransparency.COMPLETE;
+		boolean transparencyEnabled = Config.Client.Advanced.Graphics.Quality.transparency.get().transparencyEnabled;
+		boolean fakeOceanFloor = Config.Client.Advanced.Graphics.Quality.transparency.get().fakeTransparencyEnabled;
 		
 		boolean isTransparent = ColorUtil.getAlpha(color) < 255 && transparencyEnabled;
 		boolean overVoid = !RenderDataPointUtil.doesDataPointExist(bottomData);
@@ -100,6 +93,24 @@ public class ColumnBox
 		}
 		
 		
+		// fake ocean transparency
+		if (transparencyEnabled && fakeOceanFloor)
+		{
+			if (!isTransparent && isTopTransparent && RenderDataPointUtil.doesDataPointExist(topData))
+			{
+				skyLightTop = (byte) MathUtil.clamp(0, 15 - (RenderDataPointUtil.getYMax(topData) - minY), 15);
+				yHeight = (short) (RenderDataPointUtil.getYMax(topData) - minY - 1);
+			}
+			else if (isTransparent && !isBottomTransparent && RenderDataPointUtil.doesDataPointExist(bottomData))
+			{
+				minY = (short) (minY + yHeight - 1);
+				yHeight = 1;
+			}
+			
+			maxY = (short) (minY + yHeight);
+		}
+		
+		
 		
 		//==========================//
 		// add top and bottom faces //
@@ -112,7 +123,7 @@ public class ColumnBox
 					&& !isTopTransparent;
 			if (!skipTop)
 			{
-				builder.addQuadUp(minX, maxY, minZ, blockWidth, ColorUtil.applyShade(color, clientLevelWrapper.getShade(EDhDirection.UP)), irisBlockMaterialId, skyLightTop, blockLight);
+				builder.addQuadUp(minX, maxY, minZ, width, width, ColorUtil.applyShade(color, MC_RENDER.getShade(EDhDirection.UP)), irisBlockMaterialId, skyLightTop, blockLight);
 			}
 		}
 		
@@ -123,7 +134,7 @@ public class ColumnBox
 					&& !isBottomTransparent;
 			if (!skipBottom)
 			{
-				builder.addQuadDown(minX, minY, minZ, blockWidth, ColorUtil.applyShade(color, clientLevelWrapper.getShade(EDhDirection.DOWN)), irisBlockMaterialId, skyLightBot, blockLight);
+				builder.addQuadDown(minX, minY, minZ, width, width, ColorUtil.applyShade(color, MC_RENDER.getShade(EDhDirection.DOWN)), irisBlockMaterialId, skyLightBot, blockLight);
 			}
 		}
 		
@@ -135,7 +146,7 @@ public class ColumnBox
 		
 		// NORTH face
 		{
-			ColumnRenderView adjCol = adjData[EDhDirection.NORTH.compassIndex];
+			ColumnArrayView 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)
@@ -146,23 +157,23 @@ public class ColumnBox
 					builder.addQuadAdj(
 							EDhDirection.NORTH, 
 							minX, minY, minZ, 
-							blockWidth, yHeight, 
+							width, yHeight, 
 							color, irisBlockMaterialId, LodUtil.MAX_MC_LIGHT, blockLight);
 				}
 			}
 			else
 			{
 				makeAdjVerticalQuad(
-						builder, phantomArrayCheckout, clientLevelWrapper,
+						builder, phantomArrayCheckout, 
 						adjCol, adjSameDetailLevel, caveCullingMaxY, EDhDirection.NORTH, 
-						minX, minY, minZ, blockWidth, yHeight,
+						minX, minY, minZ, width, yHeight,
 						color, irisBlockMaterialId, blockLight);
 			}
 		}
 		
 		// SOUTH face
 		{
-			ColumnRenderView adjCol = adjData[EDhDirection.SOUTH.compassIndex];
+			ColumnArrayView adjCol = adjData[EDhDirection.SOUTH.compassIndex];
 			boolean adjSameDetailLevel = isAdjDataSameDetailLevel[EDhDirection.SOUTH.compassIndex];
 			if (adjCol == null)
 			{
@@ -171,23 +182,23 @@ public class ColumnBox
 					builder.addQuadAdj(
 							EDhDirection.SOUTH, 
 							minX, minY, maxZ, 
-							blockWidth, yHeight, 
+							width, yHeight, 
 							color, irisBlockMaterialId, LodUtil.MAX_MC_LIGHT, blockLight);
 				}
 			}
 			else
 			{
 				makeAdjVerticalQuad(
-						builder, phantomArrayCheckout, clientLevelWrapper,
+						builder, phantomArrayCheckout,
 						adjCol, adjSameDetailLevel, caveCullingMaxY, EDhDirection.SOUTH,
-						minX, minY, maxZ, blockWidth, yHeight,
+						minX, minY, maxZ, width, yHeight,
 						color, irisBlockMaterialId, blockLight);
 			}
 		}
 		
 		// WEST face
 		{
-			ColumnRenderView adjCol = adjData[EDhDirection.WEST.compassIndex];
+			ColumnArrayView adjCol = adjData[EDhDirection.WEST.compassIndex];
 			boolean adjSameDetailLevel = isAdjDataSameDetailLevel[EDhDirection.WEST.compassIndex];
 			if (adjCol == null)
 			{
@@ -196,23 +207,23 @@ public class ColumnBox
 					builder.addQuadAdj(
 							EDhDirection.WEST, 
 							minX, minY, minZ, 
-							blockWidth, yHeight, 
+							width, yHeight, 
 							color, irisBlockMaterialId, LodUtil.MAX_MC_LIGHT, blockLight);
 				}
 			}
 			else
 			{
 				makeAdjVerticalQuad(
-						builder, phantomArrayCheckout, clientLevelWrapper,
+						builder, phantomArrayCheckout,
 						adjCol, adjSameDetailLevel, caveCullingMaxY, EDhDirection.WEST, 
-						minX, minY, minZ, blockWidth, yHeight,
+						minX, minY, minZ, width, yHeight,
 						color, irisBlockMaterialId, blockLight);
 			}
 		}
 		
 		// EAST face
 		{
-			ColumnRenderView adjCol = adjData[EDhDirection.EAST.compassIndex];
+			ColumnArrayView adjCol = adjData[EDhDirection.EAST.compassIndex];
 			boolean adjSameDetailLevel = isAdjDataSameDetailLevel[EDhDirection.EAST.compassIndex];
 			if (adjCol == null)
 			{
@@ -221,25 +232,25 @@ public class ColumnBox
 					builder.addQuadAdj(
 							EDhDirection.EAST, 
 							maxX, minY, minZ, 
-							blockWidth, yHeight, 
+							width, yHeight, 
 							color, irisBlockMaterialId, LodUtil.MAX_MC_LIGHT, blockLight);
 				}
 			}
 			else
 			{
 				makeAdjVerticalQuad(
-						builder, phantomArrayCheckout, clientLevelWrapper,
+						builder, phantomArrayCheckout,
 						adjCol, adjSameDetailLevel, caveCullingMaxY, EDhDirection.EAST, 
-						maxX, minY, minZ, blockWidth, yHeight,
+						maxX, minY, minZ, width, yHeight,
 						color, irisBlockMaterialId, blockLight);
 			}
 		}
 	}
 	
 	private static void makeAdjVerticalQuad(
-		LodQuadBuilder builder, PhantomArrayListCheckout phantomArrayCheckout, IClientLevelWrapper clientLevelWrapper,
-		@NotNull ColumnRenderView adjColumnView, boolean adjacentIsSameDetailLevel, int caveCullingMaxY, EDhDirection direction,
-		short x, short yMin, short z, short horizontalBlockWidth, short ySize,
+		LodQuadBuilder builder, PhantomArrayListCheckout phantomArrayCheckout,
+		@NotNull ColumnArrayView adjColumnView, boolean adjacentIsSameDetailLevel, int caveCullingMaxY, EDhDirection direction,
+		short x, short yMin, short z, short horizontalWidth, short ySize,
 		int color, byte irisBlockMaterialId, byte blockLight)
 	{
 		// pooled arrays
@@ -253,12 +264,12 @@ public class ColumnBox
 		// no adjacent data //
 		//==================//
 		
-		color = ColorUtil.applyShade(color, clientLevelWrapper.getShade(direction));
+		color = ColorUtil.applyShade(color, MC_RENDER.getShade(direction));
 		
 		if (adjColumnView.size == 0
 			|| RenderDataPointUtil.hasZeroHeight(adjColumnView.get(0)))
 		{
-			builder.addQuadAdj(direction, x, yMin, z, horizontalBlockWidth, ySize, color, irisBlockMaterialId, LodUtil.MAX_MC_LIGHT, blockLight);
+			builder.addQuadAdj(direction, x, yMin, z, horizontalWidth, ySize, color, irisBlockMaterialId, LodUtil.MAX_MC_LIGHT, blockLight);
 			return;
 		}
 		
@@ -268,12 +279,12 @@ public class ColumnBox
 		// determine face visibility/light //
 		//=================================//
 		
-		boolean transparencyEnabled = Config.Client.Advanced.Graphics.Quality.transparency.get() == EDhApiTransparency.COMPLETE;
+		boolean transparencyEnabled = Config.Client.Advanced.Graphics.Quality.transparency.get().transparencyEnabled;
 		boolean inputTransparent = ColorUtil.getAlpha(color) < 255 && transparencyEnabled;
 		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));
@@ -310,34 +321,18 @@ public class ColumnBox
 			if (!adjTransparent)
 			{
 				// Adjacent is opaque
+				boolean adjacentCoversThis =
+					!adjacentIsSameDetailLevel
+						&& RenderDataPointUtil.getYMax(adjPoint) >= caveCullingMaxY
+						&&
+						(
+							(x == 0 && direction == EDhDirection.WEST)
+							|| (z == 0 && direction == EDhDirection.NORTH)
+							|| (x == 256 && direction == EDhDirection.EAST)
+							|| (z == 256 && direction == EDhDirection.SOUTH)
+						);
 				
-				// The following logic is done to provide a little bit of overdraw to
-				// prevent holes when low detail LODs are replaced by higher-detail ones
-				// when moving.
-				// If not done higher quality LODs can cause holes due to not 
-				// covering the whole face like the lower detail LODs they replaced,
-				// while still culling most LODs that are covered by other blocks.
-				
-				boolean onBorder = 
-					(direction == EDhDirection.WEST && x == 0)
-					|| (direction == EDhDirection.NORTH && z == 0)
-					|| (direction == EDhDirection.EAST && x == ((horizontalBlockWidth) * (ColumnRenderSource.WIDTH)))
-					|| (direction == EDhDirection.SOUTH && z == ((horizontalBlockWidth) * (ColumnRenderSource.WIDTH)));
-				
-				boolean isLit =
-					RenderDataPointUtil.getLightSky(adjPoint) != LodUtil.MIN_MC_LIGHT
-					|| RenderDataPointUtil.getLightBlock(adjPoint) != LodUtil.MIN_MC_LIGHT;
-				
-				// render the face if...
-				boolean useAdjLighting =
-					// we're on the border... (holes can only happen on LOD borders since faces inside an LOD will always be the same detail level)
-					onBorder
-					// ...this face has some sort of lighting... (0 light generally means the face is covered by other blocks)
-					&& isLit
-					// ...and is above the culling height
-					&& RenderDataPointUtil.getYMax(adjPoint) >= caveCullingMaxY;
-				
-				lightToApply = useAdjLighting ? adjSkyLight : SKYLIGHT_COVERED;
+				lightToApply = adjacentCoversThis ? adjSkyLight : SKYLIGHT_COVERED;
 			}
 			else
 			{
@@ -347,24 +342,13 @@ public class ColumnBox
 			
 			
 			// Apply light to the range [adjMinY, adjMaxY)
-			applyLightToRangeAndPopulateNewSgements(segments, newSegments, adjMinY, adjMaxY, lightToApply);
-			{
-				// swap references so we can use the newly populated segments
-				LongArrayList temp = segments;
-				segments = newSegments;
-				newSegments = temp;
-			}
+			applyLightToRange(segments, newSegments, adjMinY, adjMaxY, lightToApply);
 			
 			// Fill overhang area [adjMaxY, adjAboveMinY) with adjSkyLight
 			short adjAboveMinY = RenderDataPointUtil.getYMin(adjAbovePoint);
 			if (adjMaxY < adjAboveMinY)
 			{
-				applyLightToRangeAndPopulateNewSgements(segments, newSegments, adjMaxY, adjAboveMinY, adjSkyLight);
-				{
-					LongArrayList temp = segments;
-					segments = newSegments;
-					newSegments = temp;
-				}
+				applyLightToRange(segments, newSegments, adjMaxY, adjAboveMinY, adjSkyLight);
 			}
 		}
 		
@@ -380,7 +364,7 @@ public class ColumnBox
 			long segment = segments.getLong(i);
 			tryAddVerticalFaceWithSkyLightToBuilder(
 				builder, direction,
-				x, z, horizontalBlockWidth,
+				x, z, horizontalWidth,
 				color, irisBlockMaterialId, blockLight,
 				YSegmentUtil.getSkyLight(segment), inputTransparent, YSegmentUtil.getEndY(segment), YSegmentUtil.getStartY(segment)
 			);
@@ -390,11 +374,10 @@ public class ColumnBox
 	/**
 	 * Apply the new light value over the given y range,
 	 * splitting segments as needed
-	 * and putting the new segments into "newSegments"
 	 * <p>
 	 * source: claude.ai
 	 */
-	private static void applyLightToRangeAndPopulateNewSgements(
+	private static void applyLightToRange(
 			LongArrayList segments, LongArrayList newSegments, 
 			short rangeStart, short rangeEnd, 
 			byte newLight)
@@ -437,6 +420,9 @@ public class ColumnBox
 				newSegments.add(YSegmentUtil.encode(rangeEnd, endY, skyLight));
 			}
 		}
+		
+		segments.clear();
+		segments.addAll(newSegments);
 	}
 	
 	private static void tryAddVerticalFaceWithSkyLightToBuilder(
@@ -27,14 +27,15 @@ 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.util.objects.pooling.PhantomArrayListCheckout;
-import com.seibel.distanthorizons.core.util.objects.pooling.PhantomArrayListPool;
+import com.seibel.distanthorizons.core.pooling.PhantomArrayListCheckout;
+import com.seibel.distanthorizons.core.pooling.PhantomArrayListPool;
 import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos;
 import com.seibel.distanthorizons.core.pos.DhSectionPos;
-import com.seibel.distanthorizons.coreapi.util.ColorUtil;
+import com.seibel.distanthorizons.core.render.glObject.GLProxy;
+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.ColumnRenderView;
+import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnArrayView;

 import java.util.concurrent.CompletableFuture;

@@ -55,6 +56,26 @@ public class ColumnRenderBufferBuilder
 	// vbo building //
 	//==============//
 	
+	/** @link adjData should be null for adjacent sections that cross detail level boundaries */
+	public static CompletableFuture<LodBufferContainer> uploadBuffersAsync(
+			IDhClientLevel clientLevel,
+			long pos,
+			LodQuadBuilder quadBuilder
+		)
+	{
+		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);
+		uploadFuture.whenComplete((uploadedBuffer, exception) -> 
+		{
+			// clean up if not uploaded
+			if (uploadedBuffer != null && !uploadedBuffer.buffersUploaded)
+			{
+				uploadedBuffer.close();
+			}
+		});
+		return uploadFuture;
+	}
 	public static void makeLodRenderData(
 			LodQuadBuilder quadBuilder, ColumnRenderSource renderSource, IDhClientLevel clientLevel,
 			ColumnRenderSource[] adjRegions, boolean[] isSameDetailLevel)
@@ -87,36 +108,24 @@ public class ColumnRenderBufferBuilder
 		//===================//
 		
 		// pooled arrays for ColumnBox use
-		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())
+		try (PhantomArrayListCheckout phantomArrayCheckout = ARRAY_LIST_POOL.checkoutArrays(0, 0, 2))
 		{
-			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++)
 				{
-					renderSource.populateColumnView(columnRenderData, relX, relZ);
-					
-					// ignore empty columns
-					if (columnRenderData.size == 0
-						|| !RenderDataPointUtil.doesDataPointExist(columnRenderData.get(0))
-						|| RenderDataPointUtil.hasZeroHeight(columnRenderData.get(0)))
+					// ignore empty/null columns
+					ColumnArrayView columnRenderData = renderSource.getVerticalDataPointView(relX, relZ);
+					if (columnRenderData.size() == 0
+							|| !RenderDataPointUtil.doesDataPointExist(columnRenderData.get(0))
+							|| RenderDataPointUtil.hasZeroHeight(columnRenderData.get(0)))
 					{
 						continue;
 					}
 					
 					
+					
 					//=============//
 					// debug limit //
 					//=============//
@@ -143,12 +152,7 @@ public class ColumnRenderBufferBuilder
 					// get adjacent render data columns //
 					//==================================//
 					
-					// 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();
-					
+					ColumnArrayView[] adjColumnViews = new ColumnArrayView[EDhDirection.CARDINAL_COMPASS.length];
 					for (EDhDirection direction : EDhDirection.CARDINAL_COMPASS)
 					{
 						try
@@ -156,8 +160,8 @@ public class ColumnRenderBufferBuilder
 							int xAdj = relX + direction.normal.x;
 							int zAdj = relZ + direction.normal.z;
 							boolean isCrossRenderSourceBoundary =
-								(xAdj < 0 || xAdj >= ColumnRenderSource.WIDTH)
-								|| (zAdj < 0 || zAdj >= ColumnRenderSource.WIDTH);
+									(xAdj < 0 || xAdj >= ColumnRenderSource.WIDTH) ||
+											(zAdj < 0 || zAdj >= ColumnRenderSource.WIDTH);
 							
 							ColumnRenderSource adjRenderSource;
 							byte adjDetailLevel;
@@ -226,7 +230,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.");
 							}
 							
-							adjRenderSource.populateColumnView(adjColumnViews[direction.compassIndex], xAdj, zAdj);
+							adjColumnViews[direction.compassIndex] = adjRenderSource.getVerticalDataPointView(xAdj, zAdj);
 						}
 						catch (RuntimeException e)
 						{
@@ -240,14 +244,16 @@ public class ColumnRenderBufferBuilder
 					// build this render column //
 					//==========================//
 					
-					for (int i = 0; i < columnRenderData.size; i++)
+					ColumnRenderSource.DebugSourceFlag debugSourceFlag = renderSource.debugGetFlag(relX, relZ);
+					
+					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())
 						{
 							int wantedColumnIndex = Config.Client.Advanced.Debugging.ColumnBuilderDebugging.columnBuilderDebugColumnIndex.get();
 							if (wantedColumnIndex >= 0
-								&& i != wantedColumnIndex)
+									&& i != wantedColumnIndex)
 							{
 								continue;
 							}
@@ -257,21 +263,22 @@ public class ColumnRenderBufferBuilder
 						// If the data is not render-able (Void or non-existing) we stop since there is
 						// no data left in this position
 						if (RenderDataPointUtil.hasZeroHeight(data)
-							|| !RenderDataPointUtil.doesDataPointExist(data))
+								|| !RenderDataPointUtil.doesDataPointExist(data))
 						{
 							break;
 						}
 						
 						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);
+								clientLevel, phantomArrayCheckout,
+								data, topDataPoint, bottomDataPoint,
+								adjColumnViews, isSameDetailLevel,
+								thisDetailLevel, relX, relZ,
+								quadBuilder, debugSourceFlag);
 					}
+					
 				}// for z
 			}// for x
 		}// phantom checkout
@@ -281,9 +288,9 @@ public class ColumnRenderBufferBuilder
 	private static void addRenderDataPointToBuilder(
 			IDhClientLevel clientLevel, PhantomArrayListCheckout phantomArrayCheckout,
 			long renderData, long topRenderData, long bottomRenderData, 
-			ColumnRenderView[] adjColumnViews, boolean[] isSameDetailLevel,
+			ColumnArrayView[] adjColumnViews, boolean[] isSameDetailLevel,
 			byte detailLevel, int renderSourceOffsetPosX, int renderSourceOffsetPosZ, 
-			LodQuadBuilder quadBuilder)
+			LodQuadBuilder quadBuilder, ColumnRenderSource.DebugSourceFlag debugSource)
 	{
 		long sectionPos = DhSectionPos.encode(detailLevel, renderSourceOffsetPosX, renderSourceOffsetPosZ);
 		
@@ -308,13 +315,13 @@ public class ColumnRenderBufferBuilder
 		
 		int color;
 		boolean fullBright = false;
-		EDhApiDebugRendering debugging = Config.Client.Advanced.Debugging.debugRenderingColors.get();
+		EDhApiDebugRendering debugging = Config.Client.Advanced.Debugging.debugRendering.get();
 		switch (debugging)
 		{
 			case OFF:
 			{
-				float saturationMultiplier = Config.Client.Advanced.Graphics.Quality.saturationMultiplier.get();
-				float brightnessMultiplier = Config.Client.Advanced.Graphics.Quality.brightnessMultiplier.get();
+				float saturationMultiplier = Config.Client.Advanced.Graphics.Quality.saturationMultiplier.get().floatValue();
+				float brightnessMultiplier = Config.Client.Advanced.Graphics.Quality.brightnessMultiplier.get().floatValue();
 				if (saturationMultiplier == 1.0 && brightnessMultiplier == 1.0)
 				{
 					color = RenderDataPointUtil.getColor(renderData);
@@ -400,6 +407,12 @@ 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);
 		}
@@ -1,89 +0,0 @@
-package com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding;
-
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-
-public class IndexBufferBuilder
-{
-	
-	
-	//==========//
-	// building //
-	//==========//
-	//region
-	
-	public static ByteBuffer createBuffer(int quadCount)
-	{
-		int indexCount = quadCount * 6; // 2 triangles per quad
-		ByteBuffer buffer = ByteBuffer.allocateDirect(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
-	
-	
-	
-}
@@ -19,19 +19,15 @@

 package com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding;

-import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
-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.pos.DhSectionPos;
 import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos;
-import com.seibel.distanthorizons.core.render.RenderThreadTaskHandler;
-import com.seibel.distanthorizons.core.util.ExceptionUtil;
-import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
-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 com.seibel.distanthorizons.core.render.glObject.GLProxy;
+import com.seibel.distanthorizons.core.render.glObject.buffer.GLVertexBuffer;
+import com.seibel.distanthorizons.core.util.LodUtil;
+import com.seibel.distanthorizons.core.util.objects.StatsMap;
+import com.seibel.distanthorizons.api.enums.config.EDhApiGpuUploadMethod;
+import org.lwjgl.system.MemoryUtil;

 import java.nio.ByteBuffer;
 import java.util.ArrayList;
@@ -46,8 +42,12 @@ public class LodBufferContainer implements AutoCloseable
 {
 	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
-	private static final IWrapperFactory WRAPPER_FACTORY = SingletonInjector.INSTANCE.get(IWrapperFactory.class);
-	private static final AbstractDhRenderApiDefinition RENDER_DEF = SingletonInjector.INSTANCE.get(AbstractDhRenderApiDefinition.class);
+	/** number of bytes a single quad takes */
+	public static final int QUADS_BYTE_SIZE = LodUtil.LOD_VERTEX_FORMAT.getByteSize() * 4;
+	/** 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,186 +56,117 @@ public class LodBufferContainer implements AutoCloseable
 	
 	public boolean buffersUploaded = false;
 	
-	public IVertexBufferWrapper[] vboOpaqueWrappers;
-	public IVertexBufferWrapper[] vboTransparentWrappers;
+	public GLVertexBuffer[] vbos;
+	public GLVertexBuffer[] vbosTransparent;
 	
-	public ILodContainerUniformBufferWrapper uniformContainer = WRAPPER_FACTORY.createLodContainerUniformWrapper();
+	private CompletableFuture<LodBufferContainer> uploadFuture = null;
 	
 	
 	
 	//==============//
 	// constructors //
 	//==============//
-	//region
 	
-	private LodBufferContainer(long pos, DhBlockPos minCornerBlockPos)
+	public LodBufferContainer(long pos, DhBlockPos minCornerBlockPos)
 	{
 		this.pos = pos;
 		this.minCornerBlockPos = minCornerBlockPos;
-		this.vboOpaqueWrappers = new IVertexBufferWrapper[0];
-		this.vboTransparentWrappers = new IVertexBufferWrapper[0];
+		this.vbos = new GLVertexBuffer[0];
+		this.vbosTransparent = new GLVertexBuffer[0];
 	}
 	
-	//endregion
-	
 	
 	
 	//==================//
 	// buffer uploading //
 	//==================//
-	//region
 	
 	/** Should be run on a DH thread. */
-	public static CompletableFuture<LodBufferContainer> tryMakeAndUploadBuffersAsync(
-		long pos, IDhClientLevel clientLevel,
-		ArrayList<ByteBuffer> opaqueBuffers,
-		ArrayList<ByteBuffer> transparentBuffers
-	)
+	public synchronized CompletableFuture<LodBufferContainer> makeAndUploadBuffersAsync(LodQuadBuilder builder)
 	{
+		// separate variable to prevent race condition when checking null
+		CompletableFuture<LodBufferContainer> future = this.uploadFuture;
+		if (future != null)
+		{
+			// upload already in process
+			return future;
+		}
+		
 		// new upload needed
-		CompletableFuture<LodBufferContainer> future = new CompletableFuture<>();
+		future = new CompletableFuture<>();
+		this.uploadFuture = future;
 		
 		
 		
-		//================//
-		// create buffers //
-		//================//
-		//region
+		// make the buffers
+		ArrayList<ByteBuffer> opaqueBuffers = builder.makeOpaqueVertexBuffers();
+		ArrayList<ByteBuffer> transparentBuffers = builder.makeTransparentVertexBuffers();
 		
-		DhBlockPos minCornerBlockPos = new DhBlockPos(
-			DhSectionPos.getMinCornerBlockX(pos),
-			clientLevel.getLevelWrapper().getMinHeight(),
-			DhSectionPos.getMinCornerBlockZ(pos));
-		LodBufferContainer bufferContainer = new LodBufferContainer(pos, minCornerBlockPos);
-		
-		// update arrays to contain buffers
-		bufferContainer.vboOpaqueWrappers = resizeWrapperArray(bufferContainer.vboOpaqueWrappers, opaqueBuffers.size());
-		bufferContainer.vboTransparentWrappers = resizeWrapperArray(bufferContainer.vboTransparentWrappers, transparentBuffers.size());
-		
-		// create CPU index buffers if needed.
-		// 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 : bufferContainer.createIndexBuffers(opaqueBuffers);
-		@Nullable ArrayList<ByteBuffer> transparentIndexBuffers = useSingleIbo ? null : bufferContainer.createIndexBuffers(transparentBuffers);
-		
-		//endregion
+		this.vbos = resizeBuffer(this.vbos, opaqueBuffers.size());
+		this.vbosTransparent = resizeBuffer(this.vbosTransparent, transparentBuffers.size());
 		
 		
-		
-		//=============//
-		// create VBOs //
-		//=============//
-		//region	
-		
-		CompletableFuture<Void> createFuture = new CompletableFuture<Void>();
-		RenderThreadTaskHandler.INSTANCE.queueRunningOnRenderThread("LodBufferContainer Setup", () ->
+		// upload on MC's render thread
+		GLProxy.queueRunningOnRenderThread(() ->
 		{
 			try
 			{
 				// skip this event if requested
-				if (Thread.interrupted()
-					|| future.isCancelled())
+				if (Thread.interrupted() 
+					|| this.uploadFuture.isCancelled())
 				{
 					throw new InterruptedException();
 				}
 				
-				createBufferWrappers(bufferContainer.vboOpaqueWrappers, opaqueBuffers);
-				createBufferWrappers(bufferContainer.vboTransparentWrappers, transparentBuffers);
+				EDhApiGpuUploadMethod gpuUploadMethod = GLProxy.getInstance().getGpuUploadMethod();
 				
-				createFuture.complete(null);
+				// upload on the render thread
+				uploadBuffersDirect(this.vbos, opaqueBuffers, gpuUploadMethod);
+				uploadBuffersDirect(this.vbosTransparent, transparentBuffers, gpuUploadMethod);
+				this.buffersUploaded = true;
+				
+				// success
+				this.uploadFuture.complete(this);
+				this.uploadFuture = null;
+			}
+			catch (InterruptedException ignore) 
+			{
+				this.uploadFuture.complete(this);
+				this.uploadFuture = null;
 			}
 			catch (Exception e)
 			{
-				if (!ExceptionUtil.isShutdownException(e))
-				{
-					LOGGER.error("Unexpected issue creating buffers for pos: ["+DhSectionPos.toString(bufferContainer.pos)+"], error: ["+e.getMessage()+"].", e);
-				}
-
-				bufferContainer.close();
-				createFuture.completeExceptionally(e);
+				LOGGER.error("Unexpected issue uploading buffer ["+this.minCornerBlockPos +"], error: ["+e.getMessage()+"].", e);
+				
+				this.uploadFuture.completeExceptionally(e);
+				this.uploadFuture = null;
 			}
-		});
-		
-		//endregion
-		
-		
-		
-		//====================//
-		// upload VBOs to GPU //
-		//====================//
-		//region
-		
-		createFuture.exceptionally((Throwable e) ->
-		{
-			// create VBOs failed //
-			if (!ExceptionUtil.isShutdownException(e))
+			finally
 			{
-				LOGGER.error("Unexpected issue creating buffer [" + bufferContainer.minCornerBlockPos + "], error: [" + e.getMessage() + "].", e);
-			}
-			
-			bufferContainer.close();
-			future.completeExceptionally(e);
-			return null;
-		});
-		createFuture.thenRun(() ->
-		{
-			CompletableFuture<Void> opaqueFuture = uploadBuffersAsync(future, bufferContainer.vboOpaqueWrappers, opaqueBuffers, opaqueIndexBuffers);
-			CompletableFuture<Void> transparentFuture = uploadBuffersAsync(future, bufferContainer.vboTransparentWrappers, transparentBuffers, transparentIndexBuffers);
-			CompletableFuture<Void> uploadFuture = CompletableFuture.allOf(opaqueFuture, transparentFuture);
-			uploadFuture.exceptionally((Throwable e) ->
-			{
-				// upload failed //
-				if (!ExceptionUtil.isShutdownException(e))
+				// all the buffers must be manually freed to prevent memory leaks
+				
+				for (ByteBuffer buffer : opaqueBuffers)
 				{
-					LOGGER.error("Unexpected issue uploading buffer [" + bufferContainer.minCornerBlockPos + "], error: [" + e.getMessage() + "].", e);
+					MemoryUtil.memFree(buffer);
 				}
 				
-				bufferContainer.close();
-				future.completeExceptionally(e);
-				return null;
-			});
-			uploadFuture.thenRun(() ->
-			{
-				// upload success //
-				bufferContainer.buffersUploaded = true;
-				future.complete(bufferContainer);
-			});
+				for (ByteBuffer buffer : transparentBuffers)
+				{
+					MemoryUtil.memFree(buffer);
+				}
+			}
 		});
 		
-		//endregion
-		
-		
-		
 		return future;
 	}
-	
-	
-	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)
+	private static GLVertexBuffer[] resizeBuffer(GLVertexBuffer[] vbos, int newSize)
 	{
 		if (vbos.length == newSize)
 		{
 			return vbos;
 		}
 		
-		IVertexBufferWrapper[] newVbos = new IVertexBufferWrapper[newSize];
+		GLVertexBuffer[] newVbos = new GLVertexBuffer[newSize];
 		System.arraycopy(vbos, 0, newVbos, 0, Math.min(vbos.length, newSize));
 		if (newSize < vbos.length)
 		{
@@ -249,188 +180,109 @@ public class LodBufferContainer implements AutoCloseable
 		}
 		return newVbos;
 	}
-	
-	private static void createBufferWrappers(IVertexBufferWrapper[] vboWrappers, ArrayList<ByteBuffer> vertexBuffers)
+	private static void uploadBuffersDirect(
+			GLVertexBuffer[] vbos, ArrayList<ByteBuffer> byteBuffers, 
+			EDhApiGpuUploadMethod uploadMethod) throws InterruptedException
 	{
-		for (int i = 0; i < vertexBuffers.size(); i++)
-		{
-			if (i >= vboWrappers.length)
-			{
-				throw new RuntimeException("Too many vertex buffers!!");
-			}
-			
-			if (vboWrappers[i] == null)
-			{
-				vboWrappers[i] = WRAPPER_FACTORY.createVboWrapper("distantHorizons:TerrainRenderer");
-			}
-		}
-	}
-	
-	/** 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 < vertexBuffers.size(); i++)
+		for (int i = 0; i < byteBuffers.size(); i++)
 		{
-			if (vboIndex >= vboWrappers.length)
+			if (vboIndex >= vbos.length)
 			{
 				throw new RuntimeException("Too many vertex buffers!!");
 			}
 			
 			
-			
-			// final variables for use in lambdas //
-			
-			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);
-			
-			
-			final StackTraceElement[] stackTraceElements = Thread.currentThread().getStackTrace();
-			RenderThreadTaskHandler.INSTANCE.queueRunningOnRenderThread("LodBufferContainer VBO Upload", () ->
+			// get or create the VBO
+			if (vbos[vboIndex] == null)
 			{
-				try
-				{
-					// skip this event if requested
-					if (Thread.interrupted()
-						|| parentFuture.isCancelled())
-					{
-						throw new InterruptedException();
-					}
-					
-					finalVboWrapper.uploadVertexBuffer(finalVertexBuffer, finalVertexCount);
-					vertexUploadFuture.complete(null);
-				}
-				catch (Exception e)
-				{
-					LOGGER.error("Failed to upload buffer. Error: [" + e.getMessage() + "].", 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)
-					{
-						finalVboWrapper.close();
-						indexUploadFuture.completeExceptionally(e);
-					}
-				});
+				vbos[vboIndex] = new GLVertexBuffer(uploadMethod.useBufferStorage);
 			}
-			//endregion
+			GLVertexBuffer vbo = vbos[vboIndex];
 			
 			
+			ByteBuffer buffer = byteBuffers.get(i);
+			int size = buffer.limit() - buffer.position();
+			
+			try
+			{
+				vbo.bind();
+				vbo.uploadBuffer(buffer, size / LodUtil.LOD_VERTEX_FORMAT.getByteSize(), uploadMethod, FULL_SIZED_BUFFER);
+			}
+			catch (Exception e)
+			{
+				vbos[vboIndex] = null;
+				vbo.close();
+				LOGGER.error("Failed to upload buffer. Error: ["+e.getMessage()+"].", e);
+			}
 			
 			vboIndex++;
 		}
 		
-		if (vboIndex < vboWrappers.length)
+		if (vboIndex < vbos.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.vboOpaqueWrappers != null || this.vboTransparentWrappers != null; }
+	public boolean hasNonNullVbos() { return this.vbos != null || this.vbosTransparent != null; }
 	
 	/** can be used when debugging */
 	public int vboBufferCount() 
 	{
 		int count = 0;
 		
-		if (this.vboOpaqueWrappers != null)
+		if (this.vbos != null)
 		{
-			count += this.vboOpaqueWrappers.length;
+			count += this.vbos.length;
 		}
 		
-		if (this.vboTransparentWrappers != null)
+		if (this.vbosTransparent != null)
 		{
-			count += this.vboTransparentWrappers.length;
+			count += this.vbosTransparent.length;
 		}
 		
 		return count;
 	}
 	
-	//endregion
+	public boolean uploadInProgress() { return this.uploadFuture != null; }
+	
+	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.
@@ -443,33 +295,21 @@ public class LodBufferContainer implements AutoCloseable
 	{
 		this.buffersUploaded = false;
 		
-		RenderThreadTaskHandler.INSTANCE.queueRunningOnRenderThread("LodBufferContainer Close", () -> 
+		for (GLVertexBuffer buffer : this.vbos)
 		{
-			tryCloseBufferWrapperArray(this.vboOpaqueWrappers);
-			tryCloseBufferWrapperArray(this.vboTransparentWrappers);
-			
-			this.uniformContainer.close();
-		});
-	}
-	
-	private static void tryCloseBufferWrapperArray(@Nullable IVertexBufferWrapper[] bufferWrappers)
-	{
-		if (bufferWrappers != null)
-		{
-			for (int i = 0; i < bufferWrappers.length; i++)
+			if (buffer != null)
 			{
-				IVertexBufferWrapper buffer = bufferWrappers[i];
-				bufferWrappers[i] = null;
-				if (buffer != null)
-				{
-					buffer.close();
-				}
+				buffer.destroyAsync();
+			}
+		}
+		
+		for (GLVertexBuffer buffer : this.vbosTransparent)
+		{
+			if (buffer != null)
+			{
+				buffer.destroyAsync();
 			}
 		}
 	}
 	
-	//endregion
-	
-	
-	
 }
@@ -20,7 +20,6 @@
 package com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding;

 import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
 import java.util.*;

 import com.seibel.distanthorizons.api.enums.config.EDhApiGrassSideRendering;
@@ -31,97 +30,83 @@ 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.coreapi.util.ColorUtil;
+import com.seibel.distanthorizons.core.util.ColorUtil;
+import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
+import com.seibel.distanthorizons.coreapi.util.MathUtil;
+import org.lwjgl.system.MemoryUtil;

 /**
 * Used to create the quads before they are converted to render-able buffers. <br><br>
 *
 * Note: the magic number 6 you see throughout this method represents the number of sides on a cube.
 */
-public class LodQuadBuilder implements AutoCloseable
+public class LodQuadBuilder
 {
 	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	private static final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
 	
-	/** ThreadLocal is the simplest way to allow each LOD loading thread to have their own builder */
-	private static final ThreadLocal<LodQuadBuilder> THREAD_LOCAL = ThreadLocal.withInitial(LodQuadBuilder::new);
-	
-	/** 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
-				{1, 0}, // 0
-				{1, 1}, // 1
-				{0, 1}, // 2
-				{0, 0}, // 3
-			},
-			{ // DOWN
-				{0, 0}, // 0
-				{0, 1}, // 1
-				{1, 1}, // 2
-				{1, 0}, // 3
-			},
-			
-			// X,Y //
-			{ // NORTH
-				{0, 0}, // 0
-				{0, 1}, // 1
-				{1, 1}, // 2
-				
-				{1, 0}, // 3
-			},
-			{ // SOUTH
-				{1, 0}, // 0
-				{1, 1}, // 1
-				{0, 1}, // 2
-				
-				{0, 0}, // 3
-			},
-			
-			// Z,Y //
-			{ // WEST
-				{0, 0}, // 0
-				{1, 0}, // 1
-				{1, 1}, // 2
-				
-				{0, 1}, // 3
-			},
-			{ // EAST
-				{0, 1}, // 0
-				{1, 1}, // 1
-				{1, 0}, // 2
-				
-				{0, 0}, // 3
-			},
-		};
-	//endregion
-	
-	
-	
 	@SuppressWarnings("unchecked")
 	private final ArrayList<BufferQuad>[] opaqueQuads = (ArrayList<BufferQuad>[]) new ArrayList[6];
 	@SuppressWarnings("unchecked")
 	private final ArrayList<BufferQuad>[] transparentQuads = (ArrayList<BufferQuad>[]) new ArrayList[6];
 	
-	/** 
-	 * Caching the BufferQuad objects reduces overhead slightly. <br>
-	 * Caching is handled per builder (vs globally in {@link BufferQuad} itself) 
-	 * to prevent concurrency overhead.
-	 */
-	private final ArrayList<BufferQuad> bufferQuadCacheList = new ArrayList<>();
+	private final boolean doTransparency;
+	private final IClientLevelWrapper clientLevelWrapper;
 	
-	private boolean doTransparency;
-	private IClientLevelWrapper clientLevelWrapper;
+	private final EDhApiDebugRendering debugRenderingMode;
+	private final EDhApiGrassSideRendering grassSideRenderingMode;
 	
-	private EDhApiDebugRendering debugRenderingMode;
-	private EDhApiGrassSideRendering grassSideRenderingMode;
+	
+	public static final int[][][] DIRECTION_VERTEX_IBO_QUAD = new int[][][]
+			{
+					// X,Z //
+					{ // UP
+							{1, 0}, // 0
+							{1, 1}, // 1
+							{0, 1}, // 2
+							{0, 0}, // 3
+					},
+					{ // DOWN
+							{0, 0}, // 0
+							{0, 1}, // 1
+							{1, 1}, // 2
+							{1, 0}, // 3
+					},
+					
+					// X,Y //
+					{ // NORTH
+							{0, 0}, // 0
+							{0, 1}, // 1
+							{1, 1}, // 2
+							
+							{1, 0}, // 3
+					},
+					{ // SOUTH
+							{1, 0}, // 0
+							{1, 1}, // 1
+							{0, 1}, // 2
+							
+							{0, 0}, // 3
+					},
+					
+					// Z,Y //
+					{ // WEST
+							{0, 0}, // 0
+							{1, 0}, // 1
+							{1, 1}, // 2
+							
+							{0, 1}, // 3
+					},
+					{ // EAST
+							{0, 1}, // 0
+							{1, 1}, // 1
+							{1, 0}, // 2
+							
+							{0, 0}, // 3
+					},
+			};
 	
 	private int premergeCount = 0;
 	
@@ -130,48 +115,33 @@ public class LodQuadBuilder implements AutoCloseable
 	//=============//
 	// constructor //
 	//=============//
-	//region
 	
-	private LodQuadBuilder() 
+	public LodQuadBuilder(boolean doTransparency, IClientLevelWrapper clientLevelWrapper)
 	{
+		this.doTransparency = doTransparency;
 		for (int i = 0; i < 6; i++)
 		{
 			this.opaqueQuads[i] = new ArrayList<>();
 			this.transparentQuads[i] = new ArrayList<>();
 		}
-	}
-	
-	public static LodQuadBuilder getBuilder(boolean doTransparency, IClientLevelWrapper clientLevelWrapper)
-	{
-		LodQuadBuilder builder = THREAD_LOCAL.get();
-		builder.set(doTransparency, clientLevelWrapper);
-		return builder;
-	}
-	private void set(boolean doTransparency, IClientLevelWrapper clientLevelWrapper)
-	{
-		this.doTransparency = doTransparency;
 		
 		this.clientLevelWrapper = clientLevelWrapper;
 		
-		this.debugRenderingMode = Config.Client.Advanced.Debugging.debugRenderingColors.get();
+		this.debugRenderingMode = Config.Client.Advanced.Debugging.debugRendering.get();
 		this.grassSideRenderingMode = Config.Client.Advanced.Graphics.Quality.grassSideRendering.get();
 		
-		this.premergeCount = 0;
 	}
 	
-	//endregion
-	
 	
 	
 	//===========//
 	// add quads //
 	//===========//
-	//region
 	
 	public void addQuadAdj(
 			EDhDirection dir, 
 			short x, short y, short z,
-			short width, short height,
+			short widthEastWest, short widthNorthSouthOrUpDown,
 			int color, byte irisBlockMaterialId, byte skyLight, byte blockLight)
 	{
 		if (dir == EDhDirection.DOWN)
@@ -190,8 +160,7 @@ public class LodQuadBuilder implements AutoCloseable
 			quadList = this.opaqueQuads[dir.ordinal()]; 
 		}
 		
-		BufferQuad quad = this.getOrCreateBufferQuad();
-		quad.set(x, y, z, width, height, color, irisBlockMaterialId, skyLight, blockLight, dir);
+		BufferQuad quad = new BufferQuad(x, y, z, widthEastWest, widthNorthSouthOrUpDown, color, irisBlockMaterialId, skyLight, blockLight, dir);
 		if (!quadList.isEmpty()
 			&& (
 				quadList.get(quadList.size() - 1).tryMerge(quad, BufferMergeDirectionEnum.EastWest)
@@ -206,37 +175,32 @@ public class LodQuadBuilder implements AutoCloseable
 	}
 	
 	// XZ
-	public void addQuadUp(short minX, short maxY, short minZ, short blockWidth, int color, byte irisBlockMaterialId, byte skylight, byte blocklight)
+	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
 	{
 		boolean isTransparent = (this.doTransparency && ColorUtil.getAlpha(color) < 255);
 		ArrayList<BufferQuad> quadList = isTransparent 
 				? this.transparentQuads[EDhDirection.UP.ordinal()] 
 				: this.opaqueQuads[EDhDirection.UP.ordinal()];
 		
-		BufferQuad quad = this.getOrCreateBufferQuad();
-		quad.set(minX, maxY, minZ, blockWidth, blockWidth, color, irisBlockMaterialId, skylight, blocklight, EDhDirection.UP);
+		BufferQuad quad = new BufferQuad(minX, maxY, minZ, widthEastWest, widthNorthSouthOrUpDown, color, irisBlockMaterialId, skylight, blocklight, EDhDirection.UP);
 		quadList.add(quad);
 	}
 	
-	public void addQuadDown(short x, short y, short z, short blockWidth, int color, byte irisBlockMaterialId, byte skylight, byte blocklight)
+	public void addQuadDown(short x, short y, short z, short width, short wz, 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 = this.getOrCreateBufferQuad();
-		quad.set(x, y, z, blockWidth, blockWidth, color, irisBlockMaterialId, skylight, blocklight, EDhDirection.DOWN);
+		BufferQuad quad = new BufferQuad(x, y, z, width, wz, 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()
@@ -305,14 +269,11 @@ public class LodQuadBuilder implements AutoCloseable
 		return mergeCount;
 	}
 	
-	//endregion
-	
 	
 	
 	//==============//
 	// buffer setup //
 	//==============//
-	//region
 	
 	public ArrayList<ByteBuffer> makeOpaqueVertexBuffers() { return this.makeVertexBuffers(this.opaqueQuads); }
 	public ArrayList<ByteBuffer> makeTransparentVertexBuffers() { return this.makeVertexBuffers(this.transparentQuads); }
@@ -334,11 +295,9 @@ public class LodQuadBuilder implements AutoCloseable
 			{
 				// if this is the first iteration or the buffer is full, 
 				// create a new buffer
-				if (buffer == null 
-					|| buffer.remaining() < BYTES_PER_QUAD)
+				if (buffer == null || !buffer.hasRemaining())
 				{
-					buffer = ByteBuffer.allocateDirect(getMaxBufferByteSize());
-					buffer.order(ByteOrder.nativeOrder());
+					buffer = MemoryUtil.memAlloc(LodBufferContainer.FULL_SIZED_BUFFER);
 					byteBufferList.add(buffer);
 				}
 				
@@ -360,7 +319,7 @@ public class LodQuadBuilder implements AutoCloseable
 	{
 		int[][] quadBase = DIRECTION_VERTEX_IBO_QUAD[quad.direction.ordinal()];
 		short widthEastWest = quad.widthEastWest;
-		short widthNorthSouth = quad.widthNorthSouthOrHeight;
+		short widthNorthSouth = quad.widthNorthSouthOrUpDown;
 		byte normalIndex = (byte) quad.direction.ordinal();
 		EDhDirection.Axis axis = quad.direction.axis;
 		for (int i = 0; i < quadBase.length; i++)
@@ -421,7 +380,7 @@ public class LodQuadBuilder implements AutoCloseable
 								// 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, this.clientLevelWrapper.getShade(quad.direction));
+								color = ColorUtil.applyShade(color, MC_RENDER.getShade(quad.direction));
 							}
 						}
 					}
@@ -478,14 +437,11 @@ public class LodQuadBuilder implements AutoCloseable
 		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()
 	{
@@ -513,96 +469,17 @@ public class LodQuadBuilder implements AutoCloseable
 		return i;
 	}
 	
-	private static int maxBufferByteSize = -1;
-	/** 
-	 * The max number of bytes we allow for a single Vertex buffer.
-	 * If an LOD has more data than this it will be split
-	 * up into multiple buffers.
-	 */
-	public static int getMaxBufferByteSize()
+	/** Returns how many GpuBuffers will be needed to render opaque quads in this builder. */
+	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. */
+	public int getCurrentNeededTransparentVertexBufferCount()
 	{
-		if (maxBufferByteSize != -1)
+		if (!this.doTransparency)
 		{
-			return maxBufferByteSize;
+			return 0;
 		}
 		
-		// 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;
+		return MathUtil.ceilDiv(this.getCurrentTransparentQuadsCount(), LodBufferContainer.MAX_QUADS_PER_BUFFER);
 	}
 	
-	//endregion
-	
-	
-	
-	//=====================//
-	// buffer quad pooling //
-	//=====================//
-	//region
-	
-	private BufferQuad getOrCreateBufferQuad()
-	{
-		// start from the back of the list so we don't have
-		// to move the array around
-		int index = bufferQuadCacheList.size() - 1;
-		if (index < 0)
-		{
-			// cache empty, create a new object
-			return new BufferQuad();
-		}
-		
-		BufferQuad quad = bufferQuadCacheList.remove(index);
-		if (quad != null) // shouldn't happen, but just in case
-		{
-			return quad;
-		}
-		
-		return new BufferQuad();
-	}
-	
-	private static void returnQuadsToCache(ArrayList<BufferQuad> quadCache, ArrayList<BufferQuad>[] quadsToReturn)
-	{
-		for (int i = 0; i < quadsToReturn.length; i++)
-		{
-			// manual add and loop to reduce GC pressure due to addAll() doing unnecessary
-			// array copies
-			for (int j = 0; j < quadsToReturn[i].size(); j++)
-			{
-				quadCache.add(quadsToReturn[i].get(j));
-			}
-			
-			quadsToReturn[i].clear();
-		}
-	}
-	
-	//endregion
-	
-	
-	
-	//================//
-	// base overrides //
-	//================//
-	//region
-	
-	// can be used/closed multiple times
-	@Override 
-	public void close()
-	{
-		returnQuadsToCache(this.bufferQuadCacheList, this.opaqueQuads);
-		returnQuadsToCache(this.bufferQuadCacheList, this.transparentQuads);
-	}
-	
-	//endregion
-	
-	
-	
 }
@@ -0,0 +1,241 @@
+/*
+ *    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;
+	}
+	
+	
+	
+}
@@ -0,0 +1,143 @@
+/*
+ *    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);
+			}
+		}
+	}
+	
+}
@@ -1,309 +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.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
-	
-	
-	
-}
@@ -0,0 +1,59 @@
+/*
+ *    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);
+	
+}
@@ -24,24 +24,22 @@ 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.ColumnRenderView;
+import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnArrayView;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-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.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.*;
 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;
@@ -110,11 +108,11 @@ public class FullDataToRenderDataTransformer
 		final long pos = fullDataSource.getPos();
 		final byte dataDetail = fullDataSource.getDataDetailLevel();
 		
-		final int maxVertSliceCount = Config.Client.Advanced.Graphics.Quality.verticalQuality.get().calculateMaxNumberOfVerticalSlicesAtDetailLevel(fullDataSource.getDataDetailLevel());
+		final int vertSize = Config.Client.Advanced.Graphics.Quality.verticalQuality.get().calculateMaxVerticalData(fullDataSource.getDataDetailLevel());
 		
 		
 		
-		final ColumnRenderSource columnSource = ColumnRenderSource.createEmpty(pos, maxVertSliceCount, levelWrapper.getMinHeight());
+		final ColumnRenderSource columnSource = ColumnRenderSource.createEmpty(pos, vertSize, levelWrapper.getMinHeight());
 		if (fullDataSource.isEmpty)
 		{
 			return columnSource;
@@ -124,41 +122,32 @@ 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++)
 		{
-			DhBlockPosMutable mutableBlockPos = new DhBlockPosMutable();
-			for (int x = 0; x < FullDataSourceV2.WIDTH; x++)
+			for (int z = 0; z < FullDataSourceV2.WIDTH; z++)
 			{
-				for (int z = 0; z < FullDataSourceV2.WIDTH; 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,
-						// pooled references so we don't need to re-allocate/get them 4000 times per render source
-						phantomCheckout, tempExpandingColumnView, reducingList, mutableBlockPos);
-				}
+				ColumnArrayView columnArrayView = columnSource.getVerticalDataPointView(x, z);
+				LongArrayList dataColumn = fullDataSource.getColumnAtRelPos(x, z);
+				
+				updateOrReplaceRenderDataViewColumnWithFullDataColumn(
+						levelWrapper, fullDataSource, 
+						// bitshift 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);
 			}
 		}
 		
+		columnSource.fillDebugFlag(0, 0, ColumnRenderSource.WIDTH, ColumnRenderSource.WIDTH, ColumnRenderSource.DebugSourceFlag.FULL);
+		
 		return columnSource;
 	}
 	
-	/** Updates the given {@link ColumnRenderView} to match the incoming Full data {@link LongArrayList} */
+	/** Updates the given {@link ColumnArrayView} to match the incoming Full data {@link LongArrayList} */
 	public static void updateOrReplaceRenderDataViewColumnWithFullDataColumn(
 			IClientLevelWrapper levelWrapper,
 			FullDataSourceV2 fullDataSource, int blockX, int blockZ, 
-			ColumnRenderView columnArrayView, 
-			LongArrayList fullDataColumn,
-			// pooled references
-			PhantomArrayListCheckout phantomCheckout, ColumnRenderView tempExpandingColumnView, RenderDataPointReducingList reducingList, DhBlockPosMutable mutableBlockPos)
+			ColumnArrayView columnArrayView, 
+			LongArrayList fullDataColumn)
 	{
 		// we can't do anything if the full data is missing or empty
 		if (fullDataColumn == null 
@@ -168,40 +157,44 @@ public class FullDataToRenderDataTransformer
 		}
 		
 		int fullDataLength = fullDataColumn.size();
-		if (fullDataLength <= columnArrayView.maxVerticalSliceCount)
+		if (fullDataLength <= columnArrayView.verticalSize())
 		{
 			// Directly use the arrayView since it fits.
-			setRenderColumnView(levelWrapper, fullDataSource, blockX, blockZ, columnArrayView, fullDataColumn, mutableBlockPos);
+			setRenderColumnView(levelWrapper, fullDataSource, blockX, blockZ, columnArrayView, fullDataColumn);
 		}
 		else
 		{
-			LongArrayList dataArrayList = phantomCheckout.getLongArray(0, fullDataLength);
+			PhantomArrayListCheckout checkout = ARRAY_LIST_POOL.checkoutArrays(0, 0, 1);
+			LongArrayList dataArrayList = checkout.getLongArray(0, fullDataLength);
 			
-			// expand the ColumnArrayView to fit the new larger max vertical size
-			tempExpandingColumnView.populate(dataArrayList, fullDataLength, 0, fullDataLength);
-			setRenderColumnView(levelWrapper, fullDataSource, blockX, blockZ, tempExpandingColumnView, fullDataColumn, mutableBlockPos);
-			
-			columnArrayView.changeVerticalSizeFrom(tempExpandingColumnView, reducingList);
+			try
+			{
+				// expand the ColumnArrayView to fit the new larger max vertical size
+				ColumnArrayView newColumnArrayView = new ColumnArrayView(dataArrayList, fullDataLength, 0, fullDataLength);
+				setRenderColumnView(levelWrapper, fullDataSource, blockX, blockZ, newColumnArrayView, fullDataColumn);
+				
+				columnArrayView.changeVerticalSizeFrom(newColumnArrayView);
+			}
+			finally
+			{
+				ARRAY_LIST_POOL.returnCheckout(checkout);
+			}
 		}
 	}
 	private static void setRenderColumnView(
 			IClientLevelWrapper levelWrapper, FullDataSourceV2 fullDataSource,
 			int blockX, int blockZ,
-			ColumnRenderView renderColumnData, LongArrayList fullColumnData, DhBlockPosMutable mutableBlockPos)
+			ColumnArrayView renderColumnData, LongArrayList fullColumnData)
 	{
 		//===============//
 		// config values //
 		//===============//
 		
-		boolean ignoreNonCollidingBlocks = (Config.Client.Advanced.Graphics.Culling.blocksToIgnore.get() == EDhApiBlocksToAvoid.NON_COLLIDING);
-		boolean colorBelowWithAvoidedBlocks = Config.Client.Advanced.Graphics.Culling.tintWithAvoidedBlocks.get();
-		
-		final ObjectOpenHashSet<IBlockStateWrapper> blockStatesToIgnore = WRAPPER_FACTORY.getRendererIgnoredBlocks(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);
+		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);
+		HashSet<IBlockStateWrapper> caveBlockStatesToIgnore = WRAPPER_FACTORY.getRendererIgnoredCaveBlocks(levelWrapper);
 		
 		// build snow block cache if needed
 		if (snowLayerBlockStates == null)
@@ -229,7 +222,6 @@ public class FullDataToRenderDataTransformer
 		int colorToApplyToNextBlock = -1;
 		int lastColor = 0;
 		int lastBottom = -10_000;
-		IBlockStateWrapper lastBlock = null;
 		
 		int skylightToApplyToNextBlock = -1;
 		int blocklightToApplyToNextBlock = -1;
@@ -243,8 +235,7 @@ public class FullDataToRenderDataTransformer
 		
 		FullDataPointIdMap fullDataMapping = fullDataSource.mapping;
 		
-		mutableBlockPos.setX(blockX);
-		mutableBlockPos.setZ(blockZ);
+		DhBlockPosMutable mutableBlockPos = new DhBlockPosMutable(blockX, 0, blockZ);
 		
 		// goes from the top down
 		for (int fullDataIndex = 0; fullDataIndex < fullColumnData.size(); fullDataIndex++)
@@ -291,29 +282,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);
-			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)
+			boolean caveBlock = caveBlockStatesToIgnore.contains(block); // TODO caves should also ignore transparent/non-solid blocks (IE grass and plants) wthout each being defined
+			if (caveBlock)
 			{
 				if (caveCullingEnabled
-					// assume this data point is underground if it has no sky-light
-					&& skyLight == LodUtil.MIN_MC_LIGHT
-					// ignore caves above a certain height to prevent floating islands from having walls underneath them
-					&& topY < caveCullingMaxY
-					// cave culling shouldn't happen when at the top of the world
-					&& renderDataIndex != 0 && fullDataIndex != 0
-					// cave culling can't happen when at the bottom of the world
-					&& (fullDataIndex + 1) < fullColumnData.size())
+						// assume this data point is underground if it has no sky-light
+						&& skyLight == LodUtil.MIN_MC_LIGHT
+						// ignore caves above a certain height to prevent floating islands from having walls underneath them
+						&& topY < caveCullingMaxY
+						// cave culling shouldn't happen when at the top of the world
+						&& renderDataIndex != 0 && fullDataIndex != 0
+						// cave culling can't happen when at the bottom of the world
+						&& (fullDataIndex + 1) < fullColumnData.size())
 				{
 					// we need to get the next sky/block lights because
 					// the air block here will always have a light of 0/0 due to only the top of the LOD's light being saved.
@@ -321,7 +302,7 @@ public class FullDataToRenderDataTransformer
 					int nextSkyLight = FullDataPointUtil.getSkyLight(nextFullData);
 					
 					if (nextSkyLight == LodUtil.MIN_MC_LIGHT
-						&& ColorUtil.getAlpha(lastColor) == 255)
+							&& ColorUtil.getAlpha(lastColor) == 255)
 					{
 						// replace the previous block with new bottom
 						long columnData = renderColumnData.get(renderDataIndex - 1);
@@ -342,9 +323,6 @@ 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;
 			}
 			
@@ -360,68 +338,35 @@ public class FullDataToRenderDataTransformer
 				&& !block.isLiquid()
 				&& block.getOpacity() != LodUtil.BLOCK_FULLY_OPAQUE;
 			
-			// handle height reduction
-			boolean isSnowLayer = snowLayerBlockStates.contains(block);
-			boolean isWaterSurfaceReplacement = waterSurfaceReplacementBlocks.contains(block);
-			if (isSnowLayer || isWaterSurfaceReplacement)
+			// merge snow into the block below it
+			if (snowLayerBlockStates.contains(block))
 			{
-				if (isWaterSurfaceReplacement)
-				{
-					// replace the block with water
-					block = WRAPPER_FACTORY.getWaterBlockStateWrapper(levelWrapper);
-				}
-				
-				// sometimes a datapoint will be multiple blocks tall,
+				// sometimes a snow datapoint will be multiple blocks tall,
 				// in that case we just want to drop the top by 1
 				blockHeight -= 1;
 				if (blockHeight == 0)
 				{
-					// this block was entirely removed, just color the block below it
+					// this snow 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 (ignoredAlpha != 0)
+					if (ColorUtil.getAlpha(tempColor) != 0)
 					{
-						colorToApplyToNextBlock = ColorUtil.setAlpha(ignoredColor, 255);
+						colorToApplyToNextBlock = ColorUtil.setAlpha(tempColor, 255);
+						skylightToApplyToNextBlock = skyLight;
+						blocklightToApplyToNextBlock = blockLight;
 					}
 				}
 				
-				// 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;
 			}
@@ -432,37 +377,14 @@ 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
 			{
 				// use the previous block's color
 				color = colorToApplyToNextBlock;
 				colorToApplyToNextBlock = -1;
-				
-				// use the skylight override if present
-				if (skylightToApplyToNextBlock != -1)
-				{
-					skyLight = skylightToApplyToNextBlock;
-				}
-				
-				if (blocklightToApplyToNextBlock != -1)
-				{
-					blockLight = blocklightToApplyToNextBlock;
-				}
+				skyLight = skylightToApplyToNextBlock;
+				blockLight = blocklightToApplyToNextBlock;
 			}
 			
 			
@@ -491,7 +413,6 @@ public class FullDataToRenderDataTransformer
 			}
 			lastBottom = bottomY;
 			lastColor = color;
-			lastBlock = block;
 		}
 		
 		
@@ -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.)
+					// Determine lighting (we are at the height limit. There are no torches here, and sky is not obscured.) // TODO: Per face lighting someday?
 					byte blockLight = LodUtil.MIN_MC_LIGHT;
 					byte skyLight = LodUtil.MAX_MC_LIGHT;
 					
@@ -321,6 +321,8 @@ 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,
@@ -19,7 +19,7 @@

 package com.seibel.distanthorizons.core.enums;

-import com.seibel.distanthorizons.core.util.math.DhVec3i;
+import com.seibel.distanthorizons.core.util.math.Vec3i;

 /**
 * Up <Br>
@@ -32,17 +32,17 @@ import com.seibel.distanthorizons.core.util.math.DhVec3i;
 public enum EDhDirection
 {
 	/** negative Y */
-	DOWN("down", EDhDirection.AxisDirection.NEGATIVE, EDhDirection.Axis.Y, new DhVec3i(0, -1, 0), -1),
+	DOWN("down", EDhDirection.AxisDirection.NEGATIVE, EDhDirection.Axis.Y, new Vec3i(0, -1, 0), -1),
 	/** positive Y */
-	UP("up", EDhDirection.AxisDirection.POSITIVE, EDhDirection.Axis.Y, new DhVec3i(0, 1, 0), -1),
+	UP("up", EDhDirection.AxisDirection.POSITIVE, EDhDirection.Axis.Y, new Vec3i(0, 1, 0), -1),
 	/** negative Z */
-	NORTH("north", EDhDirection.AxisDirection.NEGATIVE, EDhDirection.Axis.Z, new DhVec3i(0, 0, -1), 0),
+	NORTH("north", EDhDirection.AxisDirection.NEGATIVE, EDhDirection.Axis.Z, new Vec3i(0, 0, -1), 0),
 	/** positive Z */
-	SOUTH("south", EDhDirection.AxisDirection.POSITIVE, EDhDirection.Axis.Z, new DhVec3i(0, 0, 1), 1),
+	SOUTH("south", EDhDirection.AxisDirection.POSITIVE, EDhDirection.Axis.Z, new Vec3i(0, 0, 1), 1),
 	/** negative X */
-	WEST("west", EDhDirection.AxisDirection.NEGATIVE, EDhDirection.Axis.X, new DhVec3i(-1, 0, 0), 2),
+	WEST("west", EDhDirection.AxisDirection.NEGATIVE, EDhDirection.Axis.X, new Vec3i(-1, 0, 0), 2),
 	/** positive X */
-	EAST("east", EDhDirection.AxisDirection.POSITIVE, EDhDirection.Axis.X, new DhVec3i(1, 0, 0), 3);
+	EAST("east", EDhDirection.AxisDirection.POSITIVE, EDhDirection.Axis.X, new Vec3i(1, 0, 0), 3);
 	
 	
 	/** Up, Down, West, East, North, South */
@@ -68,7 +68,7 @@ public enum EDhDirection
 	public final String name;
 	public final EDhDirection.Axis axis;
 	public final EDhDirection.AxisDirection axisDirection;
-	public final DhVec3i normal;
+	public final Vec3i normal;
 	/** -1 if not a {@link EDhDirection#CARDINAL_COMPASS} direction */
 	public final int compassIndex;
 	
@@ -78,7 +78,7 @@ public enum EDhDirection
 	// constructor //
 	//=============//
 		
-	EDhDirection(String name, EDhDirection.AxisDirection axisDirection, EDhDirection.Axis axis, DhVec3i normal, int compassIndex)
+	EDhDirection(String name, EDhDirection.AxisDirection axisDirection, EDhDirection.Axis axis, Vec3i normal, int compassIndex)
 	{
 		this.name = name;
 		this.axis = axis;
@@ -0,0 +1,286 @@
+package com.seibel.distanthorizons.core.file.fullDatafile;
+
+import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.pos.DhSectionPos;
+import com.seibel.distanthorizons.core.util.KeyedLockContainer;
+import com.seibel.distanthorizons.core.util.ThreadUtil;
+import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.jetbrains.annotations.NotNull;
+
+import java.lang.ref.WeakReference;
+import java.util.Collections;
+import java.util.Enumeration;
+import java.util.Set;
+import java.util.concurrent.*;
+import java.util.concurrent.locks.ReentrantLock;
+
+/**
+ * Used to batch together multiple data source updates that all
+ * affect the same position.
+ */
+public class DelayedFullDataSourceSaveCache implements AutoCloseable
+{
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	
+	/** 
+	 * a cache won't automatically clean itself unless we trigger it's clean method
+	 * if not done then we'd only see the cache invalidate when new inserts happen,
+	 * which causes weird behavior when placing/breaking blocks.
+	 */
+	private static final ThreadPoolExecutor BACKGROUND_CLEAN_UP_THREAD = ThreadUtil.makeSingleDaemonThreadPool("delayed save cache cleaner");
+	private static final Set<WeakReference<DelayedFullDataSourceSaveCache>> SAVE_CACHE_SET = Collections.newSetFromMap(new ConcurrentHashMap<>());
+	/** how long between clean up checks */
+	private static final int CLEANUP_CHECK_TIME_IN_MS = 1_000;
+	
+	
+	
+	private final ConcurrentHashMap<Long, DataSourceSavedTimePair> dataSourceByPosition = new ConcurrentHashMap<Long, DataSourceSavedTimePair>();
+	
+	/* don't let two threads load the same position at the same time */
+	protected final KeyedLockContainer<Long> saveLockContainer = new KeyedLockContainer<>();
+	
+	private final ISaveDataSourceFunc onSaveTimeoutAsyncFunc;
+	private final int saveDelayInMs;
+	
+	
+	
+	//=============//
+	// constructor //
+	//=============//
+	
+	static
+	{
+		BACKGROUND_CLEAN_UP_THREAD.execute(() -> runCleanupLoop());
+	}
+	
+	public DelayedFullDataSourceSaveCache(@NotNull ISaveDataSourceFunc onSaveTimeoutAsyncFunc, int saveDelayInMs)
+	{
+		this.onSaveTimeoutAsyncFunc = onSaveTimeoutAsyncFunc;
+		
+		// we can't clean items faster than the cleanup timer fires
+		if (saveDelayInMs < CLEANUP_CHECK_TIME_IN_MS)
+		{
+			LOGGER.warn("The save delay ["+saveDelayInMs+"] shouldn't be less than the cleanup check timer interval ["+CLEANUP_CHECK_TIME_IN_MS+"].");
+		}
+		this.saveDelayInMs = saveDelayInMs;
+		
+		
+		SAVE_CACHE_SET.add(new WeakReference<>(this));
+	}
+	
+	
+	
+	//==============//
+	// update queue //
+	//==============//
+	
+	/**
+	 * Writing into memory is done synchronously so inputDataSource can 
+	 * be closed after this method finishes.
+	 */
+	public void writeDataSourceToMemoryAndQueueSave(@NotNull FullDataSourceV2 inputDataSource)
+	{
+		long inputPos = inputDataSource.getPos();
+		
+		ReentrantLock lockForPos = this.saveLockContainer.getLockForPos(inputPos);
+		try
+		{
+			lockForPos.lock();
+			
+			FullDataSourceV2 memoryDataSource;
+			
+			DataSourceSavedTimePair pair = this.dataSourceByPosition.getOrDefault(inputPos, null);
+			if (pair == null)
+			{
+				// no data currently in the memory cache for this position
+				memoryDataSource = FullDataSourceV2.createEmpty(inputPos);
+				pair = new DataSourceSavedTimePair(memoryDataSource);
+				DataSourceSavedTimePair oldPair = this.dataSourceByPosition.put(inputPos, pair);
+				if (oldPair != null)
+				{
+					// shouldn't happen, but just in case
+					this.handleDataSourceRemoval(oldPair.dataSource);
+				}
+			}
+			else
+			{
+				memoryDataSource = pair.dataSource;
+			}
+			
+			// write the new data into memory
+			memoryDataSource.updateFromDataSource(inputDataSource);
+			// keep track of when the last time we saved something was
+			pair.updateLastWrittenTimestamp();
+		}
+		finally
+		{
+			lockForPos.unlock();
+		}
+	}
+	
+	/** when this method is called the datasource should no longer be in the memory cache */
+	public void handleDataSourceRemoval(@NotNull FullDataSourceV2 removedDataSource)
+	{
+		this.onSaveTimeoutAsyncFunc.saveAsync(removedDataSource)
+			.handle((voidObj, throwable) ->
+			{
+				try
+				{
+					// if this close method is fired multiple times
+					// monoliths can appear due to concurrent writing to the
+					// backend arrays
+					removedDataSource.close();
+				}
+				catch (Exception e)
+				{
+					LOGGER.error("Unable to close datasource ["+ DhSectionPos.toString(removedDataSource.getPos()) +"], error: ["+e.getMessage()+"].", e);
+				}
+				
+				return null;
+			});
+	}
+	
+	
+	
+	//==============//
+	// List methods //
+	//==============//
+	
+	public int getUnsavedCount() { return this.dataSourceByPosition.size(); }
+	
+	public void flush() { this.cleanUp(true); }
+	/** Removes everything from the memory cache and fires the {@link DelayedFullDataSourceSaveCache#onSaveTimeoutAsyncFunc} for each. */
+	public void cleanUp(boolean flushAll)
+	{
+		Enumeration<Long> keyIterator = this.dataSourceByPosition.keys();
+		while (keyIterator.hasMoreElements())
+		{
+			Long pos = keyIterator.nextElement();
+			ReentrantLock posLock = this.saveLockContainer.getLockForPos(pos);
+			try
+			{
+				posLock.lock();
+				
+				DataSourceSavedTimePair savedPair = this.dataSourceByPosition.getOrDefault(pos, null);
+				if (savedPair != null)
+				{
+					if (flushAll
+						|| savedPair.dataSourceHasTimedOut(this.saveDelayInMs))
+					{
+						this.dataSourceByPosition.remove(pos);
+						this.handleDataSourceRemoval(savedPair.dataSource);
+					}
+				}
+			}
+			finally
+			{
+				posLock.unlock();
+			}
+		}
+	}
+	
+	
+	
+	//================//
+	// static cleanup //
+	//================//
+	
+	private static void runCleanupLoop()
+	{
+		while (true)
+		{
+			try
+			{
+				try
+				{
+					Thread.sleep(CLEANUP_CHECK_TIME_IN_MS);
+				}
+				catch (InterruptedException ignore) { }
+				
+				SAVE_CACHE_SET.forEach((cacheRef) ->
+				{
+					DelayedFullDataSourceSaveCache cache = cacheRef.get();
+					if (cache == null)
+					{
+						// shouldn't be necessary, but if we forget to manually close a cache, this will prevent leaking
+						SAVE_CACHE_SET.remove(cacheRef);
+					}
+					else
+					{
+						cache.cleanUp(false);
+					}
+				});
+			}
+			catch (Exception e)
+			{
+				LOGGER.error("Unexpected error in cleanup thread: [" + e.getMessage() + "].", e);
+			}
+		}
+	}
+	
+	
+	
+	//================//
+	// base overrides //
+	//================//
+	
+	@Override
+	public void close()
+	{
+		// not the fastest way to handle removing,
+		// but we shouldn't have more than 20 or so at once
+		// so this should be just fine
+		SAVE_CACHE_SET.removeIf((cacheRef) -> 
+		{
+			DelayedFullDataSourceSaveCache cache = cacheRef.get();
+			return cache != null && cache.equals(this);
+		});
+	}
+	
+	
+	
+	//================//
+	// helper classes //
+	//================//
+	
+	@FunctionalInterface
+	public interface ISaveDataSourceFunc
+	{
+		/** called after the timeout expires */
+		CompletableFuture<Void> saveAsync(FullDataSourceV2 inputDataSource);
+	}
+	
+	/** 
+	 * used to keep track of when data sources
+	 * were written to so we can flush them once
+	 * enough time has passed.
+	 */
+	private static class DataSourceSavedTimePair
+	{
+		@NotNull
+		public final FullDataSourceV2 dataSource;
+		/** the last unix millisecond time this data source was written to */
+		public long lastWrittenDateTimeMs;
+		
+		
+		public DataSourceSavedTimePair(@NotNull FullDataSourceV2 dataSource)
+		{
+			this.dataSource = dataSource;
+			this.lastWrittenDateTimeMs = System.currentTimeMillis();
+		}
+		
+		
+		public void updateLastWrittenTimestamp()
+		{ this.lastWrittenDateTimeMs = System.currentTimeMillis(); }
+		
+		public boolean dataSourceHasTimedOut(long msTillTimeout)
+		{
+			long currentTime = System.currentTimeMillis();
+			long timeSinceUpdate = currentTime - this.lastWrittenDateTimeMs;
+			return (timeSinceUpdate > msTillTimeout);
+		}
+	}
+	
+	
+}
@@ -20,26 +20,28 @@
 package com.seibel.distanthorizons.core.file.fullDatafile;

 import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGenerationStep;
-import com.seibel.distanthorizons.core.api.internal.chunkUpdating.WorldChunkUpdateManager;
+import com.seibel.distanthorizons.core.api.internal.SharedApi;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
 import com.seibel.distanthorizons.core.file.fullDatafile.V2.FullDataSourceProviderV2;
-import com.seibel.distanthorizons.core.util.delayedSaveCache.DelayedDataSourceSaveCache;
+import com.seibel.distanthorizons.core.file.fullDatafile.V2.FullDataUpdatePropagatorV2;
 import com.seibel.distanthorizons.core.file.structure.ISaveStructure;
 import com.seibel.distanthorizons.core.generation.DhLightingEngine;
-import com.seibel.distanthorizons.core.generation.queues.IFullDataSourceRetrievalQueue;
+import com.seibel.distanthorizons.core.generation.IFullDataSourceRetrievalQueue;
 import com.seibel.distanthorizons.core.generation.tasks.DataSourceRetrievalResult;
 import com.seibel.distanthorizons.core.generation.tasks.ERetrievalResultState;
 import com.seibel.distanthorizons.core.level.IDhLevel;
 import com.seibel.distanthorizons.core.logging.DhLogger;
 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.pooling.PhantomArrayListCheckout;
+import com.seibel.distanthorizons.core.pooling.PhantomArrayListPool;
 import com.seibel.distanthorizons.core.pos.DhSectionPos;
 import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos2D;
 import com.seibel.distanthorizons.core.render.renderer.IDebugRenderable;
 import com.seibel.distanthorizons.core.util.ExceptionUtil;
 import com.seibel.distanthorizons.core.util.LodUtil;
+import com.seibel.distanthorizons.core.util.threading.PriorityTaskPicker;
+import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
 import it.unimi.dsi.fastutil.bytes.ByteArrayList;
 import it.unimi.dsi.fastutil.longs.LongArrayList;
 import org.jetbrains.annotations.NotNull;
@@ -52,6 +54,7 @@ import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
 import java.util.concurrent.atomic.AtomicReference;
+import java.util.function.Consumer;
 import java.util.stream.IntStream;

 public class GeneratedFullDataSourceProvider extends FullDataSourceProviderV2 implements IDebugRenderable
@@ -62,6 +65,9 @@ public class GeneratedFullDataSourceProvider extends FullDataSourceProviderV2 im
 	 * Having this number too high causes the system to become overwhelmed by
 	 * world gen requests and other jobs won't be done. <br>
 	 * IE: LODs won't update or render because world gen is hogging the CPU.
+	 * <br><br>
+	 * TODO this should be dynamically allocated based on CPU load
+	 *  and abilities.
 	 */
 	public static final int MAX_WORLD_GEN_REQUESTS_PER_THREAD = 20;
 	
@@ -71,9 +77,7 @@ public class GeneratedFullDataSourceProvider extends FullDataSourceProviderV2 im
 	private final AtomicReference<IFullDataSourceRetrievalQueue> worldGenQueueRef = new AtomicReference<>(null);
 	private final ArrayList<IOnWorldGenCompleteListener> onWorldGenTaskCompleteListeners = new ArrayList<>();
 	
-	protected final DelayedDataSourceSaveCache delayedFullDataSourceSaveCache = new DelayedDataSourceSaveCache(this::onDataSourceSaveAsync, 10_000);
-	
-	private final ConcurrentHashMap<Long, CompletableFuture<DataSourceRetrievalResult>> queuedRetrievalFutureByPos = new ConcurrentHashMap<>();
+	protected final DelayedFullDataSourceSaveCache delayedFullDataSourceSaveCache = new DelayedFullDataSourceSaveCache(this::onDataSourceSaveAsync, 10_000);
 	
 	
 	
@@ -133,17 +137,7 @@ public class GeneratedFullDataSourceProvider extends FullDataSourceProviderV2 im
 				LodUtil.assertTrue(genTaskResult.dataSource != null, "Successful retrieval object should have a datasource.");
 				
 				this.dataUpdater.updateDataSource(genTaskResult.dataSource);
-				
-				// synchronized to prevent a rare issue where the world generator is being shut down while this listener is firing
-				synchronized (this.onWorldGenTaskCompleteListeners)
-				{
-					// fire the event listeners 
-					for (IOnWorldGenCompleteListener listener : this.onWorldGenTaskCompleteListeners)
-					{
-						listener.onWorldGenTaskComplete(genTaskResult.pos);
-					}
-				}
-				
+				this.fireOnGenPosSuccessListeners(genTaskResult.pos);
 				genTaskResult.dataSource.close();
 			}
 			else if (genTaskResult.state == ERetrievalResultState.REQUIRES_SPLITTING)
@@ -161,9 +155,19 @@ public class GeneratedFullDataSourceProvider extends FullDataSourceProviderV2 im
 		{
 			LOGGER.error("Unexpected issue during onWorldGenTaskComplete, error: ["+e.getMessage()+"].", e);
 		}
-		finally
+	}
+	
+	// TODO only fire after the section has finished generated or once every X seconds
+	private void fireOnGenPosSuccessListeners(long pos)
+	{
+		// synchronized to prevent a rare issue where the world generator is being shut down while this listener is firing
+		synchronized (this.onWorldGenTaskCompleteListeners)
 		{
-			this.queuedRetrievalFutureByPos.remove(genPos);
+			// fire the event listeners 
+			for (IOnWorldGenCompleteListener listener : this.onWorldGenTaskCompleteListeners)
+			{
+				listener.onWorldGenTaskComplete(pos);
+			}
 		}
 	}
 	
@@ -218,28 +222,45 @@ public class GeneratedFullDataSourceProvider extends FullDataSourceProviderV2 im
 		}
 		
 		
-		// we can't queue anything if the world generator isn't set up yet
 		IFullDataSourceRetrievalQueue worldGenQueue = this.worldGenQueueRef.get();
 		if (worldGenQueue == null)
 		{
+			// we can't queue anything if the world generator isn't set up yet
 			return false;
 		}
 		
 		
+		PriorityTaskPicker.Executor renderLoadExecutor = ThreadPoolUtil.getRenderLoadingExecutor();
+		if (renderLoadExecutor == null 
+			|| renderLoadExecutor.getQueueSize() >= FullDataUpdatePropagatorV2.getMaxPropagateTaskCount() / 2)
+		{
+			// don't queue additional world gen requests if the render loader handler is overwhelmed,
+			// otherwise LODs may not load in properly
+			return false;
+		}
+		
+		PriorityTaskPicker.Executor fileHandlerExecutor = ThreadPoolUtil.getFileHandlerExecutor();
+		if (fileHandlerExecutor == null 
+			|| fileHandlerExecutor.getQueueSize() >= FullDataUpdatePropagatorV2.getMaxPropagateTaskCount() / 2)
+		{
+			// don't queue additional world gen requests if the file handler is overwhelmed,
+			// otherwise LODs may not load in properly
+			return false;
+		}
+		
+		
+		int maxQueuedChunkCount = MAX_WORLD_GEN_REQUESTS_PER_THREAD * Config.Common.MultiThreading.numberOfThreads.get(); // for now we're just using the same logic as the world gen threads, it works well enough
+		if (SharedApi.INSTANCE.getQueuedChunkUpdateCount() >= maxQueuedChunkCount)
+		{
+			// don't queue additional world gen requests if there are
+			// a lot of chunks waiting to update
+			// (this is done to reduce thread starvation for chunk updates)
+			return false;
+		}
+		
 		
 		int maxWorldGenQueueCount = MAX_WORLD_GEN_REQUESTS_PER_THREAD * Config.Common.MultiThreading.numberOfThreads.get();
-		int currentQueueCount = WorldChunkUpdateManager.INSTANCE.getTotalQueuedCount();
-		
-		
-		
-		// don't queue additional world gen requests if there are
-		// a lot of chunks waiting to update
-		if (currentQueueCount >= maxWorldGenQueueCount)
-		{
-			return false;
-		}
-		
-		
+
 		if (this.delayedFullDataSourceSaveCache.getUnsavedCount() >= maxWorldGenQueueCount)
 		{
 			// don't queue additional world gen requests if there are
@@ -286,14 +307,7 @@ public class GeneratedFullDataSourceProvider extends FullDataSourceProviderV2 im
 		}
 		
 		CompletableFuture<DataSourceRetrievalResult> worldGenFuture = worldGenQueue.submitRetrievalTask(genPos, (byte) (DhSectionPos.getDetailLevel(genPos) - DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL));
-		
-		// only queue the when-complete once for each world gen task,
-		// otherwise we can end up trying to close the same datasource multiple times 
-		CompletableFuture<DataSourceRetrievalResult> oldWorldGenFuture = this.queuedRetrievalFutureByPos.putIfAbsent(genPos, worldGenFuture);
-		if (oldWorldGenFuture == null)
-		{
-			worldGenFuture.whenComplete((r, e) -> this.onWorldGenTaskComplete(genPos, r, e));
-		}
+		worldGenFuture.whenComplete((r, e) -> this.onWorldGenTaskComplete(genPos, r, e));
 		
 		return worldGenFuture;
 	}
@@ -337,7 +351,7 @@ public class GeneratedFullDataSourceProvider extends FullDataSourceProviderV2 im
 		// don't check any child positions if this position is already fully generated 
 		if (this.repo.existsWithKey(pos))
 		{
-			try(PhantomArrayListCheckout checkout = ARRAY_LIST_POOL.checkoutByteArrays(1))
+			try(PhantomArrayListCheckout checkout = ARRAY_LIST_POOL.checkoutArrays(1, 0, 0))
 			{
 				ByteArrayList columnGenStepArray = checkout.getByteArray(0, FullDataSourceV2.WIDTH*FullDataSourceV2.WIDTH);
 				this.repo.getColumnGenerationStepForPos(pos, columnGenStepArray);
@@ -384,7 +398,7 @@ public class GeneratedFullDataSourceProvider extends FullDataSourceProviderV2 im
 			{
 				
 				EDhApiWorldGenerationStep currentMinWorldGenStep = EDhApiWorldGenerationStep.LIGHT;
-				try(PhantomArrayListCheckout checkout = ARRAY_LIST_POOL.checkoutByteArrays(1))
+				try(PhantomArrayListCheckout checkout = ARRAY_LIST_POOL.checkoutArrays(1, 0, 0))
 				{
 					ByteArrayList columnGenerationSteps = checkout.getByteArray(0, FullDataSourceV2.WIDTH*FullDataSourceV2.WIDTH);
 					this.repo.getColumnGenerationStepForPos(genPos, columnGenerationSteps);
@@ -22,10 +22,10 @@ package com.seibel.distanthorizons.core.file.fullDatafile;
 import com.google.common.cache.CacheBuilder;
 import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
 import com.seibel.distanthorizons.core.file.structure.ISaveStructure;
-import com.seibel.distanthorizons.core.generation.queues.RemoteWorldRetrievalQueue;
+import com.seibel.distanthorizons.core.generation.RemoteWorldRetrievalQueue;
 import com.seibel.distanthorizons.core.generation.tasks.DataSourceRetrievalResult;
 import com.seibel.distanthorizons.core.level.IDhLevel;
-import com.seibel.distanthorizons.core.generation.queues.LodRequestModule;
+import com.seibel.distanthorizons.core.level.LodRequestModule;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.generation.tasks.ERetrievalResultState;
 import com.seibel.distanthorizons.core.multiplayer.client.SyncOnLoadRequestQueue;
@@ -1,12 +1,9 @@
 package com.seibel.distanthorizons.core.file.fullDatafile.V1;

-import com.seibel.distanthorizons.api.enums.config.EDhApiDataCompressionMode;
 import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV1;
 import com.seibel.distanthorizons.core.file.structure.ISaveStructure;
 import com.seibel.distanthorizons.core.level.IDhLevel;
 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.pos.DhSectionPos;
 import com.seibel.distanthorizons.core.sql.dto.FullDataSourceV1DTO;
 import com.seibel.distanthorizons.core.sql.repo.AbstractDhRepo;
@@ -32,8 +29,6 @@ public class FullDataSourceProviderV1<TDhLevel extends IDhLevel>
 {
 	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
-	public static final PhantomArrayListPool ARRAY_LIST_POOL = new PhantomArrayListPool("V1DTO");
-	
 	protected final ReentrantLock closeLock = new ReentrantLock();
 	protected volatile boolean isShutdown = false;
 	
@@ -69,9 +64,7 @@ public class FullDataSourceProviderV1<TDhLevel extends IDhLevel>
 	protected FullDataSourceV1 createDataSourceFromDto(FullDataSourceV1DTO dto) throws InterruptedException, IOException, DataCorruptedException
 	{
 		FullDataSourceV1 dataSource = FullDataSourceV1.createEmpty(dto.pos);
-		try (PhantomArrayListCheckout checkout = ARRAY_LIST_POOL.checkoutByteArrays(1);
-			// LZ4 was used by DH before 2.1.0 and as such must be used until the data format is changed to record the compressor)
-			DhDataInputStream inputStream = DhDataInputStream.create(dto.dataArray, EDhApiDataCompressionMode.LZ4, checkout))
+		try (DhDataInputStream inputStream = dto.getInputStream())
 		{
 			dataSource.populateFromStream(dto, inputStream, this.level);
 		}
@@ -9,6 +9,8 @@ import com.seibel.distanthorizons.core.logging.DhLogger;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.logging.f3.F3Screen;
 import com.seibel.distanthorizons.core.pos.DhSectionPos;
+import com.seibel.distanthorizons.core.render.renderer.DebugRenderer;
+import com.seibel.distanthorizons.core.render.renderer.IDebugRenderable;
 import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;

 import java.io.File;
@@ -20,7 +22,7 @@ import java.util.List;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicBoolean;

-public class DataMigratorV1 implements AutoCloseable
+public class DataMigratorV1 implements IDebugRenderable, AutoCloseable
 {
 	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
@@ -330,6 +332,12 @@ public class DataMigratorV1 implements AutoCloseable
 	// overrides //
 	//===========//
 	
+	@Override
+	public void debugRender(DebugRenderer renderer)
+	{
+		// nothing currently needed
+	}
+	
 	@Override
 	public void close()
 	{
@@ -22,7 +22,6 @@ package com.seibel.distanthorizons.core.file.fullDatafile.V2;
 import com.seibel.distanthorizons.api.enums.config.EDhApiDataCompressionMode;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
-import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.enums.EDhDirection;
 import com.seibel.distanthorizons.core.file.fullDatafile.IDataSourceUpdateListenerFunc;
 import com.seibel.distanthorizons.core.file.structure.ISaveStructure;
@@ -31,7 +30,7 @@ import com.seibel.distanthorizons.core.level.IDhLevel;
 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.render.renderer.AbstractDebugWireframeRenderer;
+import com.seibel.distanthorizons.core.render.renderer.DebugRenderer;
 import com.seibel.distanthorizons.core.render.renderer.IDebugRenderable;
 import com.seibel.distanthorizons.core.sql.dto.FullDataSourceV2DTO;
 import com.seibel.distanthorizons.core.sql.repo.AbstractDhRepo;
@@ -57,9 +56,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
 public class FullDataSourceProviderV2 implements IDebugRenderable, AutoCloseable
 {
 	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
-	
-	private static final AbstractDebugWireframeRenderer DEBUG_WIREFRAME_RENDERER = SingletonInjector.INSTANCE.get(AbstractDebugWireframeRenderer.class);
-	
+
 	private static final Set<String> CORRUPT_DATA_ERRORS_LOGGED = Collections.newSetFromMap(new ConcurrentHashMap<>());
 	
 	/**
@@ -111,7 +108,7 @@ public class FullDataSourceProviderV2 implements IDebugRenderable, AutoCloseable
 		this.updatePropagator = new FullDataUpdatePropagatorV2(this, this.dataUpdater, this.levelId);
 		this.dataMigratorV1 = new DataMigratorV1(this.dataUpdater, this.level, this.levelId, this.saveDir);
 		
-		DEBUG_WIREFRAME_RENDERER.register(this, Config.Client.Advanced.Debugging.DebugWireframe.showFullDataUpdateStatus);
+		DebugRenderer.register(this, Config.Client.Advanced.Debugging.DebugWireframe.showFullDataUpdateStatus);
 		
 	}
 	
@@ -450,10 +447,11 @@ public class FullDataSourceProviderV2 implements IDebugRenderable, AutoCloseable
 	//===========//
 	
 	@Override
-	public void debugRender(AbstractDebugWireframeRenderer renderer)
+	public void debugRender(DebugRenderer renderer)
 	{
 		this.dataUpdater.debugRender(renderer);
 		this.updatePropagator.debugRender(renderer);
+		this.dataMigratorV1.debugRender(renderer);
 	}
 	
 	@Override 
@@ -467,8 +465,6 @@ public class FullDataSourceProviderV2 implements IDebugRenderable, AutoCloseable
 		this.updatePropagator.close();
 		this.dataMigratorV1.close();
 		
-		DEBUG_WIREFRAME_RENDERER.unregister(this, Config.Client.Advanced.Debugging.DebugWireframe.showFullDataUpdateStatus);
-		
 		this.repo.close();
 	}
 	
@@ -7,13 +7,14 @@ 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.renderer.AbstractDebugWireframeRenderer;
+import com.seibel.distanthorizons.core.render.renderer.DebugRenderer;
 import com.seibel.distanthorizons.core.render.renderer.IDebugRenderable;
 import com.seibel.distanthorizons.core.util.ThreadUtil;
 import com.seibel.distanthorizons.core.util.threading.PriorityTaskPicker;
 import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import it.unimi.dsi.fastutil.longs.LongArrayList;
+import org.jetbrains.annotations.Nullable;

 import java.awt.*;
 import java.util.HashMap;
@@ -34,10 +35,11 @@ public class FullDataUpdatePropagatorV2 implements IDebugRenderable, AutoCloseab
 	/** indicates how long the update queue thread should wait between queuing ticks */
 	protected static final int PROPAGATE_QUEUE_THREAD_DELAY_IN_MS = 250;
 	
-	public static final int NUMBER_OF_PARENT_UPDATE_TASKS_PER_THREAD = 10;
+	public static final int NUMBER_OF_PARENT_UPDATE_TASKS_PER_THREAD = 5;
 	
 	/** how many parent update tasks can be in the queue at once */
-	public static int getMaxPropagateTaskCount() { return NUMBER_OF_PARENT_UPDATE_TASKS_PER_THREAD * Config.Common.MultiThreading.numberOfThreads.get(); }
+	public static int getMaxPropagateTaskCount() 
+	{ return NUMBER_OF_PARENT_UPDATE_TASKS_PER_THREAD * Config.Common.MultiThreading.numberOfThreads.get(); }
 	
 	
 	
@@ -47,11 +49,12 @@ public class FullDataUpdatePropagatorV2 implements IDebugRenderable, AutoCloseab
 	 */
 	private final Set<Long> updatingPosSet = ConcurrentHashMap.newKeySet();
 	
+	// TODO only run thread if modifications happened recently
 	/**
-	 * It'd be better if we could be told when changes are available,
-	 * then run the update thread, but having a constantly running background
-	 * thread is simpler to deal with and gets the job done.
+	 * Will be null on the dedicated server since updates don't need to be propagated,
+	 * only the highest detail level is needed.
 	 */
+	@Nullable
 	public final ThreadPoolExecutor updateQueueProcessor;
 	
 	private final AtomicBoolean isShutdownRef = new AtomicBoolean(false);
@@ -66,7 +69,6 @@ public class FullDataUpdatePropagatorV2 implements IDebugRenderable, AutoCloseab
 	//=============//
 	// constructor //
 	//=============//
-	//region
 	
 	public FullDataUpdatePropagatorV2(FullDataSourceProviderV2 provider, FullDataUpdaterV2 dataUpdater, String levelId)
 	{
@@ -79,14 +81,11 @@ public class FullDataUpdatePropagatorV2 implements IDebugRenderable, AutoCloseab
 		this.updateQueueProcessor.execute(this::runUpdateQueue);
 	}
 	
-	//endregion
-	
 	
 	
 	//================//
 	// parent updates //
 	//================//
-	//region
 	
 	private void runUpdateQueue()
 	{
@@ -102,6 +101,8 @@ public class FullDataUpdatePropagatorV2 implements IDebugRenderable, AutoCloseab
 					continue;
 				}
 				
+				// TODO it might be worth skipping this logic if no parent updates happened
+				
 				// update positions closest to the player (if not on a server)
 				// to make world gen appear faster
 				DhBlockPos targetBlockPos = DhBlockPos.ZERO;
@@ -135,129 +136,121 @@ public class FullDataUpdatePropagatorV2 implements IDebugRenderable, AutoCloseab
 		int maxUpdateTaskCount = getMaxPropagateTaskCount();
 		
 		// queue parent updates
-		if (executor.getQueueSize() > maxUpdateTaskCount
-			|| this.updatingPosSet.size() > maxUpdateTaskCount)
+		if (executor.getQueueSize() < maxUpdateTaskCount
+			&& this.updatingPosSet.size() < maxUpdateTaskCount)
 		{
-			return;
-		}
-		
-		
-		// get the positions that need to be applied to their parents
-		LongArrayList parentUpdatePosList = this.provider.repo.getPositionsToUpdate(targetBlockPos.getX(), targetBlockPos.getZ(), maxUpdateTaskCount);
-		
-		// combine updates together based on their parent
-		HashMap<Long, HashSet<Long>> updatePosByParentPos = new HashMap<>();
-		for (Long pos : parentUpdatePosList)
-		{
-			updatePosByParentPos.compute(DhSectionPos.getParentPos(pos), (parentPos, updatePosSet) ->
-			{
-				if (updatePosSet == null)
-				{
-					updatePosSet = new HashSet<>();
-				}
-				updatePosSet.add(pos);
-				return updatePosSet;
-			});
-		}
-		
-		// queue the updates
-		for (Long parentUpdatePos : updatePosByParentPos.keySet())
-		{
-			// stop if there are already a bunch of updates queued
-			if (this.updatingPosSet.size() > maxUpdateTaskCount
-				|| executor.getQueueSize() > maxUpdateTaskCount)
-			{
-				break;
-			}
+			// get the positions that need to be applied to their parents
+			LongArrayList parentUpdatePosList = this.provider.repo.getPositionsToUpdate(targetBlockPos.getX(), targetBlockPos.getZ(), maxUpdateTaskCount);
 			
-			// skip any already-queued positions
-			if (!this.updatingPosSet.add(parentUpdatePos))
+			// combine updates together based on their parent
+			HashMap<Long, HashSet<Long>> updatePosByParentPos = new HashMap<>();
+			for (Long pos : parentUpdatePosList)
 			{
-				continue;
-			}
-			
-			try
-			{
-				executor.execute(() ->
+				updatePosByParentPos.compute(DhSectionPos.getParentPos(pos), (parentPos, updatePosSet) ->
 				{
-					ReentrantLock parentWriteLock = this.dataUpdater.updateLockProvider.getLock(parentUpdatePos);
-					boolean parentLocked = false;
-					try
+					if (updatePosSet == null)
 					{
-						//LOGGER.info("updating parent: "+parentUpdatePos);
-						
-						// Locking the parent before the children should prevent deadlocks.
-						// TryLock is used instead of lock so this thread can handle a different update.
-						if (parentWriteLock.tryLock())
+						updatePosSet = new HashSet<>();
+					}
+					updatePosSet.add(pos);
+					return updatePosSet;
+				});
+			}
+			
+			// queue the updates
+			for (Long parentUpdatePos : updatePosByParentPos.keySet())
+			{
+				// stop if there are already a bunch of updates queued
+				if (this.updatingPosSet.size() > maxUpdateTaskCount
+					|| executor.getQueueSize() > maxUpdateTaskCount
+					|| !this.updatingPosSet.add(parentUpdatePos))
+				{
+					break;
+				}
+				
+				try
+				{
+					executor.execute(() ->
+					{
+						ReentrantLock parentWriteLock = this.dataUpdater.updateLockProvider.getLock(parentUpdatePos);
+						boolean parentLocked = false;
+						try
 						{
-							parentLocked = true;
-							this.dataUpdater.lockedPosSet.add(parentUpdatePos);
+							//LOGGER.info("updating parent: "+parentUpdatePos);
 							
-							try (FullDataSourceV2 parentDataSource = this.provider.get(parentUpdatePos))
+							// Locking the parent before the children should prevent deadlocks.
+							// TryLock is used instead of lock so this thread can handle a different update.
+							if (parentWriteLock.tryLock())
 							{
-								// will return null if the file handler is shutting down
-								if (parentDataSource != null)
+								parentLocked = true;
+								this.dataUpdater.lockedPosSet.add(parentUpdatePos);
+								
+								try (FullDataSourceV2 parentDataSource = this.provider.get(parentUpdatePos))
 								{
-									// apply each child pos to the parent
-									for (Long childPos : updatePosByParentPos.get(parentUpdatePos))
+									// will return null if the file handler is shutting down
+									if (parentDataSource != null)
 									{
-										ReentrantLock childReadLock = this.dataUpdater.updateLockProvider.getLock(childPos);
-										try
+										// apply each child pos to the parent
+										for (Long childPos : updatePosByParentPos.get(parentUpdatePos))
 										{
-											childReadLock.lock();
-											this.dataUpdater.lockedPosSet.add(childPos);
-											
-											try (FullDataSourceV2 childDataSource = this.provider.get(childPos))
+											ReentrantLock childReadLock = this.dataUpdater.updateLockProvider.getLock(childPos);
+											try
 											{
-												// can return null when the file handler is being shut down
-												if (childDataSource != null)
+												childReadLock.lock();
+												this.dataUpdater.lockedPosSet.add(childPos);
+												
+												try (FullDataSourceV2 childDataSource = this.provider.get(childPos))
 												{
-													parentDataSource.updateFromDataSource(childDataSource);
+													// can return null when the file handler is being shut down
+													if (childDataSource != null)
+													{
+														parentDataSource.updateFromDataSource(childDataSource);
+													}
 												}
 											}
+											catch (Exception e)
+											{
+												LOGGER.error("Unexpected in parent update propagation for parent pos: ["+DhSectionPos.toString(parentUpdatePos)+"], child pos: [" + DhSectionPos.toString(parentUpdatePos) + "], Error: [" + e.getMessage() + "].", e);
+											}
+											finally
+											{
+												this.provider.repo.setApplyToParent(childPos, false);
+												
+												childReadLock.unlock();
+												this.dataUpdater.lockedPosSet.remove(childPos);
+											}
 										}
-										catch (Exception e)
+										
+										
+										if (DhSectionPos.getDetailLevel(parentUpdatePos) < FullDataSourceProviderV2.ROOT_SECTION_DETAIL_LEVEL)
 										{
-											LOGGER.error("Unexpected in parent update propagation for parent pos: ["+DhSectionPos.toString(parentUpdatePos)+"], child pos: [" + DhSectionPos.toString(parentUpdatePos) + "], Error: [" + e.getMessage() + "].", e);
-										}
-										finally
-										{
-											this.provider.repo.setApplyToParent(childPos, false);
-											
-											childReadLock.unlock();
-											this.dataUpdater.lockedPosSet.remove(childPos);
+											parentDataSource.applyToParent = true;
 										}
+										
+										this.dataUpdater.updateDataSource(parentDataSource);
 									}
-									
-									
-									if (DhSectionPos.getDetailLevel(parentUpdatePos) < FullDataSourceProviderV2.ROOT_SECTION_DETAIL_LEVEL)
-									{
-										parentDataSource.applyToParent = true;
-									}
-									
-									this.dataUpdater.updateDataSource(parentDataSource);
 								}
 							}
 						}
-					}
-					finally
-					{
-						if (parentLocked)
+						finally
 						{
-							parentWriteLock.unlock();
-							this.dataUpdater.lockedPosSet.remove(parentUpdatePos);
+							if (parentLocked)
+							{
+								parentWriteLock.unlock();
+								this.dataUpdater.lockedPosSet.remove(parentUpdatePos);
+							}
+							
+							this.updatingPosSet.remove(parentUpdatePos);
 						}
-						
-						this.updatingPosSet.remove(parentUpdatePos);
-					}
-				});
-			}
-			catch (RejectedExecutionException ignore)
-			{ /* the executor was shut down, it should be back up shortly and able to accept new jobs */ }
-			catch (Exception e)
-			{
-				this.updatingPosSet.remove(parentUpdatePos);
-				throw e;
+					});
+				}
+				catch (RejectedExecutionException ignore)
+				{ /* the executor was shut down, it should be back up shortly and able to accept new jobs */ }
+				catch (Exception e)
+				{
+					this.updatingPosSet.remove(parentUpdatePos);
+					throw e;
+				}
 			}
 		}
 	}
@@ -378,20 +371,17 @@ public class FullDataUpdatePropagatorV2 implements IDebugRenderable, AutoCloseab
 		}
 	}
 	
-	//endregion
-	
 	
 	
 	//===========//
 	// overrides //
 	//===========//
-	//region
 	
 	@Override
-	public void debugRender(AbstractDebugWireframeRenderer renderer)
+	public void debugRender(DebugRenderer renderer)
 	{
 		this.updatingPosSet
-				.forEach((pos) -> { renderer.renderBox(new AbstractDebugWireframeRenderer.Box(pos, -32f, 80f, 0.20f, Color.MAGENTA)); });
+				.forEach((pos) -> { renderer.renderBox(new DebugRenderer.Box(pos, -32f, 80f, 0.20f, Color.MAGENTA)); });
 	}
 	
 	@Override
@@ -403,8 +393,6 @@ public class FullDataUpdatePropagatorV2 implements IDebugRenderable, AutoCloseab
 		}
 	}
 	
-	//endregion
-	
 	
 	
 }
@@ -7,7 +7,7 @@ import com.seibel.distanthorizons.core.file.fullDatafile.IDataSourceUpdateListen
 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.render.renderer.AbstractDebugWireframeRenderer;
+import com.seibel.distanthorizons.core.render.renderer.DebugRenderer;
 import com.seibel.distanthorizons.core.render.renderer.IDebugRenderable;
 import com.seibel.distanthorizons.core.sql.dto.FullDataSourceV2DTO;
 import com.seibel.distanthorizons.core.util.threading.PositionalLockProvider;
@@ -225,18 +225,20 @@ public class FullDataUpdaterV2 implements IDebugRenderable, AutoCloseable
 	//===========//
 	
 	@Override
-	public void debugRender(AbstractDebugWireframeRenderer renderer)
+	public void debugRender(DebugRenderer renderer)
 	{
 		this.lockedPosSet
-				.forEach((pos) -> { renderer.renderBox(new AbstractDebugWireframeRenderer.Box(pos, -32f, 74f, 0.15f, Color.PINK)); });
+				.forEach((pos) -> { renderer.renderBox(new DebugRenderer.Box(pos, -32f, 74f, 0.15f, Color.PINK)); });
 		
 		this.queuedUpdateCountsByPos
-				.forEach((pos, updateCountRef) -> { renderer.renderBox(new AbstractDebugWireframeRenderer.Box(pos, -32f, 80f + (updateCountRef.get() * 16f), 0.20f, Color.WHITE)); });
+				.forEach((pos, updateCountRef) -> { renderer.renderBox(new DebugRenderer.Box(pos, -32f, 80f + (updateCountRef.get() * 16f), 0.20f, Color.WHITE)); });
 	}
 	
 	@Override
-	public void close() { this.isShutdownRef.set(true); }
-	
+	public void close()
+	{
+		this.isShutdownRef.set(true);
+	}
 	
 	
 }
@@ -20,14 +20,13 @@
 package com.seibel.distanthorizons.core.generation;

 import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
-import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.enums.EDhDirection;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos;
 import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPosMutable;
 import com.seibel.distanthorizons.core.pos.DhChunkPos;
 import com.seibel.distanthorizons.core.pos.DhSectionPos;
-import com.seibel.distanthorizons.core.render.renderer.AbstractDebugWireframeRenderer;
+import com.seibel.distanthorizons.core.render.renderer.DebugRenderer;
 import com.seibel.distanthorizons.core.util.FullDataPointUtil;
 import com.seibel.distanthorizons.core.util.LodUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper;
@@ -53,8 +52,6 @@ public class DhLightingEngine
 	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	public static final DhLightingEngine INSTANCE = new DhLightingEngine();
 	
-	private static final AbstractDebugWireframeRenderer DEBUG_RENDERER = SingletonInjector.INSTANCE.get(AbstractDebugWireframeRenderer.class);
-	
 	/** 
 	 * Minor garbage collection optimization. <br>
 	 * Since these objects are always mutated anyway, using a {@link ThreadLocal} will allow us to
@@ -728,9 +725,9 @@ public class DhLightingEngine
 							// a color can be set to null if you only want to troubleshoot up to a certain light level
 							if (color != null)
 							{
-								DEBUG_RENDERER.makeParticle(
-									new AbstractDebugWireframeRenderer.BoxParticle(
-										new AbstractDebugWireframeRenderer.Box(DhSectionPos.encode((byte) 0, chunkMinX + x, chunkMinZ + z), y, y + 1, 0.2f, color),
+								DebugRenderer.makeParticle(
+									new DebugRenderer.BoxParticle(
+										new DebugRenderer.Box(DhSectionPos.encode((byte) 0, chunkMinX + x, chunkMinZ + z), y, y + 1, 0.2f, color),
 										10.0, 0f
 									)
 								);
@@ -17,12 +17,12 @@
 *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */

-package com.seibel.distanthorizons.core.generation.queues;
+package com.seibel.distanthorizons.core.generation;

 import com.seibel.distanthorizons.core.generation.tasks.DataSourceRetrievalResult;
 import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos2D;
 import com.seibel.distanthorizons.core.pos.DhSectionPos;
-import com.seibel.distanthorizons.core.render.QuadTree.LodQuadTree;
+import com.seibel.distanthorizons.core.render.LodQuadTree;
 import com.seibel.distanthorizons.core.util.objects.RollingAverage;

 import java.io.Closeable;
@@ -30,27 +30,25 @@ import java.util.List;
 import java.util.concurrent.CompletableFuture;

 /**
- * Used to track what some of the full data sources the system currently
+ * Used to track what full data sources the system currently
 * wants but doesn't have. <br>
 * IE, what sections should be generated via the world generator. <br><br>
 * 
 * Note: <br>
 * This won't contain every position that needs to be retrieved 
- * since that would cause issues when moving or with extreme
- * render distances. <br><br>
+ * (due to causing issues at extreme render distances).
+ * TODO does that mean this object isn't necessary or 
+ *      should just be renamed since it isn't the full queue <br><br>
 * 
- * Used by both world gen and server networking.
+ * Use by both world gen and server networking.
 * 
 * @see LodQuadTree
- * @see AbstractLodRequestState
- * @see LodRequestModule
 */
 public interface IFullDataSourceRetrievalQueue extends Closeable
 {
 	//=========//
 	// getters //
 	//=========//
-	//region
 	
 	/** 
 	 * The largest numerical detail level. <br>
@@ -65,20 +63,11 @@ public interface IFullDataSourceRetrievalQueue extends Closeable
 	 */
 	byte highestDataDetail();
 	
-	/** 
-	 * Returns a value like "downloading" or "generating" depending on how the LODs are being retrieved.
-	 * Used to make the progress message easier to understand.
-	 */
-	String getRetrievalTypeName();
-	
-	//endregion
-	
 	
 	
 	//=======//
 	// setup //
 	//=======//
-	//region
 	
 	/** 
 	 * Starts the retrieval process if not already running,
@@ -89,14 +78,11 @@ public interface IFullDataSourceRetrievalQueue extends Closeable
 	 * */
 	void startAndSetTargetPos(DhBlockPos2D targetPos);
 	
-	//endregion
-	
 	
 	
 	//===============//
 	// task handling //
 	//===============//
-	//region
 	
 	/** 
 	 * Generally the retrieval queue should be fairly small, so its faster to iterate over the existing list
@@ -106,14 +92,11 @@ public interface IFullDataSourceRetrievalQueue extends Closeable
 	
 	CompletableFuture<DataSourceRetrievalResult> submitRetrievalTask(long pos, byte requiredDataDetail);
 	
-	//endregion
-	
 	
 	
 	//==========//
 	// shutdown //
 	//==========//
-	//region
 	
 	/** Can be used to let any lingering generation requests finish before fully shutting down the system */
 	CompletableFuture<Void> startClosingAsync(boolean cancelCurrentGeneration, boolean alsoInterruptRunning);
@@ -121,14 +104,11 @@ public interface IFullDataSourceRetrievalQueue extends Closeable
 	@Override
 	void close();
 	
-	//endregion
-	
 	
 	
 	//===============//
 	// debug display //
 	//===============//
-	//region
 	
 	int getWaitingTaskCount();
 	int getInProgressTaskCount();
@@ -149,8 +129,6 @@ public interface IFullDataSourceRetrievalQueue extends Closeable
 	/** Can be used to determine roughly how fast the world generator is running. */
 	RollingAverage getRollingAverageChunkGenTimeInMs();
 	
-	//endregion
-	
 	
 	
 }
--- a/Show More
+++ b/Show More