remove unused getFov()

https://github.com/IrisShaders/Iris/issues/2534

api/build.gradle

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -40,8 +40,7 @@ public interface IDhApiEventInjector extends IDependencyInjector<IDhApiEvent>
 	 * @return true if the handler was unbound, false if the handler wasn't bound.
 	 * @throws IllegalArgumentException if the implementation object doesn't implement the interface
 	 */
-	// Note to self: Don't try adding a generic type to IDhApiEvent, the constructor won't accept it
-	// TODO why are we removing the class instead of an instance?
+	// Note to DH Devs: Don't try adding a generic type to IDhApiEvent, the constructor won't accept it
 	boolean unbind(Class<? extends IDhApiEvent> dependencyInterface, Class<? extends IDhApiEvent> dependencyClassToRemove) throws IllegalArgumentException;
 	
 	

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

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

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

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

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

@@ -60,6 +60,8 @@ public class DhApiRenderParam implements IDhApiEventParam
 	public final DhApiMat4f dhProjectionMatrix;
 	/** The model view matrix Distant Horizons is using to render this frame. */
 	public final DhApiMat4f dhModelViewMatrix;
+	/** combination of the MVM and projection matrices */
+	public final DhApiMat4f dhMvmProjMatrix;
 	
 	public final int worldYOffset;
 	
@@ -111,6 +113,10 @@ public class DhApiRenderParam implements IDhApiEventParam
 		this.dhProjectionMatrix = newDhProjectionMatrix;
 		this.dhModelViewMatrix = newDhModelViewMatrix;
 		
+		DhApiMat4f combinedMatrix = new DhApiMat4f(this.dhProjectionMatrix);
+		combinedMatrix.multiply(this.dhModelViewMatrix);
+		this.dhMvmProjMatrix = combinedMatrix;
+		
 		this.worldYOffset = worldYOffset;
 		this.clientLevelWrapper = clientLevelWrapper;
 		

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

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

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

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

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

@@ -38,19 +38,19 @@ public final class ModInfo
 	public static final String NAME = "DistantHorizons";
 	/** Human-readable version of NAME */
 	public static final String READABLE_NAME = "Distant Horizons";
-	public static final String VERSION = "2.4.6-b-dev";
+	public static final String VERSION = "3.0.0-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 = 5;
+	public static final int API_MAJOR_VERSION = 6;
 	/** This version should be updated whenever new methods are added to the DH API */
-	public static final int API_MINOR_VERSION = 1;
+	public static final int API_MINOR_VERSION = 0;
 	/** This version should be updated whenever non-breaking fixes are added to the DH API */
 	public static final int API_PATCH_VERSION = 0;
 	
 	/** If the config file has an older version it'll be re-created from scratch. */
-	public static final int CONFIG_FILE_VERSION = 3;
+	public static final int CONFIG_FILE_VERSION = 4;
 	
 	/** All DH owned threads should start with this string to allow for easier debugging and profiling. */
 	public static final String THREAD_NAME_PREFIX = "DH-";

core/build.gradle

@@ -1,18 +1,23 @@
 plugins {
     id "java"
-    id "com.github.johnrengelman.shadow" version '8.1.1' apply false // Set this to true if you're using the standalone Core project
+    id "com.gradleup.shadow"
 }
 
-apply plugin: "application"
+repositories {
+    mavenCentral()
+    maven { url "https://repo.enonic.com/public/" }
+}
 
-application {
-    mainClass.set("com.seibel.distanthorizons.core.jar.JarMain")
+tasks.withType(JavaCompile).configureEach {
+    options.release = 8
+    options.encoding = "UTF-8"
 }
 
 configurations {
     shadowedArtifact // Used by DH to specify that we want to implement the shadowed core JAR file instead of the regular JAR file
     shade
     implementation.extendsFrom shade
+    testImplementation.extendsFrom compileOnly
 }
 
 OperatingSystem os = org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.currentOperatingSystem;
@@ -20,36 +25,46 @@ OperatingSystem os = org.gradle.nativeplatform.platform.internal.DefaultNativePl
 // Set the OS lwjgl is using to the current os
 project.ext.lwjglNatives = "natives-" + os.toFamilyName()
 
-dependencies { // All of these dependencies are in Vanilla Minecraft, but we need to depend on it as we arent importing Minecraft in the core
-    // 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
+dependencies {
+    // API project dependency
+    implementation project(":api")
 
-    // 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"
+    // 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"
 
-    // 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
+    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.common:google-collect:0.5")
+    compileOnly("com.google.guava:guava:31.1-jre")
 
+    // DH's bundled libraries (shadowed + relocated in loader jars)
+    implementation("com.github.luben:zstd-jni:${rootProject.zstd_version}")
+    implementation("org.lz4:lz4-java:${rootProject.lz4_version}")
+    implementation("org.tukaani:xz:${rootProject.xz_version}")
+    implementation("org.xerial:sqlite-jdbc:${rootProject.sqlite_jdbc_version}")
+    implementation("com.electronwill.night-config:toml:${rootProject.nightconfig_version}")
+    implementation("com.electronwill.night-config:json:${rootProject.nightconfig_version}")
 
-    // Some other dependencies
-    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")
-    
+    // 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")
 }
 
 artifacts {

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

@@ -20,12 +20,14 @@
 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;
@@ -34,7 +36,6 @@ 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;
@@ -55,6 +56,11 @@ public class Initializer
 	
 	public static void init()
 	{
+		//============================//
+		// check referenced libraries //
+		//============================//
+		//region
+		
 		LOGGER.info("Running library validation...");
 		
 		// confirm that all referenced libraries are available to use
@@ -94,7 +100,15 @@ 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);
 		}
 		
-		// confirm the resource directory is present
+		//endregion
+		
+		
+		
+		//==========================//
+		// check resource directory //
+		//==========================//
+		//region
+		
 		try
 		{
 			int scriptCount = DatabaseUpdater.getAutoUpdateScriptCount();
@@ -108,6 +122,15 @@ 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)
@@ -124,18 +147,43 @@ public class Initializer
 		//	}
 		//}
 		
+		//endregion
+		
+		
+		
+		//===================//
+		// API delayed setup //
+		//===================//
+		//region
+		
 		// link Core's config to the API
 		DhApi.Delayed.configs = DhApiConfig.INSTANCE;
 		DhApi.Delayed.terrainRepo = DhApiTerrainDataRepo.INSTANCE;
 		DhApi.Delayed.worldProxy = DhApiWorldProxy.INSTANCE;
 		DhApi.Delayed.renderProxy = DhApiRenderProxy.INSTANCE;
-		DhApi.Delayed.customRenderObjectFactory = GenericRenderObjectFactory.INSTANCE;
 		DhApi.Delayed.wrapperFactory = SingletonInjector.INSTANCE.get(IWrapperFactory.class);
 		if (DhApi.Delayed.wrapperFactory == null)
 		{
-			LOGGER.error("Programmer Error: No ["+IWrapperFactory.class.getSimpleName()+"] assigned to the DhApi.");
+			MC_CLIENT.crashMinecraft("Programmer Error: No ["+IWrapperFactory.class.getSimpleName()+"] assigned to the DhApi.", new Exception());
 		}
 		
+		DhApi.Delayed.customRenderObjectFactory = SingletonInjector.INSTANCE.get(IDhApiCustomRenderObjectFactory.class);
+		if (DhApi.Delayed.customRenderObjectFactory == null)
+		{
+			MC_CLIENT.crashMinecraft("Programmer Error: No ["+IDhApiCustomRenderObjectFactory.class.getSimpleName()+"] assigned to the DhApi.", new Exception());
+		}
+		
+		DhApi.events.bind(DhApiBeforeRenderEvent.class, IgnoredDimensionCsvHandler.INSTANCE);
+		
+		//endregion
+		
+		
+		
+		//==============================//
+		// G1 Garbage collector warning //
+		//==============================//
+		//region
+		
 		// log a warning if G1GC is being used
 		// (this garbage collector is known to cause stuttering)
 		{
@@ -160,20 +208,37 @@ public class Initializer
 			LOGGER.info("Garbage collectors: ["+garbageCollectorNames+"]");
 			
 			
-			if (g1GcInUse
-				&& Config.Common.Logging.Warning.logGarbageCollectorWarning.get())
+			if (g1GcInUse)
+			{
+				String warningMessageHeader = "Distant Horizons: G1 Garbage collector detected.";
+				String warningMessageBody = 
+					"This can cause FPS stuttering. \n" +
+					"It's recommended to use a concurrent garbage collector \n" +
+					"like ZGC (Java 21+) or Shenandoah (Java 8 through 17) \n" +
+					"for a smoother experience."
+					;
+				
+				if (Config.Common.Logging.Warning.logGarbageCollectorWarning.get())
 				{
 					LOGGER.warn(
-					"Distant Horizons: G1 Garbage collector detected. \n" +
-					"This garbage collector can cause FPS stuttering. \n" +
-					"It's recommended to use a concurrent garbage collector \n" +
-					"like ZGC (Java 21+) or Shenandoah (Java 8 through 17) for a smoother experience. \n" +
+						warningMessageHeader + "\n" +
+						warningMessageBody +
 						"");
+				}
 				
+				if (Config.Common.Logging.Warning.showGarbageCollectorWarning.get())
+				{
+					ClientApi.INSTANCE.showChatMessageNextFrame(
+						MinecraftTextFormat.ORANGE + warningMessageHeader + MinecraftTextFormat.CLEAR_FORMATTING + "\n" +
+						warningMessageBody +
+						"");
+				}
 			}
 		}
 		
-		DhApi.events.bind(DhApiBeforeRenderEvent.class, IgnoredDimensionCsvHandler.INSTANCE);
+		//endregion
+		
+		
 		
 	}
 	

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

@@ -35,30 +35,6 @@ public class DhApiAmbientOcclusionConfig implements IDhApiAmbientOcclusionConfig
 	
 	@Override
 	public IDhApiConfigValue<Boolean> enabled()
-	{ return new DhApiConfigValue<Boolean, Boolean>(Config.Client.Advanced.Graphics.Ssao.enableSsao); }
-	
-	@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); }
+	{ return new DhApiConfigValue<Boolean, Boolean>(Config.Client.Advanced.Graphics.enableSsao); }
 	
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -27,15 +27,22 @@ import com.seibel.distanthorizons.core.api.internal.rendering.DhRenderState;
 import com.seibel.distanthorizons.core.enums.MinecraftTextFormat;
 import com.seibel.distanthorizons.core.file.structure.ClientOnlySaveStructure;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.logging.f3.F3Screen;
 import com.seibel.distanthorizons.core.network.messages.MessageRegistry;
 import com.seibel.distanthorizons.core.pos.DhChunkPos;
 import com.seibel.distanthorizons.core.render.DhApiRenderProxy;
+import com.seibel.distanthorizons.core.render.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.Vec3d;
 import com.seibel.distanthorizons.core.util.objects.Pair;
-import com.seibel.distanthorizons.core.util.threading.PriorityTaskPicker;
+import com.seibel.distanthorizons.core.util.objects.RollingAverage;
 import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhMetaRenderer;
+import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhVanillaFadeRenderer;
+import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhTestTriangleRenderer;
 import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.network.messages.AbstractNetworkMessage;
@@ -45,7 +52,6 @@ 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;
@@ -71,11 +77,9 @@ import java.util.concurrent.ThreadPoolExecutor;
 public class ClientApi
 {
 	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
-	
-	public static boolean prefLoggerEnabled = false;
+	private static final DhLogger RATE_LIMITED_LOGGER = new DhLoggerBuilder().maxCountPerSecond(1).build();
 	
 	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);
@@ -93,6 +97,13 @@ public class ClientApi
 	 */
 	public static final DhRenderState RENDER_STATE = new DhRenderState();
 	
+	/**
+	 * 50ms = 20 FPS
+	 * @link https://fpstoms.com/ 
+	 * @see ClientApi#cameraSpeedRollingAverage
+	 */
+	private static final long MIN_MS_BETWEEN_SPEED_CHECKS = 50;
+	
 	
 	private boolean isDevBuildMessagePrinted = false;
 	private boolean lowMemoryWarningPrinted = false;
@@ -116,10 +127,26 @@ public class ClientApi
 	/** Holds any chunks that were loaded before the {@link ClientApi#clientLevelLoadEvent(IClientLevelWrapper)} was fired. */
 	public final HashMap<Pair<IClientLevelWrapper, DhChunkPos>, IChunkWrapper> waitingChunkByClientLevelAndPos = new HashMap<>();
 	
+	/** publicly available so {@link F3Screen} can display the error */
 	@Nullable
 	public String lastRenderParamValidationMessage = null;
 	
 	
+	/** 
+	 * measured in blocks/second <br>
+	 * 
+	 * The number of points tracked here is related
+	 * to the rate at which we check for speed.
+	 * So if the ms_between is changed the number of points
+	 * tracked should also be to keep the ratio roughly the same.
+	 * @see ClientApi#MIN_MS_BETWEEN_SPEED_CHECKS
+	 */
+	public RollingAverage cameraSpeedRollingAverage = new RollingAverage(40);
+	private Vec3d lastCameraPosForSpeedCheck = new Vec3d();
+	private long msSinceLastSpeedCheck = 0L;
+	
+	
+	
 	
 	//==============//
 	// constructors //
@@ -132,6 +159,7 @@ public class ClientApi
 	//==============//
 	// world events //
 	//==============//
+	///region
 	
 	/**
 	 * May be fired slightly before or after the associated
@@ -161,13 +189,12 @@ 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 can be disabled in DH's config under Advanced -> Logging.");
+					MC_CLIENT.sendChatMessage("This message can be disabled in DH's config under Advanced -> Logging.");
 					MC_CLIENT.sendChatMessage("");
 				}
 			}
 			
-			// firing after clientLevelLoadEvent
-			// TODO if level has prepped to load it should fire level load event
+			
 			DhClientWorld world = new DhClientWorld();
 			SharedApi.setDhWorld(world);
 			
@@ -210,11 +237,14 @@ public class ClientApi
 		this.waitingClientLevels.clear();
 	}
 	
+	///endregion
+	
 	
 	
 	//==============//
 	// level events //
 	//==============//
+	///region
 	
 	public void clientLevelUnloadEvent(IClientLevelWrapper level)
 	{
@@ -231,7 +261,6 @@ public class ClientApi
 			if (world != null)
 			{
 				world.unloadLevel(level);
-				SharedApi.INSTANCE.clearQueuedChunkUpdates();
 				ApiEventInjector.INSTANCE.fireAllEvents(DhApiLevelUnloadEvent.class, new DhApiLevelUnloadEvent.EventParam(level));
 			}
 			else
@@ -248,6 +277,13 @@ public class ClientApi
 	
 	public void clientLevelLoadEvent(@Nullable IClientLevelWrapper levelWrapper)
 	{
+		// can happen if there was an issue during level load
+		if (levelWrapper == null)
+		{
+			return;
+		}
+		
+		
 		// wait a moment before loading the level to give the server a chance to handle the client's login request
 		if (MC_CLIENT.clientConnectedToDedicatedServer())
 		{
@@ -308,7 +344,7 @@ public class ClientApi
 			if (levelWrapper.equals(level))
 			{
 				IChunkWrapper chunkWrapper = this.waitingChunkByClientLevelAndPos.get(levelChunkPair);
-				SharedApi.INSTANCE.chunkLoadEvent(chunkWrapper, levelWrapper);
+				SharedApi.INSTANCE.applyChunkUpdate(chunkWrapper, levelWrapper);
 				keysToRemove.add(levelChunkPair);
 			}
 		}
@@ -320,11 +356,14 @@ public class ClientApi
 		}
 	}
 	
+	///endregion
+	
 	
 	
 	//============//
 	// networking //
 	//============//
+	///region
 	
 	/**
 	 * Forwards a decoded message into the registered handlers.
@@ -357,11 +396,14 @@ public class ClientApi
 		}
 	}
 	
+	///endregion
+	
 	
 	
 	//===============//
 	// LOD rendering //
 	//===============//
+	///region
 	
 	/** Should be called before {@link ClientApi#renderDeferredLodsForShaders} */
 	public void renderLods() { this.renderLodLayer(false); }
@@ -372,50 +414,101 @@ public class ClientApi
 	 */
 	public void renderDeferredLodsForShaders() { this.renderLodLayer(true); }
 	
+	public static long firstRenderTimeMs = 0;
+	
 	private void renderLodLayer(boolean renderingDeferredLayer)
 	{
-		//=========//
-		// logging //
-		//=========//
-		
-		this.sendQueuedChatMessages();
-		
 		IProfilerWrapper profiler = MC_CLIENT.getProfiler();
-		profiler.pop(); // get out of "terrain"
 		profiler.push("DH-RenderLevel");
 		
 		
 		
+		//===========//
+		// debugging //
+		//===========//
+		//region
+		
+		//DhApiTerrainDataRepo.asyncDebugMethod(
+		//	RENDER_STATE.clientLevelWrapper,
+		//	MC_CLIENT.getPlayerBlockPos().getX(),
+		//	MC_CLIENT.getPlayerBlockPos().getY(),
+		//	MC_CLIENT.getPlayerBlockPos().getZ()
+		//);
+		
+		//endregion
+		
+		
+		
 		//=====================//
 		// render thread tasks //
 		//=====================//
+		///region
 		
 		// only run these tasks once per frame
 		if (!renderingDeferredLayer)
 		{
 			profiler.push("DH render thread tasks");
 			
+			
+			
+			//===============//
+			// chat messages //
+			//===============//
+			
+			this.sendQueuedChatMessages();
+			
+			
+			
+			//======================//
+			// GL Proxy queued jobs //
+			//======================//
+			
 			try
 			{
-				// make sure the GLProxy is created for future use
-				GLProxy.getInstance();
-				
 				// these tasks always need to be called, regardless of whether the renderer is enabled or not to prevent memory leaks
-				GLProxy.runRenderThreadTasks();
+				RenderThreadTaskHandler.INSTANCE.runRenderThreadTasks();
 			}
 			catch (Exception e)
 			{
 				LOGGER.error("Unexpected issue running render thread tasks, error: [" + e.getMessage() + "].", e);
 			}
 			
+			
+			
+			//==============//
+			// camera speed //
+			//==============//
+			
+			long nowMs = System.currentTimeMillis();
+			if (this.msSinceLastSpeedCheck + MIN_MS_BETWEEN_SPEED_CHECKS < nowMs)
+			{
+				// calc time since last check
+				double secSinceLastCheck = (nowMs - this.msSinceLastSpeedCheck) / 1_000.0;
+				this.msSinceLastSpeedCheck = nowMs;
+				
+				// get the distance traveled since last frame
+				Vec3d camPos = MC_RENDER.getCameraExactPosition();
+				double distanceInBlocks = camPos.getDistance(this.lastCameraPosForSpeedCheck);
+				double speed = distanceInBlocks / secSinceLastCheck;
+				
+				// record new values for next check
+				this.cameraSpeedRollingAverage.add(speed);
+				this.lastCameraPosForSpeedCheck = camPos;
+			}
+			
+			
 			profiler.pop();
 		}
 		
+		///endregion
+		
+		
 		
 		
 		//=================//
 		// parameter setup //
 		//=================//
+		///region
 		
 		EDhApiRenderPass renderPass;
 		if (DhApiRenderProxy.INSTANCE.getDeferTransparentRendering())
@@ -438,24 +531,26 @@ public class ClientApi
 		// render prep and actual rendering into different threads/methods
 		// this is annoying since it's possible to start a render with only
 		// partially complete info, but there isn't a better option at the moment
-		RenderParams renderParams =
-			new RenderParams(
-				renderPass,
-				RENDER_STATE.frameTime,
-				RENDER_STATE.mcProjectionMatrix, RENDER_STATE.mcModelViewMatrix,
-				RENDER_STATE.clientLevelWrapper
-			);
+		RenderParams renderParams = new RenderParams(renderPass, RENDER_STATE);
+		
+		///endregion
 		
 		
 		
 		//============//
 		// validation //
 		//============//
+		///region
 		
-		// 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 (firstRenderTimeMs == 0)
+		{
+			firstRenderTimeMs = System.currentTimeMillis();
+		}
+		
+		String validationMessage = renderParams.getValidationErrorMessage(firstRenderTimeMs);
 		if (validationMessage != null)
 		{
+			// store the error message so it can be seen on the F3 screen
 			this.lastRenderParamValidationMessage = validationMessage;
 			return;
 		}
@@ -477,22 +572,29 @@ public class ClientApi
 			return;
 		}
 		
+		if (Config.Client.Advanced.Debugging.rendererMode.get() == EDhApiRendererMode.DISABLED)
+		{
+			return;
+		}
+		
+		///endregion
+		
 		
 		
 		//===========//
 		// rendering //
 		//===========//
+		///region
 		
 		try
 		{
 			// render pass //
-			
-			if (!renderingDeferredLayer)
-			{
 			if (Config.Client.Advanced.Debugging.rendererMode.get() == EDhApiRendererMode.DEFAULT)
 			{
-					boolean renderingCancelledForThisFrame = ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeRenderEvent.class, renderParams);
-					if (!renderingCancelledForThisFrame)
+				if (!renderingDeferredLayer)
+				{
+					boolean renderingCancelled = ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeRenderEvent.class, renderParams);
+					if (!renderingCancelled)
 					{
 						LodRenderer.INSTANCE.render(renderParams, profiler);
 					}
@@ -502,13 +604,6 @@ public class ClientApi
 						ApiEventInjector.INSTANCE.fireAllEvents(DhApiAfterRenderEvent.class, null);
 					}
 				}
-				else if (Config.Client.Advanced.Debugging.rendererMode.get() == EDhApiRendererMode.DEBUG)
-				{
-					profiler.push("Render Debug");
-					ClientApi.TEST_RENDERER.render();
-					profiler.pop();
-				}
-			}
 				else
 				{
 					boolean renderingCancelled = ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeDeferredRenderEvent.class, renderParams);
@@ -524,6 +619,30 @@ public class ClientApi
 					}
 				}
 			}
+			else
+			{
+				if (!renderingDeferredLayer)
+				{
+					IDhMetaRenderer metaRenderer = SingletonInjector.INSTANCE.get(IDhMetaRenderer.class);
+					IDhTestTriangleRenderer testRenderer = SingletonInjector.INSTANCE.get(IDhTestTriangleRenderer.class);
+					if (testRenderer != null
+						&& metaRenderer != null)
+					{
+						// meta renderer needed for render state/texture
+						// for setup on some APIs (IE openGL)
+						metaRenderer.runRenderPassSetup(renderParams);
+						
+						testRenderer.render(renderParams);
+						
+						metaRenderer.runRenderPassCleanup(renderParams);
+					}
+					else
+					{
+						RATE_LIMITED_LOGGER.warn("Unable to find singleton [" + IDhTestTriangleRenderer.class.getSimpleName() + "]");
+					}
+				}
+			}
+		}
 		catch (Exception e)
 		{
 			this.rendererDisabledBecauseOfExceptions = true;
@@ -535,17 +654,21 @@ public class ClientApi
 			MC_CLIENT.sendChatMessage(MinecraftTextFormat.DARK_RED + "Error: " + MinecraftTextFormat.CLEAR_FORMATTING + e);
 		}
 		
+		///endregion
+		
 		
 		
 		profiler.pop(); // end LOD
-		profiler.push("terrain"); // go back into "terrain"
 	}
 	
+	///endregion
+	
 	
 	
 	//================//
 	// fade rendering //
 	//================//
+	///region
 	
 	/** 
 	 * The first fade pass.
@@ -553,8 +676,14 @@ public class ClientApi
 	 */
 	public void renderFadeOpaque()
 	{
+		IDhVanillaFadeRenderer fadeRenderer = SingletonInjector.INSTANCE.get(IDhVanillaFadeRenderer.class);
+		if (fadeRenderer == null)
+		{
+			return;
+		}
+		
 		// only fade when DH is rendering
-		if (Config.Client.Advanced.Debugging.rendererMode.get() == EDhApiRendererMode.DEFAULT
+		if (Config.Client.Advanced.Debugging.rendererMode.get() != EDhApiRendererMode.DISABLED
 			&&
 			(
 				// only fade when requested
@@ -565,7 +694,8 @@ public class ClientApi
 			// don't fade when Iris shaders are active, otherwise the rendering can get weird
 			&& !DhApiRenderProxy.INSTANCE.getDeferTransparentRendering())
 		{
-			VanillaFadeRenderer.INSTANCE.render(RENDER_STATE.mcModelViewMatrix, RENDER_STATE.mcProjectionMatrix, RENDER_STATE.frameTime, RENDER_STATE.clientLevelWrapper);
+			RenderParams renderParams = new RenderParams(EDhApiRenderPass.OPAQUE, RENDER_STATE);
+			fadeRenderer.render(renderParams);
 		}
 	}
 	/** 
@@ -575,8 +705,14 @@ public class ClientApi
 	 */
 	public void renderFadeTransparent()
 	{
+		IDhVanillaFadeRenderer fadeRenderer = SingletonInjector.INSTANCE.get(IDhVanillaFadeRenderer.class);
+		if (fadeRenderer == null)
+		{
+			return;
+		}
+		
 		// only fade when DH is rendering
-		if (Config.Client.Advanced.Debugging.rendererMode.get() == EDhApiRendererMode.DEFAULT)
+		if (Config.Client.Advanced.Debugging.rendererMode.get() != EDhApiRendererMode.DISABLED)
 		{
 			boolean renderFade =
 				(
@@ -589,16 +725,20 @@ public class ClientApi
 				&& !DhApiRenderProxy.INSTANCE.getDeferTransparentRendering();
 			if (renderFade)
 			{
-				VanillaFadeRenderer.INSTANCE.render(RENDER_STATE.mcModelViewMatrix, RENDER_STATE.mcProjectionMatrix, RENDER_STATE.frameTime, RENDER_STATE.clientLevelWrapper);
+				RenderParams renderParams = new RenderParams(EDhApiRenderPass.TRANSPARENT, RENDER_STATE);
+				fadeRenderer.render(renderParams);
 			}
 		}
 	}
 	
+	///endregion
 	
 	
-	//=================//
-	//    DEBUG USE    //
-	//=================//
+	
+	//==========//
+	// keyboard //
+	//==========//
+	///region
 	
 	/** Trigger once on key press, with CLIENT PLAYER. */
 	public void keyPressedEvent(int glfwKey)
@@ -610,23 +750,32 @@ public class ClientApi
 		}
 		
 		
-		if (glfwKey == GLFW.GLFW_KEY_F8)
-		{
-			Config.Client.Advanced.Debugging.debugRendering.set(EDhApiDebugRendering.next(Config.Client.Advanced.Debugging.debugRendering.get()));
-			MC_CLIENT.sendChatMessage("F8: Set debug mode to " + Config.Client.Advanced.Debugging.debugRendering.get());
-		}
-		else if (glfwKey == GLFW.GLFW_KEY_F6)
+		if (glfwKey == GLFW.GLFW_KEY_F6)
 		{
 			Config.Client.Advanced.Debugging.rendererMode.set(EDhApiRendererMode.next(Config.Client.Advanced.Debugging.rendererMode.get()));
 			MC_CLIENT.sendChatMessage("F6: Set rendering to " + Config.Client.Advanced.Debugging.rendererMode.get());
 		}
-		else if (glfwKey == GLFW.GLFW_KEY_P)
+		else if (glfwKey == GLFW.GLFW_KEY_F7)
 		{
-			prefLoggerEnabled = !prefLoggerEnabled;
-			MC_CLIENT.sendChatMessage("P: Debug Pref Logger is " + (prefLoggerEnabled ? "enabled" : "disabled"));
+			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());
+		}
+		else if (glfwKey == GLFW.GLFW_KEY_F8)
+		{
+			Config.Client.Advanced.Debugging.debugRenderingColors.set(EDhApiDebugRendering.next(Config.Client.Advanced.Debugging.debugRenderingColors.get()));
+			MC_CLIENT.sendChatMessage("F8: Set debug mode to " + Config.Client.Advanced.Debugging.debugRenderingColors.get());
 		}
 	}
 	
+	///endregion
+	
+	
+	
+	//======//
+	// chat //
+	//======//
+	///region
+	
 	private void sendQueuedChatMessages()
 	{
 		// this includes if the current build is a dev build
@@ -759,6 +908,8 @@ public class ClientApi
 	 */
 	public void showOverlayMessageNextFrame(String message) { this.overlayMessageQueueForNextFrame.add(message); }
 	
+	///endregion
+	
 	
 	
 }

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

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

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

@@ -101,7 +101,6 @@ public class ServerApi
 		if (serverWorld != null)
 		{
 			serverWorld.unloadLevel(level);
-			SharedApi.INSTANCE.clearQueuedChunkUpdates();
 			ApiEventInjector.INSTANCE.fireAllEvents(DhApiLevelUnloadEvent.class, new DhApiLevelUnloadEvent.EventParam(level));
 		}
 	}
@@ -112,8 +111,8 @@ public class ServerApi
 	// chunk modified events //
 	//=======================//
 	
-	public void serverChunkLoadEvent(IChunkWrapper chunkWrapper, ILevelWrapper level) { SharedApi.INSTANCE.applyChunkUpdate(chunkWrapper, level, false, false); }
-	public void serverChunkSaveEvent(IChunkWrapper chunkWrapper, ILevelWrapper level) { SharedApi.INSTANCE.applyChunkUpdate(chunkWrapper, level, true, false); }
+	public void serverChunkLoadEvent(IChunkWrapper chunkWrapper, ILevelWrapper level) { SharedApi.INSTANCE.applyChunkUpdate(chunkWrapper, level); }
+	public void serverChunkSaveEvent(IChunkWrapper chunkWrapper, ILevelWrapper level) { SharedApi.INSTANCE.applyChunkUpdate(chunkWrapper, level); }
 	
 	
 	

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

@@ -24,27 +24,22 @@ import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiWorldUn
 import com.seibel.distanthorizons.core.Initializer;
 import com.seibel.distanthorizons.core.api.internal.chunkUpdating.ChunkUpdateData;
 import com.seibel.distanthorizons.core.api.internal.chunkUpdating.ChunkUpdateQueueManager;
-import com.seibel.distanthorizons.core.config.Config;
+import com.seibel.distanthorizons.core.api.internal.chunkUpdating.WorldChunkUpdateManager;
 import com.seibel.distanthorizons.core.config.eventHandlers.IgnoredDimensionCsvHandler;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
-import com.seibel.distanthorizons.core.generation.DhLightingEngine;
 import com.seibel.distanthorizons.core.level.DhClientLevel;
 import com.seibel.distanthorizons.core.level.IDhLevel;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.logging.f3.F3Screen;
 import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos2D;
 import com.seibel.distanthorizons.core.pos.DhChunkPos;
-import com.seibel.distanthorizons.core.render.renderer.DebugRenderer;
+import com.seibel.distanthorizons.core.render.RenderThreadTaskHandler;
+import com.seibel.distanthorizons.core.render.renderer.AbstractDebugWireframeRenderer;
 import com.seibel.distanthorizons.core.sql.repo.AbstractDhRepo;
-import com.seibel.distanthorizons.core.util.LodUtil;
 import com.seibel.distanthorizons.core.util.objects.Pair;
-import com.seibel.distanthorizons.core.util.threading.PriorityTaskPicker;
 import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
 import com.seibel.distanthorizons.core.world.*;
 import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
 import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector;
@@ -63,44 +58,38 @@ public class SharedApi
 	/** will be null on the server-side */
 	@Nullable
 	private static final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
-	/** will be null on the server-side */
-	@Nullable
-	private static final IMinecraftClientWrapper MC_CLIENT = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
-	private static final IMinecraftSharedWrapper MC_SHARED = SingletonInjector.INSTANCE.get(IMinecraftSharedWrapper.class);
 	
-	public static final ChunkUpdateQueueManager CHUNK_UPDATE_QUEUE_MANAGER = new ChunkUpdateQueueManager();
-	/** 
-	 * 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;
+	public static final WorldChunkUpdateManager WORLD_CHUNK_UPDATE_MANAGER = WorldChunkUpdateManager.INSTANCE; // local fariable for quick access
 	
 	
 	@Nullable
 	private static AbstractDhWorld currentWorld;
-	private static int lastWorldGenTickDelta = 0;
+	private static final Object worldLockObject = new Object();
 	
 	
 	
 	//=============//
 	// constructor //
 	//=============//
+	//region
 	
 	private SharedApi() { }
 	public static void init() { Initializer.init(); }
 	
+	//endregion
+	
 	
 	
 	//===============//
 	// world methods //
 	//===============//
+	//region
 	
 	public static EWorldEnvironment getEnvironment() { return (currentWorld == null) ? null : currentWorld.environment; }
 	
 	public static void setDhWorld(AbstractDhWorld newWorld)
+	{
+		synchronized (worldLockObject)
 		{
 			AbstractDhWorld oldWorld = currentWorld;
 			if (oldWorld != null)
@@ -120,7 +109,10 @@ public class SharedApi
 			else
 			{
 				ThreadPoolUtil.shutdownThreadPools();
-			DebugRenderer.clearRenderables();
+				
+				// delayed get because SharedApi will be created before the singleton has been bound 
+				AbstractDebugWireframeRenderer debugWireframeRenderer = SingletonInjector.INSTANCE.get(AbstractDebugWireframeRenderer.class);
+				debugWireframeRenderer.clearRenderables();
 				
 				if (MC_RENDER != null)
 				{
@@ -130,7 +122,9 @@ public class SharedApi
 				// shouldn't be necessary, but if we missed closing one of the connections this should make sure they're all closed
 				AbstractDhRepo.closeAllConnections();
 				// needs to be closed on world shutdown to clear out un-processed chunks
-			CHUNK_UPDATE_QUEUE_MANAGER.clear();
+				WORLD_CHUNK_UPDATE_MANAGER.clear();
+				
+				RenderThreadTaskHandler.INSTANCE.clearDebugStats();
 				
 				// recommend that the garbage collector cleans up any objects from the old world and thread pools
 				System.gc();
@@ -141,6 +135,7 @@ public class SharedApi
 				DhApiWorldProxy.INSTANCE.setReadOnly(false, false);
 			}
 		}
+	}
 	
 	@Nullable
 	public static AbstractDhWorld getAbstractDhWorld() { return currentWorld; }
@@ -153,39 +148,44 @@ public class SharedApi
 	@Nullable
 	public static IDhServerWorld tryGetDhServerWorld() { return (currentWorld instanceof IDhServerWorld) ? (IDhServerWorld) currentWorld : null; }
 	
+	//endregion
+	
 	
 	
 	//==============//
 	// chunk update //
 	//==============//
+	//region
 	
 	/** 
 	 * Used to prevent getting a full chunk from MC if it isn't necessary. <br>
 	 * This is important since asking MC for a chunk is slow and may block the render thread.
 	 */
-	public static boolean isChunkAtBlockPosAlreadyUpdating(int blockPosX, int blockPosZ)
-	{ return CHUNK_UPDATE_QUEUE_MANAGER.contains(new DhChunkPos(new DhBlockPos2D(blockPosX, blockPosZ))); }
+	public static boolean isChunkAtBlockPosAlreadyUpdating(ILevelWrapper levelWrapper, int blockPosX, int blockPosZ)
+	{
+		ChunkUpdateQueueManager manager = WORLD_CHUNK_UPDATE_MANAGER.getByLevelWrapper(levelWrapper);
+		if (manager == null)
+		{
+			return true;
+		}
 		
-	public static boolean isChunkAtChunkPosAlreadyUpdating(int chunkPosX, int chunkPosZ)
-	{ return CHUNK_UPDATE_QUEUE_MANAGER.contains(new DhChunkPos(chunkPosX, chunkPosZ)); }
+		return manager.contains(new DhChunkPos(new DhBlockPos2D(blockPosX, blockPosZ))); 
+	}
 	
-	/** 
-	 * 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 static boolean isChunkAtChunkPosAlreadyUpdating(ILevelWrapper levelWrapper, int chunkPosX, int chunkPosZ)
+	{
+		ChunkUpdateQueueManager manager = WORLD_CHUNK_UPDATE_MANAGER.getByLevelWrapper(levelWrapper);
+		if (manager == null)
+		{
+			return true;
+		}
 		
-	public int getQueuedChunkUpdateCount() { return CHUNK_UPDATE_QUEUE_MANAGER.getQueuedCount(); }
+		return manager.contains(new DhChunkPos(chunkPosX, chunkPosZ)); 
+	}
 	
 	
 	
-	/** 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)
+	public void applyChunkUpdate(IChunkWrapper chunkWrapper, ILevelWrapper levelWrapper)
 	{
 		//===================//
 		// validation checks //
@@ -200,11 +200,11 @@ public class SharedApi
 		AbstractDhWorld dhWorld = SharedApi.getAbstractDhWorld();
 		if (dhWorld == null)
 		{
-			if (level instanceof IClientLevelWrapper)
+			if (levelWrapper instanceof IClientLevelWrapper)
 			{
 				// If the client world isn't loaded yet, keep track of which chunks were loaded so we can use them later.
 				// This may happen if the client world and client level load events happen out of order
-				IClientLevelWrapper clientLevel = (IClientLevelWrapper) level;
+				IClientLevelWrapper clientLevel = (IClientLevelWrapper) levelWrapper;
 				ClientApi.INSTANCE.waitingChunkByClientLevelAndPos.replace(new Pair<>(clientLevel, chunkWrapper.getChunkPos()), chunkWrapper);
 			}
 			
@@ -218,13 +218,13 @@ public class SharedApi
 		}
 		
 		// only continue if the level is loaded
-		IDhLevel dhLevel = dhWorld.getLevel(level);
+		IDhLevel dhLevel = dhWorld.getLevel(levelWrapper);
 		if (dhLevel == null)
 		{
-			if (level instanceof IClientLevelWrapper)
+			if (levelWrapper instanceof IClientLevelWrapper)
 			{
 				// the client level isn't loaded yet
-				IClientLevelWrapper clientLevel = (IClientLevelWrapper) level;
+				IClientLevelWrapper clientLevel = (IClientLevelWrapper) levelWrapper;
 				ClientApi.INSTANCE.waitingChunkByClientLevelAndPos.replace(new Pair<>(clientLevel, chunkWrapper.getChunkPos()), chunkWrapper);
 			}
 			
@@ -247,21 +247,23 @@ public class SharedApi
 			return;
 		}
 		
-		// shouldn't normally happen, but just in case
-		if (CHUNK_UPDATE_QUEUE_MANAGER.contains(chunkWrapper.getChunkPos()))
+		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()))
 		{
-			// TODO this will prevent some LODs from updating across dimensions if multiple levels are loaded
 			return;
 		}
 		
 		
-		queueChunkUpdate(chunkWrapper, dhLevel);
+		queueChunkUpdate(chunkManager, chunkWrapper, dhLevel);
 	}
 	
-	private static void queueChunkUpdate(IChunkWrapper chunkWrapper, IDhLevel dhLevel)
+	private static void queueChunkUpdate(ChunkUpdateQueueManager chunkManager, IChunkWrapper chunkWrapper, IDhLevel dhLevel)
 	{
 		// return if the chunk is already queued
-		if (CHUNK_UPDATE_QUEUE_MANAGER.contains(chunkWrapper.getChunkPos()))
+		if (chunkManager.contains(chunkWrapper.getChunkPos()))
 		{
 			return;
 		}
@@ -269,188 +271,36 @@ public class SharedApi
 		
 		// add chunk update data to preUpdate queue
 		ChunkUpdateData updateData = new ChunkUpdateData(chunkWrapper, dhLevel);
-		CHUNK_UPDATE_QUEUE_MANAGER.addItemToPreUpdateQueue(chunkWrapper.getChunkPos(), updateData);
+		chunkManager.addItemToPreUpdateQueue(chunkWrapper.getChunkPos(), updateData);
 		
 		
-		// queue updates up to the number of CPU cores allocated for the job
-		// (this prevents doing extra work queuing tasks that may not be necessary)
-		// and makes sure the chunks closest to the player are updated first
-		PriorityTaskPicker.Executor executor = ThreadPoolUtil.getChunkToLodBuilderExecutor();
-		if (executor != null
-			&& executor.getQueueSize() < executor.getPoolSize())
-		{
-			try
-			{
-				executor.execute(SharedApi::processQueue);
-			}
-			catch (RejectedExecutionException ignore)
-			{
-				// the executor was shut down, it should be back up shortly and able to accept new jobs
-			}
-		}
-	}
-	
-	private static void processQueue()
-	{
-		// update the center & max size of the queue manager
-		int maxUpdateSizeMultiplier;
-		if (MC_CLIENT != null && MC_CLIENT.playerExists())
-		{
-			// Local worlds & multiplayer
-			CHUNK_UPDATE_QUEUE_MANAGER.setCenter(MC_CLIENT.getPlayerChunkPos());
-			maxUpdateSizeMultiplier = MC_CLIENT.clientConnectedToDedicatedServer() ? 1 : MC_SHARED.getPlayerCount();
-		}
-		else
-		{
-			// Dedicated servers
-			// Also includes spawn chunks since they're likely to be intentionally utilized with updates
-			maxUpdateSizeMultiplier = 1 + MC_SHARED.getPlayerCount();
-		}
-		
-		CHUNK_UPDATE_QUEUE_MANAGER.maxSize = MAX_UPDATING_CHUNK_COUNT_PER_THREAD_AND_PLAYER
-				* Config.Common.MultiThreading.numberOfThreads.get()
-				* maxUpdateSizeMultiplier;
-		
-		
-		
-		//===============================//
-		// update the necessary chunk(s) //
-		//===============================//
-		
-		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())
+		if (executor != null)
 		{
 			try
 			{
-				executor.execute(SharedApi::processQueue);
+				executor.execute(WORLD_CHUNK_UPDATE_MANAGER::processEachQueue);
 			}
 			catch (RejectedExecutionException ignore)
 			{
 				// the executor was shut down, it should be back up shortly and able to accept new jobs
 			}
 		}
-		
 	}
 	
-	private static void processQueuedChunkPreUpdate()
-	{
-		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;
-	}
+	//endregion
 	
 	
 	
 	//=========//
 	// F3 Menu //
 	//=========//
+	//region
 	
-	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());
+	public ArrayList<String> getDebugMenuString() { return WORLD_CHUNK_UPDATE_MANAGER.getDebugMenuString(); }
 	
-		String maxUpdateCountStr = F3Screen.NUMBER_FORMAT.format(CHUNK_UPDATE_QUEUE_MANAGER.maxSize);
-		
-		return "Queued chunk updates: "+"( "+preUpdatingCountStr+" + "+updatingCountStr+" )  [ "+queuedCountStr+" / "+maxUpdateCountStr+" ]";
-	}
+	//endregion
 	
 	
 	

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

@@ -4,28 +4,58 @@ import com.google.common.cache.CacheBuilder;
 import com.seibel.distanthorizons.core.api.internal.ClientApi;
 import com.seibel.distanthorizons.core.api.internal.SharedApi;
 import com.seibel.distanthorizons.core.config.Config;
+import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.enums.MinecraftTextFormat;
+import com.seibel.distanthorizons.core.generation.DhLightingEngine;
+import com.seibel.distanthorizons.core.level.IDhLevel;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.logging.f3.F3Screen;
 import com.seibel.distanthorizons.core.pos.DhChunkPos;
+import com.seibel.distanthorizons.core.util.LodUtil;
+import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
 import com.seibel.distanthorizons.core.world.EWorldEnvironment;
 import com.seibel.distanthorizons.core.logging.DhLogger;
 import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
 import org.jetbrains.annotations.Nullable;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
 
+
+/**
+ * @see WorldChunkUpdateManager
+ */
 public class ChunkUpdateQueueManager
 {
 	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
+	private static final IMinecraftClientWrapper MC_CLIENT = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
+	private static final IMinecraftSharedWrapper MC_SHARED = SingletonInjector.INSTANCE.get(IMinecraftSharedWrapper.class);
+	
+	/**
+	 * how many chunks can be queued for updating per thread + player (in multiplayer), 
+	 * used to prevent updates from infinitely pilling up if the user flies around extremely fast 
+	 */
+	public static final int MAX_UPDATING_CHUNK_COUNT_PER_THREAD_AND_PLAYER = 1_000;
+	
+	/** how many milliseconds must pass before an overloaded message can be sent in chat or the log */
+	public static final int MIN_MS_BETWEEN_OVERLOADED_LOG_MESSAGE = 30_000;
+	
+	
+	
+	private final Set<DhChunkPos> ignoredChunkPosSet = Collections.newSetFromMap(new ConcurrentHashMap<>());
+	private static long lastOverloadedLogMessageMsTime = 0;
+	
+	
+	
 	
 	public final ChunkPosQueue updateQueue;
 	public final ChunkPosQueue preUpdateQueue;
-	public final Set<DhChunkPos> ignoredChunkPosSet = Collections.newSetFromMap(new ConcurrentHashMap<>());
 	
 	public final ConcurrentMap<DhChunkPos, IChunkWrapper> queuedChunkWrapperByChunkPos = CacheBuilder.newBuilder()
 		.expireAfterWrite(20, TimeUnit.SECONDS)
@@ -35,13 +65,15 @@ public class ChunkUpdateQueueManager
 	/** dynamically changes based on the number of threads currently available */
 	public int maxSize = 500;
 	
-	private static long lastOverloadedLogMessageMsTime = 0;
+	/** used to prevent flickering */
+	public long lastMsTimeShownActiveInF3Screen = System.currentTimeMillis();
 	
 	
 	
 	//=============//
 	// constructor //
 	//=============//
+	//region
 	
 	public ChunkUpdateQueueManager()
 	{
@@ -49,11 +81,14 @@ public class ChunkUpdateQueueManager
 		this.preUpdateQueue = new ChunkPosQueue();
 	}
 	
+	//endregion
+	
 	
 	
 	//==================//
 	// list/set methods //
 	//==================//
+	//region
 	
 	public boolean contains(DhChunkPos pos) 
 	{ 
@@ -69,7 +104,8 @@ public class ChunkUpdateQueueManager
 		this.ignoredChunkPosSet.clear();
 	}
 	public int getQueuedCount() { return this.updateQueue.getQueuedCount() + this.preUpdateQueue.getQueuedCount(); }
-	public boolean isEmpty()
+	
+	public boolean updateQueuesEmpty()
 	{
 		return this.updateQueue.isEmpty()
 				&& this.preUpdateQueue.isEmpty();
@@ -114,14 +150,14 @@ public class ChunkUpdateQueueManager
 	{
 		// limit how often an overloaded message can be sent
 		long msBetweenLastLog = System.currentTimeMillis() - lastOverloadedLogMessageMsTime;
-		if (msBetweenLastLog >= SharedApi.MIN_MS_BETWEEN_OVERLOADED_LOG_MESSAGE)
+		if (msBetweenLastLog >= MIN_MS_BETWEEN_OVERLOADED_LOG_MESSAGE)
 		{
 			lastOverloadedLogMessageMsTime = System.currentTimeMillis();
 			
 			String message = MinecraftTextFormat.ORANGE + "Distant Horizons overloaded, too many chunks queued for LOD processing. " + MinecraftTextFormat.CLEAR_FORMATTING +
 					"\nThis may result in holes in your LODs. " +
 					"\nFix: move through the world slower, decrease your vanilla render distance, slow down your world pre-generator (IE Chunky), or increase the Distant Horizons' CPU thread counts. " +
-					"\nMax queue count [" + SharedApi.CHUNK_UPDATE_QUEUE_MANAGER.maxSize + "] ([" + SharedApi.MAX_UPDATING_CHUNK_COUNT_PER_THREAD_AND_PLAYER + "] per thread+players).";
+					"\nMax queue count [" + this.maxSize + "] ([" + MAX_UPDATING_CHUNK_COUNT_PER_THREAD_AND_PLAYER + "] per thread+players).";
 			
 			boolean showWarningInChat = Config.Common.Logging.Warning.showUpdateQueueOverloadedChatWarning.get();
 			if (showWarningInChat)
@@ -159,20 +195,180 @@ 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)
 	{
@@ -180,5 +376,33 @@ public class ChunkUpdateQueueManager
 		this.preUpdateQueue.setCenter(newCenter);
 	}
 	
+	//endregion
+	
+	
+	
+	//=========//
+	// F3 Menu //
+	//=========//
+	//region
+	
+	public String getDebugMenuString()
+	{
+		String y = MinecraftTextFormat.YELLOW;
+		String o = MinecraftTextFormat.ORANGE;
+		String cf = MinecraftTextFormat.CLEAR_FORMATTING;
+		
+		
+		String preUpdatingCountStr = F3Screen.NUMBER_FORMAT.format(this.preUpdateQueue.getQueuedCount());
+		String updatingCountStr = F3Screen.NUMBER_FORMAT.format(this.updateQueue.getQueuedCount());
+		String queuedCountStr = F3Screen.NUMBER_FORMAT.format(this.getQueuedCount());
+		
+		String maxUpdateCountStr = F3Screen.NUMBER_FORMAT.format(this.maxSize);
+		
+		return "Queued chunk updates: "+"("+y+preUpdatingCountStr+cf+" + "+o+updatingCountStr+cf+") ["+queuedCountStr+"/"+maxUpdateCountStr+"]";
+	}
+	
+	//endregion
+	
+	
 	
 }

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

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

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

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

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

@@ -19,7 +19,6 @@
 
 package com.seibel.distanthorizons.core.config;
 
-import com.seibel.distanthorizons.api.DhApi;
 import com.seibel.distanthorizons.api.enums.config.*;
 import com.seibel.distanthorizons.api.enums.config.quickOptions.*;
 import com.seibel.distanthorizons.api.enums.rendering.*;
@@ -27,14 +26,12 @@ import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiDistantGenerat
 import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiDistantGeneratorProgressDisplayLocation;
 import com.seibel.distanthorizons.core.config.eventHandlers.*;
 import com.seibel.distanthorizons.core.config.eventHandlers.presets.*;
-import com.seibel.distanthorizons.core.config.listeners.ConfigChangeListener;
 import com.seibel.distanthorizons.core.config.types.*;
 import com.seibel.distanthorizons.core.config.types.enums.*;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.pos.DhSectionPos;
 import com.seibel.distanthorizons.core.util.NativeDialogUtil;
-import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper;
 import com.seibel.distanthorizons.coreapi.ModInfo;
 import com.seibel.distanthorizons.core.logging.DhLogger;
@@ -146,8 +143,11 @@ public class Config
 				public static ConfigCategory quality = new ConfigCategory.Builder().set(Quality.class).build();
 				public static ConfigUISpacer qualitySpacer = new ConfigUISpacer.Builder().build();
 				
-				public static ConfigUiLinkedEntry quickEnableSsao = new ConfigUiLinkedEntry(Ssao.enableSsao);
-				public static ConfigCategory ssao = new ConfigCategory.Builder().set(Ssao.class).build();
+				
+				public static ConfigEntry<Boolean> enableSsao = new ConfigEntry.Builder<Boolean>()
+					.set(true)
+					.comment("Enable Screen Space Ambient Occlusion")
+					.build();
 				public static ConfigUISpacer ssaoSpacer = new ConfigUISpacer.Builder().build();
 				
 				
@@ -270,13 +270,6 @@ public class Config
 							.addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE)
 							.build();
 					
-					public static ConfigEntry<Double> lodBias = new ConfigEntry.Builder<Double>()
-							.setMinDefaultMax(0d, 0d, null)
-							.comment(""
-									+ "What value should vanilla Minecraft's texture LodBias be? \n"
-									+ "If set to 0 the mod wont overwrite vanilla's default (which so happens to also be 0)")
-							.build();
-					
 					public static ConfigEntry<EDhApiLodShading> lodShading = new ConfigEntry.Builder<EDhApiLodShading>()
 							.set(EDhApiLodShading.AUTO)
 							.comment(""
@@ -330,8 +323,8 @@ public class Config
 									+ "")
 							.build();
 					
-					public static ConfigEntry<Double> brightnessMultiplier = new ConfigEntry.Builder<Double>() // TODO: Make this a float (the ClassicConfigGUI doesnt support floats)
-							.set(1.0)
+					public static ConfigEntry<Float> brightnessMultiplier = new ConfigEntry.Builder<Float>()
+							.set(1.0f)
 							.comment(""
 									+ "How bright LOD colors are. \n"
 									+ "\n"
@@ -341,8 +334,8 @@ public class Config
 							.addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE)
 							.build();
 					
-					public static ConfigEntry<Double> saturationMultiplier = new ConfigEntry.Builder<Double>() // TODO: Make this a float (the ClassicConfigGUI doesnt support floats)
-							.set(1.0)
+					public static ConfigEntry<Float> saturationMultiplier = new ConfigEntry.Builder<Float>()
+							.set(1.0f)
 							.comment(""
 									+ "How saturated LOD colors are. \n"
 									+ "\n"
@@ -365,71 +358,6 @@ public class Config
 							.build();	
 				}
 				
-				public static class Ssao
-				{
-					public static ConfigUIComment ssaoHeader = new ConfigUIComment.Builder().setParentConfigClass(Ssao.class).build();
-					
-					public static ConfigEntry<Boolean> enableSsao = new ConfigEntry.Builder<Boolean>()
-							.set(true)
-							.comment("Enable Screen Space Ambient Occlusion")
-							.build();
-					
-					public static ConfigEntry<Integer> sampleCount = new ConfigEntry.Builder<Integer>()
-							.set(6)
-							.comment("" +
-									"Determines how many points in space are sampled for the occlusion test. \n" +
-									"Higher numbers will improve quality and reduce banding, but will increase GPU load." +
-									"")
-							.build();
-					
-					public static ConfigEntry<Double> radius = new ConfigEntry.Builder<Double>()
-							.set(4.0)
-							.comment("" +
-									"Determines the radius Screen Space Ambient Occlusion is applied, measured in blocks." +
-									"")
-							.build();
-					
-					public static ConfigEntry<Double> strength = new ConfigEntry.Builder<Double>()
-							.set(0.2)
-							.comment("" +
-									"Determines how dark the Screen Space Ambient Occlusion effect will be." +
-									"")
-							.build();
-					
-					public static ConfigEntry<Double> bias = new ConfigEntry.Builder<Double>()
-							.set(0.02)
-							.comment("" +
-									"Increasing the value can reduce banding at the cost of reducing the strength of the effect." +
-									"")
-							.build();
-					
-					public static ConfigEntry<Double> minLight = new ConfigEntry.Builder<Double>()
-							.set(0.25)
-							.comment("" +
-									"Determines how dark the occlusion shadows can be. \n" +
-									"0 = totally black at the corners \n" +
-									"1 = no shadow" +
-									"")
-							.build();
-					
-					public static ConfigEntry<Integer> blurRadius = new ConfigEntry.Builder<Integer>()
-							.set(2)
-							.comment("" +
-									"The radius, measured in pixels, that blurring is calculated for the SSAO. \n" +
-									"Higher numbers will reduce banding at the cost of GPU performance." +
-									"")
-							.build();
-					
-					public static ConfigEntry<Integer> fadeDistanceInBlocks = new ConfigEntry.Builder<Integer>()
-							.setMinDefaultMax(0, 1_600, 30_000_000)
-							.comment("" +
-									"The distance in blocks from the camera where the SSAO will fade out to. \n"+
-									"This is done to prevent banding and noise at extreme distances. \n"+
-									"")
-							.build();
-					
-				}
-				
 				public static class GenericRendering
 				{
 					public static ConfigUIComment genericRendererHeader = new ConfigUIComment.Builder().setParentConfigClass(GenericRendering.class).build();
@@ -474,19 +402,23 @@ public class Config
 									+ "")
 							.build();
 					
-					public static ConfigEntry<Boolean> enableInstancedRendering = new ConfigEntry.Builder<Boolean>()
-							.set(true)
+					public static ConfigEntry<String> dimensionEnabledCloudRenderingCsv = new ConfigEntry.Builder<String>()
+						.set("minecraft:overworld")
+						.setAppearance(EConfigEntryAppearance.ALL)
 						.comment(""
-									+ "Can be disabled to use much slower but more compatible direct rendering. \n"
-									+ "Disabling this can be used to fix some crashes on Mac. \n"
+							+ "A comma separated separated list of dimension resource locations where DH clouds will render.\n"
+							+ "\n"
+							+ "Example: \"minecraft:overworld,minecraft:the_end\"\n"
+							+ "\n"
+							+ "Changes will only be seen when the world is re-loaded.\n"
 							+ "")
 						.build();
 				}
 				
 				public static class Fog
 				{
-					private static final Double FOG_RANGE_MIN = 0.0;
-					private static final Double FOG_RANGE_MAX = Math.sqrt(2.0);
+					private static final Float FOG_RANGE_MIN = 0.0f;
+					private static final Float FOG_RANGE_MAX = (float)Math.sqrt(2.0);
 					
 					
 					
@@ -518,8 +450,8 @@ public class Config
 					
 					
 					
-					public static ConfigEntry<Double> farFogStart = new ConfigEntry.Builder<Double>()
-							.setMinDefaultMax(FOG_RANGE_MIN, 0.4, FOG_RANGE_MAX)
+					public static ConfigEntry<Float> farFogStart = new ConfigEntry.Builder<Float>()
+							.setMinDefaultMax(FOG_RANGE_MIN, 0.4f, FOG_RANGE_MAX)
 							.comment(""
 									+ "At what distance should the far fog start? \n"
 									+ "\n"
@@ -528,8 +460,8 @@ public class Config
 									+ "1.414: Fog starts at the corner of the vanilla render distance.")
 							.build();
 					
-					public static ConfigEntry<Double> farFogEnd = new ConfigEntry.Builder<Double>()
-							.setMinDefaultMax(FOG_RANGE_MIN, 1.0, FOG_RANGE_MAX)
+					public static ConfigEntry<Float> farFogEnd = new ConfigEntry.Builder<Float>()
+							.setMinDefaultMax(FOG_RANGE_MIN, 1.0f, FOG_RANGE_MAX)
 							.comment(""
 									+ "Where should the far fog end? \n"
 									+ "\n"
@@ -538,8 +470,8 @@ public class Config
 									+ "1.414: Fog ends at the corner of the vanilla render distance.")
 							.build();
 					
-					public static ConfigEntry<Double> farFogMin = new ConfigEntry.Builder<Double>()
-							.setMinDefaultMax(-5.0, 0.0, FOG_RANGE_MAX)
+					public static ConfigEntry<Float> farFogMin = new ConfigEntry.Builder<Float>()
+							.setMinDefaultMax(-5.0f, 0.0f, FOG_RANGE_MAX)
 							.comment(""
 									+ "What is the minimum fog thickness? \n"
 									+ "\n"
@@ -547,8 +479,8 @@ public class Config
 									+ "1.0: Fully opaque fog.")
 							.build();
 					
-					public static ConfigEntry<Double> farFogMax = new ConfigEntry.Builder<Double>()
-							.setMinDefaultMax(FOG_RANGE_MIN, 1.0, 5.0)
+					public static ConfigEntry<Float> farFogMax = new ConfigEntry.Builder<Float>()
+							.setMinDefaultMax(FOG_RANGE_MIN, 1.0f, 5.0f)
 							.comment(""
 									+ "What is the maximum fog thickness? \n"
 									+ "\n"
@@ -566,8 +498,8 @@ public class Config
 									+ EDhApiFogFalloff.EXPONENTIAL_SQUARED + ": 1/(e^((distance*density)^2)")
 							.build();
 					
-					public static ConfigEntry<Double> farFogDensity = new ConfigEntry.Builder<Double>()
-							.setMinDefaultMax(0.01, 2.5, 50.0)
+					public static ConfigEntry<Float> farFogDensity = new ConfigEntry.Builder<Float>()
+							.setMinDefaultMax(0.01f, 2.5f, 50.0f)
 							.comment(""
 									+ "Used in conjunction with the Fog Falloff.")
 							.build();
@@ -613,13 +545,13 @@ public class Config
 										+ EDhApiHeightFogDirection.ABOVE_AND_BELOW_SET_HEIGHT + ": Height fog starts from a set height and goes towards both the sky and void")
 								.build();
 						
-						public static ConfigEntry<Double> heightFogBaseHeight = new ConfigEntry.Builder<Double>()
-								.setMinDefaultMax(-4096.0, 80.0, 4096.0)
+						public static ConfigEntry<Float> heightFogBaseHeight = new ConfigEntry.Builder<Float>()
+								.setMinDefaultMax(-3_000_000.0f, 80.0f, 3_000_000.0f)
 								.comment("If the height fog is calculated around a set height, what is that height position?")
 								.build();
 						
-						public static ConfigEntry<Double> heightFogStart = new ConfigEntry.Builder<Double>()
-								.setMinDefaultMax(FOG_RANGE_MIN, 0.0, FOG_RANGE_MAX)
+						public static ConfigEntry<Float> heightFogStart = new ConfigEntry.Builder<Float>()
+								.setMinDefaultMax(FOG_RANGE_MIN, 0.0f, FOG_RANGE_MAX)
 								.comment(""
 										+ "Should the start of the height fog be offset? \n"
 										+ "\n"
@@ -627,8 +559,8 @@ public class Config
 										+ "1.0: Fog start with offset of the entire world's height. (Includes depth)")
 								.build();
 						
-						public static ConfigEntry<Double> heightFogEnd = new ConfigEntry.Builder<Double>()
-								.setMinDefaultMax(FOG_RANGE_MIN, 0.6, FOG_RANGE_MAX)
+						public static ConfigEntry<Float> heightFogEnd = new ConfigEntry.Builder<Float>()
+								.setMinDefaultMax(FOG_RANGE_MIN, 0.6f, FOG_RANGE_MAX)
 								.comment(""
 										+ "Should the end of the height fog be offset? \n"
 										+ "\n"
@@ -636,8 +568,8 @@ public class Config
 										+ "1.0: Fog end with offset of the entire world's height. (Include depth)")
 								.build();
 						
-						public static ConfigEntry<Double> heightFogMin = new ConfigEntry.Builder<Double>()
-								.setMinDefaultMax(0.0, 0.0, FOG_RANGE_MAX)
+						public static ConfigEntry<Float> heightFogMin = new ConfigEntry.Builder<Float>()
+								.setMinDefaultMax(0.0f, 0.0f, FOG_RANGE_MAX)
 								.comment(""
 										+ "What is the minimum fog thickness? \n"
 										+ "\n"
@@ -645,8 +577,8 @@ public class Config
 										+ "1.0: Fully opaque fog.")
 								.build();
 						
-						public static ConfigEntry<Double> heightFogMax = new ConfigEntry.Builder<Double>()
-								.setMinDefaultMax(FOG_RANGE_MIN, 1.0, 5.0)
+						public static ConfigEntry<Float> heightFogMax = new ConfigEntry.Builder<Float>()
+								.setMinDefaultMax(FOG_RANGE_MIN, 1.0f, 5.0f)
 								.comment(""
 										+ "What is the maximum fog thickness? \n"
 										+ "\n"
@@ -664,8 +596,8 @@ public class Config
 										+ EDhApiFogFalloff.EXPONENTIAL_SQUARED + ": 1/(e^((height*density)^2)")
 								.build();
 						
-						public static ConfigEntry<Double> heightFogDensity = new ConfigEntry.Builder<Double>()
-								.setMinDefaultMax(0.01, 20.0, 50.0)
+						public static ConfigEntry<Float> heightFogDensity = new ConfigEntry.Builder<Float>()
+								.setMinDefaultMax(0.01f, 20.0f, 50.0f)
 								.comment("What is the height fog's density?")
 								.build();
 						
@@ -693,13 +625,13 @@ public class Config
 									+ "")
 							.build();
 					
-					public static ConfigEntry<Double> noiseIntensity = new ConfigEntry.Builder<Double>()    // TODO: Make this a float (the ClassicConfigGUI doesn't support floats)
-							.setMinDefaultMax(0d, 5d, 100d)                    // TODO: Once this becomes a float make it 0-1 instead of 0-100 (I did this cus doubles only allow 2 decimal places)
+					public static ConfigEntry<Float> noiseIntensity = new ConfigEntry.Builder<Float>()
+							.setMinDefaultMax(0f, 0.05f, 1f)
 							.comment(""
 									+ "How intense should the noise should be?")
 							.build();
 					
-					public static ConfigEntry<Integer> noiseDropoff = new ConfigEntry.Builder<Integer>()    // TODO: Make this a float (the ClassicConfigGUI doesn't support floats)
+					public static ConfigEntry<Integer> noiseDropoff = new ConfigEntry.Builder<Integer>()
 							.setMinDefaultMax(0, 1024, null)
 							.comment(""
 									+ "Defines how far should the noise texture render before it fades away. (in blocks) \n"
@@ -713,13 +645,13 @@ public class Config
 				{
 					public static ConfigUIComment cullingHeader = new ConfigUIComment.Builder().setParentConfigClass(Culling.class).build();
 					
-					public static ConfigEntry<Double> overdrawPrevention = new ConfigEntry.Builder<Double>()
-							.setMinDefaultMax(0.0, 0.0, 1.0) // TODO change -1 to auto
+					public static ConfigEntry<Float> overdrawPrevention = new ConfigEntry.Builder<Float>()
+							.setMinDefaultMax(-1.0f, -1.0f, 1.0f)
 							.comment(""
 								+ "Determines how far from the camera Distant Horizons will start rendering. \n"
 								+ "Measured as a percentage of the vanilla render distance.\n"
 								+ "\n"
-									+ "0 = auto, overdraw will change based on the vanilla render distance.\n"
+								+ "-1 = auto, overdraw will change based on the vanilla render distance.\n"
 								+ "\n"
 								+ "Higher values will prevent LODs from rendering behind vanilla blocks at a higher distance,\n"
 								+ "but may cause holes in the world. \n"
@@ -729,6 +661,17 @@ public class Config
 								+ "")
 							.build();
 					
+					public static ConfigEntry<Boolean> reduceOverdrawWithFastMovement = new ConfigEntry.Builder<Boolean>()
+						.set(true)
+						.comment(""
+							+ "If set to true the overdraw prevention radius will get closer\n"
+							+ "to the camera when flying/moving quickly.\n"
+							+ "\n"
+							+ "This helps reduce issues where Minecraft can't load or\n"
+							+ "generate chunks fast enough to keep up with DH.\n"
+							+ "")
+						.build();
+					
 					public static ConfigEntry<Boolean> enableCaveCulling = new ConfigEntry.Builder<Boolean>()
 							.set(true)
 							.comment(""
@@ -783,59 +726,56 @@ public class Config
 									+ "Disable this if shadows render incorrectly.")
 							.build();
 					
-					public static ConfigEntry<String> ignoredRenderBlockCsv = new ConfigEntry.Builder<String>() // TODO accept wildcards
+					public static ConfigUISpacer ignoreCsvStartSpacer = new ConfigUISpacer.Builder().build();
+					
+					public static ConfigEntry<String> ignoredRenderBlockCsv = new ConfigEntry.Builder<String>()
 							.set("minecraft:barrier,minecraft:structure_void,minecraft:light,minecraft:tripwire,minecraft:brown_mushroom")
-							.setAppearance(EConfigEntryAppearance.ONLY_IN_FILE) // only shown in file since the UI has a character limit
+							.setAppearance(EConfigEntryAppearance.ALL)
+						.addListener(RenderBlockCacheCsvHandler.INSTANCE)
 							.comment(""
 									+ "A comma separated list of block resource locations that won't be rendered by DH. \n"
 									+ "Air is always included in this list. \n"
-									+ "Requires a restart to change. \n"
 									+ "\n"
 									+ "Note:\n"
 									+ "If you see gaps, or holes you may have to change\n"
 									+ "worldCompression to ["+EDhApiWorldCompressionMode.MERGE_SAME_BLOCKS+"] and re-generate the LODs.\n"
-									+ "Black spots may happen occur to block lighting being zero for covered blocks.\n"
 									+ "")
 							.build();
 					
-					public static ConfigEntry<String> ignoredRenderCaveBlockCsv = new ConfigEntry.Builder<String>() // TODO accept wildcards
-							.set("minecraft:glow_lichen,minecraft:rail,minecraft:water,minecraft:lava,minecraft:bubble_column," +
-									"minecraft:cave_vines_plant,minecraft:vine,minecraft:cave_vines,minecraft:short_grass,minecraft:tall_grass," +
-									"minecraft:small_dripleaf,minecraft:big_dripleaf,minecraft:big_dripleaf_stem,minecraft:sculk_vein")
-							.setAppearance(EConfigEntryAppearance.ONLY_IN_FILE) // only shown in file since the UI has a character limit
+					public static ConfigEntry<String> ignoredRenderCaveBlockCsv = new ConfigEntry.Builder<String>()
+							.set("")
+							.setAppearance(EConfigEntryAppearance.ALL)
+						.addListener(RenderBlockCacheCsvHandler.INSTANCE)
 							.comment(""
 									+ "A comma separated list of block resource locations that shouldn't be rendered \n"
 									+ "if they are in a 0 sky light underground area. \n"
 									+ "Air is always included in this list. \n"
-									+ "Requires a restart to change. \n"
+									+ "\n"
+									+ "Defaults to an empty list since most cave blocks will be automatically ignored due to being: \n"
+									+ "transparent, non-solid, or liquids, but new blocks can be added here if needed.\n"
 									+ "")
 							.build();
 					
+					public static ConfigEntry<String> waterSubSurfaceBlockReplacementCsv = new ConfigEntry.Builder<String>()
+						.set("minecraft:kelp,minecraft:tall_seagrass,minecraft:seagrass")
+						.setAppearance(EConfigEntryAppearance.ALL)
+						.addListener(RenderBlockCacheCsvHandler.INSTANCE)
+						.comment(""
+							+ "A comma separated list of block resource locations that will be replaced by water \n"
+							+ "if they're visible on the water's surface. \n"
+							+ "")
+						.build();
 					
-					static
-					{
-						ignoredRenderBlockCsv.addListener(new ConfigChangeListener<String>(ignoredRenderBlockCsv,
-								(blockCsv) ->
-								{
-									IWrapperFactory wrapperFactory = SingletonInjector.INSTANCE.get(IWrapperFactory.class);
-									if (wrapperFactory != null)
-									{
-										wrapperFactory.resetRendererIgnoredBlocksSet();
-										DhApi.Delayed.renderProxy.clearRenderDataCache();
-									}
-								}));
+					public static ConfigEntry<String> waterSurfaceBlockReplacementCsv = new ConfigEntry.Builder<String>()
+						.set("minecraft:lily_pad")
+						.setAppearance(EConfigEntryAppearance.ALL)
+						.addListener(RenderBlockCacheCsvHandler.INSTANCE)
+						.comment(""
+							+ "A comma separated list of block resource locations that will be removed \n"
+							+ "when on top of water. \n"
+							+ "")
+						.build();
 					
-						ignoredRenderCaveBlockCsv.addListener(new ConfigChangeListener<String>(ignoredRenderCaveBlockCsv,
-								(blockCsv) ->
-								{
-									IWrapperFactory wrapperFactory = SingletonInjector.INSTANCE.get(IWrapperFactory.class);
-									if (wrapperFactory != null)
-									{
-										wrapperFactory.resetRendererIgnoredCaveBlocks();
-										DhApi.Delayed.renderProxy.clearRenderDataCache();
-									}
-								}));
-					}
 				}
 				
 				public static class Experimental
@@ -873,6 +813,19 @@ public class Config
 						.addListener(IgnoredDimensionCsvHandler.INSTANCE)
 						.build();
 					
+					public static ConfigEntry<EDhApiRenderApi> renderingApi = new ConfigEntry.Builder<EDhApiRenderApi>()
+						.set(EDhApiRenderApi.AUTO) 
+						.comment(""
+							+ "Requires a restart to change. \n"
+							+ " \n"
+							+ "Options: \n"
+							+ EDhApiRenderApi.AUTO + " - changes based on the most likely API for that MC version \n"
+							+ EDhApiRenderApi.OPEN_GL + " - Default \n"
+							+ EDhApiRenderApi.BLAZE_3D + " - Only supported on MC 1.21.11 \n"
+							+ "")
+						.build();
+					
+					
 				}
 				
 			}
@@ -934,11 +887,11 @@ public class Config
 								+ "What renderer is active? \n"
 								+ "\n"
 								+ EDhApiRendererMode.DEFAULT + ": Default lod renderer \n"
-								+ EDhApiRendererMode.DEBUG + ": Debug testing renderer \n"
+								+ EDhApiRendererMode.DEBUG_TRIANGLE + ": Debug testing renderer \n"
 								+ EDhApiRendererMode.DISABLED + ": Disable rendering")
 						.build();
 				
-				public static ConfigEntry<EDhApiDebugRendering> debugRendering = new ConfigEntry.Builder<EDhApiDebugRendering>()
+				public static ConfigEntry<EDhApiDebugRendering> debugRenderingColors = new ConfigEntry.Builder<EDhApiDebugRendering>()
 						.set(EDhApiDebugRendering.OFF)
 						.comment(""
 								+ "Should specialized colors/rendering modes be used? \n"
@@ -951,6 +904,13 @@ public class Config
 						.addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE)
 						.build();
 				
+				public static ConfigEntry<Boolean> enableWhiteWorld = new ConfigEntry.Builder<Boolean>()
+					.set(false)
+					.comment(""
+						+ "Stops vertex colors from being passed. \n"
+						+ "Useful for debugging shaders")
+					.build();
+				
 				public static ConfigEntry<Boolean> lodOnlyMode = new ConfigEntry.Builder<Boolean>()
 						.set(false)
 						.comment(""
@@ -968,19 +928,14 @@ public class Config
 								+ "")
 						.build();
 				
-				// TODO add LOD-only mode to this
 				public static ConfigEntry<Boolean> enableDebugKeybindings = new ConfigEntry.Builder<Boolean>()
 					.set(false)
 					.comment(""
-								+ "If true the F8 key can be used to cycle through the different debug modes. \n"
-								+ "and the F6 key can be used to enable and disable LOD rendering.")
-						.build();
-				
-				public static ConfigEntry<Boolean> enableWhiteWorld = new ConfigEntry.Builder<Boolean>()
-						.set(false)
-						.comment(""
-								+ "Stops vertex colors from being passed. \n"
-								+ "Useful for debugging shaders")
+						+ "If true several keys can be used to toggle debug states. \n"
+						+ "F6 - enable/disable LOD rendering \n"
+						+ "F7 - enable/disable LOD only rendering \n"
+						+ "F8 - cycle through the different debug rendering modes \n"
+						+ "")
 					.build();
 				
 				public static ConfigEntry<Boolean> showOverlappingQuadErrors = new ConfigEntry.Builder<Boolean>()
@@ -1043,15 +998,6 @@ public class Config
 							.set(false)
 							.comment("Render LOD section status?")
 							.build();
-					public static ConfigEntry<Boolean> showRenderSectionToggling = new ConfigEntry.Builder<Boolean>()
-							.set(false)
-							.comment("" +
-									"A white box will be drawn when an LOD starts rendering \n" +
-									"and a purple box when an LOD stops rendering. \n" +
-									"\n" +
-									"This can be used to debug Quad Tree holes.\n" +
-									"")
-							.build();
 					
 					public static ConfigEntry<Boolean> showQuadTreeRenderStatus = new ConfigEntry.Builder<Boolean>()
 							.set(false)
@@ -1104,13 +1050,6 @@ public class Config
 									+ "")
 							.build();
 					
-					public static ConfigEntry<EDhApiGpuUploadMethod> glUploadMode = new ConfigEntry.Builder<EDhApiGpuUploadMethod>()
-							.set(EDhApiGpuUploadMethod.AUTO)
-							.comment(""
-									+ "\n"
-									+ "")
-							.build();
-					
 				}
 				
 				public static class ColumnBuilderDebugging
@@ -1177,6 +1116,11 @@ public class Config
 							.comment("Shows info about each thread pool.")
 							.build();
 					
+					public static ConfigEntry<Boolean> showRenderThreadTasks = new ConfigEntry.Builder<Boolean>()
+							.set(false)
+							.comment("Shows info about the render thread tasks.")
+							.build();
+					
 					public static ConfigEntry<Boolean> showCombinedObjectPools = new ConfigEntry.Builder<Boolean>()
 							.set(false)
 							.comment("Shows the combined memory use and array counts for all DH pooled objects.")
@@ -1188,7 +1132,7 @@ public class Config
 					
 					public static ConfigEntry<Boolean> showQueuedChunkUpdateCount = new ConfigEntry.Builder<Boolean>()
 							.set(true)
-							.comment("Shows how many chunks are queud for processing and the max count that can be queued.")
+							.comment("Shows how many chunks are queued for processing and the max count that can be queued.")
 							.build();
 					
 					public static ConfigEntry<Boolean> showLevelStatus = new ConfigEntry.Builder<Boolean>()
@@ -1196,6 +1140,11 @@ public class Config
 							.comment("Shows what levels are loaded and world gen/rendering info about those levels.")
 							.build();
 					
+					public static ConfigEntry<Boolean> onlyShowRenderingLevels = new ConfigEntry.Builder<Boolean>()
+							.set(true)
+							.comment("Only show levels that DH is actively rendering.")
+							.build();
+					
 				}
 				
 				/** This class is used to debug the different features of the config GUI */
@@ -1679,7 +1628,16 @@ public class Config
 					.comment(""
 						+ "If enabled, a message will be logged if the garbage \n"
 						+ "collector Java is currently using is known \n"
-						+ "to cause stutters and/or issues. \n"
+						+ "to cause frame stuttering and/or other issues. \n"
+						+ "")
+					.build();
+				
+				public static ConfigEntry<Boolean> showGarbageCollectorWarning = new ConfigEntry.Builder<Boolean>()
+					.set(true)
+					.comment(""
+						+ "If enabled, a chat message will be displayed if the garbage \n"
+						+ "collector Java is currently using is known \n"
+						+ "to cause frame stuttering and/or other issues. \n"
 						+ "")
 					.build();
 				

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

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

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

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

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

@@ -0,0 +1,69 @@
+/*
+ *    This file is part of the Distant Horizons mod
+ *    licensed under the GNU LGPL v3 License.
+ *
+ *    Copyright (C) 2020 James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU Lesser General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.distanthorizons.core.config.eventHandlers;
+
+import com.seibel.distanthorizons.api.DhApi;
+import com.seibel.distanthorizons.api.enums.config.EDhApiMcRenderingFadeMode;
+import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiBeforeRenderEvent;
+import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiCancelableEventParam;
+import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiRenderParam;
+import com.seibel.distanthorizons.core.config.Config;
+import com.seibel.distanthorizons.core.config.listeners.IConfigListener;
+import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
+import com.seibel.distanthorizons.core.logging.DhLogger;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
+import com.seibel.distanthorizons.coreapi.util.StringUtil;
+
+public class RenderBlockCacheCsvHandler implements IConfigListener
+{
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	
+	public static RenderBlockCacheCsvHandler INSTANCE = new RenderBlockCacheCsvHandler();
+	
+	
+	
+	//=============//
+ 	// constructor //
+	//=============//
+	
+	/** private since we only ever need one handler at a time */
+	private RenderBlockCacheCsvHandler() { }
+	
+	
+	
+	//=================//
+	// config handling //
+	//=================//
+	
+	@Override
+	public void onConfigValueSet()
+	{
+		IWrapperFactory wrapperFactory = SingletonInjector.INSTANCE.get(IWrapperFactory.class);
+		if (wrapperFactory != null)
+		{
+			wrapperFactory.resetCachedIgnoredBlocksSets();
+			DhApi.Delayed.renderProxy.clearRenderDataCache();
+		}
+	}
+	
+	
+	
+}

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

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

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

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

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

@@ -1,196 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.core.config.gui;
-
-import com.seibel.distanthorizons.core.jar.EPlatform;
-import org.jetbrains.annotations.NotNull;
-import org.lwjgl.system.jawt.JAWT;
-import org.lwjgl.system.macosx.*;
-
-import java.awt.*;
-import java.lang.reflect.*;
-import java.util.regex.*;
-
-import static org.lwjgl.glfw.GLFWNativeCocoa.*;
-import static org.lwjgl.glfw.GLFWNativeWin32.*;
-import static org.lwjgl.glfw.GLFWNativeX11.*;
-import static org.lwjgl.system.JNI.*;
-import static org.lwjgl.system.jawt.JAWTFunctions.*;
-import static org.lwjgl.system.macosx.ObjCRuntime.*;
-
-// Some of the code is from https://github.com/LWJGL/lwjgl3/blob/master/modules/samples/src/test/java/org/lwjgl/demo/system/jawt/EmbeddedFrameUtil.java
-// which is licensed under https://www.lwjgl.org/license
-
-/**
- * Some utils for embedding awt and swing items into lwjgl windows
- *
- * @author Ran
- * @author coolGi
- */
-public final class EmbeddedFrameUtil
-{
-	
-	private static final int JAVA_VERSION;
-	
-	private static final JAWT awt;
-	
-	static
-	{
-		Pattern p = Pattern.compile("^(?:1[.])?([1-9][0-9]*)[.-]");
-		Matcher m = p.matcher(System.getProperty("java.version"));
-		
-		if (!m.find())
-		{
-			throw new IllegalStateException("Failed to parse java.version");
-		}
-		
-		JAVA_VERSION = Integer.parseInt(m.group(1));
-		
-		awt = JAWT.calloc();
-		awt.version(JAVA_VERSION < 9 ? JAWT_VERSION_1_4 : JAWT_VERSION_9);
-		if (!JAWT_GetAWT(awt))
-		{
-			throw new RuntimeException("GetAWT failed");
-		}
-	}
-	
-	private static String getEmbeddedFrameImpl()
-	{
-		switch (EPlatform.get())
-		{
-			case LINUX:
-				return "sun.awt.X11.XEmbeddedFrame";
-			case WINDOWS:
-				return "sun.awt.windows.WEmbeddedFrame";
-			case MACOS:
-				return "sun.lwawt.macosx.CViewEmbeddedFrame";
-			default:
-				throw new IllegalStateException();
-		}
-	}
-	
-	private static long getEmbeddedFrameHandle(long window)
-	{
-		switch (EPlatform.get())
-		{
-			case LINUX:
-				return glfwGetX11Window(window);
-			case WINDOWS:
-				return glfwGetWin32Window(window);
-			case MACOS:
-				long objc_msgSend = ObjCRuntime.getLibrary().getFunctionAddress("objc_msgSend");
-				return invokePPP(glfwGetCocoaWindow(window), sel_getUid("contentView"), objc_msgSend);
-			default:
-				throw new IllegalStateException();
-		}
-	}
-	
-	public static Frame embeddedFrameCreate(long window)
-	{
-		if (JAVA_VERSION < 9)
-		{
-			try
-			{
-				@SuppressWarnings("unchecked")
-				Class<? extends Frame> EmdeddedFrame = (Class<? extends Frame>) Class.forName(getEmbeddedFrameImpl());
-				Constructor<? extends Frame> c = EmdeddedFrame.getConstructor(long.class);
-				
-				return c.newInstance(getEmbeddedFrameHandle(window));
-			}
-			catch (Exception e)
-			{
-				throw new RuntimeException(e);
-			}
-		}
-		else
-		{
-			return nJAWT_CreateEmbeddedFrame(getEmbeddedFrameHandle(window), awt.CreateEmbeddedFrame());
-		}
-	}
-	
-	static void embeddedFrameSynthesizeWindowActivation(Frame embeddedFrame, boolean doActivate)
-	{
-		if (JAVA_VERSION < 9)
-		{
-			try
-			{
-				embeddedFrame
-						.getClass()
-						.getMethod("synthesizeWindowActivation", boolean.class)
-						.invoke(embeddedFrame, doActivate);
-			}
-			catch (Exception e)
-			{
-				throw new RuntimeException(e);
-			}
-		}
-		else
-		{
-			JAWT_SynthesizeWindowActivation(embeddedFrame, doActivate, awt.SynthesizeWindowActivation());
-		}
-	}
-	
-	public static void embeddedFrameSetBounds(Frame embeddedFrame, int x, int y, int width, int height)
-	{
-		if (JAVA_VERSION < 9)
-		{
-			try
-			{
-				Method setLocationPrivate = embeddedFrame
-						.getClass()
-						.getSuperclass()
-						.getDeclaredMethod("setBoundsPrivate", int.class, int.class, int.class, int.class);
-				setLocationPrivate.setAccessible(true);
-				setLocationPrivate.invoke(embeddedFrame, x, y, width, height);
-			}
-			catch (Exception e)
-			{
-				throw new RuntimeException(e);
-			}
-		}
-		else
-		{
-			JAWT_SetBounds(embeddedFrame, x, y, width, height, awt.SetBounds());
-		}
-	}
-	
-	
-	public static void hideFrame(@NotNull Frame embeddedFrame)
-	{
-		embeddedFrame.setVisible(false);
-		embeddedFrameSynthesizeWindowActivation(embeddedFrame, false);
-	}
-	
-	public static void showFrame(@NotNull Frame embeddedFrame)
-	{
-		embeddedFrameSynthesizeWindowActivation(embeddedFrame, true);
-		embeddedFrame.setVisible(true);
-	}
-	public static void placeAtCenter(Frame embeddedFrame, int windowWidth, int windowHeight, int frameWidth, int frameHeight, float scale)
-	{
-		float scaleFactor = (100.0F - scale) / 100.0F;
-		float newWidth = frameWidth * scaleFactor;
-		float newHeight = frameHeight * scaleFactor;
-		float newX = (windowWidth - newWidth) / 2F;
-		float newY = (windowHeight - newHeight) / 2F;
-		embeddedFrameSetBounds(embeddedFrame, Math.round(newX), Math.round(newY), Math.round(newWidth), Math.round(newHeight));
-	}
-	
-}

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

@@ -1,164 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.core.config.gui;
-
-import org.jetbrains.annotations.NotNull;
-
-import javax.swing.*;
-import java.awt.*;
-import java.awt.event.ActionEvent;
-import java.awt.event.KeyEvent;
-import java.awt.event.KeyListener;
-
-/**
- *
- */
-public class JavaScreenHandlerScreen extends AbstractScreen
-{
-	public static Frame frame;
-	public static boolean firstRun = true;
-	public final Component jComponent;
-	
-	
-	
-	static
-	{
-		// Note: this code can cause Mac
-		// to lock up and refuse the load (there's a bug with Java.awt texture loading)
-		
-		// Needs to be called before any Swing code is called, otherwise
-		// Swing will get stuck thinking it's headless
-		System.setProperty("java.awt.headless", "false");
-	}
-	
-	public JavaScreenHandlerScreen(@NotNull Component component)
-	{
-		this.jComponent = component;
-	}
-	
-	@Override
-	public void init()
-	{
-		if (firstRun)
-		{
-			frame = EmbeddedFrameUtil.embeddedFrameCreate(this.minecraftWindow); // Don't call this multiple times
-		}
-		
-		frame.add(this.jComponent);
-		frame.setBackground(new Color(0, 125, 155));
-		
-		JavaScreenHandlerScreen thiss = this;
-		
-		frame.addKeyListener(new KeyListener() 
-		{
-			@Override
-			public void keyPressed(KeyEvent keyEvent)
-			{
-				System.out.println("Key pressed code=" + keyEvent.getKeyCode() + ", char=" + keyEvent.getKeyChar());
-				if (keyEvent.getKeyCode() == KeyEvent.VK_ESCAPE)
-				{
-					thiss.close = true;
-				}
-			}
-			
-			@Override
-			public void keyTyped(KeyEvent keyEvent) { }
-			@Override
-			public void keyReleased(KeyEvent keyEvent) { }
-		});
-		
-		if (firstRun)
-		{
-			EmbeddedFrameUtil.embeddedFrameSetBounds(frame, 0, 0, this.width, this.height);
-			firstRun = false;
-		}
-		
-		EmbeddedFrameUtil.showFrame(frame);
-	}
-	
-	/** A testing/debug screen */
-	public static class ExampleScreen extends JComponent
-	{
-		public ExampleScreen()
-		{
-			this.setLayout(new GridBagLayout());
-			this.setBackground(new Color(255, 0, 0)); // doesn't appear to be used
-			
-			GridBagConstraints helloWorldConstraints = new GridBagConstraints();
-			helloWorldConstraints.weightx = 0.5;
-			helloWorldConstraints.gridx = 0;
-			helloWorldConstraints.gridy = 0;
-			//helloWorldConstraints.fill = GridBagConstraints.BOTH;
-			this.add(new JLabel("Hello World!"), helloWorldConstraints);
-			
-			
-			GridBagConstraints buttonConstraints = new GridBagConstraints();
-			buttonConstraints.weightx = 0.5;
-			buttonConstraints.gridx = 0;
-			buttonConstraints.gridy = 1;
-			//buttonConstraints.fill = GridBagConstraints.BOTH;
-			JButton button = new JButton();
-			button.setBackground(Color.GREEN);
-			button.setFocusable(false); // otherwise we can't use escape to leave
-			button.setAction(new ExampleButtonEventHandler("Button text"));
-			this.add(button, buttonConstraints);
-		}
-		
-		private class ExampleButtonEventHandler extends AbstractAction
-		{
-			public ExampleButtonEventHandler(String text)
-			{
-				super(text);
-				//this.putValue(SHORT_DESCRIPTION, text);
-				//this.putValue(MNEMONIC_KEY, text);
-			}
-			
-			@Override
-			public void actionPerformed(ActionEvent e)
-			{
-				System.out.println("button pressed");
-			}
-		}
-		
-	}
-	
-	
-	@Override
-	public void render(float delta)
-	{
-		// TODO: Make screen only update on this being called
-	}
-	
-	@Override
-	public void onResize()
-	{
-		EmbeddedFrameUtil.embeddedFrameSetBounds(frame, 0, 0, this.width, this.height);
-	}
-	
-	@Override
-	public void onClose()
-	{
-		frame.remove(this.jComponent);
-		EmbeddedFrameUtil.hideFrame(frame);
-	}
-	
-	
-	
-}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -23,12 +23,11 @@ import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.enums.EDhDirection;
 import com.seibel.distanthorizons.core.level.IDhClientLevel;
-import com.seibel.distanthorizons.core.pooling.PhantomArrayListCheckout;
+import com.seibel.distanthorizons.core.util.objects.pooling.PhantomArrayListCheckout;
 import com.seibel.distanthorizons.core.util.ColorUtil;
 import com.seibel.distanthorizons.core.util.LodUtil;
 import com.seibel.distanthorizons.core.util.RenderDataPointUtil;
-import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
-import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnArrayView;
+import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnRenderView;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
 import com.seibel.distanthorizons.coreapi.util.MathUtil;
 import it.unimi.dsi.fastutil.longs.LongArrayList;
@@ -55,7 +54,7 @@ public class ColumnBox
 			short width, short yHeight,
 			short minX, short minY, short minZ,
 			int color, byte irisBlockMaterialId, byte skyLight, byte blockLight,
-			long topData, long bottomData, ColumnArrayView[] adjData, boolean[] isAdjDataSameDetailLevel)
+			long topData, long bottomData, ColumnRenderView[] adjData, boolean[] isAdjDataSameDetailLevel)
 	{
 		//================//
 		// variable setup //
@@ -123,7 +122,7 @@ public class ColumnBox
 					&& !isTopTransparent;
 			if (!skipTop)
 			{
-				builder.addQuadUp(minX, maxY, minZ, width, width, ColorUtil.applyShade(color, MC_RENDER.getShade(EDhDirection.UP)), irisBlockMaterialId, skyLightTop, blockLight);
+				builder.addQuadUp(minX, maxY, minZ, width, ColorUtil.applyShade(color, MC_RENDER.getShade(EDhDirection.UP)), irisBlockMaterialId, skyLightTop, blockLight);
 			}
 		}
 		
@@ -134,7 +133,7 @@ public class ColumnBox
 					&& !isBottomTransparent;
 			if (!skipBottom)
 			{
-				builder.addQuadDown(minX, minY, minZ, width, width, ColorUtil.applyShade(color, MC_RENDER.getShade(EDhDirection.DOWN)), irisBlockMaterialId, skyLightBot, blockLight);
+				builder.addQuadDown(minX, minY, minZ, width, ColorUtil.applyShade(color, MC_RENDER.getShade(EDhDirection.DOWN)), irisBlockMaterialId, skyLightBot, blockLight);
 			}
 		}
 		
@@ -146,7 +145,7 @@ public class ColumnBox
 		
 		// NORTH face
 		{
-			ColumnArrayView adjCol = adjData[EDhDirection.NORTH.compassIndex];
+			ColumnRenderView adjCol = adjData[EDhDirection.NORTH.compassIndex];
 			boolean adjSameDetailLevel = isAdjDataSameDetailLevel[EDhDirection.NORTH.compassIndex];
 			// if the adjacent column is null that generally means the adjacent area hasn't been generated yet
 			if (adjCol == null)
@@ -173,7 +172,7 @@ public class ColumnBox
 		
 		// SOUTH face
 		{
-			ColumnArrayView adjCol = adjData[EDhDirection.SOUTH.compassIndex];
+			ColumnRenderView adjCol = adjData[EDhDirection.SOUTH.compassIndex];
 			boolean adjSameDetailLevel = isAdjDataSameDetailLevel[EDhDirection.SOUTH.compassIndex];
 			if (adjCol == null)
 			{
@@ -198,7 +197,7 @@ public class ColumnBox
 		
 		// WEST face
 		{
-			ColumnArrayView adjCol = adjData[EDhDirection.WEST.compassIndex];
+			ColumnRenderView adjCol = adjData[EDhDirection.WEST.compassIndex];
 			boolean adjSameDetailLevel = isAdjDataSameDetailLevel[EDhDirection.WEST.compassIndex];
 			if (adjCol == null)
 			{
@@ -223,7 +222,7 @@ public class ColumnBox
 		
 		// EAST face
 		{
-			ColumnArrayView adjCol = adjData[EDhDirection.EAST.compassIndex];
+			ColumnRenderView adjCol = adjData[EDhDirection.EAST.compassIndex];
 			boolean adjSameDetailLevel = isAdjDataSameDetailLevel[EDhDirection.EAST.compassIndex];
 			if (adjCol == null)
 			{
@@ -249,7 +248,7 @@ public class ColumnBox
 	
 	private static void makeAdjVerticalQuad(
 		LodQuadBuilder builder, PhantomArrayListCheckout phantomArrayCheckout,
-		@NotNull ColumnArrayView adjColumnView, boolean adjacentIsSameDetailLevel, int caveCullingMaxY, EDhDirection direction,
+		@NotNull ColumnRenderView adjColumnView, boolean adjacentIsSameDetailLevel, int caveCullingMaxY, EDhDirection direction,
 		short x, short yMin, short z, short horizontalWidth, short ySize,
 		int color, byte irisBlockMaterialId, byte blockLight)
 	{
@@ -284,7 +283,7 @@ public class ColumnBox
 		short yMax = (short) (yMin + ySize);
 		
 		
-		int adjCount = adjColumnView.size();
+		int adjCount = adjColumnView.size;
 		
 		// Start with the entire range at max light
 		segments.add(YSegmentUtil.encode(yMin, yMax, LodUtil.MAX_MC_LIGHT));

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

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

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

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

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

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

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

@@ -31,10 +31,8 @@ import com.seibel.distanthorizons.core.enums.EDhDirection;
 import com.seibel.distanthorizons.core.logging.DhLogger;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.util.ColorUtil;
-import com.seibel.distanthorizons.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;
 
 /**
@@ -58,8 +56,12 @@ public class LodQuadBuilder
 	private final EDhApiDebugRendering debugRenderingMode;
 	private final EDhApiGrassSideRendering grassSideRenderingMode;
 	
+	/** the number of bytes for a single vertex */
+	public static final int BYTES_PER_VERTEX = 16;
+	public static final int BYTES_PER_QUAD = BYTES_PER_VERTEX * 4;
 	
 	public static final int[][][] DIRECTION_VERTEX_IBO_QUAD = new int[][][]
+	///region
 		{
 			// X,Z //
 			{ // UP
@@ -107,6 +109,7 @@ public class LodQuadBuilder
 				{0, 0}, // 3
 			},
 		};
+	///endregion
 	
 	private int premergeCount = 0;
 	
@@ -115,6 +118,7 @@ public class LodQuadBuilder
 	//=============//
 	// constructor //
 	//=============//
+	//region
 	
 	public LodQuadBuilder(boolean doTransparency, IClientLevelWrapper clientLevelWrapper)
 	{
@@ -127,21 +131,24 @@ public class LodQuadBuilder
 		
 		this.clientLevelWrapper = clientLevelWrapper;
 		
-		this.debugRenderingMode = Config.Client.Advanced.Debugging.debugRendering.get();
+		this.debugRenderingMode = Config.Client.Advanced.Debugging.debugRenderingColors.get();
 		this.grassSideRenderingMode = Config.Client.Advanced.Graphics.Quality.grassSideRendering.get();
 		
 	}
 	
+	//endregion
+	
 	
 	
 	//===========//
 	// add quads //
 	//===========//
+	///region
 	
 	public void addQuadAdj(
 			EDhDirection dir, 
 			short x, short y, short z,
-			short widthEastWest, short widthNorthSouthOrUpDown,
+			short width, short height,
 			int color, byte irisBlockMaterialId, byte skyLight, byte blockLight)
 	{
 		if (dir == EDhDirection.DOWN)
@@ -160,7 +167,7 @@ public class LodQuadBuilder
 			quadList = this.opaqueQuads[dir.ordinal()]; 
 		}
 		
-		BufferQuad quad = new BufferQuad(x, y, z, widthEastWest, widthNorthSouthOrUpDown, color, irisBlockMaterialId, skyLight, blockLight, dir);
+		BufferQuad quad = new BufferQuad(x, y, z, width, height, color, irisBlockMaterialId, skyLight, blockLight, dir);
 		if (!quadList.isEmpty()
 			&& (
 				quadList.get(quadList.size() - 1).tryMerge(quad, BufferMergeDirectionEnum.EastWest)
@@ -175,32 +182,35 @@ public class LodQuadBuilder
 	}
 	
 	// XZ
-	public void addQuadUp(short minX, short maxY, short minZ, short widthEastWest, short widthNorthSouthOrUpDown, int color, byte irisBlockMaterialId, byte skylight, byte blocklight) // TODO argument names are wrong
+	public void addQuadUp(short minX, short maxY, short minZ, short width, int color, byte irisBlockMaterialId, byte skylight, byte blocklight)
 	{
 		boolean isTransparent = (this.doTransparency && ColorUtil.getAlpha(color) < 255);
 		ArrayList<BufferQuad> quadList = isTransparent 
 				? this.transparentQuads[EDhDirection.UP.ordinal()] 
 				: this.opaqueQuads[EDhDirection.UP.ordinal()];
 		
-		BufferQuad quad = new BufferQuad(minX, maxY, minZ, widthEastWest, widthNorthSouthOrUpDown, color, irisBlockMaterialId, skylight, blocklight, EDhDirection.UP);
+		BufferQuad quad = new BufferQuad(minX, maxY, minZ, width, width, color, irisBlockMaterialId, skylight, blocklight, EDhDirection.UP);
 		quadList.add(quad);
 	}
 	
-	public void addQuadDown(short x, short y, short z, short width, short wz, int color, byte irisBlockMaterialId, byte skylight, byte blocklight)
+	public void addQuadDown(short x, short y, short z, short width, int color, byte irisBlockMaterialId, byte skylight, byte blocklight)
 	{
 		ArrayList<BufferQuad> quadArray = (this.doTransparency && ColorUtil.getAlpha(color) < 255)
 				? this.transparentQuads[EDhDirection.DOWN.ordinal()]
 				: this.opaqueQuads[EDhDirection.DOWN.ordinal()];
 		
-		BufferQuad quad = new BufferQuad(x, y, z, width, wz, color, irisBlockMaterialId, skylight, blocklight, EDhDirection.DOWN);
+		BufferQuad quad = new BufferQuad(x, y, z, width, width, color, irisBlockMaterialId, skylight, blocklight, EDhDirection.DOWN);
 		quadArray.add(quad);
 	}
 	
+	///endregion
+	
 	
 	
 	//=================//
 	// data finalizing //
 	//=================//
+	///region
 	
 	/** Uses Greedy meshing to merge this builder's Quads. */
 	public void mergeQuads()
@@ -269,11 +279,14 @@ public class LodQuadBuilder
 		return mergeCount;
 	}
 	
+	///endregion
+	
 	
 	
 	//==============//
 	// buffer setup //
 	//==============//
+	///region
 	
 	public ArrayList<ByteBuffer> makeOpaqueVertexBuffers() { return this.makeVertexBuffers(this.opaqueQuads); }
 	public ArrayList<ByteBuffer> makeTransparentVertexBuffers() { return this.makeVertexBuffers(this.transparentQuads); }
@@ -295,9 +308,10 @@ public class LodQuadBuilder
 			{
 				// if this is the first iteration or the buffer is full, 
 				// create a new buffer
-				if (buffer == null || !buffer.hasRemaining())
+				if (buffer == null 
+					|| buffer.remaining() < BYTES_PER_QUAD)
 				{
-					buffer = MemoryUtil.memAlloc(LodBufferContainer.FULL_SIZED_BUFFER);
+					buffer = MemoryUtil.memAlloc(getMaxBufferByteSize());
 					byteBufferList.add(buffer);
 				}
 				
@@ -319,7 +333,7 @@ public class LodQuadBuilder
 	{
 		int[][] quadBase = DIRECTION_VERTEX_IBO_QUAD[quad.direction.ordinal()];
 		short widthEastWest = quad.widthEastWest;
-		short widthNorthSouth = quad.widthNorthSouthOrUpDown;
+		short widthNorthSouth = quad.widthNorthSouthOrHeight;
 		byte normalIndex = (byte) quad.direction.ordinal();
 		EDhDirection.Axis axis = quad.direction.axis;
 		for (int i = 0; i < quadBase.length; i++)
@@ -437,11 +451,14 @@ public class LodQuadBuilder
 		bb.putShort((short) 0); // padding to make sure the vertex format as a whole is a multiple of 4
 	}
 	
+	///endregion
+	
 	
 	
 	//=========//
 	// getters //
 	//=========//
+	///region
 	
 	public int getCurrentOpaqueQuadsCount()
 	{
@@ -469,17 +486,35 @@ public class LodQuadBuilder
 		return i;
 	}
 	
-	/** 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()
+	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()
 	{
-		if (!this.doTransparency)
+		if (maxBufferByteSize != -1)
 		{
-			return 0;
+			return maxBufferByteSize;
 		}
 		
-		return MathUtil.ceilDiv(this.getCurrentTransparentQuadsCount(), LodBufferContainer.MAX_QUADS_PER_BUFFER);
+		// 2 MB
+		// note: this is relatively small (10 MB was the previous max) to reduce stuttering
+		// during the upload process by having smaller upload steps
+		int maxVboByteSize = 2 * 1024 * 1024; 
+		
+		int maxQuadsPerBuffer = maxVboByteSize / BYTES_PER_QUAD;
+		// integer truncation to remove decimal component
+		int fullSizedBuffer = maxQuadsPerBuffer * BYTES_PER_QUAD;
+		
+		maxBufferByteSize = fullSizedBuffer;
+		
+		return fullSizedBuffer;
 	}
 	
+	///endregion
+	
+	
+	
 }

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

@@ -1,241 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.core.dataObjects.render.columnViews;
-
-
-import com.seibel.distanthorizons.core.dataObjects.render.ColumnRenderSource;
-import com.seibel.distanthorizons.core.util.RenderDataPointUtil;
-import it.unimi.dsi.fastutil.longs.LongArrayList;
-
-import java.util.Arrays;
-import java.util.ConcurrentModificationException;
-
-public final class ColumnArrayView implements IColumnDataView
-{
-	public final LongArrayList data;
-	
-	/** 
-	 * How many data points are currently being represented by this view. <br>
-	 * Will be equal to or less than {@link ColumnArrayView#verticalSize}.
-	 */
-	public final int size;
-	/** 
-	 * Vertical size in data points. <Br>
-	 * Can be 0 if this column was created for an empty data source.
-	 */
-	public final int verticalSize;
-	
-	/**
-	 * Where the relative starting index is in the {@link ColumnArrayView#data} array
-	 * if this view is representing part of a {@link ColumnRenderSource}.
-	 */
-	public final int offset;
-	
-	
-	
-	//=============//
-	// constructor //
-	//=============//
-	
-	/** @throws IllegalArgumentException if the offset is greater than the data's size */
-	public ColumnArrayView(LongArrayList data, int size, int offset, int verticalSize) throws IllegalArgumentException
-	{
-		this.data = data;
-		this.size = size;
-		this.offset = offset;
-		this.verticalSize = verticalSize;
-		
-		if (this.data.size() < this.offset)
-		{
-			throw new IllegalArgumentException("data size ["+this.data.size()+"] is shorter than offset ["+this.offset+"].");
-		}
-	}
-	
-	
-	
-	//=====================//
-	// getters and setters //
-	//=====================//
-	
-	@Override
-	public long get(int index) 
-	{
-		try
-		{
-			return this.data.getLong(index + this.offset);
-		}
-		catch (IndexOutOfBoundsException e)
-		{
-			// we can fairly confidently say this is a concurrent exception over an actual
-			// index out of bounds, since we're generally iterating over the whole
-			// array any time we use this getter.
-			throw new ConcurrentModificationException("Potential concurrent modification detected. Make sure the parent ColumnRenderSource isn't being closed before the ColumnArrayView processing is complete.", e);
-		}
-	}
-	public void set(int index, long value) { data.set(index + offset, value); }
-	
-	@Override
-	public int size() { return size; }
-	@Override
-	public int verticalSize() { return verticalSize; }
-	
-	@Override
-	public int dataCount() { return (this.verticalSize != 0) ? (this.size / this.verticalSize) : 0; } // TODO what does the divide by mean?
-	
-	@Override
-	public ColumnArrayView subView(int dataIndexStart, int dataCount)
-	{ return new ColumnArrayView(data, dataCount * verticalSize, offset + dataIndexStart * verticalSize, verticalSize); }
-	
-	public void fill(long value) { Arrays.fill(data.elements(), offset, offset + size, value); }
-	
-	public void copyFrom(IColumnDataView source) { copyFrom(source, 0); }
-	public void copyFrom(IColumnDataView source, int outputDataIndexOffset)
-	{
-		if (source.verticalSize() > verticalSize)
-		{
-			throw new IllegalArgumentException("source verticalSize must be <= self's verticalSize to copy");
-		}
-		else if (source.dataCount() + outputDataIndexOffset > dataCount())
-		{
-			throw new IllegalArgumentException("dataIndexStart + source.dataCount() must be <= self.dataCount() to copy");
-		}
-		else if (source.verticalSize() != verticalSize)
-		{
-			for (int i = 0; i < source.dataCount(); i++)
-			{
-				int outputOffset = offset + outputDataIndexOffset * verticalSize + i * verticalSize;
-				source.subView(i, 1).copyTo(data.elements(), outputOffset, source.verticalSize());
-				Arrays.fill(data.elements(), outputOffset + source.verticalSize(),
-						outputOffset + verticalSize, 0);
-			}
-		}
-		else
-		{
-			source.copyTo(data.elements(), offset + outputDataIndexOffset * verticalSize, source.size());
-		}
-	}
-	
-	@Override
-	public void copyTo(long[] target, int offset, int size) { System.arraycopy(data.elements(), this.offset, target, offset, size); }
-	
-	public boolean mergeWith(ColumnArrayView source, boolean override)
-	{
-		if (size != source.size)
-		{
-			throw new IllegalArgumentException("Cannot merge views of different sizes");
-		}
-		if (verticalSize != source.verticalSize)
-		{
-			throw new IllegalArgumentException("Cannot merge views of different vertical sizes");
-		}
-		boolean anyChange = false;
-		for (int o = 0; o < (source.size() * verticalSize); o += verticalSize)
-		{
-			if (override)
-			{
-				if (RenderDataPointUtil.compareDatapointPriority(source.get(o), get(o)) >= 0)
-				{
-					anyChange = true;
-					System.arraycopy(source.data, source.offset + o, data, offset + o, verticalSize);
-				}
-			}
-			else
-			{
-				if (RenderDataPointUtil.compareDatapointPriority(source.get(o), get(o)) > 0)
-				{
-					anyChange = true;
-					System.arraycopy(source.data, source.offset + o, data, offset + o, verticalSize);
-				}
-			}
-		}
-		return anyChange;
-	}
-	
-	public void changeVerticalSizeFrom(IColumnDataView source)
-	{
-		if (this.dataCount() != source.dataCount())
-		{
-			throw new IllegalArgumentException("Cannot copy and resize to views with different dataCounts");
-		}
-		
-		if (this.verticalSize >= source.verticalSize())
-		{
-			this.copyFrom(source);
-		}
-		else
-		{
-			for (int i = 0; i < this.dataCount(); i++)
-			{
-				RenderDataPointUtil.mergeMultiData(source.subView(i, 1), this.subView(i, 1));
-			}
-		}
-	}
-	
-	
-	
-	//================//
-	// base overrides //
-	//================//
-	
-	@Override
-	public String toString()
-	{
-		StringBuilder sb = new StringBuilder();
-		sb.append("S:").append(this.size);
-		sb.append(" V:").append(this.verticalSize);
-		sb.append(" O:").append(this.offset);
-		
-		sb.append(" [");
-		for (int i = 0; i < this.size; i++)
-		{
-			sb.append(RenderDataPointUtil.toString(this.data.getLong(this.offset + i)));
-			if (i < this.size - 1)
-			{
-				sb.append(",\n");
-			}
-		}
-		sb.append("]");
-		
-		return sb.toString();
-	}
-	
-	
-	public int getDataHash() { return arrayHash(this.data, this.offset, this.size); }
-	private static int arrayHash(LongArrayList a, int offset, int length)
-	{
-		if (a == null)
-		{
-			return 0;
-		}
-		
-		int result = 1;
-		int end = offset + length;
-		for (int i = offset; i < end; i++)
-		{
-			long element = a.getLong(i);
-			int elementHash = (int) (element ^ (element >>> 32));
-			result = 31 * result + elementHash;
-		}
-		return result;
-	}
-	
-	
-	
-}

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

@@ -1,143 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.core.dataObjects.render.columnViews;
-
-import it.unimi.dsi.fastutil.longs.LongArrayList;
-
-public class ColumnQuadView implements IColumnDataView
-{
-	private final LongArrayList data;
-	private final int perColumnOffset; // per column (of columns of data) offset in longs
-	private final int xSize; // x size in datapoints
-	private final int zSize; // x size in datapoints
-	private final int offset; // offset in longs
-	private final int vertSize; // vertical size in longs
-	
-	public ColumnQuadView(LongArrayList data, int dataZWidth, int dataVertSize, int viewXOffset, int viewZOffset, int xSize, int zSize)
-	{
-		if (viewXOffset + xSize > (data.size() / (dataZWidth * dataVertSize)) || viewZOffset + zSize > dataZWidth)
-		{
-			throw new IllegalArgumentException("View is out of bounds");
-		}
-		
-		this.data = data;
-		this.xSize = xSize;
-		this.zSize = zSize;
-		this.vertSize = dataVertSize;
-		this.perColumnOffset = dataZWidth * dataVertSize;
-		this.offset = viewXOffset * perColumnOffset + viewZOffset * dataVertSize;
-	}
-	private ColumnQuadView(LongArrayList data, int perColumnOffset, int offset, int vertSize, int xSize, int zSize)
-	{
-		this.data = data;
-		this.perColumnOffset = perColumnOffset;
-		this.offset = offset;
-		this.vertSize = vertSize;
-		this.xSize = xSize;
-		this.zSize = zSize;
-	}
-	
-	@Override
-	public long get(int index)
-	{
-		int x = index / perColumnOffset;
-		int z = (index % perColumnOffset) / vertSize;
-		int v = index % vertSize;
-		return get(x, z, v);
-	}
-	
-	public long get(int x, int z, int v)
-	{
-		return data.getLong(offset + x * perColumnOffset + z * vertSize + v);
-	}
-	
-	public long set(int x, int z, int v, long value)
-	{
-		return data.set(offset + x * perColumnOffset + z * vertSize + v, value);
-	}
-	
-	public ColumnArrayView get(int x, int z)
-	{
-		return new ColumnArrayView(data, vertSize, offset + x * perColumnOffset + z * vertSize, vertSize);
-	}
-	
-	public ColumnArrayView getRow(int x)
-	{
-		return new ColumnArrayView(data, zSize * vertSize, offset + x * perColumnOffset, vertSize);
-	}
-	
-	public void set(int x, int z, IColumnDataView singleColumn)
-	{
-		if (singleColumn.verticalSize() != vertSize) throw new IllegalArgumentException("Vertical size of singleColumn must be equal to vertSize");
-		if (singleColumn.dataCount() != 1) throw new IllegalArgumentException("SingleColumn must contain exactly one data point");
-		singleColumn.copyTo(data.elements(), offset + x * perColumnOffset + z * vertSize, singleColumn.size());
-	}
-	
-	@Override
-	public int size()
-	{
-		return xSize * zSize * vertSize;
-	}
-	
-	@Override
-	public int verticalSize()
-	{
-		return vertSize;
-	}
-	
-	@Override
-	public int dataCount()
-	{
-		return xSize * zSize;
-	}
-	
-	@Override
-	public IColumnDataView subView(int dataIndexStart, int dataCount)
-	{
-		if (dataCount != 1) throw new UnsupportedOperationException("Fixme: subView for QUadView only support one data point!");
-		int x = dataIndexStart / xSize;
-		int z = dataIndexStart % xSize;
-		return new ColumnArrayView(data, vertSize * dataCount, offset + x * perColumnOffset + z * vertSize, vertSize);
-	}
-	
-	public ColumnQuadView subView(int xOffset, int zOffset, int xSize, int zSize)
-	{
-		if (xOffset + xSize > this.xSize || zOffset + zSize > this.zSize) throw new IllegalArgumentException("SubView is out of bounds");
-		return new ColumnQuadView(data, perColumnOffset, offset + xOffset * perColumnOffset + zOffset * vertSize, vertSize, xSize, zSize);
-	}
-	
-	@Override
-	public void copyTo(long[] target, int offset, int size)
-	{
-		if (size != this.size() && size > zSize * vertSize) throw new UnsupportedOperationException("Not supported yet");
-		if (size <= xSize * vertSize)
-		{
-			System.arraycopy(data, this.offset, target, offset, size);
-		}
-		else
-		{
-			for (int x = 0; x < xSize; x++)
-			{
-				System.arraycopy(data, this.offset + x * perColumnOffset, target, offset + x * xSize * vertSize, xSize * vertSize);
-			}
-		}
-	}
-	
-}

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

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

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

@@ -1,59 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.core.dataObjects.render.columnViews;
-
-import it.unimi.dsi.fastutil.longs.LongIterator;
-
-import java.util.Iterator;
-
-public interface IColumnDataView
-{
-	long get(int index);
-	
-	// FIXME probably horizontal size in blocks?
-	int size();
-	
-	default LongIterator iterator()
-	{
-		return new LongIterator()
-		{
-			private int index = 0;
-			private final int size = IColumnDataView.this.size();
-			
-			@Override
-			public boolean hasNext() { return this.index < this.size; }
-			
-			@Override
-			public long nextLong() { return IColumnDataView.this.get(this.index++); }
-			
-		};
-	}
-	
-	// FIXME measured in blocks?
-	int verticalSize();
-	
-	// FIXME how many datapoints in this LOD?
-	int dataCount();
-	
-	IColumnDataView subView(int dataIndexStart, int dataCount);
-	
-	void copyTo(long[] target, int offset, int count);
-	
-}

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

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

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

@@ -154,7 +154,7 @@ public class LodDataBuilder
 					IBlockStateWrapper currentBlockState = AIR;
 					int mappedId = dataSource.mapping.addIfNotPresentAndGetId(currentBiome, currentBlockState);
 					
-					// Determine lighting (we are at the height limit. There are no torches here, and sky is not obscured.) // TODO: Per face lighting someday?
+					// Determine lighting (we are at the height limit. There are no torches here, and sky is not obscured.)
 					byte blockLight = LodUtil.MIN_MC_LIGHT;
 					byte skyLight = LodUtil.MAX_MC_LIGHT;
 					
@@ -321,8 +321,6 @@ public class LodDataBuilder
 				
 				LongArrayList packedDataPoints = convertApiDataPointListToPackedLongArray(columnDataPoints, dataSource, apiChunk.bottomYBlockPos, runAdditionalValidation);
 				
-				// TODO add the ability for API users to define a different compression mode
-				//  or add a "unkown" compression mode
 				dataSource.setSingleColumn(
 						packedDataPoints,
 						relBlockX + relSourceBlockX, relBlockZ + relSourceBlockZ,

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

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

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

@@ -20,11 +20,11 @@
 package com.seibel.distanthorizons.core.file.fullDatafile;
 
 import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGenerationStep;
-import com.seibel.distanthorizons.core.api.internal.SharedApi;
+import com.seibel.distanthorizons.core.api.internal.chunkUpdating.WorldChunkUpdateManager;
 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.file.fullDatafile.V2.FullDataUpdatePropagatorV2;
+import com.seibel.distanthorizons.core.util.delayedSaveCache.DelayedDataSourceSaveCache;
 import com.seibel.distanthorizons.core.file.structure.ISaveStructure;
 import com.seibel.distanthorizons.core.generation.DhLightingEngine;
 import com.seibel.distanthorizons.core.generation.IFullDataSourceRetrievalQueue;
@@ -33,15 +33,13 @@ 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.pooling.PhantomArrayListCheckout;
-import com.seibel.distanthorizons.core.pooling.PhantomArrayListPool;
+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.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;
@@ -54,7 +52,6 @@ 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
@@ -65,9 +62,6 @@ 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;
 	
@@ -77,7 +71,9 @@ public class GeneratedFullDataSourceProvider extends FullDataSourceProviderV2 im
 	private final AtomicReference<IFullDataSourceRetrievalQueue> worldGenQueueRef = new AtomicReference<>(null);
 	private final ArrayList<IOnWorldGenCompleteListener> onWorldGenTaskCompleteListeners = new ArrayList<>();
 	
-	protected final DelayedFullDataSourceSaveCache delayedFullDataSourceSaveCache = new DelayedFullDataSourceSaveCache(this::onDataSourceSaveAsync, 10_000);
+	protected final DelayedDataSourceSaveCache delayedFullDataSourceSaveCache = new DelayedDataSourceSaveCache(this::onDataSourceSaveAsync, 10_000);
+	
+	private final ConcurrentHashMap<Long, CompletableFuture<DataSourceRetrievalResult>> queuedRetrievalFutureByPos = new ConcurrentHashMap<>();
 	
 	
 	
@@ -137,7 +133,17 @@ public class GeneratedFullDataSourceProvider extends FullDataSourceProviderV2 im
 				LodUtil.assertTrue(genTaskResult.dataSource != null, "Successful retrieval object should have a datasource.");
 				
 				this.dataUpdater.updateDataSource(genTaskResult.dataSource);
-				this.fireOnGenPosSuccessListeners(genTaskResult.pos);
+				
+				// 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);
+					}
+				}
+				
 				genTaskResult.dataSource.close();
 			}
 			else if (genTaskResult.state == ERetrievalResultState.REQUIRES_SPLITTING)
@@ -155,19 +161,9 @@ public class GeneratedFullDataSourceProvider extends FullDataSourceProviderV2 im
 		{
 			LOGGER.error("Unexpected issue during onWorldGenTaskComplete, error: ["+e.getMessage()+"].", e);
 		}
-	}
-	
-	// TODO only fire after the section has finished generated or once every X seconds
-	private void fireOnGenPosSuccessListeners(long pos)
+		finally
 		{
-		// 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(pos);
-			}
+			this.queuedRetrievalFutureByPos.remove(genPos);
 		}
 	}
 	
@@ -222,44 +218,27 @@ 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)
 		{
@@ -307,7 +286,14 @@ 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));
+		}
 		
 		return worldGenFuture;
 	}
@@ -351,7 +337,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.checkoutArrays(1, 0, 0))
+			try(PhantomArrayListCheckout checkout = ARRAY_LIST_POOL.checkoutByteArrays(1))
 			{
 				ByteArrayList columnGenStepArray = checkout.getByteArray(0, FullDataSourceV2.WIDTH*FullDataSourceV2.WIDTH);
 				this.repo.getColumnGenerationStepForPos(pos, columnGenStepArray);
@@ -398,7 +384,7 @@ public class GeneratedFullDataSourceProvider extends FullDataSourceProviderV2 im
 			{
 				
 				EDhApiWorldGenerationStep currentMinWorldGenStep = EDhApiWorldGenerationStep.LIGHT;
-				try(PhantomArrayListCheckout checkout = ARRAY_LIST_POOL.checkoutArrays(1, 0, 0))
+				try(PhantomArrayListCheckout checkout = ARRAY_LIST_POOL.checkoutByteArrays(1))
 				{
 					ByteArrayList columnGenerationSteps = checkout.getByteArray(0, FullDataSourceV2.WIDTH*FullDataSourceV2.WIDTH);
 					this.repo.getColumnGenerationStepForPos(genPos, columnGenerationSteps);

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

@@ -1,9 +1,12 @@
 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;
@@ -29,6 +32,8 @@ 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;
 	
@@ -64,7 +69,9 @@ public class FullDataSourceProviderV1<TDhLevel extends IDhLevel>
 	protected FullDataSourceV1 createDataSourceFromDto(FullDataSourceV1DTO dto) throws InterruptedException, IOException, DataCorruptedException
 	{
 		FullDataSourceV1 dataSource = FullDataSourceV1.createEmpty(dto.pos);
-		try (DhDataInputStream inputStream = dto.getInputStream())
+		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))
 		{
 			dataSource.populateFromStream(dto, inputStream, this.level);
 		}

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

@@ -9,8 +9,6 @@ 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;
@@ -22,7 +20,7 @@ import java.util.List;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicBoolean;
 
-public class DataMigratorV1 implements IDebugRenderable, AutoCloseable
+public class DataMigratorV1 implements AutoCloseable
 {
 	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
@@ -332,12 +330,6 @@ public class DataMigratorV1 implements IDebugRenderable, AutoCloseable
 	// overrides //
 	//===========//
 	
-	@Override
-	public void debugRender(DebugRenderer renderer)
-	{
-		// nothing currently needed
-	}
-	
 	@Override
 	public void close()
 	{

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

@@ -22,6 +22,7 @@ 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;
@@ -30,7 +31,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.DebugRenderer;
+import com.seibel.distanthorizons.core.render.renderer.AbstractDebugWireframeRenderer;
 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,6 +58,8 @@ 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<>());
 	
 	/**
@@ -108,7 +111,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);
 		
-		DebugRenderer.register(this, Config.Client.Advanced.Debugging.DebugWireframe.showFullDataUpdateStatus);
+		DEBUG_WIREFRAME_RENDERER.register(this, Config.Client.Advanced.Debugging.DebugWireframe.showFullDataUpdateStatus);
 		
 	}
 	
@@ -447,11 +450,10 @@ public class FullDataSourceProviderV2 implements IDebugRenderable, AutoCloseable
 	//===========//
 	
 	@Override
-	public void debugRender(DebugRenderer renderer)
+	public void debugRender(AbstractDebugWireframeRenderer renderer)
 	{
 		this.dataUpdater.debugRender(renderer);
 		this.updatePropagator.debugRender(renderer);
-		this.dataMigratorV1.debugRender(renderer);
 	}
 	
 	@Override 
@@ -465,6 +467,8 @@ 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();
 	}
 	

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

@@ -7,14 +7,13 @@ 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.DebugRenderer;
+import com.seibel.distanthorizons.core.render.renderer.AbstractDebugWireframeRenderer;
 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;
@@ -35,11 +34,10 @@ 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 = 5;
+	public static final int NUMBER_OF_PARENT_UPDATE_TASKS_PER_THREAD = 10;
 	
 	/** 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(); }
 	
 	
 	
@@ -49,12 +47,11 @@ public class FullDataUpdatePropagatorV2 implements IDebugRenderable, AutoCloseab
 	 */
 	private final Set<Long> updatingPosSet = ConcurrentHashMap.newKeySet();
 	
-	// TODO only run thread if modifications happened recently
 	/**
-	 * Will be null on the dedicated server since updates don't need to be propagated,
-	 * only the highest detail level is needed.
+	 * 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.
 	 */
-	@Nullable
 	public final ThreadPoolExecutor updateQueueProcessor;
 	
 	private final AtomicBoolean isShutdownRef = new AtomicBoolean(false);
@@ -69,6 +66,7 @@ public class FullDataUpdatePropagatorV2 implements IDebugRenderable, AutoCloseab
 	//=============//
 	// constructor //
 	//=============//
+	//region
 	
 	public FullDataUpdatePropagatorV2(FullDataSourceProviderV2 provider, FullDataUpdaterV2 dataUpdater, String levelId)
 	{
@@ -81,11 +79,14 @@ public class FullDataUpdatePropagatorV2 implements IDebugRenderable, AutoCloseab
 		this.updateQueueProcessor.execute(this::runUpdateQueue);
 	}
 	
+	//endregion
+	
 	
 	
 	//================//
 	// parent updates //
 	//================//
+	//region
 	
 	private void runUpdateQueue()
 	{
@@ -101,8 +102,6 @@ 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;
@@ -136,9 +135,13 @@ 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);
 		
@@ -162,12 +165,17 @@ public class FullDataUpdatePropagatorV2 implements IDebugRenderable, AutoCloseab
 		{
 			// stop if there are already a bunch of updates queued
 			if (this.updatingPosSet.size() > maxUpdateTaskCount
-					|| executor.getQueueSize() > maxUpdateTaskCount
-					|| !this.updatingPosSet.add(parentUpdatePos))
+				|| executor.getQueueSize() > maxUpdateTaskCount)
 			{
 				break;
 			}
 			
+			// skip any already-queued positions
+			if (!this.updatingPosSet.add(parentUpdatePos))
+			{
+				continue;
+			}
+			
 			try
 			{
 				executor.execute(() ->
@@ -253,7 +261,6 @@ public class FullDataUpdatePropagatorV2 implements IDebugRenderable, AutoCloseab
 			}
 		}
 	}
-	}
 	/** stops if it finds any LOD data */
 	private void runChildUpdates(PriorityTaskPicker.Executor executor, DhBlockPos targetBlockPos)
 	{
@@ -371,17 +378,20 @@ public class FullDataUpdatePropagatorV2 implements IDebugRenderable, AutoCloseab
 		}
 	}
 	
+	//endregion
+	
 	
 	
 	//===========//
 	// overrides //
 	//===========//
+	//region
 	
 	@Override
-	public void debugRender(DebugRenderer renderer)
+	public void debugRender(AbstractDebugWireframeRenderer renderer)
 	{
 		this.updatingPosSet
-				.forEach((pos) -> { renderer.renderBox(new DebugRenderer.Box(pos, -32f, 80f, 0.20f, Color.MAGENTA)); });
+				.forEach((pos) -> { renderer.renderBox(new AbstractDebugWireframeRenderer.Box(pos, -32f, 80f, 0.20f, Color.MAGENTA)); });
 	}
 	
 	@Override
@@ -393,6 +403,8 @@ public class FullDataUpdatePropagatorV2 implements IDebugRenderable, AutoCloseab
 		}
 	}
 	
+	//endregion
+	
 	
 	
 }

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

@@ -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.DebugRenderer;
+import com.seibel.distanthorizons.core.render.renderer.AbstractDebugWireframeRenderer;
 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,20 +225,18 @@ public class FullDataUpdaterV2 implements IDebugRenderable, AutoCloseable
 	//===========//
 	
 	@Override
-	public void debugRender(DebugRenderer renderer)
+	public void debugRender(AbstractDebugWireframeRenderer renderer)
 	{
 		this.lockedPosSet
-				.forEach((pos) -> { renderer.renderBox(new DebugRenderer.Box(pos, -32f, 74f, 0.15f, Color.PINK)); });
+				.forEach((pos) -> { renderer.renderBox(new AbstractDebugWireframeRenderer.Box(pos, -32f, 74f, 0.15f, Color.PINK)); });
 		
 		this.queuedUpdateCountsByPos
-				.forEach((pos, updateCountRef) -> { renderer.renderBox(new DebugRenderer.Box(pos, -32f, 80f + (updateCountRef.get() * 16f), 0.20f, Color.WHITE)); });
+				.forEach((pos, updateCountRef) -> { renderer.renderBox(new AbstractDebugWireframeRenderer.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); }
+	
 	
 	
 }

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

@@ -20,13 +20,14 @@
 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.DebugRenderer;
+import com.seibel.distanthorizons.core.render.renderer.AbstractDebugWireframeRenderer;
 import com.seibel.distanthorizons.core.util.FullDataPointUtil;
 import com.seibel.distanthorizons.core.util.LodUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper;
@@ -52,6 +53,8 @@ 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
@@ -725,9 +728,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)
 							{
-								DebugRenderer.makeParticle(
-									new DebugRenderer.BoxParticle(
-										new DebugRenderer.Box(DhSectionPos.encode((byte) 0, chunkMinX + x, chunkMinZ + z), y, y + 1, 0.2f, color),
+								DEBUG_RENDERER.makeParticle(
+									new AbstractDebugWireframeRenderer.BoxParticle(
+										new AbstractDebugWireframeRenderer.Box(DhSectionPos.encode((byte) 0, chunkMinX + x, chunkMinZ + z), y, y + 1, 0.2f, color),
 										10.0, 0f
 									)
 								);

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

@@ -22,7 +22,7 @@ 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.LodQuadTree;
+import com.seibel.distanthorizons.core.render.QuadTree.LodQuadTree;
 import com.seibel.distanthorizons.core.util.objects.RollingAverage;
 
 import java.io.Closeable;
@@ -30,17 +30,16 @@ import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
 /**
- * Used to track what full data sources the system currently
+ * Used to track what some of the 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 
- * (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>
+ * since that would cause issues when moving or with extreme
+ * render distances. <br><br>
  * 
- * Use by both world gen and server networking.
+ * Used by both world gen and server networking.
  * 
  * @see LodQuadTree
  */
@@ -49,6 +48,7 @@ public interface IFullDataSourceRetrievalQueue extends Closeable
 	//=========//
 	// getters //
 	//=========//
+	//region
 	
 	/** 
 	 * The largest numerical detail level. <br>
@@ -63,11 +63,14 @@ public interface IFullDataSourceRetrievalQueue extends Closeable
 	 */
 	byte highestDataDetail();
 	
+	//endregion
+	
 	
 	
 	//=======//
 	// setup //
 	//=======//
+	//region
 	
 	/** 
 	 * Starts the retrieval process if not already running,
@@ -78,11 +81,14 @@ 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
@@ -92,11 +98,14 @@ 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);
@@ -104,11 +113,14 @@ public interface IFullDataSourceRetrievalQueue extends Closeable
 	@Override
 	void close();
 	
+	//endregion
+	
 	
 	
 	//===============//
 	// debug display //
 	//===============//
+	//region
 	
 	int getWaitingTaskCount();
 	int getInProgressTaskCount();
@@ -129,6 +141,8 @@ public interface IFullDataSourceRetrievalQueue extends Closeable
 	/** Can be used to determine roughly how fast the world generator is running. */
 	RollingAverage getRollingAverageChunkGenTimeInMs();
 	
+	//endregion
+	
 	
 	
 }

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

@@ -9,7 +9,6 @@ import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.file.fullDatafile.GeneratedFullDataSourceProvider;
 import com.seibel.distanthorizons.core.generation.tasks.DataSourceRetrievalResult;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.generation.tasks.ERetrievalResultState;
 import com.seibel.distanthorizons.core.pos.DhSectionPos;
 import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos2D;
 import com.seibel.distanthorizons.core.util.FormatUtil;
@@ -93,7 +92,8 @@ public class PregenManager
 		private final AtomicInteger nextSectionSpiralIndex = new AtomicInteger(0);
 		
 		private final AtomicLong lastTaskFinishTime = new AtomicLong(System.currentTimeMillis());
-		private final RollingAverage averageTaskCompletionIntervalMs = new RollingAverage(1000);
+		private RollingAverage averageTaskCompletionIntervalMs = new RollingAverage(1000);
+		private final RollingAverage averageTaskCompletionIntervalMsShort = new RollingAverage(50);
 		
 		private final AtomicLong lastLogTime = new AtomicLong();
 		
@@ -112,6 +112,7 @@ public class PregenManager
 					
 					long timeSincePreviousTaskFinish = System.currentTimeMillis() - this.lastTaskFinishTime.getAndSet(System.currentTimeMillis());
 					this.averageTaskCompletionIntervalMs.add(timeSincePreviousTaskFinish);
+					this.averageTaskCompletionIntervalMsShort.add(timeSincePreviousTaskFinish);
 					
 					PregenState.this.fillPendingQueue();
 				})
@@ -182,6 +183,13 @@ public class PregenManager
 			int chunkRatePerSecond = (int) (1000 / this.averageTaskCompletionIntervalMs.getAverage() * 4 * 4);
 			double etaMs = this.averageTaskCompletionIntervalMs.getAverage() * (this.sectionsToGenerate - this.nextSectionSpiralIndex.get());
 
+			// Reset long rolling average if short average diverged too much (<0.5 / >2.0)
+			double averageRatio = this.averageTaskCompletionIntervalMsShort.getAverage() / this.averageTaskCompletionIntervalMs.getAverage();
+			if (averageRatio < 0.5 || averageRatio > 2.0)
+			{
+				this.averageTaskCompletionIntervalMs = new RollingAverage(1000);
+			}
+
 			return MessageFormat.format("Generated radius: {0,number,#.###} / {1,number,#.#} chunks ({2} cps, {3,number,#.###%}), ETA: {4}",
 					this.generatedRadius.getValue(),
 					chunksToGenerate,

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

@@ -1,6 +1,7 @@
 package com.seibel.distanthorizons.core.generation;
 
 import com.seibel.distanthorizons.core.config.Config;
+import com.seibel.distanthorizons.core.file.fullDatafile.V2.FullDataSourceProviderV2;
 import com.seibel.distanthorizons.core.generation.tasks.DataSourceRetrievalResult;
 import com.seibel.distanthorizons.core.generation.tasks.ERetrievalResultState;
 import com.seibel.distanthorizons.core.level.DhClientLevel;
@@ -47,7 +48,7 @@ public class RemoteWorldRetrievalQueue extends AbstractFullDataNetworkRequestQue
 	public void startAndSetTargetPos(DhBlockPos2D targetPos) { super.tick(targetPos); }
 	
 	@Override
-	public byte lowestDataDetail() { return LodUtil.BLOCK_DETAIL_LEVEL + 12; } // TODO should be the same as what the server's update propagator can provide
+	public byte lowestDataDetail() { return FullDataSourceProviderV2.ROOT_SECTION_DETAIL_LEVEL; }
 	@Override
 	public byte highestDataDetail() { return LodUtil.BLOCK_DETAIL_LEVEL; }
 	

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

@@ -26,6 +26,7 @@ import com.seibel.distanthorizons.api.objects.data.DhApiChunk;
 import com.seibel.distanthorizons.api.objects.data.IDhApiFullDataSource;
 import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
+import com.seibel.distanthorizons.core.file.fullDatafile.V2.FullDataSourceProviderV2;
 import com.seibel.distanthorizons.core.generation.tasks.DataSourceRetrievalResult;
 import com.seibel.distanthorizons.core.generation.tasks.DataSourceRetrievalTask;
 import com.seibel.distanthorizons.core.level.IDhServerLevel;
@@ -35,7 +36,7 @@ import com.seibel.distanthorizons.core.pos.DhChunkPos;
 import com.seibel.distanthorizons.core.pos.DhSectionPos;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.dataObjects.transformers.LodDataBuilder;
-import com.seibel.distanthorizons.core.render.renderer.DebugRenderer;
+import com.seibel.distanthorizons.core.render.renderer.AbstractDebugWireframeRenderer;
 import com.seibel.distanthorizons.core.render.renderer.IDebugRenderable;
 import com.seibel.distanthorizons.core.util.ExceptionUtil;
 import com.seibel.distanthorizons.core.util.LodUtil.AssertFailureException;
@@ -60,6 +61,7 @@ public class WorldGenerationQueue implements IFullDataSourceRetrievalQueue, IDeb
 {
 	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	private static final IWrapperFactory WRAPPER_FACTORY = SingletonInjector.INSTANCE.get(IWrapperFactory.class);
+	private static final AbstractDebugWireframeRenderer DEBUG_RENDERER = SingletonInjector.INSTANCE.get(AbstractDebugWireframeRenderer.class);
 	
 	
 	private final IDhApiWorldGenerator generator;
@@ -78,11 +80,11 @@ public class WorldGenerationQueue implements IFullDataSourceRetrievalQueue, IDeb
 	/** If not null this generator is in the process of shutting down */
 	private volatile CompletableFuture<Void> generatorClosingFuture = null;
 	
-	// TODO this logic isn't great and can cause a limit to how many threads could be used for world generation, 
-	//  however it won't cause duplicate requests or concurrency issues, so it will be good enough for now.
-	//  A good long term fix may be to either:
-	//  1. allow the generator to deal with larger sections (let the generator threads split up larger tasks into smaller ones
-	//  2. batch requests better. instead of sending 4 individual tasks of detail level N, send 1 task of detail level n+1
+	/** 
+	 * having a single thread queue for world gen can cause a bottleneck,
+	 * however that's usually only for extremely fast custom generators
+	 * and doesn't generally come up in normal gameplay.
+	 */
 	private final ExecutorService queueingThread = ThreadUtil.makeSingleThreadPool("World Gen Queue");
 	private boolean generationQueueRunning = false;
 	private DhBlockPos2D generationTargetPos = DhBlockPos2D.ZERO;
@@ -109,7 +111,7 @@ public class WorldGenerationQueue implements IFullDataSourceRetrievalQueue, IDeb
 		this.lowestDataDetail = generator.getLargestDataDetailLevel();
 		this.highestDataDetail = generator.getSmallestDataDetailLevel();
 		
-		DebugRenderer.register(this, Config.Client.Advanced.Debugging.DebugWireframe.showWorldGenQueue);
+		DEBUG_RENDERER.register(this, Config.Client.Advanced.Debugging.DebugWireframe.showWorldGenQueue);
 		LOGGER.info("Created world gen queue");
 	}
 	
@@ -137,6 +139,9 @@ public class WorldGenerationQueue implements IFullDataSourceRetrievalQueue, IDeb
 		DataSourceRetrievalTask existingGenTask = this.waitingTasks.get(pos);
 		if (existingGenTask != null)
 		{
+			// if the same future is returned
+			// the caller shouldn't close the datasource multiple times,
+			// otherwise issues will occur (holes and/or out-of-place LOD data)
 			return existingGenTask.future;
 		}
 		
@@ -546,7 +551,8 @@ public class WorldGenerationQueue implements IFullDataSourceRetrievalQueue, IDeb
 		
 		// only apply to children if we aren't at the bottom of the tree
 		pooledDataSource.applyToChildren = DhSectionPos.getDetailLevel(pooledDataSource.getPos()) > DhSectionPos.SECTION_BLOCK_DETAIL_LEVEL;
-		pooledDataSource.applyToParent = DhSectionPos.getDetailLevel(pooledDataSource.getPos()) < DhSectionPos.SECTION_BLOCK_DETAIL_LEVEL + 12; // TODO what does this 12 reference?
+		// apply to parents up to the top of the tree
+		pooledDataSource.applyToParent = DhSectionPos.getDetailLevel(pooledDataSource.getPos()) < FullDataSourceProviderV2.ROOT_SECTION_DETAIL_LEVEL;
 		
 		CompletableFuture<Void> lodGenFuture = this.generator.generateLod(
 			chunkPosMin.getX(), chunkPosMin.getZ(),
@@ -618,7 +624,7 @@ public class WorldGenerationQueue implements IFullDataSourceRetrievalQueue, IDeb
 	///region debug
 	
 	@Override
-	public void debugRender(DebugRenderer renderer)
+	public void debugRender(AbstractDebugWireframeRenderer renderer)
 	{
 		int levelMinY = this.level.getLevelWrapper().getMinHeight();
 		int levelMaxY = this.level.getLevelWrapper().getMaxHeight();
@@ -633,7 +639,7 @@ public class WorldGenerationQueue implements IFullDataSourceRetrievalQueue, IDeb
 		this.waitingTasks.keySet().forEach((Long pos) -> 
 		{ 
 			renderer.renderBox(
-				new DebugRenderer.Box(pos, levelMinY, maxY, 0.05f, Color.blue)
+				new AbstractDebugWireframeRenderer.Box(pos, levelMinY, maxY, 0.05f, Color.blue)
 			); 
 		});
 		
@@ -641,7 +647,7 @@ public class WorldGenerationQueue implements IFullDataSourceRetrievalQueue, IDeb
 		this.inProgressGenTasksByLodPos.forEach((Long pos, DataSourceRetrievalTask task) -> 
 		{ 
 			renderer.renderBox(
-				new DebugRenderer.Box(pos, levelMinY, maxY, 0.05f, Color.red)
+				new AbstractDebugWireframeRenderer.Box(pos, levelMinY, maxY, 0.05f, Color.red)
 			); 
 		});
 	}
@@ -727,7 +733,7 @@ public class WorldGenerationQueue implements IFullDataSourceRetrievalQueue, IDeb
 		
 		
 		this.generator.close();
-		DebugRenderer.unregister(this, Config.Client.Advanced.Debugging.DebugWireframe.showWorldGenQueue);
+		DEBUG_RENDERER.unregister(this, Config.Client.Advanced.Debugging.DebugWireframe.showWorldGenQueue);
 		
 		
 		try

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

@@ -23,45 +23,36 @@ import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.pos.DhSectionPos;
 import com.seibel.distanthorizons.core.sql.dto.FullDataSourceV2DTO;
 import com.seibel.distanthorizons.core.sql.repo.FullDataSourceV2Repo;
-import com.seibel.distanthorizons.core.util.NativeDialogUtil;
 import com.seibel.distanthorizons.coreapi.ModInfo;
-import com.seibel.distanthorizons.core.jar.gui.BaseJFrame;
-import com.seibel.distanthorizons.core.jar.gui.cusomJObject.JBox;
-import com.seibel.distanthorizons.core.jar.installer.ModrinthGetter;
-import com.seibel.distanthorizons.core.jar.installer.WebDownloader;
 import org.apache.logging.log4j.LogManager;
 import com.seibel.distanthorizons.core.logging.DhLogger;
 import org.apache.logging.log4j.core.LoggerContext;
 
-import javax.swing.*;
-import java.awt.*;
 import java.io.*;
-import java.net.URL;
 import java.sql.SQLException;
 import java.util.*;
 import java.util.List;
-import java.util.concurrent.atomic.AtomicReference;
 
 /**
- * The main class when you run the standalone jar
+ * Only partially implemented.
+ * No one has asked for the ability to parse/submit DH data outside the game
+ * (and those who have gone down that path have all wanted to handle the
+ * parsing themselves via their own implementations). <Br>
+ * But in the off chance someone in the future wants to add this functionality
+ * James will leave the code he's done so far here as a starting place.
+ * <Br><Br>
  * 
- * @author coolGi
+ * Once built this would be in core/build/libs/DistantHorizons-<Version>-dev-all.jar
  */
-// Once built it would be in core/build/libs/DistantHorizons-<Version>-dev-all.jar
 public class JarMain
 {
 	public static final DhLogger LOGGER = new DhLoggerBuilder().build();
-	public static List<String> argList;
-	public static final boolean isDarkTheme = DarkModeDetector.isDarkMode();
-	public static boolean isOffline = WebDownloader.netIsAvailable();
 	
-	// TODO: Rewrite the standalone jar
-	// Previous version here https://gitlab.com/jeseibel/distant-horizons-core/-/blob/333dc4d0e079777b712c0fff246837104ae9a2b6/core/src/main/java/com/seibel/lod/core/jar/JarMain.java
 	
 	
 	public static void main(String[] args)
 	{
-		argList = Arrays.asList(args);
+		List<String> argList = Arrays.asList(args);
 		
 		if (!argList.contains("--no-custom-logger"))
 		{
@@ -72,31 +63,16 @@ public class JarMain
 			}
 			catch (Exception e)
 			{
-				LOGGER.error("Failed to set log4j config. Try running with the \"--no-custom-logger\" argument");
-				e.printStackTrace();
+				LOGGER.error("Failed to set log4j config. Try running with the [--no-custom-logger] argument", e);
 			}
 		}
 		
 		LOGGER.debug("Running " + ModInfo.READABLE_NAME + " standalone jar");
 		LOGGER.warn("The standalone jar is still a massive WIP, expect bugs");
 		LOGGER.debug("Java version " + System.getProperty("java.version"));
-		//LOGGER.debug(argList);
 		
 		
-		if (args.length == 0 || Arrays.asList(args).contains("--gui"))
-		{
-			// Sets up the local
-			if (JarUtils.accessFile("assets/lod/lang/" + Locale.getDefault().toString().toLowerCase() + ".json") == null)
-			{
-				LOGGER.warn("The language setting [" + Locale.getDefault().toString().toLowerCase() + "] isn't allowed yet. Defaulting to [" + Locale.US.toString().toLowerCase() + "].");
-				Locale.setDefault(Locale.US);
-			}
-			JarDependencySetup.createInitialBindings();
 		
-			startGUI();
-		}
-		else if (argList.get(0).equals("--export"))
-		{
 		Byte exportDetailLevel = null;
 		Long exportPos = null;
 		
@@ -178,7 +154,7 @@ public class JarMain
 		
 		
 		// set the export file
-			File exportFile = new File("DistantHorizons-export.csv"); // TODO allow setting an export folder
+		File exportFile = new File("DistantHorizons-export.csv");
 		if (exportFile.isDirectory())
 		{
 			LOGGER.error("Export file can't be a folder. Given path: ["+exportFile+"].");
@@ -235,7 +211,6 @@ public class JarMain
 			exportEntireDatabase(repo, exportFile);
 		}
 	}
-	}
 	
 	private static void exportLodDataAtPosition(FullDataSourceV2Repo repo, File exportFile, long pos)
 	{
@@ -245,239 +220,21 @@ public class JarMain
 			LOGGER.error("Unable to find any data at the position ["+DhSectionPos.toString(pos)+"].");
 			return;
 		}
-		// TODO need a way to create datasources (specifically data mappings) without a MC level object to deserialize with
+		
+		// In order to finish this, we'd need a way to create datasources (specifically data mappings) without a MC level object to deserialize with.
+		// Granted it would be possible to just export the mapping data as the raw string data it's stored as.
 		//dto.createPooledDataSource();
 		
 	}
 	private static void exportAllAtDetailLevel(FullDataSourceV2Repo repo, File exportFile, byte detailLevel)
 	{
-		// TODO
+		throw new UnsupportedOperationException("Method Not Implemented");
 	}
 	private static void exportEntireDatabase(FullDataSourceV2Repo repo, File exportFile)
 	{
-		// TODO
+		throw new UnsupportedOperationException("Method Not Implemented");
 	}
 	
 	
 	
-	
-	public static void startGUI()
-	{
-		// Set up the theme
-//        System.setProperty("apple.awt.application.appearance", "system");
-//        if (isDarkTheme)
-//            FlatDarkLaf.setup();
-//        else
-//            FlatLightLaf.setup();
-		// This is done in BaseJFrame now
-
-
-//        GitlabGetter.init();
-		ModrinthGetter.init();
-		System.out.println("WARNING: The standalone jar still work in progress");
-
-//        JOptionPane.showMessageDialog(null, "The GUI for the standalone jar isn't made yet\nIf you want to use the mod then put it in your mods folder", "Distant Horizons", JOptionPane.WARNING_MESSAGE);
-
-//        if (getOperatingSystem().equals(OperatingSystem.MACOS)) {
-//            System.out.println("If you want the installer then please use Linux or Windows for the time being.\nMacOS support/testing will come later on");
-//        }
-		
-		// Code will be changed later on to allow resizing and work better
-		
-		
-		
-		BaseJFrame frame = new BaseJFrame(false, true);
-		frame.addExtraButtons(frame.getWidth(), 0, true, false);
-		
-		// Buttons which you want to be stacked vertically should be added with this (`frame.add(obj, this);`)
-		GridBagConstraints verticalLayout = new GridBagConstraints();
-		verticalLayout.gridy = GridBagConstraints.RELATIVE;
-		verticalLayout.gridx = 0;
-		verticalLayout.fill = GridBagConstraints.HORIZONTAL;
-		verticalLayout.weightx = 1.0;
-		verticalLayout.anchor = GridBagConstraints.NORTH;
-		
-		
-		// Selected download
-		AtomicReference<String> downloadID = new AtomicReference<String>("");
-		
-		
-		// This is for the panel to show the update description
-		JPanel modVersionDescriptionPanel = new JPanel(new GridBagLayout());
-		JScrollPane modVersionDescriptionScroll = new JScrollPane(modVersionDescriptionPanel, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
-		// Sets all the layout stuff for it
-		int modDescriptionWidth = 275;
-		modVersionDescriptionScroll.setBounds(frame.getWidth() - modDescriptionWidth, 225, modDescriptionWidth, frame.getHeight() - 255);
-		modVersionDescriptionScroll.setBorder(null); // Disables the border
-		modVersionDescriptionScroll.setWheelScrollingEnabled(true);
-		// The label
-		JLabel modVersionDescriptionLabel = new JLabel();
-		modVersionDescriptionPanel.add(modVersionDescriptionLabel, verticalLayout);
-		// Finally add it
-		frame.add(modVersionDescriptionScroll);
-		
-		
-		
-		// This is for the pannel to select MinecraftVersion
-		JPanel modMinecraftVersionsPannel = new JPanel(new GridBagLayout());
-		JScrollPane modMinecraftVersionsScroll = new JScrollPane(modMinecraftVersionsPannel, JScrollPane.VERTICAL_SCROLLBAR_ALWAYS, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
-		// Sets all the layout stuff for it
-		modMinecraftVersionsScroll.setBounds(0, 225, 125, frame.getHeight() - 255);
-		modMinecraftVersionsScroll.setBorder(null); // Disables the border
-		modMinecraftVersionsScroll.setWheelScrollingEnabled(true);
-		// List to store all the buttons
-		ArrayList<JButton> modMinecraftReleaseButtons = new ArrayList<>();
-		frame.add(modMinecraftVersionsScroll);
-		
-		
-		// This is for selecting the mod version
-		JPanel modVersionsPannel = new JPanel(new GridBagLayout());
-		JScrollPane modVersionsScroll = new JScrollPane(modVersionsPannel, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER);
-		// Sets all the layout stuff for it
-		modVersionsScroll.setBounds(125, 225, 100, frame.getHeight() - 255);
-		modVersionsScroll.setBorder(null); // Disables the border
-		modVersionsScroll.setWheelScrollingEnabled(true);
-		// List to store all the buttons
-		ArrayList<JButton> modReleaseButtons = new ArrayList<>();
-		frame.add(modVersionsScroll);
-		
-		// Add all the buttons
-		for (String mcVer : ModrinthGetter.mcVersions)
-		{
-			JButton btn = new JButton(mcVer);
-			btn.setBackground(UIManager.getColor("Panel.background")); // Does the same thing as removing the background
-			btn.setBorderPainted(false); // Removes the borders
-//            btn.setHorizontalAlignment(SwingConstants.LEFT); // Sets the text to be on the left side rather than the center
-			
-			btn.addActionListener(e -> {
-				// Clears the selected colors for the rest of the buttons
-				for (JButton currentBtn : modMinecraftReleaseButtons)
-				{
-					currentBtn.setBackground(UIManager.getColor("Panel.background"));
-				}
-				btn.setBackground(UIManager.getColor("Button.background")); // Sets this to the selected color
-				
-				// Clears the minecraft version panel
-				modVersionsPannel.removeAll();
-				modReleaseButtons.clear();
-				
-				
-				// Adds all the buttons for the minecraft panel
-				for (String modID : ModrinthGetter.mcVerToReleaseID.get(mcVer))
-				{
-					// No need to comment most of these as it is the same this as before
-					JButton btnDownload = new JButton(ModrinthGetter.releaseNames.get(modID));
-					btnDownload.setBackground(UIManager.getColor("Panel.background"));
-					btnDownload.setBorderPainted(false);
-					btnDownload.setHorizontalAlignment(SwingConstants.LEFT);
-					
-					btnDownload.addActionListener(f -> {
-						downloadID.set(modID);
-						
-						for (JButton currentBtn : modReleaseButtons)
-						{
-							currentBtn.setBackground(UIManager.getColor("Panel.background"));
-						}
-						btnDownload.setBackground(UIManager.getColor("Button.background"));
-						
-						
-						modVersionDescriptionLabel.setText(
-								WebDownloader.formatMarkdownToHtml(
-										ModrinthGetter.changeLogs.get(modID), modDescriptionWidth - 75)
-						);
-						modVersionDescriptionPanel.repaint();
-					});
-					modVersionsPannel.add(btnDownload, verticalLayout);
-					modReleaseButtons.add(btnDownload);
-				}
-				
-				modVersionsScroll.getVerticalScrollBar().setValue(0); // Reset the scroll bar back to the top
-				
-				modVersionsPannel.repaint(); // Update the version pannel
-				frame.validate(); // Update the frame
-			});
-			
-			modMinecraftVersionsPannel.add(btn, verticalLayout);
-			modMinecraftReleaseButtons.add(btn);
-		}
-		
-		
-		
-		// Bar at the top
-		frame.add(new JBox(UIManager.getColor("Separator.foreground"), 0, 220, frame.getWidth(), 5));
-		// Minecraft version text
-		JLabel textMcVersionHeader = new JLabel("Minecraft version");
-		textMcVersionHeader.setBounds(0, 200, 125, 20);
-		frame.add(textMcVersionHeader);
-		// Version text
-		JLabel textVersionHeader = new JLabel("Mod version");
-		textVersionHeader.setBounds(125, 200, 150, 20);
-		frame.add(textVersionHeader);
-		
-		
-		
-		
-		// Stuff for setting the file install path
-		JFileChooser minecraftDirPop = new JFileChooser();
-		switch (EPlatform.get())
-		{
-			case WINDOWS:
-				minecraftDirPop.setCurrentDirectory(new File(System.getenv("APPDATA") + "/.minecraft/mods"));
-			case LINUX:
-				minecraftDirPop.setCurrentDirectory(new File(System.getProperty("user.home") + "/.minecraft/mods"));
-		}
-		minecraftDirPop.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY);
-		JButton minecraftDirBtn = new JButton("Click to select install path");
-		minecraftDirBtn.addActionListener(e -> {
-			if (minecraftDirPop.showOpenDialog(frame) == JFileChooser.APPROVE_OPTION)
-				minecraftDirBtn.setText(minecraftDirPop.getSelectedFile().toString());
-		});
-		minecraftDirBtn.setBounds(230, frame.getHeight() - 100, 200, 20);
-		frame.add(minecraftDirBtn);
-		
-		// Button for the install button
-		JButton installMod = new JButton("Install " + ModInfo.READABLE_NAME);
-		installMod.setBounds(230, frame.getHeight() - 70, 200, 20);
-		installMod.addActionListener(e -> {
-			if (minecraftDirPop.getSelectedFile() == null)
-			{
-				NativeDialogUtil.showDialog(ModInfo.READABLE_NAME, "Please select your install directory", "ok", "warning");
-				return;
-			}
-			
-			URL downloadPath = ModrinthGetter.downloadUrl.get(downloadID.get());
-			
-			try
-			{
-				WebDownloader.downloadAsFile(
-						downloadPath,
-						minecraftDirPop.getSelectedFile().toPath().resolve(
-								ModInfo.NAME + "-" + ModrinthGetter.releaseNames.get(downloadID.get()) + ".jar"
-						).toFile());
-				
-				NativeDialogUtil.showDialog(ModInfo.READABLE_NAME, "Installation done. \nYou can now close the installer", "ok", "info");
-			}
-			catch (Exception f)
-			{
-				NativeDialogUtil.showDialog(ModInfo.READABLE_NAME, "Download failed. Check your internet connection \nStacktrace: " + f.getMessage(), "error", "info");
-			}
-		});
-		frame.add(installMod);
-		
-		
-		// Fabric installer
-//        try {
-//            WebDownloader.downloadAsFile(new URL("https://maven.fabricmc.net/net/fabricmc/fabric-installer/0.11.0/fabric-installer-0.11.0.jar"), new File(System.getProperty("java.io.tmpdir") + "/fabricInstaller.jar"));
-//            Runtime.getRuntime().exec("java -jar " + System.getProperty("java.io.tmpdir") + "/fabricInstaller.jar");
-//        } catch (Exception e) {e.printStackTrace();}
-		
-		
-		
-		
-		frame.addLogo(); // Has to be run at the end cus of a bug with java swing (it may not be a bug but idk how to fix it so I'll call it a bug)
-		
-		frame.validate(); // Update to add the widgets
-		frame.setVisible(true); // Start the ui
-	}
-	
 }

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

@@ -53,6 +53,7 @@ public class JarUtils
 	//=============//
 	// constructor //
 	//=============//
+	//region
 	
 	static 
 	{
@@ -80,11 +81,14 @@ public class JarUtils
 		}
 	}
 	
+	//endregion
+	
 	
 	
 	//=========//
 	// methods //
 	//=========//
+	//region
 	
 	/**
 	 * Gets the URI of a resource
@@ -183,27 +187,8 @@ public class JarUtils
 		return sb.toString();
 	}
 	
+	//endregion
+	
 	
-	/** Please use the EPlatform enum instead */
-	@Deprecated
-	public enum OperatingSystem
-	{WINDOWS, MACOS, LINUX, NONE} // Easy to use enum for the 3 main os's
-	/** Please use the EPlatform enum instead */
-	@Deprecated
-	public static OperatingSystem getOperatingSystem()
-	{ 
-		// Get the os and turn it into that enum
-		switch (EPlatform.get())
-		{
-			case WINDOWS:
-				return OperatingSystem.WINDOWS;
-			case LINUX:
-				return OperatingSystem.LINUX;
-			case MACOS:
-				return OperatingSystem.MACOS;
-			default:
-				return OperatingSystem.NONE;
-		}
-	}
 	
 }

core/src/main/java/com/seibel/distanthorizons/core/jar/gui/BaseJFrame.java

@@ -1,255 +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.jar.gui;
-
-import com.seibel.distanthorizons.core.jar.JarUtils;
-import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
-import com.seibel.distanthorizons.core.wrapperInterfaces.config.ILangWrapper;
-
-import javax.imageio.ImageIO;
-import javax.swing.*;
-import java.awt.*;
-import java.awt.image.BufferedImage;
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.util.*;
-import java.util.List;
-
-/**
- * @author coolGi
- */
-// This will be removed later on to make a better ui
-// To get colors use https://alvinalexander.com/java/java-uimanager-color-keys-list/
-// TODO: Make the code less spaghetti later
-public class BaseJFrame extends JFrame
-{
-	public BaseJFrame()
-	{
-		init();
-	}
-	public BaseJFrame(boolean show, boolean resizable)
-	{
-		init();
-		setVisible(show);
-		setResizable(resizable);
-	}
-	
-	public void init()
-	{
-		setTitle(SingletonInjector.INSTANCE.get(ILangWrapper.class).getLang("lod.title"));
-		try
-		{
-			setIconImage(ImageIO.read(JarUtils.accessFile("assets/distanthorizons/icon.png")));
-		}
-		catch (Exception e)
-		{
-			e.printStackTrace();
-		}
-		setSize(720, 480);
-		setLocationRelativeTo(null); // Puts the window at the middle of the screen
-		setLayout(new BorderLayout());
-		setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);
-		initLookAndFeel();
-	}
-	
-	/**
-	 * Buttons for language and theme changing
-	 *
-	 * @param themeOnBottom Puts the theme buttons below the language
-	 * @param rootPosOnLeft Where the start for the x is (on the left of the buttons or on the right)
-	 */
-	public void addExtraButtons(int x, int y, boolean themeOnBottom, boolean rootPosOnLeft)
-	{
-		// ========== LANGUAGE ==========
-		int langBoxHeight = 25;
-		int langBoxWidth = 100;
-		
-		// Creates a list with all the options in it
-		List<String> langsToChoose = new ArrayList<>();
-		try (
-				final InputStreamReader isr = new InputStreamReader(JarUtils.accessFile("assets/distanthorizons/lang"), StandardCharsets.UTF_8);
-				final BufferedReader br = new BufferedReader(isr)
-		)
-		{
-			List<Object> col = Collections.unmodifiableList(new ArrayList<>(Arrays.asList(br.lines().toArray())));
-			for (Object obj : col)
-			{
-				langsToChoose.add(((String) obj).replaceAll("\\.json", ""));
-			}
-		}
-		catch (Exception e)
-		{
-			e.printStackTrace();
-		}
-		
-		// Creates the box
-		JComboBox<String> languageBox = new JComboBox(new DefaultComboBoxModel(langsToChoose.toArray()));
-		languageBox.setSelectedIndex(langsToChoose.indexOf(Locale.getDefault().toString().toLowerCase()));
-		languageBox.addActionListener(e -> {
-			Locale.setDefault(Locale.forLanguageTag(languageBox.getSelectedItem().toString())); // Change lang on update
-		});
-		// Set where it goes
-		languageBox.setBounds(rootPosOnLeft ? x : x - langBoxWidth, themeOnBottom ? y : y + langBoxHeight, langBoxWidth, langBoxHeight);
-		// And finally add it
-		add(languageBox);
-		
-		
-		// ========== THEMING ========== //
-		/**
-		// TODO: Change the theme to a toggle switch rather than having 2 buttons
-		int themeButtonSize = 25;
-		JButton lightMode = null;
-		JButton darkMode = null;
-		// Try to set the icons for them
-		try
-		{
-			lightMode = new JButton(new ImageIcon(
-					new FlatSVGIcon(JarUtils.accessFile("assets/distanthorizons/textures/jar/themeLight.svg")).getImage() // Get the image
-							.getScaledInstance(themeButtonSize, themeButtonSize, Image.SCALE_DEFAULT) // Scale it to the correct size
-			));
-			darkMode = new JButton(new ImageIcon(
-					new FlatSVGIcon(JarUtils.accessFile("assets/distanthorizons/textures/jar/themeDark.svg")).getImage() // Get the image
-							.getScaledInstance(themeButtonSize, themeButtonSize, Image.SCALE_DEFAULT) // Scale it to the correct size
-			));
-		}
-		catch (Exception e)
-		{
-			e.printStackTrace();
-		}
-		// Where do the buttons go
-		lightMode.setBounds(rootPosOnLeft ? x : x - (themeButtonSize * 2), themeOnBottom ? y + langBoxHeight : y, themeButtonSize, themeButtonSize);
-		darkMode.setBounds(rootPosOnLeft ? x + themeButtonSize : x - themeButtonSize, themeOnBottom ? y + langBoxHeight : y, themeButtonSize, themeButtonSize);
-		// Tell buttons what to do
-		lightMode.addActionListener(e -> {
-			FlatLightLaf.setup();
-			FlatLightLaf.updateUI();
-		});
-		darkMode.addActionListener(e -> {
-			FlatDarkLaf.setup();
-			FlatDarkLaf.updateUI();
-		});
-		// Finally add the buttons
-		add(lightMode);
-		add(darkMode);
-		 */
-	}
-	
-	public BaseJFrame addLogo()
-	{
-		int logoHeight = 200;
-		
-		JPanel logo = new JPanel()
-		{
-			@Override
-			protected void paintComponent(Graphics g)
-			{
-				super.paintComponent(g);
-				try
-				{
-					BufferedImage image = ImageIO.read(JarUtils.accessFile("assets/distanthorizons/logo.png"));
-					int logoWidth = (int) ((double) logoHeight * ((double) image.getWidth() / (double) image.getHeight())); // Calculate the aspect ratio and set the height correctly to not stretch it
-					g.drawImage(image, (getWidth() / 2) - (logoWidth / 2), 0, logoWidth, logoHeight, this); // Resize image and draw it
-				}
-				catch (Exception e)
-				{
-					e.printStackTrace();
-				}
-			}
-		};
-		logo.setBounds(logo.getX(), logo.getY(), logo.getWidth(), logo.getHeight());
-		
-		add(logo);
-		
-		return this;
-	}
-	
-	
-	
-	
-	// This part of the code is taken from the official java docs at https://docs.oracle.com/javase/tutorial/uiswing/lookandfeel/plaf.html
-	
-	// Specify the look and feel to use by defining the LOOKANDFEEL constant
-	// Valid values are: null (use the default), "Metal", "System", "Motif", and "GTK"
-	final static String LOOKANDFEEL = "GTK";
-	private static void initLookAndFeel()
-	{
-		String lookAndFeel = null;
-		
-		if (LOOKANDFEEL != null)
-		{
-			if (LOOKANDFEEL.equals("Metal"))
-			{
-				lookAndFeel = UIManager.getCrossPlatformLookAndFeelClassName();
-				//  an alternative way to set the Metal L&F is to replace the
-				// previous line with:
-				// lookAndFeel = "javax.swing.plaf.metal.MetalLookAndFeel";
-				
-			}
-			else if (LOOKANDFEEL.equals("System"))
-			{
-				lookAndFeel = UIManager.getSystemLookAndFeelClassName();
-			}
-			else if (LOOKANDFEEL.equals("Motif"))
-			{
-				lookAndFeel = "com.sun.java.swing.plaf.motif.MotifLookAndFeel";
-			}
-			else if (LOOKANDFEEL.equals("GTK"))
-			{
-				lookAndFeel = "com.sun.java.swing.plaf.gtk.GTKLookAndFeel";
-			}
-			else
-			{
-				System.err.println("Unexpected value of LOOKANDFEEL specified: "
-						+ LOOKANDFEEL);
-				lookAndFeel = UIManager.getCrossPlatformLookAndFeelClassName();
-			}
-			
-			try
-			{
-				UIManager.setLookAndFeel(lookAndFeel);
-			}
-			catch (ClassNotFoundException e)
-			{
-				System.err.println("Couldn't find class for specified look and feel:"
-						+ lookAndFeel);
-				System.err.println("Did you include the L&F library in the class path?");
-				System.err.println("Using the default look and feel.");
-			}
-			catch (UnsupportedLookAndFeelException e)
-			{
-				System.err.println("Can't use the specified look and feel ("
-						+ lookAndFeel
-						+ ") on this platform.");
-				System.err.println("Using the default look and feel.");
-			}
-			catch (Exception e)
-			{
-				System.err.println("Couldn't get specified look and feel ("
-						+ lookAndFeel
-						+ "), for some reason.");
-				System.err.println("Using the default look and feel.");
-				e.printStackTrace();
-			}
-		}
-	}
-	
-}
-

core/src/main/java/com/seibel/distanthorizons/core/jar/gui/JSwitch.java

@@ -1,179 +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.jar.gui;
-
-import java.awt.*;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.beans.ConstructorProperties;
-import java.io.IOException;
-import java.io.ObjectOutputStream;
-
-import javax.swing.*;
-import javax.swing.plaf.ButtonUI;
-
-/**
- * A switch button cus Java dosnt have one
- *
- * <p>
- * Ever wanted a switch like
- * <code><a href="https://www.overflowarchives.com/wp-content/uploads/2020/05/overflow-archives-unity-3d-switch-button-ui.jpg">this</a></code>
- * or
- * <code><a href="https://c8.alamy.com/comp/2E3PHHW/day-night-mode-switch-ui-button-light-dark-mode-slider-theme-2E3PHHW.jpg">this</a></code>?
- * Well now you can this this class!
- * </p>
- *
- * Based off Java's JButton
- *
- * @author coolGi
- */
-// TODO: Make this for the theme (and finish the documentation once it is done)
-@SuppressWarnings("serial")
-public class JSwitch extends AbstractButton
-{
-	private static final String uiClassID = "SwitchUI";
-	
-	/** Creates a switch with no set text or icons */
-	public JSwitch()
-	{
-		this(null, null, null, null);
-	}
-	
-	/**
-	 * Creates a switch with an icon
-	 *
-	 * @param offIcon The deactivated icon image
-	 * @param onIcon The activated icon image
-	 */
-	public JSwitch(Icon offIcon, Icon onIcon)
-	{
-		this(null, null, offIcon, onIcon);
-	}
-	
-	/**
-	 * Creates a switch with text
-	 *
-	 * @param offText the deactivated text of the button
-	 * @param onText the activated text of the button
-	 */
-	@ConstructorProperties({"text"})
-	public JSwitch(String offText, String onText)
-	{
-		this(offText, onText, null, null);
-	}
-	
-	/**
-	 * Creates a switch where properties are taken from the
-	 * <code>Action</code> supplied.
-	 *
-	 * @param a the <code>Action</code> used to specify the code that runs when pressing
-	 */
-	public JSwitch(Action a)
-	{
-		this();
-		setAction(a);
-	}
-	
-	/**
-	 * Creates a switch with initial text and an icon
-	 *
-	 * @param offText the deactivated text of the button
-	 * @param onText the activated text of the button
-	 * @param offIcon The deactivated icon image
-	 * @param onIcon The activated icon image
-	 */
-	public JSwitch(String offText, String onText, Icon offIcon, Icon onIcon)
-	{
-		// Create the model
-		setModel(new DefaultButtonModel());
-
-//        this.trueLabel = trueLabel;
-//        this.falseLabel = falseLabel;
-//        double trueLenth = getFontMetrics( getFont() ).getStringBounds( trueLabel, getGraphics() ).getWidth();
-//        double falseLenght = getFontMetrics( getFont() ).getStringBounds( falseLabel, getGraphics() ).getWidth();
-//        max = (int)Math.max( trueLenth, falseLenght );
-//        gap =  Math.max( 5, 5+(int)Math.abs(trueLenth - falseLenght ) );
-//        thumbBounds  = new Dimension(max+gap*2,20);
-//        globalWitdh =  max + thumbBounds.width+gap*2;
-//        setModel( new DefaultButtonModel() );
-//        setSelected( false );
-//        addMouseListener( new MouseAdapter() {
-//            @Override
-//            public void mouseReleased( MouseEvent e ) {
-//                if(new Rectangle( getPreferredSize() ).contains( e.getPoint() )) {
-//                    setSelected( !isSelected() );
-//                }
-//            }
-//        });
-	}
-	
-	/**
-	 * Resets the UI property to a value from the current look and feel
-	 *
-	 * @see JComponent#updateUI
-	 */
-	public void updateUI()
-	{
-		setUI((ButtonUI) UIManager.getUI(this));
-	}
-	
-	
-	@Override
-	public void setSelected(boolean b)
-	{
-//        if(b){
-//            setText( trueLabel );
-//            setBackground( green );
-//        } else {
-//            setBackground( red );
-//            setText( falseLabel );
-//        }
-		super.setSelected(b);
-	}
-	
-	
-	/**
-	 * Returns a string that specifies the name of the L&amp;F class
-	 * that renders this component.
-	 *
-	 * @return the string "ButtonUI"
-	 * @see JComponent#getUIClassID
-	 * @see UIDefaults#getUI
-	 */
-	public String getUIClassID()
-	{
-		return uiClassID;
-	}
-	
-	
-	/**
-	 * Overrides <code>JComponent.removeNotify</code> to check if
-	 * this button is currently set as the default button on the
-	 * <code>RootPane</code>, and if so, sets the <code>RootPane</code>'s
-	 * default button to <code>null</code> to ensure the
-	 * <code>RootPane</code> doesn't hold onto an invalid button reference.
-	 */
-	public void removeNotify()
-	{
-		JRootPane root = SwingUtilities.getRootPane(this);
-		super.removeNotify();
-	}
-	
-}

core/src/main/java/com/seibel/distanthorizons/core/jar/gui/JSwitchBox.java

@@ -1,219 +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.jar.gui;
-
-import java.awt.Color;
-import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.FontMetrics;
-import java.awt.GradientPaint;
-import java.awt.Graphics;
-import java.awt.Graphics2D;
-import java.awt.Rectangle;
-import java.awt.RenderingHints;
-import java.awt.event.MouseAdapter;
-import java.awt.event.MouseEvent;
-import java.awt.geom.Rectangle2D;
-
-import javax.swing.AbstractButton;
-import javax.swing.DefaultButtonModel;
-import javax.swing.JLabel;
-import javax.swing.UIManager;
-import javax.swing.border.Border;
-
-/**
- * Taken from https://github.com/sshtools/ui/blob/master/src/main/java/com/sshtools/ui/swing/JSwitchBox.java
- *
- * @author sshtools
- */
-// TODO: Merge this with my own JSwitch rather than use all their code
-// TODO: Make it work with the theme rather than do whatever it is doing now
-public class JSwitchBox extends AbstractButton
-{
-	private Color shadow1 = UIManager.getColor("controlHighlight");
-	private Color shadow2 = UIManager.getColor("control");
-	private Color colorBright = UIManager.getColor("Button.light");
-	private Color red = UIManager.getColor("controlShadow");
-	private Color redf = UIManager.getColor("Button.foreground");
-	private Color trackBackground = UIManager.getColor("textHighlight");
-	private Color trackBackgroundText = UIManager.getColor("textHighlightText");
-	private Border buttonBorder = UIManager.getBorder("Button.border");
-	private Border trackBorder = UIManager.getBorder("Button.border");
-	
-	private Font font = new JLabel().getFont();
-	private int gap = 5;
-	private int globalWitdh = 0;
-	private final String trueLabel;
-	private final String falseLabel;
-	private Dimension thumbBounds;
-	private Rectangle2D bounds;
-	private int max;
-	
-	public JSwitchBox(String trueLabel, String falseLabel)
-	{
-		setBackground(UIManager.getColor("Panel.background"));
-		this.trueLabel = trueLabel;
-		this.falseLabel = falseLabel;
-		FontMetrics fontMetrics = getFontMetrics(getFont());
-		double trueLenth = fontMetrics
-				.getStringBounds(trueLabel, getGraphics()).getWidth();
-		double falseLenght = fontMetrics.getStringBounds(falseLabel,
-				getGraphics()).getWidth();
-		max = (int) Math.max(trueLenth, falseLenght);
-		gap = Math.max(5, 5 + (int) Math.abs(trueLenth - falseLenght));
-		thumbBounds = new Dimension(max + gap * 2,
-				(int) ((float) fontMetrics.getHeight() * 1.5));
-		globalWitdh = max + thumbBounds.width + gap * 2;
-		setModel(new DefaultButtonModel());
-		setSelected(false);
-		addMouseListener(new MouseAdapter()
-		{
-			@Override
-			public void mouseReleased(MouseEvent e)
-			{
-				if (new Rectangle(getPreferredSize()).contains(e.getPoint()))
-				{
-					setSelected(!isSelected());
-				}
-			}
-		});
-	}
-	
-	@Override
-	public Dimension getPreferredSize()
-	{
-		return new Dimension(globalWitdh, thumbBounds.height);
-	}
-	
-	@Override
-	public void setSelected(boolean b)
-	{
-		if (b)
-		{
-			setText(trueLabel);
-			setBackground(trackBackground);
-			setForeground(trackBackgroundText);
-		}
-		else
-		{
-			setBackground(red);
-			setForeground(redf);
-			setText(falseLabel);
-		}
-		super.setSelected(b);
-	}
-	
-	@Override
-	public void setText(String text)
-	{
-		super.setText(text);
-	}
-	
-	@Override
-	public int getHeight()
-	{
-		
-		return getPreferredSize().height;
-	}
-	
-	@Override
-	public int getWidth()
-	{
-		return getPreferredSize().width;
-	}
-	
-	@Override
-	public Font getFont()
-	{
-		return font;
-	}
-	
-	@Override
-	protected void paintComponent(Graphics g)
-	{
-		g.setColor(getBackground());
-		g.fillRect(0, 0, getWidth(), getHeight() - 4);
-		Graphics2D g2 = (Graphics2D) g;
-		
-		// g2.setColor(black);
-		// g2.drawRoundRect(1, 1, getWidth() - 2 - 1, getHeight() - 2 - 1, 2,
-		// 2);
-		// g2.setColor(white);
-		// g2.drawRoundRect(1 + 1, 1 + 1, getWidth() - 2 - 3, getHeight() - 2 -
-		// 3,
-		// 2, 2);
-		
-		trackBorder.paintBorder(this, g2, 0, 2, getWidth(), getHeight() - 4);
-		
-		int buttonX = 0;
-		int textX = 0;
-		if (isSelected())
-		{
-			textX = thumbBounds.width;
-		}
-		else
-		{
-			buttonX = thumbBounds.width;
-		}
-		int y = 0;
-		int w = thumbBounds.width;
-		int h = thumbBounds.height;
-		
-		g2.setPaint(new GradientPaint(buttonX, (int) (y - 0.1 * h), shadow2,
-				buttonX, (int) (y + 1.2 * h), shadow1));
-		g2.fillRect(buttonX, y, w, h);
-		g2.setPaint(new GradientPaint(buttonX, (int) (y + .65 * h), shadow1,
-				buttonX, (int) (y + 1.3 * h), shadow2));
-		g2.fillRect(buttonX, (int) (y + .65 * h), w, (int) (h - .65 * h));
-		
-		if (w > 14)
-		{
-			int size = 10;
-			g2.setColor(colorBright);
-			g2.fillRect(buttonX + w / 2 - size / 2, y + h / 2 - size / 2, size,
-					size);
-			g2.setColor(colorBright.darker());
-			g2.fillRect(buttonX + w / 2 - 4, h / 2 - 4, 2, 2);
-			g2.fillRect(buttonX + w / 2 - 1, h / 2 - 4, 2, 2);
-			g2.fillRect(buttonX + w / 2 + 2, h / 2 - 4, 2, 2);
-			g2.setColor(colorBright.darker().darker());
-			g2.fillRect(buttonX + w / 2 - 4, h / 2 - 2, 2, 6);
-			g2.fillRect(buttonX + w / 2 - 1, h / 2 - 2, 2, 6);
-			g2.fillRect(buttonX + w / 2 + 2, h / 2 - 2, 2, 6);
-			g2.setColor(colorBright.darker());
-			g2.fillRect(buttonX + w / 2 - 4, h / 2 + 2, 2, 2);
-			g2.fillRect(buttonX + w / 2 - 1, h / 2 + 2, 2, 2);
-			g2.fillRect(buttonX + w / 2 + 2, h / 2 + 2, 2, 2);
-		}
-		
-		buttonBorder.paintBorder(this, g2, buttonX, y, w, h);
-		// g2.setColor(black);
-		// g2.drawRoundRect(x, y, w - 1, h - 1, 2, 2);
-		// g2.setColor(white);
-		// g2.drawRoundRect(x + 1, y + 1, w - 3, h - 3, 2, 2);
-		
-		g2.setColor(getForeground());
-		g2.setRenderingHint(RenderingHints.KEY_TEXT_ANTIALIASING,
-				RenderingHints.VALUE_TEXT_ANTIALIAS_ON);
-		g2.setFont(getFont());
-		g2.drawString(getText(), textX + gap, y + h / 2 + h / 4);
-	}
-	
-}

core/src/main/java/com/seibel/distanthorizons/core/jar/gui/cusomJObject/JBox.java

@@ -1,75 +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.jar.gui.cusomJObject;
-
-import javax.swing.*;
-import java.awt.*;
-
-/**
- * A rectangular box that can be placed with java swing
- *
- * @author coolGi
- */
-public class JBox extends JComponent
-{
-	private static final String uiClassID = "BoxBarUI";
-	
-	private Color color;
-	
-	private int x;
-	private int y;
-	private int width;
-	private int height;
-	
-	public JBox()
-	{
-		this(null);
-	}
-	
-	public JBox(Color color)
-	{
-		this.color = color;
-	}
-	
-	public JBox(Color color, Rectangle rectangle)
-	{
-		this(color, rectangle.x, rectangle.y, rectangle.width, rectangle.height);
-	}
-	
-	public JBox(Color color, int x, int y, int width, int height)
-	{
-		this.color = color;
-		setBounds(x, y, width, height);
-	}
-	
-	public void setColor(Color color)
-	{
-		this.color = color;
-	}
-	
-	@Override
-	public void paintComponent(Graphics g)
-	{
-		super.paintComponent(g);
-		g.setColor(color);
-		g.fillRect(0, 0, getBounds().width, getBounds().height);
-	}
-	
-}

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

@@ -85,7 +85,6 @@ public class WebDownloader
 					totalDataRead = totalDataRead + i;
 					bout.write(data, 0, i);
 					
-					// TODO: Link this to an atomic integer rather than printing it to log
                     int newPercent = (int) ((totalDataRead * 100) / filesize);
 					if (percent != newPercent)
 					{
@@ -100,7 +99,6 @@ public class WebDownloader
 	public static String downloadAsString(URL url) throws Exception
 	{
 		StringBuilder stringBuilder = new StringBuilder();
-//        URL url = new URL(urlS);
 		
 		URLConnection urlConnection = url.openConnection();
 		urlConnection.setConnectTimeout(1000);

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

@@ -345,9 +345,10 @@ public class SelfUpdater
 						nextByte = inputStream.read();
 						byteReadIndex++;
 						
-						// TODO it would be better to change this divisor based on the expected size,
+						// It would be better to change this divisor based on the expected size,
 						// so it would always be split up into 100 1% increments
-						//  but this will work for now when the expected size is about 17 MB, this will log about 170 times
+						// but this works well enough. 
+						// When the expected size is about 17 MB, this will log about 170 times
 						if (byteReadIndex % 100_000 == 0)
 						{
 							LOGGER.info("Decompressing ["+outputFormat.format(((double)byteReadIndex / expectedSize)*100.0)+"]%");

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

@@ -19,45 +19,33 @@
 
 package com.seibel.distanthorizons.core.level;
 
-import com.seibel.distanthorizons.api.enums.rendering.EDhApiBlockMaterial;
-import com.seibel.distanthorizons.api.interfaces.render.IDhApiRenderableBoxGroup;
 import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiChunkModifiedEvent;
-import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiRenderParam;
-import com.seibel.distanthorizons.api.objects.math.DhApiVec3d;
-import com.seibel.distanthorizons.api.objects.render.DhApiRenderableBox;
-import com.seibel.distanthorizons.api.objects.render.DhApiRenderableBoxGroupShading;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
-import com.seibel.distanthorizons.core.file.fullDatafile.DelayedFullDataSourceSaveCache;
+import com.seibel.distanthorizons.core.render.renderer.CloudRenderHandler;
+import com.seibel.distanthorizons.core.util.delayedSaveCache.DelayedBeaconSaveCache;
+import com.seibel.distanthorizons.core.util.delayedSaveCache.DelayedDataSourceSaveCache;
 import com.seibel.distanthorizons.core.generation.DhLightingEngine;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.pos.DhChunkPos;
 import com.seibel.distanthorizons.core.pos.DhSectionPos;
 import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos;
-import com.seibel.distanthorizons.core.render.renderer.generic.CloudRenderHandler;
-import com.seibel.distanthorizons.core.render.renderer.generic.GenericObjectRenderer;
-import com.seibel.distanthorizons.core.render.renderer.generic.GenericRenderObjectFactory;
 import com.seibel.distanthorizons.core.sql.dto.BeaconBeamDTO;
 import com.seibel.distanthorizons.core.sql.dto.ChunkHashDTO;
 import com.seibel.distanthorizons.core.sql.repo.AbstractDhRepo;
 import com.seibel.distanthorizons.core.sql.repo.BeaconBeamRepo;
 import com.seibel.distanthorizons.core.sql.repo.ChunkHashRepo;
-import com.seibel.distanthorizons.core.util.ColorUtil;
 import com.seibel.distanthorizons.core.util.KeyedLockContainer;
 import com.seibel.distanthorizons.core.util.LodUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhGenericRenderer;
 import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector;
-import com.seibel.distanthorizons.coreapi.ModInfo;
-import com.seibel.distanthorizons.coreapi.util.MathUtil;
 import com.seibel.distanthorizons.core.logging.DhLogger;
 import org.jetbrains.annotations.Nullable;
 
-import java.awt.*;
 import java.io.File;
 import java.io.IOException;
 import java.sql.SQLException;
-import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -77,8 +65,8 @@ public abstract class AbstractDhLevel implements IDhLevel
 	public BeaconBeamRepo beaconBeamRepo;
 	
 	protected final KeyedLockContainer<Long> beaconUpdateLockContainer = new KeyedLockContainer<>();
-	
-	protected final DelayedFullDataSourceSaveCache delayedFullDataSourceSaveCache = new DelayedFullDataSourceSaveCache(this::onDataSourceSaveAsync, 3_000);
+	protected final DelayedDataSourceSaveCache delayedFullDataSourceSaveCache = new DelayedDataSourceSaveCache(this::onDataSourceSaveAsync, 1_000);
+	protected final DelayedBeaconSaveCache delayedBeaconSaveCache = new DelayedBeaconSaveCache(this::updateBeaconBeamsBetweenBlockPos, 1_000);
 	/** contains the {@link DhChunkPos} for each {@link DhSectionPos} that are queued to save */
 	protected final ConcurrentHashMap<Long, HashSet<DhChunkPos>> updatedChunkPosSetBySectionPos = new ConcurrentHashMap<>();
 	protected final ConcurrentHashMap<DhChunkPos, Integer> updatedChunkHashesByChunkPos = new ConcurrentHashMap<>();
@@ -92,6 +80,7 @@ public abstract class AbstractDhLevel implements IDhLevel
 	//=============//
 	// constructor //
 	//=============//
+	//region
 	
 	protected AbstractDhLevel() { }
 	
@@ -130,15 +119,16 @@ public abstract class AbstractDhLevel implements IDhLevel
 	/** handles any setup that needs the repos to be created */
 	protected void runRepoReliantSetup()
 	{
-		GenericObjectRenderer genericRenderer = this.getGenericRenderer();
+		IDhGenericRenderer genericRenderer = this.getGenericRenderer();
 		if (genericRenderer != null)
 		{
 			// only client levels can render clouds
 			if (this instanceof IDhClientLevel)
 			{
 				// only add clouds for certain dimension types
-				if (!this.getLevelWrapper().hasCeiling()
-						&& !this.getLevelWrapper().getDimensionType().isTheEnd())
+				String enabledCloudDimensions = Config.Client.Advanced.Graphics.GenericRendering.dimensionEnabledCloudRenderingCsv.get();
+				String dimName = this.getLevelWrapper().getDimensionType().getName();
+				if (enabledCloudDimensions.contains(dimName))
 				{
 					this.cloudRenderHandler = new CloudRenderHandler((IDhClientLevel)this, genericRenderer);
 				}
@@ -146,11 +136,14 @@ public abstract class AbstractDhLevel implements IDhLevel
 		}
 	}
 	
+	//endregion
+	
 	
 	
 	//=================//
 	// default methods //
 	//=================//
+	//region
 	
 	@Override
 	public void updateChunkAsync(IChunkWrapper chunkWrapper, int chunkHash)
@@ -177,7 +170,7 @@ public abstract class AbstractDhLevel implements IDhLevel
 			
 			// merging writes together in memory significantly improves throughput, since most
 			// chunk modifications will be right next to each other, IE effecting the same LODs
-			this.delayedFullDataSourceSaveCache.writeDataSourceToMemoryAndQueueSave(dataSource);
+			this.delayedFullDataSourceSaveCache.writeToMemoryAndQueueSave(dataSource);
 		}
 	}
 	
@@ -219,13 +212,14 @@ public abstract class AbstractDhLevel implements IDhLevel
 			});
 	}
 	
+	//endregion
+	
 	
 	
 	//=======//
 	// repos //
 	//=======//
-	
-	// chunk hash //
+	//region
 	
 	@Override
 	public int getChunkHash(DhChunkPos pos)
@@ -239,23 +233,26 @@ public abstract class AbstractDhLevel implements IDhLevel
 		return (dto != null) ? dto.chunkHash : 0;
 	}
 	
+	//endregion
+	
 	
 	
 	//=================//
 	// beacon handling //
 	//=================//
+	//region
 	
 	@Override
 	public void updateBeaconBeamsForSectionPos(long sectionPos, List<BeaconBeamDTO> activeBeamList)
 	{
 		int minBlockX = DhSectionPos.getMinCornerBlockX(sectionPos);
 		int minBlockZ = DhSectionPos.getMinCornerBlockZ(sectionPos);
-		// TODO special logic had to be done for DhChunkPos.getMaxBlock,
-		//  does that need to be done here?
-		//  The DhChunkPos issue caused beacons to appear/disappear incorrectly on negative chunk borders
 		int maxBlockX = minBlockX + DhSectionPos.getBlockWidth(sectionPos);
 		int maxBlockZ = minBlockZ + DhSectionPos.getBlockWidth(sectionPos);
 		
+		// no delayed cache needed since each hit will be at a different position
+		// and this is generally called when LODs are received from the
+		// server, so repeat hits to the same position are unlikely
 		this.updateBeaconBeamsBetweenBlockPos(
 				sectionPos,
 				minBlockX, maxBlockX,
@@ -267,21 +264,10 @@ public abstract class AbstractDhLevel implements IDhLevel
 	@Override
 	public void updateBeaconBeamsForChunkPos(DhChunkPos chunkPos, List<BeaconBeamDTO> activeBeamList)
 	{ 
-		long sectionPos = DhSectionPos.encodeContaining(DhSectionPos.SECTION_BLOCK_DETAIL_LEVEL, chunkPos);
-		
-		int minBlockX = chunkPos.getMinBlockX();
-		int minBlockZ = chunkPos.getMinBlockZ();
-		int maxBlockX = chunkPos.getMaxBlockX();
-		int maxBlockZ = chunkPos.getMaxBlockZ();
-		
-		//LOGGER.info("beacons ["+activeBeamList.size()+"] at ["+chunkPos+"] x["+minBlockX+"]-["+maxBlockX+"] z["+minBlockZ+"]-["+maxBlockZ+"].");
-		
-		this.updateBeaconBeamsBetweenBlockPos(
-				sectionPos,
-				minBlockX, maxBlockX,
-				minBlockZ, maxBlockZ,
-				activeBeamList
-		);
+		// a delayed cache is used to prevent lock contention
+		// when flying through new chunks (or updating modified chunks)
+		// that are right next to each other (requiring up to 16 hits to the same LOD position
+		this.delayedBeaconSaveCache.queueBeaconBeamUpdatesForChunkPos(chunkPos, activeBeamList); 
 	}
 	
 	private void updateBeaconBeamsBetweenBlockPos(
@@ -289,7 +275,7 @@ public abstract class AbstractDhLevel implements IDhLevel
 			int minBlockX, int maxBlockX,
 			int minBlockZ, int maxBlockZ,
 			List<BeaconBeamDTO> activeBeamList
-		) // TODO min/max block pos instead
+		)
 	{
 		if (this.beaconBeamRepo == null)
 		{
@@ -297,8 +283,11 @@ public abstract class AbstractDhLevel implements IDhLevel
 		}
 		
 		
-		// locked to prevent two threads from updating the same section at the same time
-		ReentrantLock lock = this.beaconUpdateLockContainer.getLockForPos(sectionPosForLock); // TODO this can cause a lot of slow-downs
+		//LOGGER.info("beacons ["+activeBeamList.size()+"] at x["+minBlockX+"]-["+maxBlockX+"] z["+minBlockZ+"]-["+maxBlockZ+"].");
+		
+		
+		// locked to prevent two threads from updating the same position at the same time
+		ReentrantLock lock = this.beaconUpdateLockContainer.getLockForPos(sectionPosForLock);
 		try
 		{
 			lock.lock();
@@ -329,14 +318,10 @@ public abstract class AbstractDhLevel implements IDhLevel
 			
 			for (DhBlockPos beaconPos : allPosSet)
 			{
-				if (minBlockX <= beaconPos.getX() && beaconPos.getX() <= maxBlockX
-					&& minBlockZ <= beaconPos.getZ() && beaconPos.getZ() <= maxBlockZ)
-				{
-					//// don't modify beacons outside the updated range
-					//continue;
-				}
-				else
+				if (minBlockX > beaconPos.getX() || beaconPos.getX() > maxBlockX
+					|| minBlockZ > beaconPos.getZ() || beaconPos.getZ() > maxBlockZ)
 				{
+					// don't modify beacons outside the updated range
 					continue;
 				}
 				
@@ -345,12 +330,12 @@ public abstract class AbstractDhLevel implements IDhLevel
 				BeaconBeamDTO activeBeam = activeBeamByPos.get(beaconPos);
 				if (activeBeam != null)
 				{
-					//LOGGER.info("add beacon ["+activeBeam.blockPos+"] x["+minBlockX+"]-["+maxBlockX+"] z["+minBlockZ+"]-["+maxBlockZ+"].");
-					
 					if (existingBeam == null)
 					{
 						// new beam found, add to DB
 						this.beaconBeamRepo.save(activeBeam);
+						
+						//LOGGER.info("new beacon ["+activeBeam+"].");
 					}
 					else
 					{
@@ -359,6 +344,12 @@ public abstract class AbstractDhLevel implements IDhLevel
 						{
 							// beam colors were changed
 							this.beaconBeamRepo.save(activeBeam);
+							
+							//LOGGER.info("change beacon ["+existingBeam+"] -> ["+activeBeam+"].");
+						}
+						else
+						{
+							//LOGGER.info("existing beacon ["+existingBeam+"].");
 						}
 					}
 				}
@@ -366,7 +357,8 @@ public abstract class AbstractDhLevel implements IDhLevel
 				{
 					// beam no longer exists at position, remove from DB
 					this.beaconBeamRepo.deleteWithKey(beaconPos);
-					//LOGGER.info("remove beacon ["+beaconPos+"] x["+minBlockX+"]-["+maxBlockX+"] z["+minBlockZ+"]-["+maxBlockZ+"].");
+					
+					//LOGGER.info("remove beacon ["+existingBeam+"].");
 				}
 			}
 		}
@@ -380,6 +372,8 @@ public abstract class AbstractDhLevel implements IDhLevel
 	@Nullable
 	public BeaconBeamRepo getBeaconBeamRepo() { return this.beaconBeamRepo; }
 	
+	//endregion
+	
 	
 	
 	//================//

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

@@ -46,8 +46,7 @@ public abstract class AbstractDhServerLevel extends AbstractDhLevel implements I
 	
 	/**
 	 * This queue is used for ensuring fair generation speed for each player. <br>
-	 * Every tick the first player gets used for centering generation, and then is immediately moved into the back of the queue. <br>
-	 * TODO only add players that actually have something to generate
+	 * Every tick the first player gets used for centering generation, and then is immediately moved into the back of the queue.
 	 */
 	protected final ConcurrentLinkedQueue<IServerPlayerWrapper> worldGenPlayerCenteringQueue = new ConcurrentLinkedQueue<>();
 	
@@ -99,7 +98,7 @@ public abstract class AbstractDhServerLevel extends AbstractDhLevel implements I
 	
 	@Override
 	public boolean shouldDoWorldGen()
-	{ return Config.Common.WorldGenerator.enableDistantGeneration.get() && !this.worldGenPlayerCenteringQueue.isEmpty(); }
+	{ return Config.Common.WorldGenerator.enableDistantGeneration.get(); }
 	
 	@Override
 	public DhBlockPos2D getTargetPosForGeneration()

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

@@ -26,11 +26,12 @@ import com.seibel.distanthorizons.core.file.fullDatafile.IDataSourceUpdateListen
 import com.seibel.distanthorizons.core.file.fullDatafile.V2.FullDataSourceProviderV2;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos2D;
-import com.seibel.distanthorizons.core.render.LodQuadTree;
+import com.seibel.distanthorizons.core.render.QuadTree.LodQuadTree;
 import com.seibel.distanthorizons.core.render.RenderBufferHandler;
-import com.seibel.distanthorizons.core.render.renderer.generic.GenericObjectRenderer;
 import com.seibel.distanthorizons.core.util.LodUtil;
+import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhGenericRenderer;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import com.seibel.distanthorizons.core.logging.DhLogger;
 
@@ -43,6 +44,7 @@ public class ClientLevelModule implements Closeable, IDataSourceUpdateListenerFu
 {
 	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	private static final IMinecraftClientWrapper MC_CLIENT = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
+	private static final IWrapperFactory WRAPPER_FACTORY = SingletonInjector.INSTANCE.get(IWrapperFactory.class);
 	
 	private final IDhClientLevel clientLevel;
 	
@@ -51,12 +53,12 @@ public class ClientLevelModule implements Closeable, IDataSourceUpdateListenerFu
 	public final AtomicReference<ClientRenderState> ClientRenderStateRef = new AtomicReference<>();
 	/** 
 	 * This is handled outside of the {@link ClientRenderState} to prevent destroying
-	 * the {@link GenericObjectRenderer} when changing render distances or enabling/disabling rendering. <br><br>
+	 * the {@link IDhGenericRenderer} when changing render distances or enabling/disabling rendering. <br><br>
 	 * 
-	 * Destroying the {@link GenericObjectRenderer} would cause any existing bindings to be 
+	 * Destroying the {@link IDhGenericRenderer} would cause any existing bindings to be 
 	 * erroneously removed.
 	 */
-	public final GenericObjectRenderer genericRenderer = new GenericObjectRenderer();
+	public final IDhGenericRenderer genericRenderer = WRAPPER_FACTORY.createGenericRenderer();
 	
 	
 	
@@ -92,27 +94,19 @@ public class ClientLevelModule implements Closeable, IDataSourceUpdateListenerFu
 			return;
 		}
 		
-		// TODO this should probably be handled via a config change listener
 		// recreate the RenderState if the render distance changes
-		if (clientRenderState.quadtree.blockRenderDistanceDiameter != Config.Client.Advanced.Graphics.Quality.lodChunkRenderDistanceRadius.get() * LodUtil.CHUNK_WIDTH * 2)
+		if (clientRenderState.viewDiameterInBlocks != ClientRenderState.getViewDiameterInBlocks())
 		{
-			if (!this.ClientRenderStateRef.compareAndSet(clientRenderState, null))
-			{
-				return;
-			}
-			
+			// close the older renderer
 			clientRenderState.close();
+			this.ClientRenderStateRef.set(null);
+			
+			// create the new renderer
 			clientRenderState = new ClientRenderState(this.clientLevel, this.clientLevel.getFullDataProvider());
-			if (!this.ClientRenderStateRef.compareAndSet(null, clientRenderState))
-			{
-				//FIXME: How to handle this?
-				LOGGER.warn("Failed to set render state due to concurrency after changing view distance");
-				clientRenderState.close();
-				return;
-			}
+			this.ClientRenderStateRef.set(clientRenderState);
 		}
 		
-		clientRenderState.quadtree.tick(new DhBlockPos2D(MC_CLIENT.getPlayerBlockPos()));
+		clientRenderState.quadtree.tryTick(new DhBlockPos2D(MC_CLIENT.getPlayerBlockPos()));
 	}
 	
 	
@@ -121,14 +115,13 @@ public class ClientLevelModule implements Closeable, IDataSourceUpdateListenerFu
 	// render //
 	//========//
 	
-	// TODO start rendering during frame request
 	public void startRenderer()
 	{
-		ClientRenderState ClientRenderState = new ClientRenderState(this.clientLevel, this.clientLevel.getFullDataProvider());
-		if (!this.ClientRenderStateRef.compareAndSet(null, ClientRenderState))
+		ClientRenderState clientRenderState = new ClientRenderState(this.clientLevel, this.clientLevel.getFullDataProvider());
+		if (!this.ClientRenderStateRef.compareAndSet(null, clientRenderState))
 		{
-			LOGGER.warn("Failed to start renderer due to concurrency");
-			ClientRenderState.close();
+			LOGGER.warn("Renderer already started for ["+this+"].");
+			clientRenderState.close();
 		}
 	}
 	
@@ -136,23 +129,15 @@ public class ClientLevelModule implements Closeable, IDataSourceUpdateListenerFu
 	
 	public void stopRenderer()
 	{
-		LOGGER.info("Stopping renderer for " + this);
-		ClientRenderState ClientRenderState = this.ClientRenderStateRef.get();
-		if (ClientRenderState == null)
+		ClientRenderState clientRenderState = this.ClientRenderStateRef.get();
+		if (clientRenderState == null)
 		{
-			LOGGER.warn("Tried to stop renderer for " + this + " when it was not started!");
+			LOGGER.warn("Tried to stop the renderer for [" + this + "] when it was not started.");
 			return;
 		}
-		// stop the render state
-		while (!this.ClientRenderStateRef.compareAndSet(ClientRenderState, null)) // TODO why is there a while loop here?
-		{
-			ClientRenderState = this.ClientRenderStateRef.get();
-			if (ClientRenderState == null)
-			{
-				return;
-			}
-		}
-		ClientRenderState.close();
+		
+		this.ClientRenderStateRef.compareAndSet(clientRenderState, null);
+		clientRenderState.close();
 	}
 	
 	
@@ -170,7 +155,7 @@ public class ClientLevelModule implements Closeable, IDataSourceUpdateListenerFu
 		ClientRenderState ClientRenderState = this.ClientRenderStateRef.get();
 		if (ClientRenderState != null)
 		{
-			ClientRenderState.quadtree.reloadPos(updatedFullDataSource.getPos());
+			ClientRenderState.quadtree.queuePosToReload(updatedFullDataSource.getPos());
 		}
 	}
 	
@@ -180,21 +165,9 @@ public class ClientLevelModule implements Closeable, IDataSourceUpdateListenerFu
 		ClientRenderState ClientRenderState = this.ClientRenderStateRef.get();
 		if (ClientRenderState != null)
 		{
-			// TODO does this have to be in a while loop, if so why?
-			while (!this.ClientRenderStateRef.compareAndSet(ClientRenderState, null))
-			{
-				ClientRenderState = this.ClientRenderStateRef.get();
-				if (ClientRenderState == null)
-				{
-					break;
-				}
-			}
-			
-			if (ClientRenderState != null)
-			{
+			this.ClientRenderStateRef.compareAndSet(ClientRenderState, null);
 			ClientRenderState.close();
 		}
-		}
 		
 		this.fullDataSourceProvider.removeDataSourceUpdateListener(this);
 	}
@@ -225,7 +198,7 @@ public class ClientLevelModule implements Closeable, IDataSourceUpdateListenerFu
 		ClientRenderState clientRenderState = this.ClientRenderStateRef.get();
 		if (clientRenderState != null && clientRenderState.quadtree != null)
 		{
-			clientRenderState.quadtree.reloadPos(pos);
+			clientRenderState.quadtree.queuePosToReload(pos);
 		}
 	}
 	
@@ -242,6 +215,8 @@ public class ClientLevelModule implements Closeable, IDataSourceUpdateListenerFu
 		public final LodQuadTree quadtree;
 		public final RenderBufferHandler renderBufferHandler;
 		
+		public final int viewDiameterInBlocks;
+		
 		
 		
 		//=============//
@@ -252,9 +227,11 @@ public class ClientLevelModule implements Closeable, IDataSourceUpdateListenerFu
 				IDhClientLevel dhClientLevel, 
 				FullDataSourceProviderV2 fullDataSourceProvider)
 		{
+			this.viewDiameterInBlocks = getViewDiameterInBlocks();
+			
 			this.quadtree = new LodQuadTree(
 				dhClientLevel,
-					Config.Client.Advanced.Graphics.Quality.lodChunkRenderDistanceRadius.get() * LodUtil.CHUNK_WIDTH * 2,
+				this.viewDiameterInBlocks,
 				// initial position is (0,0) just in case the player hasn't loaded in yet, the tree will be moved once the level starts ticking
 				0, 0,
 				fullDataSourceProvider);
@@ -262,6 +239,17 @@ public class ClientLevelModule implements Closeable, IDataSourceUpdateListenerFu
 			this.renderBufferHandler = new RenderBufferHandler(this.quadtree);
 		}
 		
+		/**
+		 * Used both during setup and
+		 * to determine if the render distance changed.
+		 */
+		public static int getViewDiameterInBlocks() 
+		{ 
+			return Config.Client.Advanced.Graphics.Quality.lodChunkRenderDistanceRadius.get() 
+				* LodUtil.CHUNK_WIDTH 
+				* 2; 
+		}
+		
 		
 		
 		//================//

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

@@ -23,6 +23,7 @@ import com.google.common.cache.CacheBuilder;
 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.MinecraftTextFormat;
 import com.seibel.distanthorizons.core.file.fullDatafile.V2.FullDataSourceProviderV2;
 import com.seibel.distanthorizons.core.file.fullDatafile.RemoteFullDataSourceProvider;
 import com.seibel.distanthorizons.core.file.structure.ISaveStructure;
@@ -35,19 +36,17 @@ import com.seibel.distanthorizons.core.network.event.ScopedNetworkEventSource;
 import com.seibel.distanthorizons.core.network.messages.fullData.FullDataPartialUpdateMessage;
 import com.seibel.distanthorizons.core.pos.DhChunkPos;
 import com.seibel.distanthorizons.core.render.RenderBufferHandler;
-import com.seibel.distanthorizons.core.render.renderer.generic.GenericObjectRenderer;
 import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos2D;
-import com.seibel.distanthorizons.core.render.renderer.DebugRenderer;
 import com.seibel.distanthorizons.core.sql.dto.FullDataSourceV2DTO;
 import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhGenericRenderer;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import javax.annotation.CheckForNull;
-import java.awt.*;
 import java.io.File;
 import java.io.IOException;
 import java.sql.SQLException;
@@ -95,6 +94,7 @@ public class DhClientLevel extends AbstractDhLevel implements IDhClientLevel
 	//=============//
 	// constructor //
 	//=============//
+	//region
 	
 	public DhClientLevel(
 		ISaveStructure saveStructure, 
@@ -182,7 +182,6 @@ public class DhClientLevel extends AbstractDhLevel implements IDhClientLevel
 					{
 						try
 						{
-							// TODO this has a lock which can cause stuttering/lag issues
 							this.updateBeaconBeamsForSectionPos(dataSourceDto.pos, message.payload.beaconBeams);
 						}
 						catch (Exception e)
@@ -204,11 +203,14 @@ public class DhClientLevel extends AbstractDhLevel implements IDhClientLevel
 		});
 	}
 	
+	//endregion
+	
 	
 	
 	//==============//
 	// tick methods //
 	//==============//
+	//region
 	
 	@Override
 	public void clientTick()
@@ -249,11 +251,14 @@ public class DhClientLevel extends AbstractDhLevel implements IDhClientLevel
 	@Override
 	public DhBlockPos2D getTargetPosForGeneration() { return new DhBlockPos2D(MC_CLIENT.getPlayerBlockPos()); }
 	
+	//endregion
+	
 	
 	
 	//===========//
 	// world gen //
 	//===========//
+	//region
 	
 	@Override
 	public void onWorldGenTaskComplete(long pos)
@@ -261,11 +266,14 @@ public class DhClientLevel extends AbstractDhLevel implements IDhClientLevel
 		this.clientside.reloadPos(pos);
 	}
 	
+	//endregion
+	
 	
 	
 	//=========//
 	// getters //
 	//=========//
+	//region
 	
 	@Override
 	public IClientLevelWrapper getClientLevelWrapper() { return this.levelWrapper; }
@@ -287,7 +295,7 @@ public class DhClientLevel extends AbstractDhLevel implements IDhClientLevel
 	public ISaveStructure getSaveStructure() { return this.saveStructure; }
 	
 	@Override
-	public GenericObjectRenderer getGenericRenderer() { return this.clientside.genericRenderer; }
+	public IDhGenericRenderer getGenericRenderer() { return this.clientside.genericRenderer; }
 	@Override
 	public RenderBufferHandler getRenderBufferHandler()
 	{
@@ -295,6 +303,9 @@ public class DhClientLevel extends AbstractDhLevel implements IDhClientLevel
 		return (renderState != null) ? renderState.renderBufferHandler : null;
 	}
 	
+	@Override 
+	public boolean isRendering() { return this.clientside.isRendering(); }
+	
 	public boolean shouldProcessChunkUpdate(DhChunkPos chunkPos)
 	{
 		if (this.networkState == null || !this.networkState.isReady())
@@ -305,18 +316,28 @@ public class DhClientLevel extends AbstractDhLevel implements IDhClientLevel
 		return !this.networkState.sessionConfig.isRealTimeUpdatesEnabled() || this.loadedOnceChunks.add(chunkPos);
 	}
 	
+	//endregion
+	
 	
 	
 	//===========//
 	// debugging //
 	//===========//
+	//region
 	
 	@Override
 	public void addDebugMenuStringsToList(List<String> messageList)
 	{
+		String o = MinecraftTextFormat.ORANGE;
+		String y = MinecraftTextFormat.YELLOW;
+		String g = MinecraftTextFormat.GREEN;
+		String cf = MinecraftTextFormat.CLEAR_FORMATTING;
+		
+		
 		String dimName = this.levelWrapper.getDhIdentifier();
 		boolean rendering = this.clientside.isRendering();
-		messageList.add("["+dimName+"] rendering: "+(rendering ? "yes" : "no"));
+		String renderingString = rendering ? (g+"yes"+cf) : (o+"no"+cf);
+		messageList.add("["+y+dimName+cf+"] rendering: "+renderingString);
 		
 		
 		this.remoteDataSourceProvider.addDebugMenuStringsToList(messageList);
@@ -334,11 +355,14 @@ public class DhClientLevel extends AbstractDhLevel implements IDhClientLevel
 		}
 	}
 	
+	//endregion
+	
 	
 	
 	//================//
 	// base overrides //
 	//================//
+	//region
 	
 	@Override
 	public String toString() { return "DhClientLevel{" + this.getClientLevelWrapper().getDhIdentifier() + "}"; }
@@ -363,11 +387,14 @@ public class DhClientLevel extends AbstractDhLevel implements IDhClientLevel
 		LOGGER.info("Closed [" + DhClientLevel.class.getSimpleName() + "] for [" + this.levelWrapper + "]");
 	}
 	
+	//endregion
+	
 	
 	
 	//================//
 	// helper classes //
 	//================//
+	//region
 	
 	private static class LodRequestState extends LodRequestModule.AbstractLodRequestState
 	{
@@ -377,4 +404,8 @@ public class DhClientLevel extends AbstractDhLevel implements IDhClientLevel
 		}
 	}
 	
+	//endregion
+	
+	
+	
 }

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

@@ -19,20 +19,17 @@
 
 package com.seibel.distanthorizons.core.level;
 
-import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiRenderParam;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
+import com.seibel.distanthorizons.core.enums.MinecraftTextFormat;
 import com.seibel.distanthorizons.core.file.structure.ISaveStructure;
 import com.seibel.distanthorizons.core.multiplayer.server.ServerPlayerStateManager;
 import com.seibel.distanthorizons.core.render.RenderBufferHandler;
-import com.seibel.distanthorizons.core.render.renderer.DebugRenderer;
-import com.seibel.distanthorizons.core.render.renderer.generic.GenericObjectRenderer;
-import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IProfilerWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhGenericRenderer;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper;
 import org.jetbrains.annotations.Nullable;
 
-import java.awt.*;
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.List;
@@ -49,6 +46,7 @@ public class DhClientServerLevel extends AbstractDhServerLevel implements IDhCli
 	//=============//
 	// constructor //
 	//=============//
+	//region
 	
 	public DhClientServerLevel(
 		ISaveStructure saveStructure, 
@@ -63,30 +61,42 @@ public class DhClientServerLevel extends AbstractDhServerLevel implements IDhCli
 		this.runRepoReliantSetup();
 	}
 	
+	//endregion
+	
 	
 	
 	//==============//
 	// tick methods //
 	//==============//
+	//region
 	
 	@Override
 	public void clientTick() { this.clientside.clientTick(); }
 	
+	//endregion
+	
 	
 	
 	//========//
 	// render //
 	//========//
+	//region
 	
 	public void startRenderer() { this.clientside.startRenderer(); }
 	
 	public void stopRenderer() { this.clientside.stopRenderer(); }
 	
+	@Override
+	public boolean isRendering() { return this.clientside.isRendering(); }
+	
+	//endregion
+	
 	
 	
 	//================//
 	// level handling //
 	//================//
+	//region
 	
 	@Nullable
 	@Override
@@ -95,26 +105,36 @@ public class DhClientServerLevel extends AbstractDhServerLevel implements IDhCli
 	@Override
 	public void clearRenderCache() { this.clientside.clearRenderCache(); }
 	
+	//endregion
+	
 	
 	
 	//===========//
 	// debugging //
 	//===========//
+	//region
 	
 	@Override
 	public void addDebugMenuStringsToList(List<String> messageList)
 	{
 		// header
+		String o = MinecraftTextFormat.ORANGE;
+		String y = MinecraftTextFormat.YELLOW;
+		String g = MinecraftTextFormat.GREEN;
+		String cf = MinecraftTextFormat.CLEAR_FORMATTING;
+		
+		
 		String dimName = this.serverLevelWrapper.getDhIdentifier();
 		boolean rendering = this.clientside.isRendering();
-		messageList.add("["+dimName+"] rendering: "+(rendering ? "yes" : "no"));
+		String renderingString = rendering ? (g+"yes"+cf) : (o+"no"+cf);
+		messageList.add("["+y+dimName+cf+"] rendering: "+renderingString);
 		
 		super.addDebugMenuStringsToList(messageList);
 	}
 	
 	
 	@Override
-	public GenericObjectRenderer getGenericRenderer() { return this.clientside.genericRenderer; }
+	public IDhGenericRenderer getGenericRenderer() { return this.clientside.genericRenderer; }
 	@Override
 	public RenderBufferHandler getRenderBufferHandler()
 	{
@@ -122,11 +142,14 @@ public class DhClientServerLevel extends AbstractDhServerLevel implements IDhCli
 		return (renderState != null) ? renderState.renderBufferHandler : null;
 	}
 	
+	//endregion
+	
 	
 	
 	//===============//
 	// data handling //
 	//===============//
+	//region
 	
 	@Override
 	public void onWorldGenTaskComplete(long pos)
@@ -135,11 +158,14 @@ public class DhClientServerLevel extends AbstractDhServerLevel implements IDhCli
 		this.clientside.reloadPos(pos);
 	}
 	
+	//endregion
+	
 	
 	
 	//================//
 	// base overrides //
 	//================//
+	//region
 	
 	@Override
 	public String toString() { return "DhClientServerLevel{"+this.serverLevelWrapper.getKeyedLevelDimensionName()+"}"; }
@@ -153,4 +179,8 @@ public class DhClientServerLevel extends AbstractDhServerLevel implements IDhCli
 		LOGGER.info("Closed " + this.getClass().getSimpleName() + " for " + this.getServerLevelWrapper());
 	}
 	
+	//endregion
+	
+	
+	
 }

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

@@ -23,9 +23,8 @@ import com.seibel.distanthorizons.core.file.structure.ISaveStructure;
 import com.seibel.distanthorizons.core.multiplayer.server.ServerPlayerStateManager;
 import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos2D;
 import com.seibel.distanthorizons.core.render.RenderBufferHandler;
-import com.seibel.distanthorizons.core.render.renderer.generic.GenericObjectRenderer;
+import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhGenericRenderer;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper;
-import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
 import java.sql.SQLException;
@@ -51,10 +50,7 @@ public class DhServerLevel extends AbstractDhServerLevel
 	//=======//
 	
 	@Override
-	public boolean shouldDoWorldGen()
-	{
-		return true; //todo;
-	}
+	public boolean shouldDoWorldGen() { return super.shouldDoWorldGen(); }
 	@Override
 	public DhBlockPos2D getTargetPosForGeneration()
 	{
@@ -72,7 +68,7 @@ public class DhServerLevel extends AbstractDhServerLevel
 	//=========//
 	
 	@Override
-	public GenericObjectRenderer getGenericRenderer() 
+	public IDhGenericRenderer getGenericRenderer() 
 	{ 
 		// server-only levels don't support rendering
 		return null; 

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

@@ -19,6 +19,7 @@
 
 package com.seibel.distanthorizons.core.level;
 
+import com.seibel.distanthorizons.core.logging.f3.F3Screen;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import org.jetbrains.annotations.Nullable;
 
@@ -39,4 +40,12 @@ public interface IDhClientLevel extends IDhLevel
 	 */
 	void clearRenderCache();
 	
+	/** 
+	 * returns true if this level is currently rendering. <br>
+	 * Designed for use for debugging and the {@link F3Screen}.
+	 */
+	boolean isRendering();
+	
+	
+	
 }

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

@@ -27,10 +27,10 @@ import com.seibel.distanthorizons.core.file.fullDatafile.GeneratedFullDataSource
 import com.seibel.distanthorizons.core.file.structure.ISaveStructure;
 import com.seibel.distanthorizons.core.pos.DhChunkPos;
 import com.seibel.distanthorizons.core.render.RenderBufferHandler;
-import com.seibel.distanthorizons.core.render.renderer.generic.GenericObjectRenderer;
 import com.seibel.distanthorizons.core.sql.dto.BeaconBeamDTO;
 import com.seibel.distanthorizons.core.sql.repo.BeaconBeamRepo;
 import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhGenericRenderer;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -92,7 +92,7 @@ public interface IDhLevel extends AutoCloseable, GeneratedFullDataSourceProvider
 	 * Not supported on the server-side. 
 	 */
 	@Nullable
-	GenericObjectRenderer getGenericRenderer();
+	IDhGenericRenderer getGenericRenderer();
 	/**
 	 * Will return null if the renderer isn't set up yet. <br>
 	 * Not supported on the server-side. 

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

@@ -168,7 +168,8 @@ public class LodRequestModule implements Closeable
 			}
 		}
 		dataFileHandler.clearRetrievalQueue();
-		worldGenState.closeAsync(true).join(); //TODO: Make it async.
+		// synchronized shutdown necessary to make sure the tasks are all handled correctly
+		worldGenState.closeAsync(true).join();
 		dataFileHandler.removeWorldGenCompleteListener(this.onWorldGenCompleteListener);
 	}
 	
@@ -198,7 +199,8 @@ public class LodRequestModule implements Closeable
 			
 			if (worldGenState != null)
 			{
-				worldGenState.closeAsync(true).join(); //TODO: Make it async.
+				// synchronized shutdown necessary to make sure the tasks are all handled correctly
+				worldGenState.closeAsync(true).join();
 			}
 		}
 	}
@@ -298,7 +300,7 @@ public class LodRequestModule implements Closeable
 			remainingChunkCount += this.retrievalQueue.getQueuedChunkCount();
 			String remainingChunkCountStr = F3Screen.NUMBER_FORMAT.format(remainingChunkCount);
 			
-			String message = "DH is generating chunks. " + remainingChunkCountStr + " left.";
+			String message = "DH is generating chunks. " + remainingChunkCountStr + " left."; // TODO getting stuck at 32 chunks remaining
 			
 			// show a message about how to disable progress logging if requested
 			int msToShowDisableInstructions = Config.Common.WorldGenerator.generationProgressDisableMessageDisplayTimeInSeconds.get() * 1_000;

core/src/main/java/com/seibel/distanthorizons/core/logging/f3/F3Screen.java

@@ -23,25 +23,27 @@ 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.jar.ModJarInfo;
+import com.seibel.distanthorizons.core.level.IDhClientLevel;
 import com.seibel.distanthorizons.core.level.IDhLevel;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.pooling.PhantomArrayListPool;
+import com.seibel.distanthorizons.core.render.RenderThreadTaskHandler;
+import com.seibel.distanthorizons.core.util.objects.pooling.PhantomArrayListPool;
 import com.seibel.distanthorizons.core.pos.DhSectionPos;
 import com.seibel.distanthorizons.core.render.RenderBufferHandler;
-import com.seibel.distanthorizons.core.render.renderer.generic.GenericObjectRenderer;
 import com.seibel.distanthorizons.core.util.threading.PriorityTaskPicker;
 import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
 import com.seibel.distanthorizons.core.world.AbstractDhWorld;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.render.AbstractDhRenderApiDefinition;
+import com.seibel.distanthorizons.core.wrapperInterfaces.render.renderPass.IDhGenericRenderer;
 import com.seibel.distanthorizons.coreapi.ModInfo;
 import com.seibel.distanthorizons.coreapi.util.StringUtil;
-import org.apache.logging.log4j.LogManager;
 import com.seibel.distanthorizons.core.logging.DhLogger;
 
 import java.text.NumberFormat;
 import java.util.*;
-import java.util.concurrent.ThreadPoolExecutor;
 
 public class F3Screen
 {
@@ -81,18 +83,12 @@ public class F3Screen
 	 */
 	public static void addStringToDisplay(List<String> messageList)
 	{
-		// multi thread pools
-		PriorityTaskPicker.Executor worldGenPool = ThreadPoolUtil.getWorldGenExecutor();
-		PriorityTaskPicker.Executor fileHandlerPool = ThreadPoolUtil.getFileHandlerExecutor();
-		PriorityTaskPicker.Executor renderLoadingPool = ThreadPoolUtil.getRenderLoadingExecutor();
-		PriorityTaskPicker.Executor updatePool = ThreadPoolUtil.getUpdatePropagatorExecutor();
-		PriorityTaskPicker.Executor lodBuilderPool = ThreadPoolUtil.getChunkToLodBuilderExecutor();
-		PriorityTaskPicker.Executor networkPool = ThreadPoolUtil.getNetworkCompressionExecutor();
+		String r = MinecraftTextFormat.RED;
+		String y = MinecraftTextFormat.YELLOW;
+		String a = MinecraftTextFormat.AQUA;
+		String cf = MinecraftTextFormat.CLEAR_FORMATTING;
+		
 		
-		// single thread pools
-		ThreadPoolExecutor cleanupPool = ThreadPoolUtil.getCleanupExecutor();
-		ThreadPoolExecutor beaconCullingPool = ThreadPoolUtil.getBeaconCullingExecutor();
-		ThreadPoolExecutor migrationPool = ThreadPoolUtil.getFullDataMigrationExecutor();
 		
 		AbstractDhWorld world = SharedApi.getAbstractDhWorld();
 		if (world == null)
@@ -114,7 +110,7 @@ public class F3Screen
 		// render validation error
 		if (ClientApi.INSTANCE.lastRenderParamValidationMessage != null)
 		{
-			messageList.add("Render Validation Err: " + ClientApi.INSTANCE.lastRenderParamValidationMessage);
+			messageList.add("Render Validation Err: " + r + ClientApi.INSTANCE.lastRenderParamValidationMessage + cf);
 		}
 		
 		
@@ -129,7 +125,10 @@ public class F3Screen
 				int detailLevel = DhSectionPos.getDetailLevel(sectionPos);
 				int posX = DhSectionPos.getX(sectionPos);
 				int posZ = DhSectionPos.getZ(sectionPos);
-				messageList.add("LOD Pos: " + detailLevel + "*"+posX+","+posZ);
+				messageList.add("LOD Pos: "+y+detailLevel+"*"+posX+","+posZ+cf);
+				
+				AbstractDhRenderApiDefinition renderApiDef = SingletonInjector.INSTANCE.get(AbstractDhRenderApiDefinition.class);
+				messageList.add("Rendering API: "+a+renderApiDef.getApiName()+cf);
 			}
 			messageList.add("");
 		}
@@ -138,16 +137,23 @@ public class F3Screen
 		if (Config.Client.Advanced.Debugging.F3Screen.showThreadPools.get())
 		{
 			// multi thread pools
-			messageList.add(getThreadPoolStatString("World Gen/Import", worldGenPool));
-			messageList.add(getThreadPoolStatString("Render Load", renderLoadingPool));
-			messageList.add(getThreadPoolStatString("File Handler", fileHandlerPool));
-			messageList.add(getThreadPoolStatString("Update Propagator", updatePool));
-			messageList.add(getThreadPoolStatString("LOD Builder", lodBuilderPool));
-			messageList.add(getThreadPoolStatString("Networking", networkPool));
+			messageList.add(PriorityTaskPicker.Executor.getThreadPoolStatString("World Gen/Import", ThreadPoolUtil.getWorldGenExecutor()));
+			messageList.add(PriorityTaskPicker.Executor.getThreadPoolStatString("Render Load", ThreadPoolUtil.getFileHandlerExecutor()));
+			messageList.add(PriorityTaskPicker.Executor.getThreadPoolStatString("File Handler", ThreadPoolUtil.getRenderLoadingExecutor()));
+			messageList.add(PriorityTaskPicker.Executor.getThreadPoolStatString("Update Propagator", ThreadPoolUtil.getUpdatePropagatorExecutor()));
+			messageList.add(PriorityTaskPicker.Executor.getThreadPoolStatString("LOD Builder", ThreadPoolUtil.getChunkToLodBuilderExecutor()));
+			messageList.add(PriorityTaskPicker.Executor.getThreadPoolStatString("Networking", ThreadPoolUtil.getNetworkCompressionExecutor()));
 			//// single thread pools
-			//messageList.add(getThreadPoolStatString("Cleanup", cleanupPool));
-			//messageList.add(getThreadPoolStatString("Beacon Culling", beaconCullingPool));
-			//messageList.add(getThreadPoolStatString("Migration", migrationPool));
+			//messageList.add(PriorityTaskPicker.Executor.getThreadPoolStatString("Cleanup", ThreadPoolUtil.getCleanupExecutor()));
+			//messageList.add(PriorityTaskPicker.Executor.getThreadPoolStatString("Beacon Culling", ThreadPoolUtil.getBeaconCullingExecutor()));
+			//messageList.add(PriorityTaskPicker.Executor.getThreadPoolStatString("Migration", ThreadPoolUtil.getFullDataMigrationExecutor()));
+			messageList.add("");
+		}
+		
+		// render thread tasks
+		if (Config.Client.Advanced.Debugging.F3Screen.showRenderThreadTasks.get())
+		{
+			RenderThreadTaskHandler.INSTANCE.addDebugMenuStringsToList(messageList);
 			messageList.add("");
 		}
 		
@@ -167,7 +173,8 @@ public class F3Screen
 		// chunk updates
 		if (Config.Client.Advanced.Debugging.F3Screen.showQueuedChunkUpdateCount.get())
 		{
-			messageList.add(SharedApi.INSTANCE.getDebugMenuString());
+			ArrayList<String> chunkQueueList = SharedApi.INSTANCE.getDebugMenuString();
+			messageList.addAll(chunkQueueList);
 			messageList.add("");
 		}
 		
@@ -178,7 +185,23 @@ public class F3Screen
 			messageList.add("");
 			for (IDhLevel level : levelIterator)
 			{
+				// skip non-rendering levels if requested
+				if (Config.Client.Advanced.Debugging.F3Screen.onlyShowRenderingLevels.get())
+				{
+					if (level instanceof IDhClientLevel)
+					{
+						IDhClientLevel clientLevel = (IDhClientLevel) level;
+						if (!clientLevel.isRendering())
+						{
+							continue;
+						}
+					}
+				}
+				
+				
+				
 				level.addDebugMenuStringsToList(messageList);
+				
 				// LOD rendering
 				RenderBufferHandler renderBufferHandler = level.getRenderBufferHandler();
 				if (renderBufferHandler != null)
@@ -190,8 +213,9 @@ public class F3Screen
 						messageList.add(showPassString);
 					}
 				}
+				
 				// Generic rendering
-				GenericObjectRenderer genericRenderer = level.getGenericRenderer();
+				IDhGenericRenderer genericRenderer = level.getGenericRenderer();
 				if (genericRenderer != null)
 				{
 					messageList.add(genericRenderer.getVboRenderDebugMenuString());
@@ -203,43 +227,4 @@ public class F3Screen
 	
 	
 	
-	//================//
-	// helper methods //
-	//================//
-	
-	private static String getThreadPoolStatString(String name, PriorityTaskPicker.Executor pool)
-	{
-		String queueSize = (pool != null) ? NUMBER_FORMAT.format(pool.getQueueSize()) : "-";
-		String completedCount = (pool != null) ? NUMBER_FORMAT.format(pool.getCompletedTaskCount()) : "-";
-		
-		String message = name+", Tasks: "+queueSize+", Done: "+completedCount;
-		
-		if (pool != null)
-		{
-			// active threads
-			int activeThreadCount = pool.getRunningTaskCount();
-			int threadCount = pool.getPoolSize();
-			message += ", Active: "+activeThreadCount+"/"+threadCount;
-			
-			// thread runtime
-			String runTimeAvgStr;
-			double runTimeAvgInMs = pool.getAverageRunTimeInMs();
-			if (!Double.isNaN(runTimeAvgInMs))
-			{
-				runTimeAvgStr = NUMBER_FORMAT.format(runTimeAvgInMs);
-			}
-			else
-			{
-				runTimeAvgStr = "<0";
-			}
-			
-			message += ", Avg: "+runTimeAvgStr+"ms";
-		}
-		
-		
-		return message;
-	}
-	
-	
-	
 }

core/src/main/java/com/seibel/distanthorizons/core/multiplayer/client/AbstractFullDataNetworkRequestQueue.java

@@ -1,7 +1,6 @@
 package com.seibel.distanthorizons.core.multiplayer.client;
 
 import com.google.common.base.Stopwatch;
-import com.google.common.cache.CacheBuilder;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.config.types.ConfigEntry;
 import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
@@ -19,7 +18,7 @@ import com.seibel.distanthorizons.core.network.messages.fullData.FullDataSourceR
 import com.seibel.distanthorizons.core.network.messages.fullData.FullDataSourceResponseMessage;
 import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos2D;
 import com.seibel.distanthorizons.core.pos.DhSectionPos;
-import com.seibel.distanthorizons.core.render.renderer.DebugRenderer;
+import com.seibel.distanthorizons.core.render.renderer.AbstractDebugWireframeRenderer;
 import com.seibel.distanthorizons.core.render.renderer.IDebugRenderable;
 import com.seibel.distanthorizons.core.sql.dto.FullDataSourceV2DTO;
 import com.seibel.distanthorizons.core.util.LodUtil;
@@ -44,6 +43,7 @@ public abstract class AbstractFullDataNetworkRequestQueue implements IDebugRende
 			.build();
 	
 	private static final IMinecraftClientWrapper MC_CLIENT = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
+	private static final AbstractDebugWireframeRenderer DEBUG_RENDERER = SingletonInjector.INSTANCE.get(AbstractDebugWireframeRenderer.class);
 	
 	private static final int MAX_RETRY_ATTEMPTS = 3;
 	
@@ -87,7 +87,7 @@ public abstract class AbstractFullDataNetworkRequestQueue implements IDebugRende
 		this.level = level;
 		this.changedOnly = changedOnly;
 		this.showDebugWireframeConfig = showDebugWireframeConfig;
-		DebugRenderer.register(this, this.showDebugWireframeConfig);
+		DEBUG_RENDERER.register(this, this.showDebugWireframeConfig);
 	}
 	
 	
@@ -386,10 +386,7 @@ public abstract class AbstractFullDataNetworkRequestQueue implements IDebugRende
 	}
 	
 	@Override
-	public void close()
-	{
-		DebugRenderer.unregister(this, this.showDebugWireframeConfig);
-	}
+	public void close() { DEBUG_RENDERER.unregister(this, this.showDebugWireframeConfig); }
 	
 	
 	
@@ -398,7 +395,7 @@ public abstract class AbstractFullDataNetworkRequestQueue implements IDebugRende
 	//===========//
 	
 	@Override
-	public void debugRender(DebugRenderer renderer)
+	public void debugRender(AbstractDebugWireframeRenderer renderer)
 	{
 		if (MC_CLIENT.getWrappedClientLevel() != this.level.getClientLevelWrapper())
 		{
@@ -429,7 +426,7 @@ public abstract class AbstractFullDataNetworkRequestQueue implements IDebugRende
 				}
 			}
 			
-			renderer.renderBox(new DebugRenderer.Box(pos, -32f, 64f, 0.05f, color));
+			renderer.renderBox(new AbstractDebugWireframeRenderer.Box(pos, -32f, 64f, 0.05f, color));
 		}
 	}
 	

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

@@ -1,295 +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.pos;
-
-import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
-import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos2D;
-import com.seibel.distanthorizons.coreapi.util.BitShiftUtil;
-import com.seibel.distanthorizons.core.util.LodUtil;
-import org.jetbrains.annotations.NotNull;
-
-import java.util.Objects;
-
-/**
- * A MC world position that is relative to a given detail level.
- *
- * @author Leetom
- * @version 2022-11-6
- * 
- * @deprecated TODO replace entirely with DhSectionPos, 
- *                  we don't need to have a full fledged position object for 
- *                  positions inside a LOD, we only need this position object
- *                  to get to/from the LOD section.
- */
-@Deprecated
-public class DhLodPos implements Comparable<DhLodPos>
-{
-	public final byte detailLevel;
-	
-	public final int x;
-	public final int z;
-	
-	
-	
-	//==============//
-	// constructors //
-	//==============//
-	
-	public DhLodPos(byte detailLevel, int x, int z)
-	{
-		this.detailLevel = detailLevel;
-		this.x = x;
-		this.z = z;
-	}
-	public DhLodPos(long sectionPos) { this(DhSectionPos.getDetailLevel(sectionPos), DhSectionPos.getX(sectionPos), DhSectionPos.getZ(sectionPos)); }
-	
-	
-	
-	//=========//
-	// getters //
-	//=========//
-	
-	/** gets the X position closest to negative infinity */
-	public DhLodUnit getMinX() { return new DhLodUnit(this.detailLevel, this.x); }
-	/** gets the Z position closest to negative infinity */
-	public DhLodUnit getMinZ() { return new DhLodUnit(this.detailLevel, this.z); }
-	
-	// Get the width of this pos, measured in the mc block unit. (i.e. detail 0)
-	public int getBlockWidth() { return this.getWidthAtDetail((byte) 0); }
-	
-	// Get the width of this pos, measured in the target detail level.
-	public int getWidthAtDetail(byte targetLevel)
-	{
-		if (targetLevel > this.detailLevel)
-		{
-			LodUtil.assertNotReach("getWidthAtDetail for pos "+this+", given target detail level of bounds: ["+targetLevel+"], this: ["+this.detailLevel+"]");
-		}
-		
-		return BitShiftUtil.powerOfTwo(this.detailLevel - targetLevel);
-	}
-	
-	public DhBlockPos2D getCenterBlockPos()
-	{
-		return new DhBlockPos2D(
-				this.getMinX().toBlockWidth() + BitShiftUtil.half(this.getBlockWidth()),
-				this.getMinZ().toBlockWidth() + BitShiftUtil.half(this.getBlockWidth()));
-	}
-	public DhBlockPos2D getCornerBlockPos() { return new DhBlockPos2D(this.getMinX().toBlockWidth(), this.getMinZ().toBlockWidth()); }
-	
-	/** converts this position to a lower detail level, angled towards the corner position. */
-	public DhLodPos getCornerLodPos(byte newDetail)
-	{
-		LodUtil.assertTrue(newDetail <= this.detailLevel);
-		return new DhLodPos(newDetail,
-				this.x * BitShiftUtil.powerOfTwo(this.detailLevel - newDetail),
-				this.z * BitShiftUtil.powerOfTwo(this.detailLevel - newDetail));
-	}
-	
-	/**
-	 * Returns the DhLodPos 1 detail level lower <br><br>
-	 *
-	 * Relative child positions returned for each index: <br>
-	 * 0 = (0,0) <br>
-	 * 1 = (1,0) <br>
-	 * 2 = (0,1) <br>
-	 * 3 = (1,1) <br>
-	 *
-	 * @param child0to3 must be an int between 0 and 3
-	 */
-	public DhLodPos getChildPosByIndex(int child0to3) throws IllegalArgumentException, IllegalStateException
-	{
-		if (child0to3 < 0 || child0to3 > 3)
-			throw new IllegalArgumentException("child0to3 must be between 0 and 3");
-		if (this.detailLevel <= 0)
-			throw new IllegalStateException("detailLevel must be greater than 0");
-		
-		return new DhLodPos((byte) (this.detailLevel - 1),
-				this.x * 2 + (child0to3 & 1),
-				this.z * 2 + BitShiftUtil.half(child0to3 & 2));
-	}
-	/** Returns this position's child index in its parent */
-	public int getChildIndexOfParent() { return (this.x & 1) + BitShiftUtil.square(this.z & 1); }
-	
-	/** @see DhLodPos#getSectionPosWithSectionDetailLevel(byte) */
-	public DhLodPos getDhSectionRelativePositionForDetailLevel() throws IllegalArgumentException { return this.getDhSectionRelativePositionForDetailLevel(this.detailLevel); }
-	/**
-	 * Returns a DhLodPos with the given detail level and an X/Z position somewhere between (0,0) and (63,63).
-	 * This is done to access specific sections from a {@link FullDataSourceV2} where LOD columns are stored
-	 * in 64 x 64 blocks.
-	 *
-	 * @throws IllegalArgumentException if this position's detail level is lower than the output detail level
-	 */
-	public DhLodPos getDhSectionRelativePositionForDetailLevel(byte outputDetailLevel) throws IllegalArgumentException
-	{
-		final int xInputOriginal = this.x;
-		final int zInputOriginal = this.z;
-		
-		byte detailLevelDifference = (byte) (outputDetailLevel - this.detailLevel);
-		if (outputDetailLevel < this.detailLevel)
-		{
-			throw new IllegalArgumentException("The output Detail Level [" + outputDetailLevel + "] is less than this " + DhLodPos.class.getSimpleName() + "'s detail level [" + this.detailLevel + "].");
-		}
-		
-		
-		
-		// negative values need to be offset by the detail level difference squared (in blocks)
-		// to skip over -0 (relative position) to -1 (relative position)
-		int blockOffset = BitShiftUtil.powerOfTwo(detailLevelDifference) - 1;
-		blockOffset = Math.max(1, blockOffset);
-		
-		int xInput = xInputOriginal;
-		xInput += (xInputOriginal < 0) ? blockOffset : 0;
-		
-		int zInput = zInputOriginal;
-		zInput += (zInputOriginal < 0) ? blockOffset : 0;
-		
-		// convert the input positions into the new detail level
-		int xRelativePos = xInput / BitShiftUtil.powerOfTwo(detailLevelDifference);
-		int zRelativePos = zInput / BitShiftUtil.powerOfTwo(detailLevelDifference);
-		
-		// convert the positions into section relative space (0-63)
-		xRelativePos = xInputOriginal >= 0 ? (xRelativePos % 64) : 63 + (xRelativePos % 64);
-		zRelativePos = zInputOriginal >= 0 ? (zRelativePos % 64) : 63 + (zRelativePos % 64);
-		
-		return new DhLodPos(outputDetailLevel, xRelativePos, zRelativePos);
-	}
-	
-	/**
-	 * @param sectionDetailLevel This is different from the normal LOD Detail level, see {@link DhSectionPos} for more information
-	 * @throws IllegalArgumentException if this position's detail level is lower than the output detail level
-	 */
-	public long getSectionPosWithSectionDetailLevel(byte sectionDetailLevel) throws IllegalArgumentException
-	{
-		if (sectionDetailLevel < this.detailLevel)
-		{
-			throw new IllegalArgumentException("The section Detail Level [" + sectionDetailLevel + "] is less than this " + DhLodPos.class.getSimpleName() + "'s detail level [" + this.detailLevel + "].");
-		}
-		
-		DhLodPos lodPos = new DhLodPos(this.detailLevel, this.x, this.z);
-		lodPos = lodPos.convertToDetailLevel(sectionDetailLevel);
-		return DhSectionPos.encode(lodPos.detailLevel, lodPos.x, lodPos.z);
-	}
-	
-	
-	
-	//=========//
-	// methods //
-	//=========//
-	
-	/** Returns a new DhLodPos with the given detail level. */
-	public DhLodPos convertToDetailLevel(byte newDetailLevel)
-	{
-		if (newDetailLevel >= this.detailLevel)
-		{
-			return new DhLodPos(newDetailLevel,
-					Math.floorDiv(this.x, BitShiftUtil.powerOfTwo(newDetailLevel - this.detailLevel)),
-					Math.floorDiv(this.z, BitShiftUtil.powerOfTwo(newDetailLevel - this.detailLevel)));
-		}
-		else
-		{
-			return new DhLodPos(newDetailLevel,
-					this.x * BitShiftUtil.powerOfTwo(this.detailLevel - newDetailLevel),
-					this.z * BitShiftUtil.powerOfTwo(this.detailLevel - newDetailLevel));
-		}
-	}
-	
-	/** @return true if the two positions overlap exactly */
-	public boolean overlapsExactly(DhLodPos other)
-	{
-		if (this.equals(other))
-		{
-			return true;
-		}
-		else if (this.detailLevel == other.detailLevel)
-		{
-			return false;
-		}
-		else if (this.detailLevel > other.detailLevel)
-		{
-			return this.equals(other.convertToDetailLevel(this.detailLevel));
-		}
-		else
-		{
-			return other.equals(this.convertToDetailLevel(other.detailLevel));
-		}
-	}
-	
-	/** Only valid for DhLodUnits for an equal or greater detail level */
-	public DhLodPos addLodUnit(DhLodUnit width)
-	{
-		if (width.detailLevel < this.detailLevel)
-			throw new IllegalArgumentException("add called with width.detailLevel < pos detail");
-		
-		return new DhLodPos(this.detailLevel,
-				this.x + width.createFromDetailLevel(this.detailLevel).numberOfLodSectionsWide,
-				this.z + width.createFromDetailLevel(this.detailLevel).numberOfLodSectionsWide);
-	}
-	
-	/** Equivalent to adding a DhLodUnit with the same detail level as this DhLodPos */
-	public DhLodPos addOffset(int xOffset, int zOffset) { return new DhLodPos(this.detailLevel, this.x + xOffset, this.z + zOffset); }
-	
-	
-	
-	//===========//
-	// overrides //
-	//===========//
-	
-	@Override
-	public boolean equals(Object obj)
-	{
-		if (this == obj)
-		{
-			return true;
-		}
-		else if (obj == null || this.getClass() != obj.getClass())
-		{
-			return false;
-		}
-		else
-		{
-			DhLodPos otherPos = (DhLodPos) obj;
-			return this.detailLevel == otherPos.detailLevel && this.x == otherPos.x && this.z == otherPos.z;
-		}
-	}
-	
-	@Override
-	public int hashCode() { return Objects.hash(this.detailLevel, this.x, this.z); }
-	
-	@Override
-	public int compareTo(@NotNull DhLodPos obj)
-	{
-		if (this.detailLevel != obj.detailLevel)
-		{
-			return Integer.compare(this.detailLevel, obj.detailLevel);
-		}
-		else if (this.x != obj.x)
-		{
-			return Integer.compare(this.x, obj.x);
-		}
-		else
-		{
-			return Integer.compare(this.z, obj.z);
-		}
-	}
-	
-	@Override
-	public String toString() { return "[" + this.detailLevel + "*" + this.x + "," + this.z + "]"; }
-	
-}

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

@@ -1,82 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.core.pos;
-
-import com.seibel.distanthorizons.coreapi.util.BitShiftUtil;
-
-/**
- * Often used to measure LOD widths
- *
- * @author Leetom
- * @version 2022-11-6
- */
-public class DhLodUnit
-{
-	/** The detail level of this LOD Unit */
-	public final byte detailLevel;
-	/** How many LOD columns wide this LOD Unit represents */
-	public final int numberOfLodSectionsWide;
-	
-	
-	
-	//==============//
-	// constructors //
-	//==============//
-	
-	public DhLodUnit(byte detailLevel, int numberOfLodSectionsWide)
-	{
-		this.detailLevel = detailLevel;
-		this.numberOfLodSectionsWide = numberOfLodSectionsWide;
-	}
-	
-	
-	
-	//=========//
-	// methods //
-	//=========//
-	
-	/** @return the size of this LOD unit in Minecraft blocks */
-	public int toBlockWidth() { return BitShiftUtil.pow(this.numberOfLodSectionsWide, this.detailLevel); }
-	/** @return the LOD Unit relative to the given block width and detail level */
-	public static DhLodUnit fromBlockWidth(int blockWidth, byte targetDetailLevel) { return new DhLodUnit(targetDetailLevel, Math.floorDiv(blockWidth, BitShiftUtil.powerOfTwo(targetDetailLevel))); }
-	
-	/**
-	 * if the targetDetailLevel and this object's detail are the same,
-	 * this will be returned instead of creating a new object
-	 */
-	public DhLodUnit createFromDetailLevel(byte targetDetailLevel)
-	{
-		if (this.detailLevel == targetDetailLevel)
-		{
-			// no need to create a new object, this one is already the right detail level
-			return this;
-		}
-		else if (this.detailLevel > targetDetailLevel)
-		{
-			//TODO check if this is correct
-			return new DhLodUnit(targetDetailLevel, this.numberOfLodSectionsWide * BitShiftUtil.powerOfTwo(this.detailLevel - targetDetailLevel));
-		}
-		else
-		{
-			return new DhLodUnit(targetDetailLevel, Math.floorDiv(this.numberOfLodSectionsWide, BitShiftUtil.powerOfTwo(targetDetailLevel - this.detailLevel)));
-		}
-	}
-	
-}

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

@@ -42,8 +42,6 @@ import java.util.function.LongConsumer;
  * <strong>Too big</strong>, and the LOD dropoff will be very noticeable.<br>
  * With those thoughts in mind we decided on a smallest section size of 64 data points square (IE 4x4 chunks).
  *
- * TODO absolute vs section detail levels
- * 
  * @author Leetom
  */
 public class DhSectionPos
@@ -81,6 +79,7 @@ public class DhSectionPos
 	//==============//
 	// constructors //
 	//==============//
+	//region
 	
 	/** 
 	 * This class just holds utility methods for handling a packed
@@ -134,11 +133,14 @@ public class DhSectionPos
 		return sectionPos;
 	}
 	
+	//endregion
+	
 	
 	
 	//============//
 	// converters //
 	//============//
+	//region
 
 	/** uses the absolute detail level aka detail levels like {@link LodUtil#CHUNK_DETAIL_LEVEL} instead of the dhSectionPos detailLevels. */
 	public static long convertToDetailLevel(long pos, byte newDetailLevel)
@@ -162,11 +164,14 @@ public class DhSectionPos
 		return encode(newDetailLevel, x, z);
 	}
 	
+	//endregion
+	
 	
 	
 	//==================//
 	// property getters //
 	//==================//
+	//region
 	
 	public static byte getDetailLevel(long pos) { return (byte) ((pos >> DETAIL_LEVEL_OFFSET) & DETAIL_LEVEL_MASK); }
 	public static int getX(long pos)
@@ -184,11 +189,14 @@ public class DhSectionPos
 		return Z;
 	}
 	
+	//endregion
 	
 	
-	//=========//
-	// getters //
-	//=========//
+	
+	//=================//
+	// complex getters //
+	//=================//
+	//region
 
 	/** @return the block X pos that represents the smallest X coordinate of this section */
 	public static int getMinCornerBlockX(long pos)
@@ -303,10 +311,63 @@ public class DhSectionPos
 	}
 	
 	
+	/**
+	 * Returns a {@link DhSectionPos} with the given detail level and an X/Z position somewhere between (0,0) and (63,63).
+	 * This is done to access specific sections from a {@link FullDataSourceV2} where LOD columns are stored
+	 * in 64 x 64 blocks.
+	 *
+	 * @throws IllegalArgumentException if this position's detail level is lower than the output detail level
+	 * @see FullDataSourceV2#WIDTH
+	 */
+	public static long getDhSectionRelativePositionForDetailLevel(long pos, byte outputDetailLevel) throws IllegalArgumentException
+	{
+		final int xInputOriginal = DhSectionPos.getX(pos);
+		final int zInputOriginal = DhSectionPos.getZ(pos);
+		
+		byte detailLevelDifference = (byte) (outputDetailLevel - DhSectionPos.getDetailLevel(pos));
+		if (outputDetailLevel < DhSectionPos.getDetailLevel(pos))
+		{
+			throw new IllegalArgumentException("The output Detail Level [" + outputDetailLevel + "] is less than the input pos's detail level [" + DhSectionPos.getDetailLevel(pos) + "].");
+		}
+		
+		
+		
+		// negative values need to be offset by the detail level difference squared (in blocks)
+		// to skip over -0 (relative position) to -1 (relative position)
+		int blockOffset = BitShiftUtil.powerOfTwo(detailLevelDifference) - 1;
+		blockOffset = Math.max(1, blockOffset);
+		
+		int xInput = xInputOriginal;
+		xInput += (xInputOriginal < 0) ? blockOffset : 0;
+		
+		int zInput = zInputOriginal;
+		zInput += (zInputOriginal < 0) ? blockOffset : 0;
+		
+		// convert the input positions into the new detail level
+		int xRelativePos = xInput / BitShiftUtil.powerOfTwo(detailLevelDifference);
+		int zRelativePos = zInput / BitShiftUtil.powerOfTwo(detailLevelDifference);
+		
+		
+		// width inclusive
+		final int WIDTH_IN = FullDataSourceV2.WIDTH;
+		// width exclusive
+		final int WIDTH_EX = FullDataSourceV2.WIDTH - 1; 
+		
+		// convert the positions into section relative space (0-63)
+		xRelativePos = xInputOriginal >= 0 ? (xRelativePos % WIDTH_IN) : WIDTH_EX + (xRelativePos % WIDTH_IN);
+		zRelativePos = zInputOriginal >= 0 ? (zRelativePos % WIDTH_IN) : WIDTH_EX + (zRelativePos % WIDTH_IN);
+		
+		return DhSectionPos.encode(outputDetailLevel, xRelativePos, zRelativePos);
+	}
+	
+	//endregion
+	
+	
 	
 	//==================//
 	// parent child pos //
 	//==================//
+	//region
 	
 	/**
 	 * Returns a position 1 detail level lower. <br><br>
@@ -343,6 +404,7 @@ public class DhSectionPos
 	
 	public static long getParentPos(long pos) { return DhSectionPos.encode((byte) (getDetailLevel(pos) + 1), BitShiftUtil.half(getX(pos)), BitShiftUtil.half(getZ(pos))); }
 	
+	//endregion
 	
 
 	public static long getAdjacentPos(long pos, EDhDirection dir) throws IllegalArgumentException
@@ -357,14 +419,14 @@ public class DhSectionPos
 				getZ(pos) + dir.normal.z);
 	}
 	
-	@Deprecated
-	public static DhLodPos getSectionBBoxPos(long pos) { return new DhLodPos(getDetailLevel(pos), getX(pos), getZ(pos)); }
+	
 	
 	
 	
 	//=============//
 	// comparisons //
 	//=============//
+	//region
 	
 	public static boolean contains(long aPos, long bPos)
 	{
@@ -398,11 +460,14 @@ public class DhSectionPos
 				sectionMinZ <= blockZ && blockZ <= sectionMaxZ;
 	}
 	
+	//endregion
+	
 	
 	
 	//===========//
 	// iterators //
 	//===========//
+	//region
 	
 	/** Applies the given consumer to all 4 of this position's children. */
 	public static void forEachChild(long pos, LongConsumer callback) throws IllegalArgumentException, IllegalStateException
@@ -455,21 +520,27 @@ public class DhSectionPos
 		forEachPosUpToDetailLevel(getParentPos(pos), maxSectionDetailLevel, callback);
 	}
 	
+	//endregion
+	
 	
 	
 	//==============//
 	// Base methods //
 	//==============//
+	//region
 	
 	/** Example: "6*1,-3" */
 	public static String toString(long pos) { return getDetailLevel(pos) + "*" + getX(pos) + "," + getZ(pos); }
 	public static int hashCode(long pos) { return Long.hashCode(pos); }
 	
+	//endregion
+	
 	
 	
 	//================//
-	// helper methods //
+	// helper classes //
 	//================//
+	//region
 	
 	/** Used instead of {@link java.util.function.Function} to prevent unnecessary (un)wrapping. */
 	@FunctionalInterface
@@ -479,4 +550,7 @@ public class DhSectionPos
 		boolean accept(long value);
 	}
 	
+	//endregion
+	
+	
 }

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

@@ -1,113 +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.pos;
-
-import com.seibel.distanthorizons.coreapi.util.MathUtil;
-
-import java.util.Objects;
-
-
-/** immutable */
-@Deprecated // TODO why does this exist vs blockpos2d?
-public class Pos2D
-{
-	public static final Pos2D ZERO = new Pos2D(0, 0);
-	
-	private final int x;
-	public int getX() { return this.x; }
-	
-	private final int y;
-	public int getY() { return this.y; }
-	
-	
-	
-	//==============//
-	// constructors //
-	//==============//
-	
-	public Pos2D(int x, int y)
-	{
-		this.x = x;
-		this.y = y;
-	}
-	
-	
-	
-	
-	//======//
-	// math //
-	//======//
-	
-	public Pos2D add(Pos2D other) { return new Pos2D(this.x + other.x, this.y + other.y); }
-	public Pos2D subtract(Pos2D other) { return new Pos2D(this.x - other.x, this.y - other.y); }
-	public Pos2D subtract(int value) { return new Pos2D(this.x - value, this.y - value); }
-	
-	public double dist(Pos2D other) { return Math.sqrt(Math.pow(this.x - other.x, 2) + Math.pow(this.y - other.y, 2)); }
-	public long distSquared(Pos2D other) { return MathUtil.pow2((long) this.x - other.x) + MathUtil.pow2((long) this.y - other.y); }
-	
-	/**
-	 * Returns the maximum distance along either the X or Z axis <br><br>
-	 *
-	 * Example chebyshev distance between X and every point around it: <br>
-	 * <code>
-	 * 2 2 2 2 2 <br>
-	 * 2 1 1 1 2 <br>
-	 * 2 1 X 1 2 <br>
-	 * 2 1 1 1 2 <br>
-	 * 2 2 2 2 2 <br>
-	 * </code>
-	 */
-	public int chebyshevDist(Pos2D other) { return Math.max(Math.abs(this.x - other.x), Math.abs(this.y - other.y)); }
-	
-	/**
-	 * Can be used to quickly determine the rough distance between two points<Br>
-	 * or determine the taxi cab (manhattan) distance between two points. <Br><Br>
-	 *
-	 * Manhattan distance is equivalent to determining the distance between two street intersections,
-	 * where you can only drive along each street, instead of directly to the other point.
-	 */
-	public int manhattanDist(Pos2D other) { return Math.abs(this.x - other.x) + Math.abs(this.y - other.y); }
-	
-	
-	
-	//================//
-	// base overrides //
-	//================//
-	
-	@Override
-	public int hashCode() { return Objects.hash(this.x, this.y); }
-	
-	@Override
-	public String toString() { return "[" + this.x + ", " + this.y + "]"; }
-	
-	@Override
-	public boolean equals(Object otherObj)
-	{
-		if (otherObj == this)
-			return true;
-		if (otherObj instanceof Pos2D)
-		{
-			Pos2D otherPos = (Pos2D) otherObj;
-			return this.x == otherPos.x && this.y == otherPos.y;
-		}
-		return false;
-	}
-	
-}

core/src/main/java/com/seibel/distanthorizons/core/pos/blockPos/DhBlockPos2D.java

@@ -19,7 +19,6 @@
 
 package com.seibel.distanthorizons.core.pos.blockPos;
 
-import com.seibel.distanthorizons.core.pos.Pos2D;
 import com.seibel.distanthorizons.coreapi.util.MathUtil;
 
 /** immutable */
@@ -34,6 +33,7 @@ public class DhBlockPos2D
 	//==============//
 	// constructors //
 	//==============//
+	//region
 	
 	public DhBlockPos2D(int x, int z)
 	{
@@ -47,13 +47,14 @@ public class DhBlockPos2D
 		this.z = blockPos.getZ();
 	}
 	
-	public static DhBlockPos2D fromPos2D(Pos2D pos) { return new DhBlockPos2D(pos.getX(), pos.getY()); }
+	//endregion
 	
 	
 	
 	//==========//
 	// mutators //
 	//==========//
+	//region
 	
 	public DhBlockPos2D add(DhBlockPos2D other) { return new DhBlockPos2D(this.x + other.x, this.z + other.z); }
 	
@@ -61,13 +62,14 @@ public class DhBlockPos2D
 	
 	public DhBlockPos2D subtract(DhBlockPos2D other) { return new DhBlockPos2D(this.x - other.x, this.z - other.z); }
 	
-	public Pos2D toPos2D() { return new Pos2D(this.x, this.z); }
+	//endregion
 	
 	
 	
 	//==============//
 	// calculations //
 	//==============//
+	//region
 	
 	public double dist(DhBlockPos2D other) { return this.dist(other.x, other.z); }
 	public double dist(int x, int z) { return Math.sqrt(Math.pow(this.x - x, 2) + Math.pow(this.z - z, 2)); }
@@ -98,12 +100,14 @@ public class DhBlockPos2D
 	 */
 	public int manhattanDist(DhBlockPos2D other) { return Math.abs(this.x - other.x) + Math.abs(this.z - other.z); }
 	
+	//endregion
 	
 	
 	
-	//===========//
-	// overrides //
-	//===========//
+	//================//
+	// base overrides //
+	//================//
+	//region
 	
 	@Override
 	public String toString() { return "(" + this.x + ", " + this.z + ")"; }
@@ -123,4 +127,8 @@ public class DhBlockPos2D
 	@Override
 	public int hashCode() { return Integer.hashCode(this.x) ^ Integer.hashCode(this.z); }
 	
+	//endregion
+	
+	
+	
 }