Bump protocol version

.editorconfig

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

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

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

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

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

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

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

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

@@ -44,10 +44,6 @@ public enum EDhApiGpuUploadMethod
 	/** 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>

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

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

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

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

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

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

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

@@ -0,0 +1,55 @@
+/*
+ *    This file is part of the Distant Horizons mod
+ *    licensed under the GNU LGPL v3 License.
+ *
+ *    Copyright (C) 2020 James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU Lesser General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.distanthorizons.api.enums.config;
+
+import org.apache.logging.log4j.Level;
+
+/**
+ * @since API 2.0.0
+ * @version 2024-4-6
+ */
+public enum EDhApiLoggerMode
+{
+	DISABLED(Level.OFF, Level.OFF),
+	LOG_ALL_TO_FILE(Level.ALL, Level.OFF),
+	LOG_ERROR_TO_CHAT(Level.ALL, Level.ERROR),
+	LOG_WARNING_TO_CHAT(Level.ALL, Level.WARN),
+	LOG_INFO_TO_CHAT(Level.ALL, Level.INFO),
+	LOG_DEBUG_TO_CHAT(Level.ALL, Level.DEBUG),
+	LOG_ALL_TO_CHAT(Level.ALL, Level.ALL),
+	LOG_ERROR_TO_CHAT_AND_FILE(Level.ERROR, Level.ERROR),
+	LOG_WARNING_TO_CHAT_AND_FILE(Level.WARN, Level.WARN),
+	LOG_INFO_TO_CHAT_AND_FILE(Level.INFO, Level.INFO),
+	LOG_DEBUG_TO_CHAT_AND_FILE(Level.DEBUG, Level.DEBUG),
+	LOG_WARNING_TO_CHAT_AND_INFO_TO_FILE(Level.INFO, Level.WARN),
+	LOG_ERROR_TO_CHAT_AND_INFO_TO_FILE(Level.INFO, Level.ERROR),
+	LOG_ERROR_TO_CHAT_AND_WARNING_TO_FILE(Level.ERROR, Level.WARN),
+	;
+	
+	public final Level levelForFile;
+	public final Level levelForChat;
+	
+	EDhApiLoggerMode(Level levelForFile, Level levelForChat)
+	{
+		this.levelForFile = levelForFile;
+		this.levelForChat = levelForChat;
+	}
+	
+}

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

@@ -64,7 +64,10 @@ public enum EDhApiMaxHorizontalResolution
 	/** How wide each LOD DataPoint is */
 	public final int dataPointWidth;
 	
-	/** This is the same as detailLevel in LodQuadTreeNode */
+	/**
+	 * This is the same as detailLevel in LodQuadTreeNode,
+	 * lowest is 0 highest is 9
+	 */
 	public final byte detailLevel;
 	
 	/* Start/End X/Z give the block positions

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,197 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.api.methods.events.abstractEvents;
-
-import com.seibel.distanthorizons.api.interfaces.block.IDhApiBiomeWrapper;
-import com.seibel.distanthorizons.api.interfaces.block.IDhApiBlockStateWrapper;
-import com.seibel.distanthorizons.api.interfaces.factories.IDhApiWrapperFactory;
-import com.seibel.distanthorizons.api.interfaces.world.IDhApiLevelWrapper;
-import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEvent;
-import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEventParam;
-import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiEventParam;
-
-/**
- * Used to override which blocks may be stored in a given chunk.
- * This can be used for X-ray prevention or to replace problematic mod blocks
- * that don't fit into the {@link IDhApiBlockStateWrapper} format DH requires
- * (IE modded blocks that use NBT data
- * to determine their model and/or texture). <br/><br/>
- *
- * This event is fired for each block or biome change when DH is processing a chunk.
- * A change happens when DH finds a different block or biome while walking through a chunk.
- * For example with the block sequence:<br/>
- * <code> stone -> stone -> air -> stone </code> <br/>
- * This event would be fired for the first, third, and forth blocks in the sequence
- * (IE the first stone, first air, and last stone respectively). <br/> <br/>
- * 
- * The order DH will process blocks is undefined so a specific ordering shouldn't be relied upon for your logic to function. <br/> <br/>
- * 
- * <b>Threading note:</b> this event may be called concurrently across multiple threads. <br/>
- * <b>Performance note:</b> this event will be called very frequently, avoid expensive lookups or other slow operations if possible. <br/>
- * 
- * @see DhApiLevelLoadEvent
- * @see IDhApiWrapperFactory
- *
- * @author James Seibel
- * @version 2025-09-29
- * @since API 4.1.0
- */
-public abstract class DhApiChunkProcessingEvent implements IDhApiEvent<DhApiChunkProcessingEvent.EventParam>
-{
-	public abstract void blockOrBiomeChangedDuringChunkProcessing(DhApiEventParam<EventParam> event);
-	
-	
-	//=========================//
-	// internal DH API methods //
-	//=========================//
-	
-	@Override
-	public final void fireEvent(DhApiEventParam<EventParam> event) { this.blockOrBiomeChangedDuringChunkProcessing(event); }
-	
-	
-	//==================//
-	// parameter object //
-	//==================//
-	
-	public static class EventParam implements IDhApiEventParam
-	{
-		/** The saved level. */
-		public final IDhApiLevelWrapper levelWrapper;
-		
-		/** the processed chunk's X pos in chunk coordinates */
-		public final int chunkX;
-		/** the processed chunk's Z pos in chunk coordinates */
-		public final int chunkZ;
-		
-		
-		public int relativeBlockPosX;
-		public int blockPosY;
-		public int relativeBlockPosZ;
-		
-		public IDhApiBlockStateWrapper currentBlock;
-		public IDhApiBiomeWrapper currentBiome;
-		
-		private IDhApiBlockStateWrapper newBlock;
-		private IDhApiBiomeWrapper newBiome;
-		
-		
-		
-		//=============//
-		// constructor //
-		//=============//
-		
-		public EventParam(IDhApiLevelWrapper newLevelWrapper, int chunkX, int chunkZ)
-		{
-			this.levelWrapper = newLevelWrapper;
-			this.chunkX = chunkX;
-			this.chunkZ = chunkZ;
-		}
-		
-		/** 
-		 * Internal method use by Distant Horizons
-		 * to set up this event.
-		 */
-		public void updateForPosition(
-				int relativeBlockPosX, int blockPosY, int relativeBlockPosZ,
-				IDhApiBlockStateWrapper currentBlock,
-				IDhApiBiomeWrapper currentBiome)
-		{
-			this.relativeBlockPosX = relativeBlockPosX;
-			this.blockPosY = blockPosY;
-			this.relativeBlockPosZ = relativeBlockPosZ;
-			
-			this.newBlock = null;
-			this.newBiome = null;
-			
-			this.currentBlock = currentBlock;
-			this.currentBiome = currentBiome;
-		}
-		
-		
-		
-		//=================//
-		// getters/setters //
-		//=================//
-		
-		/**
-		 * Sets the {@link IDhApiBlockStateWrapper} that should be used at this event's current position in the chunk.
-		 * If you don't want to modify the block at this event's current position, 
-		 * either don't call this method or pass in null. <br>
-		 * Passing in null will remove the override, meaning the original block will be used. <br><br>
-		 *
-		 * A {@link IDhApiWrapperFactory} should be used to get the {@link IDhApiBlockStateWrapper} that's returned. 
-		 * Attempting to create your own {@link IDhApiBlockStateWrapper} will cause a {@link ClassCastException}. <br/> <br/>
-		 *
-		 * If multiple API users are listening to this event the override may already have been set.
-		 * With that in mind it is recommended to check if an override has already been set via
-		 * {@link EventParam#getBlockOverride()} to handle that occurrence. <br>
-		 * Note that the order of API events firing is undefined so a specific order shouldn't be relied upon. <br><br>
-		 * 
-		 * @see IDhApiWrapperFactory
-		 */
-		public void setBlockOverride(IDhApiBlockStateWrapper block) { this.newBlock = block; }
-		/** 
-		 * Returns the currently overriding block for this position.
-		 * This will be null if no other API event has set the override.
-		 */
-		public IDhApiBlockStateWrapper getBlockOverride() { return this.newBlock; }
-		
-		
-		
-		/**
-		 * Sets the {@link IDhApiBiomeWrapper} that should be used at this event's current position in the chunk.
-		 * If you don't want to modify the biome at this event's current position, 
-		 * either don't call this method or pass in null. <br>
-		 * Passing in null will remove the override, meaning the original biome will be used. <br><br>
-		 *
-		 * A {@link IDhApiWrapperFactory} should be used to get the {@link IDhApiBiomeWrapper} that's returned. 
-		 * Attempting to create your own {@link IDhApiBiomeWrapper} will cause a {@link ClassCastException}. <br/> <br/>
-		 *
-		 * If multiple API users are listening to this event the override may already have been set.
-		 * With that in mind it is recommended to check if an override has already been set via
-		 * {@link EventParam#getBiomeOverride()} ()} to handle that occurrence. <br>
-		 * Note that the order of API events firing is undefined so a specific order shouldn't be relied upon. <br><br>
-		 *
-		 * @see IDhApiWrapperFactory
-		 */
-		public void setBiomeOverride(IDhApiBiomeWrapper biome) { this.newBiome = biome; }
-		/**
-		 * Returns the currently overriding biome for this position.
-		 * This will be null if no other API event has set the override.
-		 */
-		public IDhApiBiomeWrapper getBiomeOverride() { return this.newBiome; }
-		
-		
-		
-		/** 
-		 * Returns the same instance of this event.
-		 * Copying this event isn't recommended due to 
-		 * how often it would be called per chunk, creating
-		 * unnecessary garbage collector pressure.
-		 */
-		@Override
-		public EventParam copy() { return this; }
-		
-		@Override 
-		public boolean getCopyBeforeFire() { return false; }
-		
-	}
-	
-}

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

@@ -33,7 +33,7 @@ import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhAp
  * @since API 2.0.0
  * @deprecated Replaced by {@link DhApiBeforeColorDepthTextureCreatedEvent} since this event's name isn't obvious when it fires.
  */
-@Deprecated // internal notes: this method must be kept around due to Iris using it and we don't want to break old Iris support
+@Deprecated
 public abstract class DhApiColorDepthTextureCreatedEvent implements IDhApiEvent<DhApiColorDepthTextureCreatedEvent.EventParam>
 {
 	/** Fired before Distant Horizons creates. */

api/src/main/java/com/seibel/distanthorizons/api/methods/events/interfaces/IDhApiEventParam.java

@@ -9,23 +9,5 @@ import com.seibel.distanthorizons.api.interfaces.util.IDhApiCopyable;
  */
 public interface IDhApiEventParam extends IDhApiCopyable
 {
-	/** 
-	 * Internal DH use. <br> <br>
-	 * 
-	 * Most API events will clone their parameters
-	 * before firing to prevent API implementors
-	 * from modifying the properties causing
-	 * any subsequent listeners to see the wrong data. <br><br>
-	 * 
-	 * However, this can be overridden for API events that shouldn't 
-	 * be cloned before firing.
-	 * Generally that would be done for performance reasons
-	 * where an event may fire hundreds or thousands of times 
-	 * in quick succession or where the event parameter is needed
-	 * internally by DH after firing.
-	 * 
-	 * @since API 4.1.0 
-	 */
-	default boolean getCopyBeforeFire() { return true; }
 	
 }

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

@@ -38,7 +38,7 @@ public class DhApiRenderParam implements IDhApiEventParam
 	/** Indicates how far into this tick the frame is. */
 	public final float partialTicks;
 	
-	/**
+	/** 
 	 * Indicates DH's near clip plane, measured in blocks. 
 	 * Note: this may change based on time, player speed, and other factors. 
 	 */
@@ -67,6 +67,7 @@ public class DhApiRenderParam implements IDhApiEventParam
 	// constructors //
 	//==============//
 	
+	
 	public DhApiRenderParam(DhApiRenderParam parent)
 	{
 		this(
@@ -85,7 +86,7 @@ public class DhApiRenderParam implements IDhApiEventParam
 			DhApiMat4f newMcProjectionMatrix, DhApiMat4f newMcModelViewMatrix,
 			DhApiMat4f newDhProjectionMatrix, DhApiMat4f newDhModelViewMatrix,
 			int worldYOffset
-		)
+			)
 	{
 		this.renderPass = renderPass;
 		
@@ -110,9 +111,10 @@ public class DhApiRenderParam implements IDhApiEventParam
 	// base overrides //
 	//================//
 	
-	@Override
-	public DhApiRenderParam copy() { return new DhApiRenderParam(this); }
-	
-	
+	@Override 
+	public DhApiRenderParam copy()
+	{
+		return new DhApiRenderParam(this); 
+	}
 	
 }

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

@@ -17,12 +17,12 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.distanthorizons.core.config.api;
+package com.seibel.distanthorizons.api.objects.config;
 
 import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
-import com.seibel.distanthorizons.core.config.types.ConfigEntry;
+import com.seibel.distanthorizons.coreapi.interfaces.config.IConfigEntry;
 import com.seibel.distanthorizons.coreapi.interfaces.config.IConverter;
-import com.seibel.distanthorizons.core.config.api.converters.DefaultConverter;
+import com.seibel.distanthorizons.coreapi.util.converters.DefaultConverter;
 
 import java.util.function.Consumer;
 
@@ -41,7 +41,7 @@ import java.util.function.Consumer;
  */
 public class DhApiConfigValue<coreType, apiType> implements IDhApiConfigValue<apiType>
 {
-	private final ConfigEntry<coreType> configBase;
+	private final IConfigEntry<coreType> configEntry;
 	
 	private final IConverter<coreType, apiType> configConverter;
 	
@@ -53,9 +53,9 @@ public class DhApiConfigValue<coreType, apiType> implements IDhApiConfigValue<ap
 	 * Uses the default object converter, this requires coreType and apiType to be the same.
 	 */
 	@SuppressWarnings("unchecked") // DefaultConverter's cast is safe
-	public DhApiConfigValue(ConfigEntry<coreType> configBase)
+	public DhApiConfigValue(IConfigEntry<coreType> newConfigEntry)
 	{
-		this.configBase = configBase;
+		this.configEntry = newConfigEntry;
 		this.configConverter = (IConverter<coreType, apiType>) new DefaultConverter<coreType>();
 	}
 	
@@ -63,22 +63,22 @@ public class DhApiConfigValue<coreType, apiType> implements IDhApiConfigValue<ap
 	 * This constructor should only be called internally. <br>
 	 * There is no reason for API users to create this object. <br><br>
 	 */
-	public DhApiConfigValue(ConfigEntry<coreType> configBase, IConverter<coreType, apiType> newConverter)
+	public DhApiConfigValue(IConfigEntry<coreType> newConfigEntry, IConverter<coreType, apiType> newConverter)
 	{
-		this.configBase = configBase;
+		this.configEntry = newConfigEntry;
 		this.configConverter = newConverter;
 	}
 	
 	
-	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()); }
+	public apiType getValue() { return this.configConverter.convertToApiType(this.configEntry.get()); }
+	public apiType getTrueValue() { return this.configConverter.convertToApiType(this.configEntry.getTrueValue()); }
+	public apiType getApiValue() { return this.configConverter.convertToApiType(this.configEntry.getApiValue()); }
 	
 	public boolean setValue(apiType newValue)
 	{
-		if (this.configBase.getAllowApiOverride())
+		if (this.configEntry.getAllowApiOverride())
 		{
-			this.configBase.setApiValue(this.configConverter.convertToCoreType(newValue));
+			this.configEntry.setApiValue(this.configConverter.convertToCoreType(newValue));
 			return true;
 		}
 		else
@@ -89,11 +89,11 @@ public class DhApiConfigValue<coreType, apiType> implements IDhApiConfigValue<ap
 	
 	public boolean clearValue()
 	{
-		if (this.configBase.getAllowApiOverride())
+		if (this.configEntry.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);
+			this.configEntry.setApiValue(null);
 			return true;
 		}
 		else
@@ -102,16 +102,16 @@ public class DhApiConfigValue<coreType, apiType> implements IDhApiConfigValue<ap
 		}
 	}
 	
-	public boolean getCanBeOverrodeByApi() { return this.configBase.getAllowApiOverride(); }
+	public boolean getCanBeOverrodeByApi() { return this.configEntry.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()); }
+	public apiType getDefaultValue() { return this.configConverter.convertToApiType(this.configEntry.getDefaultValue()); }
+	public apiType getMaxValue() { return this.configConverter.convertToApiType(this.configEntry.getMax()); }
+	public apiType getMinValue() { return this.configConverter.convertToApiType(this.configEntry.getMin()); }
 	
 	
 	public void addChangeListener(Consumer<apiType> onValueChangeFunc) 
 	{
-		this.configBase.addValueChangeListener((coreValue) -> 
+		this.configEntry.addValueChangeListener((coreValue) -> 
 		{
 			apiType apiValue = this.configConverter.convertToApiType(coreValue);
 			onValueChangeFunc.accept(apiValue);

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

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

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

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

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

@@ -143,23 +143,19 @@ public class ApiEventInjector extends DependencyInjector<IDhApiEvent> implements
 					
 					
 					// attempt to clone the event input if possible
-					// this is done to reduce the likelihood that one event listener 
-					// will change the event parameter for other listeners 
+					// this is done to reduce the likely hood that one event listener 
+					// will make change the event parameter for other listeners 
 					T input = eventInput;
 					if (eventInput instanceof IDhApiEventParam)
 					{
-						IDhApiEventParam dhApiEventParam = (IDhApiEventParam) eventInput;
-						if (dhApiEventParam.getCopyBeforeFire())
+						try
 						{
-							try
-							{
-								//noinspection unchecked
-								input = (T) dhApiEventParam.copy();
-							}
-							catch (Exception e)
-							{
-								LOGGER.error("Unable to clone event parameter [" + eventInput.getClass().getSimpleName() + "], error: [" + e.getMessage() + "].", e);
-							}
+							//noinspection unchecked
+							input = (T) ((IDhApiEventParam) eventInput).copy();
+						}
+						catch (Exception e)
+						{
+							LOGGER.error("Unable to clone event parameter ["+eventInput.getClass().getSimpleName()+"], error: ["+e.getMessage()+"].", e);
 						}
 					}
 					

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 //
-	//==============//
+	public DependencyInjector(Class<BindableType> newBindableInterface)
+	{
+		this.bindableInterface = newBindableInterface;
+		this.allowDuplicateBindings = false;
+	}
 	
 	public DependencyInjector(Class<BindableType> newBindableInterface, boolean newAllowDuplicateBindings)
 	{
@@ -55,16 +57,12 @@ public class DependencyInjector<BindableType extends IBindable> implements IDepe
 	
 	
 	
-	//=========//
-	// binding //
-	//=========//
 	
 	@Override
 	public void bind(Class<? extends BindableType> dependencyInterface, BindableType dependencyImplementation) throws IllegalStateException, IllegalArgumentException
 	{
 		// duplicate check if requested
-		if (this.dependencies.containsKey(dependencyInterface) 
-			&& !this.allowDuplicateBindings)
+		if (this.dependencies.containsKey(dependencyInterface) && !this.allowDuplicateBindings)
 		{
 			throw new IllegalStateException("The dependency [" + dependencyInterface.getSimpleName() + "] has already been bound.");
 		}
@@ -132,54 +130,6 @@ public class DependencyInjector<BindableType extends IBindable> implements IDepe
 	public boolean checkIfClassExtends(Class<?> classToTest, Class<?> extensionToLookFor) { return extensionToLookFor.isAssignableFrom(classToTest); }
 	
 	
-	
-	//===========//
-	// unbinding //
-	//===========//
-	
-	// 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
-		if (!this.dependencies.containsKey(dependencyInterface))
-		{
-			return;
-		}
-		
-		
-		// make sure the given dependency implements the necessary interfaces
-		boolean implementsInterface = this.checkIfClassImplements(dependencyImplementation.getClass(), dependencyInterface)
-				|| this.checkIfClassExtends(dependencyImplementation.getClass(), dependencyInterface);
-		boolean implementsBindable = this.checkIfClassImplements(dependencyImplementation.getClass(), this.bindableInterface);
-		
-		// display any errors
-		if (!implementsInterface)
-		{
-			throw new IllegalArgumentException("The dependency [" + dependencyImplementation.getClass().getSimpleName() + "] doesn't implement or extend: [" + dependencyInterface.getSimpleName() + "].");
-		}
-		if (!implementsBindable)
-		{
-			throw new IllegalArgumentException("The dependency [" + dependencyImplementation.getClass().getSimpleName() + "] doesn't implement the interface: [" + IBindable.class.getSimpleName() + "].");
-		}
-		
-		
-		// make sure the hashSet has an array to hold the dependency
-		if (!this.dependencies.containsKey(dependencyInterface))
-		{
-			this.dependencies.put(dependencyInterface, new ArrayList<BindableType>());
-		}
-		
-		// remove the dependency if present
-		this.dependencies.get(dependencyInterface).remove(dependencyImplementation);
-		this.dependencies.remove(dependencyInterface);
-	}
-	
-	
-	
-	//=========//
-	// getters //
-	//=========//
-	
 	@SuppressWarnings("unchecked")
 	@Override
 	public <T extends BindableType> T get(Class<T> interfaceClass) throws ClassCastException

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

@@ -31,21 +31,21 @@ public final class ModInfo
 	public static final String DEDICATED_SERVER_INITIAL_PATH = "dedicated_server_initial";
 	
 	/** Incremented every time any packets are added, changed or removed, with a few exceptions. */
-	public static final int PROTOCOL_VERSION = 13;
+	public static final int PROTOCOL_VERSION = 12;
 	public static final String WRAPPER_PACKET_PATH = "message";
 	
 	/** The internal mod name */
 	public static final String NAME = "DistantHorizons";
 	/** Human-readable version of NAME */
 	public static final String READABLE_NAME = "Distant Horizons";
-	public static final String VERSION = "2.4.0-b";
+	public static final String VERSION = "2.3.5-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 = 4;
 	/** This version should be updated whenever new methods are added to the DH API */
-	public static final int API_MINOR_VERSION = 0;
+	public static final int API_MINOR_VERSION = 1;
 	/** This version should be updated whenever non-breaking fixes are added to the DH API */
 	public static final int API_PATCH_VERSION = 0;
 	

api/src/main/java/com/seibel/distanthorizons/coreapi/interfaces/config/IConfigEntry.java

@@ -0,0 +1,83 @@
+/*
+ *    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.coreapi.interfaces.config;
+
+
+import java.util.function.Consumer;
+
+/**
+ * Use for making the config variables
+ *
+ * @author coolGi
+ * @version 2022-5-26
+ */
+public interface IConfigEntry<T>
+{
+	
+	/** Gets the default value of the option */
+	T getDefaultValue();
+	
+	void setApiValue(T newApiValue);
+	T getApiValue();
+	
+	/** Returns true if this config can be set via the API. */
+	boolean getAllowApiOverride();
+	
+	void set(T newValue);
+	T get();
+	T getTrueValue();
+	
+	/** Sets the value without saving */
+	void setWithoutSaving(T newValue);
+	
+	/** Gets the min value */
+	T getMin();
+	/** Sets the min value */
+	void setMin(T newMin);
+	/** Gets the max value */
+	T getMax();
+	/** Sets the max value */
+	void setMax(T newMax);
+	/** Sets the min and max in 1 setter */
+	void setMinMax(T newMin, T newMax);
+	
+	/** Gets the comment */
+	String getComment();
+	/** Sets the comment */
+	void setComment(String newComment);
+	
+	/**
+	 * Checks if the option is valid
+	 *
+	 * 0 == valid
+	 * 2 == invalid
+	 * 1 == number too high
+	 * -1 == number too low
+	 */
+	byte isValid(); // TODO replace with an enum
+	/** Checks if a value is valid */
+	byte isValid(T value);
+	
+	/** Is the value of this equal to another */
+	boolean equals(IConfigEntry<?> obj);
+	
+	void addValueChangeListener(Consumer<T> onValueChangeFunc);
+	
+}

api/src/main/java/com/seibel/distanthorizons/coreapi/util/converters/ApiFogDrawModeConverter.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.distanthorizons.core.config.api.converters;
+package com.seibel.distanthorizons.coreapi.util.converters;
 
 import com.seibel.distanthorizons.api.enums.rendering.EDhApiFogDrawMode;
 import com.seibel.distanthorizons.coreapi.interfaces.config.IConverter;

api/src/main/java/com/seibel/distanthorizons/coreapi/util/converters/DefaultConverter.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.distanthorizons.core.config.api.converters;
+package com.seibel.distanthorizons.coreapi.util.converters;
 
 import com.seibel.distanthorizons.coreapi.interfaces.config.IConverter;
 

api/src/main/java/com/seibel/distanthorizons/coreapi/util/converters/RenderModeEnabledConverter.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.distanthorizons.core.config.api.converters;
+package com.seibel.distanthorizons.coreapi.util.converters;
 
 import com.seibel.distanthorizons.api.enums.rendering.EDhApiRendererMode;
 import com.seibel.distanthorizons.coreapi.interfaces.config.IConverter;

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

@@ -19,9 +19,7 @@
 
 package com.seibel.distanthorizons.core;
 
-import com.github.luben.zstd.ZstdOutputStream;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.render.renderer.generic.GenericRenderObjectFactory;
 import com.seibel.distanthorizons.core.sql.DatabaseUpdater;
 import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
@@ -34,7 +32,7 @@ import com.seibel.distanthorizons.api.DhApi;
 import com.seibel.distanthorizons.core.render.DhApiRenderProxy;
 import net.jpountz.lz4.LZ4FrameOutputStream;
 import org.apache.logging.log4j.LogManager;
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.Logger;
 import org.sqlite.SQLiteJDBCLoader;
 import org.sqlite.util.OSInfo;
 import org.tukaani.xz.XZOutputStream;
@@ -45,7 +43,8 @@ import java.io.File;
 /** Handles first time Core setup. */
 public class Initializer
 {
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = LogManager.getLogger(ModInfo.NAME + "-" + Initializer.class.getSimpleName());
+	private static final IMinecraftClientWrapper MC_CLIENT = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
 	
 	
 	public static void init()
@@ -55,9 +54,8 @@ public class Initializer
 		{
 			// if any library isn't present in the jar its class
 			// will throw an error (not an exception)
-			Class<?> lz4Compressor = LZ4FrameOutputStream.class;
-			Class<?> zstdCompressor = ZstdOutputStream.class;
-			Class<?> lzmaCompressor = XZOutputStream.class;
+			Class<?> fastCompressor = LZ4FrameOutputStream.class;
+			Class<?> smallCompressor = XZOutputStream.class;
 			//Class<?> networking = ByteBuf.class;
 			Class<?> config = com.electronwill.nightconfig.core.Config.class;
 			Class<?> oldFastUtil = it.unimi.dsi.fastutil.longs.LongArrayList.class; // available in 8.2.1
@@ -65,6 +63,30 @@ public class Initializer
 			Class<?> sqliteJava = org.sqlite.SQLiteConnection.class;
 			Class<?> sqliteNative = org.sqlite.core.NativeDB.class;
 			
+			//// maybe these lines are needed to shade SQLite, James isn't sure.
+			//// Although they never seemed to fail, which is a bit odd.
+			//try
+			//{
+			//	// needed by Forge to load the Java database connection
+			//	Class.forName("org.sqlite.JDBC");
+			//	LOGGER.info("loaded normal SQLITE");
+			//}
+			//catch (ClassNotFoundException e)
+			//{
+			//	LOGGER.warn("normal: " + e.getMessage(), e);
+			//}
+			//
+			//try
+			//{
+			//	// needed by Forge to load the Java database connection
+			//	Class.forName("DistantHorizons.libraries.sqlite.JDBC");
+			//	LOGGER.info("loaded shaded SQLITE");
+			//}
+			//catch (ClassNotFoundException e)
+			//{
+			//	LOGGER.warn("shaded: " + e.getMessage(), e);
+			//}
+			
 			boolean sqliteLoaded = SQLiteJDBCLoader.initialize();
 			if (!sqliteLoaded)
 			{

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

@@ -21,7 +21,7 @@ package com.seibel.distanthorizons.core.api.external.methods.config.client;
 
 import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
 import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiAmbientOcclusionConfig;
-import com.seibel.distanthorizons.core.config.api.DhApiConfigValue;
+import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue;
 import com.seibel.distanthorizons.core.config.Config;
 
 public class DhApiAmbientOcclusionConfig implements IDhApiAmbientOcclusionConfig

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

@@ -21,7 +21,7 @@ package com.seibel.distanthorizons.core.api.external.methods.config.client;
 
 import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
 import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiDebuggingConfig;
-import com.seibel.distanthorizons.core.config.api.DhApiConfigValue;
+import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.api.enums.rendering.EDhApiDebugRendering;
 

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

@@ -22,7 +22,7 @@ package com.seibel.distanthorizons.core.api.external.methods.config.client;
 import com.seibel.distanthorizons.api.enums.rendering.EDhApiFogFalloff;
 import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
 import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiFarFogConfig;
-import com.seibel.distanthorizons.core.config.api.DhApiConfigValue;
+import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue;
 import com.seibel.distanthorizons.core.config.Config;
 
 public class DhApiFarFogConfig implements IDhApiFarFogConfig

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

@@ -25,9 +25,9 @@ import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
 import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiFarFogConfig;
 import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiFogConfig;
 import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiHeightFogConfig;
-import com.seibel.distanthorizons.core.config.api.DhApiConfigValue;
+import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue;
 import com.seibel.distanthorizons.core.config.Config;
-import com.seibel.distanthorizons.core.config.api.converters.ApiFogDrawModeConverter;
+import com.seibel.distanthorizons.coreapi.util.converters.ApiFogDrawModeConverter;
 
 public class DhApiFogConfig implements IDhApiFogConfig
 {

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

@@ -21,7 +21,7 @@ package com.seibel.distanthorizons.core.api.external.methods.config.client;
 
 import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
 import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiGenericRenderingConfig;
-import com.seibel.distanthorizons.core.config.api.DhApiConfigValue;
+import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue;
 import com.seibel.distanthorizons.core.config.Config;
 
 public class DhApiGenericRenderingConfig implements IDhApiGenericRenderingConfig

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

@@ -23,10 +23,10 @@ import com.seibel.distanthorizons.api.enums.config.*;
 import com.seibel.distanthorizons.api.enums.rendering.EDhApiTransparency;
 import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
 import com.seibel.distanthorizons.api.interfaces.config.client.*;
-import com.seibel.distanthorizons.core.config.api.DhApiConfigValue;
+import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue;
 import com.seibel.distanthorizons.api.enums.rendering.EDhApiRendererMode;
 import com.seibel.distanthorizons.core.config.Config;
-import com.seibel.distanthorizons.core.config.api.converters.RenderModeEnabledConverter;
+import com.seibel.distanthorizons.coreapi.util.converters.RenderModeEnabledConverter;
 
 public class DhApiGraphicsConfig implements IDhApiGraphicsConfig
 {
@@ -97,9 +97,10 @@ public class DhApiGraphicsConfig implements IDhApiGraphicsConfig
 	public IDhApiConfigValue<Boolean> tintWithAvoidedBlocks()
 	{ return new DhApiConfigValue<Boolean, Boolean>(Config.Client.Advanced.Graphics.Quality.tintWithAvoidedBlocks); }
 	
-	@Override
-	public IDhApiConfigValue<Integer> getBiomeBlending()
-	{ return new DhApiConfigValue<Integer, Integer>(Config.Client.Advanced.Graphics.Quality.lodBiomeBlending); }
+	// TODO re-implement
+//	@Override
+//	public IDhApiConfigValue<Integer> getBiomeBlending()
+//	{ return new DhApiConfigValue<Integer, Integer>(Quality.lodBiomeBlending); }
 	
 	
 	

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

@@ -24,7 +24,7 @@ import com.seibel.distanthorizons.api.enums.rendering.EDhApiHeightFogMixMode;
 import com.seibel.distanthorizons.api.enums.rendering.EDhApiHeightFogDirection;
 import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
 import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiHeightFogConfig;
-import com.seibel.distanthorizons.core.config.api.DhApiConfigValue;
+import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue;
 import com.seibel.distanthorizons.core.config.Config;
 
 public class DhApiHeightFogConfig implements IDhApiHeightFogConfig

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

@@ -21,7 +21,7 @@ package com.seibel.distanthorizons.core.api.external.methods.config.client;
 
 import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
 import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiMultiThreadingConfig;
-import com.seibel.distanthorizons.core.config.api.DhApiConfigValue;
+import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue;
 import com.seibel.distanthorizons.core.config.Config;
 
 public class DhApiMultiThreadingConfig implements IDhApiMultiThreadingConfig

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

@@ -21,7 +21,7 @@ package com.seibel.distanthorizons.core.api.external.methods.config.client;
 
 import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
 import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiMultiplayerConfig;
-import com.seibel.distanthorizons.core.config.api.DhApiConfigValue;
+import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.api.enums.config.EDhApiServerFolderNameMode;
 

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

@@ -21,7 +21,7 @@ package com.seibel.distanthorizons.core.api.external.methods.config.client;
 
 import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
 import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiNoiseTextureConfig;
-import com.seibel.distanthorizons.core.config.api.DhApiConfigValue;
+import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue;
 import com.seibel.distanthorizons.core.config.Config;
 
 public class DhApiNoiseTextureConfig implements IDhApiNoiseTextureConfig

core/src/main/java/com/seibel/distanthorizons/core/api/external/methods/config/common/DhApiWorldGenerationConfig.java

@@ -21,7 +21,7 @@ package com.seibel.distanthorizons.core.api.external.methods.config.common;
 
 import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
 import com.seibel.distanthorizons.api.interfaces.config.both.IDhApiWorldGenerationConfig;
-import com.seibel.distanthorizons.core.config.api.DhApiConfigValue;
+import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue;
 import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiDistantGeneratorMode;
 import com.seibel.distanthorizons.core.config.Config;
 

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

@@ -2,10 +2,10 @@ package com.seibel.distanthorizons.core.api.external.methods.data;
 
 import com.seibel.distanthorizons.api.interfaces.data.IDhApiTerrainDataCache;
 import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
-import com.seibel.distanthorizons.core.logging.DhLogger;
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import it.unimi.dsi.fastutil.longs.Long2ReferenceOpenHashMap;
 import it.unimi.dsi.fastutil.longs.LongSet;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.Nullable;
 
 import java.lang.ref.SoftReference;
@@ -15,7 +15,7 @@ public class DhApiTerrainDataCache implements IDhApiTerrainDataCache
 	private final Object modificationLock = new Object();
 	private Long2ReferenceOpenHashMap<SoftReference<FullDataSourceV2>> posToFullDataRef = new Long2ReferenceOpenHashMap<>();
 	
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = LogManager.getLogger(DhApiTerrainDataCache.class.getSimpleName());
 	
 	
 	

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

@@ -31,7 +31,6 @@ import com.seibel.distanthorizons.core.dataObjects.fullData.FullDataPointIdMap;
 import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
 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.DhSectionPos;
 import com.seibel.distanthorizons.core.render.renderer.DebugRenderer;
@@ -49,7 +48,8 @@ import com.seibel.distanthorizons.coreapi.util.BitShiftUtil;
 import com.seibel.distanthorizons.core.util.math.Vec3d;
 import com.seibel.distanthorizons.core.util.math.Vec3i;
 import it.unimi.dsi.fastutil.longs.LongArrayList;
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.Nullable;
 
 import java.awt.*;
@@ -64,7 +64,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 {
 	public static DhApiTerrainDataRepo INSTANCE = new DhApiTerrainDataRepo();
 	
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = LogManager.getLogger(DhApiTerrainDataRepo.class.getSimpleName());
 	
 	// debugging values
 	private static volatile boolean debugThreadRunning = false;
@@ -258,7 +258,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 			//===============================//
 			
 			FullDataPointIdMap mapping = dataSource.mapping;
-			LongArrayList dataColumn = dataSource.getColumnAtRelPos(relativePos.x, relativePos.z);
+			LongArrayList dataColumn = dataSource.get(relativePos.x, relativePos.z);
 			if (dataColumn != null)
 			{
 				int dataColumnIndexCount = dataColumn.size();
@@ -277,7 +277,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 					if (!getSpecificYCoordinate)
 					{
 						// if we aren't look for a specific datapoint, add each datapoint to the return array
-						returnArray[i] = DhApiTerrainDataPointUtil.createApiDatapoint(levelWrapper.getMinHeight(), mapping, requestedDetailLevel, dataPoint);
+						returnArray[i] = DhApiTerrainDataPointUtil.createApiDatapoint(levelWrapper, mapping, requestedDetailLevel, dataPoint);
 					}
 					else
 					{
@@ -294,7 +294,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 							if (bottomY <= requestedY && requestedY < topY) // blockPositions start from the bottom of the block, thus "<=" for bottomY, just "<" for topY
 							{
 								// this datapoint contains the requested block position, return it
-								DhApiTerrainDataPoint apiTerrainData = DhApiTerrainDataPointUtil.createApiDatapoint(levelWrapper.getMinHeight(), mapping, requestedDetailLevel, dataPoint);
+								DhApiTerrainDataPoint apiTerrainData = DhApiTerrainDataPointUtil.createApiDatapoint(levelWrapper, mapping, requestedDetailLevel, dataPoint);
 								return DhApiResult.createSuccess(new DhApiTerrainDataPoint[]{apiTerrainData});
 							}
 						}
@@ -345,10 +345,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 			@Nullable
 			IDhApiTerrainDataCache dataCache)
 	{
-		return this.raycastLodData(levelWrapper, 
-				new Vec3d(rayOriginX, rayOriginY, rayOriginZ), 
-				new Vec3f(rayDirectionX, rayDirectionY, rayDirectionZ), 
-				maxRayBlockLength, dataCache);
+		return this.raycastLodData(levelWrapper, new Vec3d(rayOriginX, rayOriginY, rayOriginZ), new Vec3f(rayDirectionX, rayDirectionY, rayDirectionZ), maxRayBlockLength, dataCache);
 	}
 	
 	/**
@@ -366,8 +363,8 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 	{
 		rayDirection.normalize();
 		
-		int minLevelBlockHeight = levelWrapper.getMinHeight();
-		int maxLevelBlockHeight = levelWrapper.getMaxHeight();
+		int minBlockHeight = levelWrapper.getMinHeight();
+		int maxBlockHeight = levelWrapper.getMaxHeight();
 		
 		
 		
@@ -383,8 +380,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 		DhApiRaycastResult closetFoundDataPoint = null;
 		
 		
-		while (blockPos.y >= minLevelBlockHeight 
-				&& blockPos.y < maxLevelBlockHeight
+		while (blockPos.y >= minBlockHeight && blockPos.y < maxBlockHeight
 				&& currentLength <= maxRayBlockLength)
 		{
 			// get the LOD columns around this position
@@ -407,8 +403,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 					{
 						// does this LOD contain the given Y position?
 						Vec3i dataPointPos = new Vec3i(columnPos.x, dataPoint.bottomYBlockPos, columnPos.z);
-						if (exactPos.y >= dataPoint.bottomYBlockPos 
-							&& exactPos.y <= dataPoint.topYBlockPos)
+						if (exactPos.y >= dataPoint.bottomYBlockPos && exactPos.y <= dataPoint.topYBlockPos)
 						{
 							if (closetFoundDataPoint == null)
 							{
@@ -508,7 +503,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(), true);
 		
 		
 		return DhApiResult.createSuccess();
@@ -521,7 +516,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 	//=============//
 	
 	@Override
-	public IDhApiTerrainDataCache createSoftCache() { return new DhApiTerrainDataCache(); }
+	public IDhApiTerrainDataCache getSoftCache() { return new DhApiTerrainDataCache(); }
 	
 	
 	
@@ -577,16 +572,12 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 					}
 					
 					// draw raycast position
-					if (rayCast.success 
-						&& rayCast.payload != null)
+					if (rayCast.success && rayCast.payload != null)
 					{
 						DebugRenderer.makeParticle(
 							new DebugRenderer.BoxParticle(
 								new DebugRenderer.Box(
-									DhSectionPos.encode((byte) 0, rayCast.payload.pos.x, rayCast.payload.pos.z), 
-										rayCast.payload.dataPoint.bottomYBlockPos, 
-										rayCast.payload.dataPoint.topYBlockPos, 
-										-0.1f, Color.RED),
+									DhSectionPos.encode((byte) 0, rayCast.payload.pos.x, rayCast.payload.pos.z), rayCast.payload.dataPoint.bottomYBlockPos, rayCast.payload.dataPoint.topYBlockPos, -0.1f, Color.RED),
 							1.0, 0f
 							)
 						);

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

@@ -23,17 +23,17 @@ import com.seibel.distanthorizons.api.DhApi;
 import com.seibel.distanthorizons.api.enums.config.EDhApiMcRenderingFadeMode;
 import com.seibel.distanthorizons.api.enums.rendering.EDhApiRenderPass;
 import com.seibel.distanthorizons.api.methods.events.abstractEvents.*;
-import com.seibel.distanthorizons.core.api.internal.rendering.DhRenderState;
+import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiRenderParam;
 import com.seibel.distanthorizons.core.file.structure.ClientOnlySaveStructure;
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.network.messages.MessageRegistry;
 import com.seibel.distanthorizons.core.pos.DhChunkPos;
 import com.seibel.distanthorizons.core.render.DhApiRenderProxy;
-import com.seibel.distanthorizons.core.render.renderer.*;
+import com.seibel.distanthorizons.core.render.renderer.FadeRenderer;
 import com.seibel.distanthorizons.core.util.TimerUtil;
 import com.seibel.distanthorizons.core.util.objects.Pair;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
 import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector;
+import com.seibel.distanthorizons.core.level.IDhClientLevel;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.network.messages.AbstractNetworkMessage;
 import com.seibel.distanthorizons.core.network.session.NetworkSession;
@@ -42,22 +42,30 @@ 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.logging.ConfigBasedLogger;
+import com.seibel.distanthorizons.core.logging.ConfigBasedSpamLogger;
+import com.seibel.distanthorizons.core.logging.SpamReducedLogger;
+import com.seibel.distanthorizons.core.util.math.Mat4f;
 import com.seibel.distanthorizons.core.render.glObject.GLProxy;
+import com.seibel.distanthorizons.core.render.renderer.TestRenderer;
+import com.seibel.distanthorizons.core.util.RenderUtil;
 import com.seibel.distanthorizons.core.world.AbstractDhWorld;
+import com.seibel.distanthorizons.core.world.DhClientServerWorld;
 import com.seibel.distanthorizons.core.world.DhClientWorld;
 import com.seibel.distanthorizons.core.world.IDhClientWorld;
 import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IProfilerWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 import org.lwjgl.glfw.GLFW;
 
 import java.io.File;
 import java.util.*;
 import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
 
 /**
  * This holds the methods that should be called
@@ -66,7 +74,7 @@ import java.util.concurrent.LinkedBlockingQueue;
  */
 public class ClientApi
 {
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = LogManager.getLogger();
 	
 	public static boolean prefLoggerEnabled = false;
 	
@@ -76,6 +84,8 @@ public class ClientApi
 	private static final IMinecraftClientWrapper MC_CLIENT = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
 	private static final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
 	
+	public static final long SPAM_LOGGER_FLUSH_NS = TimeUnit.NANOSECONDS.convert(1, TimeUnit.SECONDS);
+	
 	/** this includes the is dev build message and low allocated memory warning */
 	private static final int MS_BETWEEN_STATIC_STARTUP_MESSAGES = 4_000;
 	
@@ -87,13 +97,14 @@ public class ClientApi
 	 * 
 	 * Only downside is making sure each variable is populated before rendering.
 	 */
-	public static final DhRenderState RENDER_STATE = new DhRenderState();
+	public static final RenderState RENDER_STATE = new RenderState();
 	
 	
 	private boolean isDevBuildMessagePrinted = false;
 	private boolean lowMemoryWarningPrinted = false;
 	private boolean highVanillaRenderDistanceWarningPrinted = false;
 	
+	/** when the last static */
 	private long lastStaticWarningMessageSentMsTime = 0L;
 	
 	private final Queue<String> chatMessageQueueForNextFrame = new LinkedBlockingQueue<>();
@@ -101,6 +112,8 @@ public class ClientApi
 	
 	public boolean rendererDisabledBecauseOfExceptions = false;
 	
+	private long lastFlushNanoTime = 0;
+	
 	private final ClientPluginChannelApi pluginChannelApi = new ClientPluginChannelApi(this::clientLevelLoadEvent, this::clientLevelUnloadEvent);
 	
 	/** Delay loading the first level to give the server some time to respond with level to actually load */
@@ -112,8 +125,8 @@ 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<>();
 	
-	@Nullable
-	public String lastRenderParamValidationMessage = null;
+	/** re-set every frame during the opaque rendering stage */
+	private boolean renderingCancelledForThisFrame;
 	
 	
 	
@@ -318,11 +331,10 @@ public class ClientApi
 	
 	
 	
-	//============//
-	// clint tick //
-	//============//
+	//===============//
+	// render events //
+	//===============//
 	
-	@Deprecated
 	public void clientTickEvent()
 	{
 		IProfilerWrapper profiler = MC_CLIENT.getProfiler();
@@ -330,10 +342,25 @@ public class ClientApi
 		
 		try
 		{
-			IDhClientWorld clientWorld = SharedApi.tryGetDhClientWorld();
+			boolean doFlush = System.nanoTime() - this.lastFlushNanoTime >= SPAM_LOGGER_FLUSH_NS;
+			if (doFlush)
+			{
+				this.lastFlushNanoTime = System.nanoTime();
+				SpamReducedLogger.flushAll();
+			}
+			ConfigBasedLogger.updateAll();
+			ConfigBasedSpamLogger.updateAll(doFlush);
+			
+			IDhClientWorld clientWorld = SharedApi.getIDhClientWorld();
 			if (clientWorld != null)
 			{
 				clientWorld.clientTick();
+				
+				// Ignore local world gen, as it's managed by server ticking
+				if (!(clientWorld instanceof DhClientServerWorld))
+				{
+					SharedApi.worldGenTick(clientWorld::worldGenTick);
+				}
 			}
 		}
 		catch (Exception e)
@@ -367,24 +394,27 @@ public class ClientApi
 	
 	
 	
-	//===============//
-	// LOD rendering //
-	//===============//
+	//===========//
+	// rendering //
+	//===========//
 	
 	/** Should be called before {@link ClientApi#renderDeferredLodsForShaders} */
-	public void renderLods() { this.renderLodLayer(false); }
+	public void renderLods(IClientLevelWrapper levelWrapper, Mat4f mcModelViewMatrix, Mat4f mcProjectionMatrix, float partialTicks)
+	{ this.renderLodLayer(levelWrapper, mcModelViewMatrix, mcProjectionMatrix, partialTicks, false); }
 	
 	/** 
 	 * Only necessary when Shaders are in use.
 	 * Should be called after {@link ClientApi#renderLods} 
 	 */
-	public void renderDeferredLodsForShaders() { this.renderLodLayer(true); }
+	public void renderDeferredLodsForShaders(IClientLevelWrapper levelWrapper, Mat4f mcModelViewMatrix, Mat4f mcProjectionMatrix, float partialTicks)
+	{ this.renderLodLayer(levelWrapper, mcModelViewMatrix, mcProjectionMatrix, partialTicks, true); }
 	
-	private void renderLodLayer(boolean renderingDeferredLayer)
+	
+	private void renderLodLayer(
+			IClientLevelWrapper levelWrapper, Mat4f mcModelViewMatrix, Mat4f mcProjectionMatrix, float partialTicks,
+			boolean renderingDeferredLayer)
 	{
-		//=========//
 		// logging //
-		//=========//
 		
 		this.sendQueuedChatMessages();
 		
@@ -394,33 +424,7 @@ public class ClientApi
 		
 		
 		
-		//=====================//
-		// render thread tasks //
-		//=====================//
-		
-		// only run these tasks once per frame
-		if (!renderingDeferredLayer)
-		{
-			profiler.push("DH render thread tasks");
-			
-			try
-			{
-				// these tasks always need to be called, regardless of whether the renderer is enabled or not to prevent memory leaks
-				GLProxy.getInstance().runRenderThreadTasks();
-			}
-			catch (Exception e)
-			{
-				LOGGER.error("Unexpected issue running render thread tasks, error: [" + e.getMessage() + "].", e);
-			}
-			
-			profiler.pop();
-		}
-		
-		
-		
-		//=================//
-		// parameter setup //
-		//=================//
+		// render parameter setup //
 		
 		EDhApiRenderPass renderPass;
 		if (DhApiRenderProxy.INSTANCE.getDeferTransparentRendering())
@@ -439,67 +443,86 @@ public class ClientApi
 			renderPass = EDhApiRenderPass.OPAQUE_AND_TRANSPARENT;
 		}
 		
-		// A global render state variable is used since MC has split up their
-		// render prep and actual rendering into different threads/methods
-		// this is annoying since it's possible to start a render with only
-		// partially complete info, but there isn't a better option at the moment
-		RenderParams renderParams =
-			new RenderParams(
-				renderPass,
-				RENDER_STATE.frameTime,
-				RENDER_STATE.mcProjectionMatrix, RENDER_STATE.mcModelViewMatrix,
-				RENDER_STATE.clientLevelWrapper
-			);
+		DhApiRenderParam renderEventParam =
+				new DhApiRenderParam(
+						renderPass,
+						partialTicks,
+						RenderUtil.getNearClipPlaneDistanceInBlocks(partialTicks), RenderUtil.getFarClipPlaneDistanceInBlocks(),
+						mcProjectionMatrix, mcModelViewMatrix,
+						RenderUtil.createLodProjectionMatrix(mcProjectionMatrix, partialTicks), RenderUtil.createLodModelViewMatrix(mcModelViewMatrix),
+						levelWrapper.getMinHeight()
+				);
 		
 		
 		
-		//============//
-		// validation //
-		//============//
-		
-		// TODO write this message to the F3 menu so people can see when a different mod screws with the lightmap
-		String validationMessage = renderParams.getValidationErrorMessage();
-		if (validationMessage != null)
-		{
-			this.lastRenderParamValidationMessage = validationMessage;
-			return;
-		}
-		else
-		{
-			this.lastRenderParamValidationMessage = null;
-		}
-		
-		if (this.rendererDisabledBecauseOfExceptions)
-		{
-			// re-enable rendering if the user toggles DH rendering
-			if (!Config.Client.quickEnableRendering.get())
-			{
-				LOGGER.info("DH Renderer re-enabled after exception. Some rendering issues may occur. Please reboot Minecraft if you see any rendering issues.");
-				this.rendererDisabledBecauseOfExceptions = false;
-				Config.Client.quickEnableRendering.set(true);
-			}
-			
-			return;
-		}
+		//Mat4f mcCombined = mcModelViewMatrix.copy();
+		//mcCombined.multiply(mcProjectionMatrix);
+		//
+		//com.seibel.distanthorizons.api.objects.math.DhApiMat4f dhCombined = renderEventParam.dhModelViewMatrix.copy();
+		//dhCombined.multiply(renderEventParam.dhProjectionMatrix);
+		//
+		//LOGGER.info("\n\n" +
+		//		"API\n" +
+		//		"Mc MVM: \n" + mcModelViewMatrix.toString() + "\n" +
+		//		"Mc Proj: \n" + mcProjectionMatrix + "\n" +
+		//		"Mc Combined:\n" + mcCombined.toString() + "\n" +
+		//		"\n" +
+		//		"DH MVM: \n" + renderEventParam.dhModelViewMatrix.toString() + "\n" +
+		//		"DH Proj: \n" + renderEventParam.dhProjectionMatrix + "\n" +
+		//		"DH Combined:\n" + mcCombined.toString()
+		//);
 		
 		
 		
-		//===========//
-		// rendering //
-		//===========//
+		// render validation //
 		
 		try
 		{
+			// TODO write this message to the F3 menu so people can see when a different mod screws with the lightmap
+			String reasonLodsCannotRender = RenderUtil.shouldLodsRender(levelWrapper, renderEventParam);
+			if (reasonLodsCannotRender != null)
+			{
+				return;
+			}
+			
+			IDhClientWorld dhClientWorld = SharedApi.getIDhClientWorld();
+			if (dhClientWorld == null)
+			{
+				return;
+			}
+			
+			IDhClientLevel level = (IDhClientLevel) dhClientWorld.getLevel(levelWrapper);
+			if (level == null)
+			{
+				return;
+			}
+			
+			
+			if (this.rendererDisabledBecauseOfExceptions)
+			{
+				// re-enable rendering if the user toggles DH rendering
+				if (!Config.Client.quickEnableRendering.get())
+				{
+					LOGGER.info("DH Renderer re-enabled after exception. Some rendering issues may occur. Please reboot Minecraft if you see any rendering issues.");
+					this.rendererDisabledBecauseOfExceptions = false;
+					Config.Client.quickEnableRendering.set(true);
+				}
+				
+				return;
+			}
+			
+			
+			
 			// render pass //
 			
 			if (!renderingDeferredLayer)
 			{
 				if (Config.Client.Advanced.Debugging.rendererMode.get() == EDhApiRendererMode.DEFAULT)
 				{
-					boolean renderingCancelledForThisFrame = ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeRenderEvent.class, renderParams);
-					if (!renderingCancelledForThisFrame)
+					this.renderingCancelledForThisFrame = ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeRenderEvent.class, renderEventParam);
+					if (!this.renderingCancelledForThisFrame)
 					{
-						LodRenderer.INSTANCE.render(renderParams, profiler);
+						level.render(renderEventParam, profiler);
 					}
 					
 					if (!DhApi.Delayed.renderProxy.getDeferTransparentRendering())
@@ -516,10 +539,10 @@ public class ClientApi
 			}
 			else
 			{
-				boolean renderingCancelled = ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeDeferredRenderEvent.class, renderParams);
+				boolean renderingCancelled = ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeDeferredRenderEvent.class, renderEventParam);
 				if (!renderingCancelled)
 				{
-					LodRenderer.INSTANCE.renderDeferred(renderParams, profiler);
+					level.renderDeferred(renderEventParam, profiler);
 				}
 				
 				
@@ -539,68 +562,54 @@ public class ClientApi
 			MC_CLIENT.sendChatMessage("\u00A74Toggle DH rendering via the config UI to re-activate DH rendering.");
 			MC_CLIENT.sendChatMessage("\u00A74Error: " + e);
 		}
-		
-		
-		
-		profiler.pop(); // end LOD
-		profiler.push("terrain"); // go back into "terrain"
+		finally
+		{
+			try
+			{
+				// these tasks always need to be called, regardless of whether the renderer is enabled or not to prevent memory leaks
+				GLProxy.getInstance().runRenderThreadTasks();
+			}
+			catch (Exception e)
+			{
+				LOGGER.error("Unexpected issue running render thread tasks.", e);
+			}
+			
+			
+			profiler.pop(); // end LOD
+			profiler.push("terrain"); // go back into "terrain"
+		}
 	}
 	
-	
-	
-	//================//
-	// fade rendering //
-	//================//
-	
-	/** 
-	 * The first fade pass.
-	 * Called after MC finishes rendering the opaque passes. 
-	 */
-	public void renderFadeOpaque()
+	/** should be called after DH and MC finish rendering so we can smooth the transition between the two */
+	public void renderFadeOpaque(Mat4f mcModelViewMatrix, Mat4f mcProjectionMatrix, float partialTicks, IClientLevelWrapper level)
 	{
 		// only fade when DH is rendering
 		if (Config.Client.Advanced.Debugging.rendererMode.get() == EDhApiRendererMode.DEFAULT
-			&&
-			(
-				// only fade when requested
-				Config.Client.Advanced.Graphics.Quality.vanillaFadeMode.get() == EDhApiMcRenderingFadeMode.DOUBLE_PASS
-				// or if LOD-only mode is enabled (fading is used to remove the MC render pass)
-				|| Config.Client.Advanced.Debugging.lodOnlyMode.get()
-			)
+			// only fade when requested
+			&& Config.Client.Advanced.Graphics.Quality.vanillaFadeMode.get() == EDhApiMcRenderingFadeMode.DOUBLE_PASS
 			// 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);
+			FadeRenderer.INSTANCE.render(mcModelViewMatrix, mcProjectionMatrix, partialTicks, level);
 		}
 	}
-	/** 
-	 * The second fade pass.
-	 * Called after MC finishes rendering both opaque
-	 * and transparent passes. 
-	 */
-	public void renderFadeTransparent()
+	/** should be called after DH and MC finish rendering so we can smooth the transition between the two */
+	public void renderFade(Mat4f mcModelViewMatrix, Mat4f mcProjectionMatrix, float partialTicks, IClientLevelWrapper level)
 	{
 		// only fade when DH is rendering
-		if (Config.Client.Advanced.Debugging.rendererMode.get() == EDhApiRendererMode.DEFAULT)
+		if (Config.Client.Advanced.Debugging.rendererMode.get() == EDhApiRendererMode.DEFAULT
+			// only fade when requested
+			&& Config.Client.Advanced.Graphics.Quality.vanillaFadeMode.get() != EDhApiMcRenderingFadeMode.NONE
+			// don't fade when Iris shaders are active, otherwise the rendering can get weird
+			&& !DhApiRenderProxy.INSTANCE.getDeferTransparentRendering())
 		{
-			boolean renderFade =
-				(
-					// only fade when requested
-					Config.Client.Advanced.Graphics.Quality.vanillaFadeMode.get() != EDhApiMcRenderingFadeMode.NONE
-					// or if LOD-only mode is enabled (fading is used to remove the MC render pass)
-					|| Config.Client.Advanced.Debugging.lodOnlyMode.get()
-				)
-				// don't fade when Iris shaders are active, otherwise the rendering can get weird
-				&& !DhApiRenderProxy.INSTANCE.getDeferTransparentRendering();
-			if (renderFade)
-			{
-				VanillaFadeRenderer.INSTANCE.render(RENDER_STATE.mcModelViewMatrix, RENDER_STATE.mcProjectionMatrix, RENDER_STATE.frameTime, RENDER_STATE.clientLevelWrapper);
-			}
+			FadeRenderer.INSTANCE.render(mcModelViewMatrix, mcProjectionMatrix, partialTicks, level);
 		}
 	}
 	
 	
 	
+	
 	//=================//
 	//    DEBUG USE    //
 	//=================//
@@ -767,4 +776,45 @@ public class ClientApi
 	
 	
 	
+	//================//
+	// helper classes //
+	//================//
+	
+	public static class RenderState
+	{
+		public Mat4f mcModelViewMatrix = null;
+		public Mat4f mcProjectionMatrix = null;
+		public float frameTime = -1;
+		
+		
+		public void canRenderOrThrow() throws IllegalStateException
+		{
+			String errorReasons = "";
+			
+			if (this.mcModelViewMatrix == null)
+			{
+				errorReasons += "no MVM Matrix, ";
+			}
+			
+			if (this.mcProjectionMatrix == null)
+			{
+				errorReasons += "no Projection Matrix, ";
+			}
+			
+			if (this.frameTime == -1)
+			{
+				errorReasons += "no Frame Time, ";
+			}
+			
+			
+			if (!errorReasons.isEmpty())
+			{
+				throw new IllegalStateException(errorReasons);
+			}
+			
+		}
+	}
+	
+	
+	
 }

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

@@ -4,15 +4,14 @@ import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.level.IKeyedClientLevelManager;
 import com.seibel.distanthorizons.core.level.IServerKeyedClientLevel;
-import com.seibel.distanthorizons.core.logging.DhLogger;
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.logging.ConfigBasedLogger;
 import com.seibel.distanthorizons.core.network.event.internal.CloseInternalEvent;
 import com.seibel.distanthorizons.core.network.messages.base.LevelInitMessage;
 import com.seibel.distanthorizons.core.network.session.NetworkSession;
-import com.seibel.distanthorizons.core.render.glObject.GLProxy;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
-import org.jetbrains.annotations.NotNull;
+import org.apache.logging.log4j.LogManager;
+import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Objects;
@@ -23,10 +22,8 @@ import java.util.function.Consumer;
  */
 public class ClientPluginChannelApi
 {
-	private static final DhLogger LOGGER = new DhLoggerBuilder()
-			.fileLevelConfig(Config.Common.Logging.logNetworkEventToFile)
-			.build();  
-			
+	private static final ConfigBasedLogger LOGGER = new ConfigBasedLogger(LogManager.getLogger(),
+			() -> Config.Common.Logging.logNetworkEvent.get());
 	private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
 	private static final IKeyedClientLevelManager KEYED_CLIENT_LEVEL_MANAGER = SingletonInjector.INSTANCE.get(IKeyedClientLevelManager.class);
 	
@@ -68,7 +65,7 @@ public class ClientPluginChannelApi
 	//================//
 	
 	/** fired when this client connects to a server with DH support */
-	public void onJoinServer(@NotNull NetworkSession networkSession)
+	public void onJoinServer(@NonNull NetworkSession networkSession)
 	{
 		Objects.requireNonNull(networkSession);
 		this.networkSession = networkSession;
@@ -78,19 +75,14 @@ public class ClientPluginChannelApi
 	
 	private void onLevelInitMessage(LevelInitMessage msg)
 	{
-		if (!msg.serverKey.isEmpty() && !msg.serverKey.matches(LevelInitMessage.SERVER_KEY_REGEX))
-		{
-			throw new IllegalArgumentException("Server sent invalid server key.");
-		}
-		
-		if (!msg.levelKey.matches(LevelInitMessage.LEVEL_KEY_REGEX))
+		if (!msg.levelKey.matches(LevelInitMessage.VALIDATION_REGEX))
 		{
 			throw new IllegalArgumentException("Server sent invalid level key.");
 		}
 		
 		LOGGER.info("Server level key received: [" + msg.levelKey + "].");
 		
-		GLProxy.getInstance().queueRunningOnRenderThread(() -> 
+		MC.executeOnRenderThread(() -> 
 		{
 			IClientLevelWrapper clientLevel = MC.getWrappedClientLevel(true);
 			IServerKeyedClientLevel existingKeyedClientLevel = KEYED_CLIENT_LEVEL_MANAGER.getServerKeyedLevel();
@@ -113,12 +105,10 @@ public class ClientPluginChannelApi
 				this.levelUnloadHandler.accept(clientLevel);
 			}
 			
-			if (existingKeyedClientLevel == null
-					|| !existingKeyedClientLevel.getServerKey().equals(msg.serverKey)
-					|| !existingKeyedClientLevel.getServerLevelKey().equals(msg.levelKey))
+			if (existingKeyedClientLevel == null || !existingKeyedClientLevel.getServerLevelKey().equals(msg.levelKey))
 			{
 				LOGGER.info("Loading level with key: [" + msg.levelKey + "].");
-				IServerKeyedClientLevel keyedLevel = KEYED_CLIENT_LEVEL_MANAGER.setServerKeyedLevel(clientLevel, msg.serverKey, msg.levelKey);
+				IServerKeyedClientLevel keyedLevel = KEYED_CLIENT_LEVEL_MANAGER.setServerKeyedLevel(clientLevel, msg.levelKey);
 				this.levelLoadHandler.accept(keyedLevel);
 			}
 		});

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

@@ -30,7 +30,7 @@ import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper;
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -41,7 +41,7 @@ public class ServerApi
 {
 	public static final ServerApi INSTANCE = new ServerApi();
 	
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
 	
 	
@@ -53,6 +53,30 @@ public class ServerApi
 	
 	
 	
+	//=============//
+	// tick events //
+	//=============//
+	
+	public void serverTickEvent()
+	{
+		try
+		{
+			IDhServerWorld serverWorld = SharedApi.getIDhServerWorld();
+			if (serverWorld != null)
+			{
+				serverWorld.serverTick();
+				SharedApi.worldGenTick(serverWorld::worldGenTick);
+			}
+		}
+		catch (Exception e)
+		{
+			// try catch is necessary to prevent crashing the internal server when an exception is thrown
+			LOGGER.error("ServerTickEvent error: " + e.getMessage(), e);
+		}
+	}
+	
+	
+	
 	//===============//
 	// server events //
 	//===============//
@@ -112,8 +136,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, false); }
+	public void serverChunkSaveEvent(IChunkWrapper chunkWrapper, ILevelWrapper level) { SharedApi.INSTANCE.applyChunkUpdate(chunkWrapper, level, true); }
 	
 	
 	
@@ -128,7 +152,7 @@ public class ServerApi
 			return;
 		}
 		
-		IDhServerWorld serverWorld = SharedApi.tryGetDhServerWorld();
+		IDhServerWorld serverWorld = SharedApi.getIDhServerWorld();
 		LOGGER.info("Player ["+player.getName()+"] joined.");
 		if (serverWorld != null)
 		{
@@ -142,7 +166,7 @@ public class ServerApi
 			return;
 		}
 		
-		IDhServerWorld serverWorld = SharedApi.tryGetDhServerWorld();
+		IDhServerWorld serverWorld = SharedApi.getIDhServerWorld();
 		LOGGER.info("Player ["+player.getName()+"] disconnected.");
 		if (serverWorld != null)
 		{
@@ -156,7 +180,7 @@ public class ServerApi
 			return;
 		}
 		
-		IDhServerWorld serverWorld = SharedApi.tryGetDhServerWorld();
+		IDhServerWorld serverWorld = SharedApi.getIDhServerWorld();
 		LOGGER.info("Player ["+player.getName()+"] changed level: ["+originLevel.getKeyedLevelDimensionName()+"] -> ["+destinationLevel.getKeyedLevelDimensionName()+"].");
 		if (serverWorld != null)
 		{
@@ -176,7 +200,7 @@ public class ServerApi
 			return;
 		}
 		
-		IDhServerWorld serverWorld = SharedApi.tryGetDhServerWorld();
+		IDhServerWorld serverWorld = SharedApi.getIDhServerWorld();
 		if (serverWorld != null)
 		{
 			serverWorld.getServerPlayerStateManager().handlePluginMessage(player, message);

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

@@ -22,8 +22,6 @@ package com.seibel.distanthorizons.core.api.internal;
 import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiWorldLoadEvent;
 import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiWorldUnloadEvent;
 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.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.generation.DhLightingEngine;
@@ -47,7 +45,7 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSha
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
 import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector;
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
@@ -58,7 +56,7 @@ public class SharedApi
 {
 	public static final SharedApi INSTANCE = new SharedApi();
 	
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	/** will be null on the server-side */
 	@Nullable
 	private static final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
@@ -67,20 +65,20 @@ public class SharedApi
 	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();
+	private static final UpdateChunkPosManager UPDATE_POS_MANAGER = new UpdateChunkPosManager();
 	/** 
 	 * 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;
+	private 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 static final int MIN_MS_BETWEEN_OVERLOADED_LOG_MESSAGE = 30_000;
 	
 	
-	@Nullable
 	private static AbstractDhWorld currentWorld;
 	private static int lastWorldGenTickDelta = 0;
+	private static long lastOverloadedLogMessageMsTime = 0;
 	
 	
 	
@@ -129,7 +127,7 @@ 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();
+			UPDATE_POS_MANAGER.clear();
 			
 			// recommend that the garbage collector cleans up any objects from the old world and thread pools
 			System.gc();
@@ -141,16 +139,23 @@ public class SharedApi
 		}
 	}
 	
-	@Nullable
+	public static void worldGenTick(Runnable worldGenRunnable)
+	{
+		lastWorldGenTickDelta--;
+		if (lastWorldGenTickDelta <= 0)
+		{
+			worldGenRunnable.run();
+			lastWorldGenTickDelta = 20;
+		}
+	}
+	
 	public static AbstractDhWorld getAbstractDhWorld() { return currentWorld; }
-	
+	/** returns null if the {@link SharedApi#currentWorld} isn't a {@link DhClientServerWorld} */
+	public static DhClientServerWorld getDhClientServerWorld() { return (currentWorld instanceof DhClientServerWorld) ? (DhClientServerWorld) currentWorld : null; }
 	/** returns null if the {@link SharedApi#currentWorld} isn't a {@link DhClientWorld} or {@link DhClientServerWorld} */
-	@Nullable
-	public static IDhClientWorld tryGetDhClientWorld() { return (currentWorld instanceof IDhClientWorld) ? (IDhClientWorld) currentWorld : null; }
-	
+	public static IDhClientWorld getIDhClientWorld() { return (currentWorld instanceof IDhClientWorld) ? (IDhClientWorld) currentWorld : null; }
 	/** returns null if the {@link SharedApi#currentWorld} isn't a {@link DhServerWorld} or {@link DhClientServerWorld} */
-	@Nullable
-	public static IDhServerWorld tryGetDhServerWorld() { return (currentWorld instanceof IDhServerWorld) ? (IDhServerWorld) currentWorld : null; }
+	public static IDhServerWorld getIDhServerWorld() { return (currentWorld instanceof IDhServerWorld) ? (IDhServerWorld) currentWorld : null; }
 	
 	
 	
@@ -163,10 +168,10 @@ public class SharedApi
 	 * 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))); }
+	{ return UPDATE_POS_MANAGER.contains(new DhChunkPos(new DhBlockPos2D(blockPosX, blockPosZ))); }
 	
 	public static boolean isChunkAtChunkPosAlreadyUpdating(int chunkPosX, int chunkPosZ)
-	{ return CHUNK_UPDATE_QUEUE_MANAGER.contains(new DhChunkPos(chunkPosX, chunkPosZ)); }
+	{ return UPDATE_POS_MANAGER.contains(new DhChunkPos(chunkPosX, chunkPosZ)); }
 	
 	/** 
 	 * This is often fired when unloading a level.
@@ -174,18 +179,17 @@ public class SharedApi
 	 * rapidly changing dimensions.
 	 * (IE prevent DH from infinitely allocating memory 
 	 */
-	public void clearQueuedChunkUpdates() { CHUNK_UPDATE_QUEUE_MANAGER.clear(); }
+	public void clearQueuedChunkUpdates() { UPDATE_POS_MANAGER.clear(); }
 	
-	public int getQueuedChunkUpdateCount() { return CHUNK_UPDATE_QUEUE_MANAGER.getQueuedCount(); }
+	public int getQueuedChunkUpdateCount() { return UPDATE_POS_MANAGER.closestQueue.size(); }
 	
 	
 	
 	/** 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 chunkBlockChangedEvent(IChunkWrapper chunk, ILevelWrapper level) { this.applyChunkUpdate(chunk, level, true); }
+	public void chunkLoadEvent(IChunkWrapper chunk, ILevelWrapper level) { this.applyChunkUpdate(chunk, level, false); }
 	
-	//public void applyChunkUpdate(IChunkWrapper chunkWrapper, ILevelWrapper level, boolean canGetNeighboringChunks) { this.applyChunkUpdate(chunkWrapper, level, canGetNeighboringChunks, false); }
-	public void applyChunkUpdate(IChunkWrapper chunkWrapper, ILevelWrapper level, boolean canGetNeighboringChunks, boolean newlyLoaded)
+	public void applyChunkUpdate(IChunkWrapper chunkWrapper, ILevelWrapper level, boolean updateNeighborChunks)
 	{
 		//========================//
 		// world and level checks //
@@ -241,7 +245,7 @@ public class SharedApi
 		}
 		
 		// shoudln't normally happen, but just in case
-		if (CHUNK_UPDATE_QUEUE_MANAGER.contains(chunkWrapper.getChunkPos()))
+		if (UPDATE_POS_MANAGER.contains(chunkWrapper.getChunkPos()))
 		{
 			// TODO this will prevent some LODs from updating across dimensions if multiple levels are loaded
 			return;
@@ -253,53 +257,23 @@ public class SharedApi
 		// update the necessary chunk(s) //
 		//===============================//
 		
-		if (!canGetNeighboringChunks)
+		if (!updateNeighborChunks)
 		{
 			// only update the center chunk
-			queueChunkUpdate(chunkWrapper, null, dhLevel, false);
-			return;
-		}
-		
-		
-		ArrayList<IChunkWrapper> neighboringChunkList = getNeighborChunkListForChunk(chunkWrapper, dhLevel);
-		
-		if (newlyLoaded)
-		{
-			// this means this chunkWrapper is a newly loaded chunk 
-			// which may be missing some neighboring chunk data
-			// because it is bordering the render distance
-			// thus, only the chunks neighboring this chunkWrapper will get updated
-			// because those are more likely to have their full neighboring chunk data
-			//TODO this does not prevent those neighboring chunks from updating
-			// this newly loaded chunk that were just skipped
-			// leading to occasional lighting issues
-			for (IChunkWrapper neighboringChunk : neighboringChunkList)
-			{
-				if (neighboringChunk == chunkWrapper)
-				{
-					continue;
-				}
-				
-				this.applyChunkUpdate(neighboringChunk, level, true, false);
-			}
+			
+			queueChunkUpdate(chunkWrapper, null, dhLevel);
 		}
 		else
 		{
-			// if not all neighboring chunk data is available, do not try to update
-			if (neighboringChunkList.size() < 9)
-			{
-				return;
-			}
-			
 			// update the center with any existing neighbour chunks. 
 			// this is done so lighting changes are propagated correctly
-			queueChunkUpdate(chunkWrapper, neighboringChunkList, dhLevel, true);
+			queueChunkUpdate(chunkWrapper, getNeighbourChunkListForChunk(chunkWrapper,dhLevel), dhLevel);
 		}
 	}
-	private static ArrayList<IChunkWrapper> getNeighborChunkListForChunk(IChunkWrapper chunkWrapper, IDhLevel dhLevel)
+	private static ArrayList<IChunkWrapper> getNeighbourChunkListForChunk(IChunkWrapper chunkWrapper, IDhLevel dhLevel)
 	{
 		// get the neighboring chunk list
-		ArrayList<IChunkWrapper> neighborChunkList = new ArrayList<>(9);
+		ArrayList<IChunkWrapper> neighbourChunkList = new ArrayList<>(9);
 		for (int xOffset = -1; xOffset <= 1; xOffset++)
 		{
 			for (int zOffset = -1; zOffset <= 1; zOffset++)
@@ -307,36 +281,80 @@ public class SharedApi
 				if (xOffset == 0 && zOffset == 0)
 				{
 					// center chunk
-					neighborChunkList.add(chunkWrapper);
+					neighbourChunkList.add(chunkWrapper);
 				}
 				else
 				{
-					// neighboring chunk 
-					DhChunkPos neighborPos = new DhChunkPos(chunkWrapper.getChunkPos().getX() + xOffset, chunkWrapper.getChunkPos().getZ() + zOffset);
-					IChunkWrapper neighborChunk = dhLevel.getLevelWrapper().tryGetChunk(neighborPos);
-					if (neighborChunk != null)
+					// neighboring chunk
+					DhChunkPos neighbourPos = new DhChunkPos(chunkWrapper.getChunkPos().getX() + xOffset, chunkWrapper.getChunkPos().getZ() + zOffset);
+					IChunkWrapper neighbourChunk = dhLevel.getLevelWrapper().tryGetChunk(neighbourPos);
+					if (neighbourChunk != null)
 					{
-						neighborChunkList.add(neighborChunk);
+						neighbourChunkList.add(neighbourChunk);
 					}
 				}
 			}
 		}
-		return neighborChunkList;
+		return neighbourChunkList;
 	}
 	
-	private static void queueChunkUpdate(IChunkWrapper chunkWrapper, @Nullable ArrayList<IChunkWrapper> neighborChunkList, IDhLevel dhLevel, boolean canGetNeighboringChunks)
+	private static void queueChunkUpdate(IChunkWrapper chunkWrapper, @Nullable ArrayList<IChunkWrapper> neighbourChunkList, IDhLevel dhLevel) 
+	{ queueChunkUpdate(chunkWrapper, neighbourChunkList, dhLevel,false); }
+	private static void queueChunkUpdate(IChunkWrapper chunkWrapper, @Nullable ArrayList<IChunkWrapper> neighbourChunkList, IDhLevel dhLevel, boolean lightUpdateOnly)
 	{
-				
-		// return if the chunk is already queued
-		if (CHUNK_UPDATE_QUEUE_MANAGER.contains(chunkWrapper.getChunkPos()))
+		int maxUpdateSizeMultiplier;
+		if (MC_CLIENT != null && MC_CLIENT.playerExists())
 		{
-			return;
+			// Local worlds & multiplayer
+			UPDATE_POS_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();
+		}
+		
+		UPDATE_POS_MANAGER.maxSize = MAX_UPDATING_CHUNK_COUNT_PER_THREAD_AND_PLAYER
+				* Config.Common.MultiThreading.numberOfThreads.get()
+				* maxUpdateSizeMultiplier;
+		
+		UpdateChunkData updateData = new UpdateChunkData(chunkWrapper, neighbourChunkList, dhLevel, lightUpdateOnly);
+		if(lightUpdateOnly)
+		{
+			UPDATE_POS_MANAGER.removeItem(chunkWrapper.getChunkPos());
+		}
+		int remainingCapacity = UPDATE_POS_MANAGER.addItem(chunkWrapper.getChunkPos(), updateData);
+		if (remainingCapacity <= 0)
+		{
+			// limit how often an overloaded message can be sent
+			long msBetweenLastLog = System.currentTimeMillis() - lastOverloadedLogMessageMsTime;
+			if (msBetweenLastLog >= MIN_MS_BETWEEN_OVERLOADED_LOG_MESSAGE)
+			{
+				lastOverloadedLogMessageMsTime = System.currentTimeMillis();
+				
+				String message = "\u00A76" + "Distant Horizons overloaded, too many chunks queued for LOD processing. " + "\u00A7r" +
+						"\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 ["+UPDATE_POS_MANAGER.maxSize+"] (["+ MAX_UPDATING_CHUNK_COUNT_PER_THREAD_AND_PLAYER +"] per thread+players).";
+				
+				boolean showWarningInChat = Config.Common.Logging.Warning.showUpdateQueueOverloadedChatWarning.get();
+				if (showWarningInChat)
+				{
+					ClientApi.INSTANCE.showChatMessageNextFrame(message);
+				}
+				
+				// Don't log warnings in singleplayer or in hosted LAN since it usually isn't a problem (and if it is it's easy to notice).
+				// Servers should always log since being overloaded is harder to notice. 
+				EWorldEnvironment environment = SharedApi.getEnvironment();
+				if (showWarningInChat || environment == EWorldEnvironment.SERVER_ONLY)
+				{
+					LOGGER.warn(message);
+				}
+			}
 		}
-			
 		
-		// add chunk update data to preUpdate queue
-		ChunkUpdateData updateData = new ChunkUpdateData(chunkWrapper, neighborChunkList, dhLevel, canGetNeighboringChunks);
-		CHUNK_UPDATE_QUEUE_MANAGER.addItemToPreUpdateQueue(chunkWrapper.getChunkPos(), updateData);
 		
 		
 		// queue updates up to the number of CPU cores allocated for the job
@@ -347,7 +365,7 @@ public class SharedApi
 		{
 			try
 			{
-				executor.execute(SharedApi::processQueue);
+				executor.execute(SharedApi::processQueuedChunkUpdate);
 			}
 			catch (RejectedExecutionException ignore)
 			{
@@ -355,159 +373,94 @@ public class SharedApi
 			}
 		}
 	}
-	
-	private static void processQueue()
-	{
-		// update the center & max size of the queue manager
-		int maxUpdateSizeMultiplier;
-		if (MC_CLIENT != null && MC_CLIENT.playerExists())
-		{
-			// Local worlds & multiplayer
-			CHUNK_UPDATE_QUEUE_MANAGER.setCenter(MC_CLIENT.getPlayerChunkPos());
-			maxUpdateSizeMultiplier = MC_CLIENT.clientConnectedToDedicatedServer() ? 1 : MC_SHARED.getPlayerCount();
-		}
-		else
-		{
-			// Dedicated servers
-			// Also includes spawn chunks since they're likely to be intentionally utilized with updates
-			maxUpdateSizeMultiplier = 1 + MC_SHARED.getPlayerCount();
-		}
-		
-		CHUNK_UPDATE_QUEUE_MANAGER.maxSize = MAX_UPDATING_CHUNK_COUNT_PER_THREAD_AND_PLAYER
-				* Config.Common.MultiThreading.numberOfThreads.get()
-				* maxUpdateSizeMultiplier;
-		
-		
-		
-		//===============================//
-		// update the necessary chunk(s) //
-		//===============================//
-		
-		// process preUpdate queue
-		processQueuedChunkPreUpdate();
-		
-		// process update queue
-		processQueuedChunkUpdate();
-		
-		// queue the next position if there are still positions to process
-		AbstractExecutorService executor = ThreadPoolUtil.getChunkToLodBuilderExecutor();
-		if (executor != null && !CHUNK_UPDATE_QUEUE_MANAGER.isEmpty())
-		{
-			try
-			{
-				executor.execute(SharedApi::processQueue);
-			}
-			catch (RejectedExecutionException ignore)
-			{
-				// the executor was shut down, it should be back up shortly and able to accept new jobs
-			}
-		}
-		
-	}
-	
-	private static void processQueuedChunkPreUpdate()
-	{
-		ChunkUpdateData preUpdateData = CHUNK_UPDATE_QUEUE_MANAGER.preUpdateQueue.popClosest();
-		if (preUpdateData == null)
-		{
-			return;
-		}
-		
-		IDhLevel dhLevel = preUpdateData.dhLevel;
-		IChunkWrapper chunkWrapper = preUpdateData.chunkWrapper;
-		boolean canGetNeighboringChunks = preUpdateData.canGetNeighboringChunks;
-		ArrayList<IChunkWrapper> neighborChunkList = preUpdateData.neighborChunkList;
-		
-		try
-		{
-			// check if this chunk has been converted into an LOD already
-			boolean checkChunkHash = !Config.Common.LodBuilding.disableUnchangedChunkCheck.get();
-			if (checkChunkHash)
-			{
-				int oldChunkHash = dhLevel.getChunkHash(chunkWrapper.getChunkPos()); // shouldn't happen on the render thread since it may take a few moments to run
-				int newChunkHash = chunkWrapper.getBlockBiomeHashCode();
-				
-				boolean hasNewChunkHash = (oldChunkHash != newChunkHash);
-				if (!hasNewChunkHash)
-				{
-					// do not update the chunk if the hash is the same
-					return;
-				}
-				
-				// if this chunk will update and can get neighbors
-				// then queue neighboring chunks to update as well
-				// neighboring chunk will get added directly to the update queue
-				// so they won't queue further chunk updates
-				if (neighborChunkList != null 
-					&& !neighborChunkList.isEmpty())
-				{
-					for (IChunkWrapper adjacentChunk : neighborChunkList)
-					{
-						// pulling a new chunkWrapper is necessary to prevent concurrent modification on the existing chunkWrappers
-						IChunkWrapper newCenterChunk = dhLevel.getLevelWrapper().tryGetChunk(adjacentChunk.getChunkPos());
-						if (newCenterChunk != null)
-						{
-							ChunkUpdateData newUpdateData;
-							if (canGetNeighboringChunks)
-							{
-								newUpdateData = new ChunkUpdateData(newCenterChunk, getNeighborChunkListForChunk(newCenterChunk, dhLevel), dhLevel, true);
-							}
-							else
-							{
-								newUpdateData = new ChunkUpdateData(newCenterChunk, null, dhLevel, false);
-							}
-							
-							CHUNK_UPDATE_QUEUE_MANAGER.addItemToUpdateQueue(newCenterChunk.getChunkPos(), newUpdateData);
-						}
-					}
-				}
-			}
-			
-			CHUNK_UPDATE_QUEUE_MANAGER.addItemToUpdateQueue(chunkWrapper.getChunkPos(), preUpdateData);
-		}
-		catch (Exception e)
-		{
-			LOGGER.error("Unexpected error when pre-updating chunk at pos: [" + chunkWrapper.getChunkPos() + "]", e);
-		}
-	}
-	
 	private static void processQueuedChunkUpdate()
 	{
 		//LOGGER.trace(chunkWrapper.getChunkPos() + " " + executor.getActiveCount() + " / " + executor.getQueue().size() + " - " + executor.getCompletedTaskCount());
 		
-		ChunkUpdateData updateData = CHUNK_UPDATE_QUEUE_MANAGER.updateQueue.popClosest();
+		UpdateChunkData updateData = UPDATE_POS_MANAGER.popClosest();
 		if (updateData == null)
 		{
 			return;
 		}
 		
 		IChunkWrapper chunkWrapper = updateData.chunkWrapper;
+		@Nullable ArrayList<IChunkWrapper> neighbourChunkList = updateData.neighbourChunkList;
 		IDhLevel dhLevel = updateData.dhLevel;
-		ILevelWrapper levelWrapper = dhLevel.getLevelWrapper();
-		// having a list of the nearby chunks is needed for lighting and beacon generation
-		@Nullable ArrayList<IChunkWrapper> nearbyChunkList = updateData.neighborChunkList; 
 		
-		// a non-null list is needed for the lighting engine
-		if (nearbyChunkList == null)
-		{
-			nearbyChunkList = new ArrayList<IChunkWrapper>();
-			nearbyChunkList.add(chunkWrapper);
-		}
 		
 		try
 		{
+			boolean checkChunkHash = !Config.Common.LodBuilding.disableUnchangedChunkCheck.get();
+			
+			// check if this chunk has been converted into an LOD already
+			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();
+			if (checkChunkHash)
+			{
+				if (oldChunkHash == newChunkHash && !updateData.lightUpdateOnly)
+				{
+					// if the chunk hashes are the same then we don't need to bother with lighting the chunk
+					// or creating/updating the LODs
+					return;
+				}
+			}
+			
+			
+			// having a list of the nearby chunks is needed for lighting and beacon generation
+			ArrayList<IChunkWrapper> nearbyChunkList;
+			if (neighbourChunkList != null)
+			{
+				nearbyChunkList = neighbourChunkList;
+			}
+			else
+			{
+				nearbyChunkList = new ArrayList<>(1);
+				nearbyChunkList.add(chunkWrapper);
+			}
+			
+			// if this chunk will update its lighting
+			// then queue adjacent chunks to update theirs as well
+			// adjacent chunk will have 'lightUpdateOnly' true 
+			// so they won't schedule further chunk updates
+			if (!updateData.lightUpdateOnly)
+			{
+				for (IChunkWrapper adjacentChunk : nearbyChunkList)
+				{
+					// pulling a new chunkWrapper is necessary to prevent concurrent modification on the existing chunkWrappers
+					IChunkWrapper newCenterChunk = dhLevel.getLevelWrapper().tryGetChunk(adjacentChunk.getChunkPos());
+					if (newCenterChunk != null)
+					{
+						queueChunkUpdate(newCenterChunk, getNeighbourChunkListForChunk(newCenterChunk, dhLevel), dhLevel, true);
+					}
+				}
+			}
+			
 			// 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);
+			DhLightingEngine.INSTANCE.bakeChunkBlockLighting(chunkWrapper, nearbyChunkList, dhLevel.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);
 		}
+		finally
+		{
+			// queue the next position if there are still positions to process
+			AbstractExecutorService executor = ThreadPoolUtil.getChunkToLodBuilderExecutor();
+			if (executor != null && !UPDATE_POS_MANAGER.updateDataByChunkPos.isEmpty())
+			{
+				try
+				{
+					executor.execute(SharedApi::processQueuedChunkUpdate);
+				}
+				catch (RejectedExecutionException ignore)
+				{
+					// the executor was shut down, it should be back up shortly and able to accept new jobs
+				}
+			}
+		}
 	}
 	
 	
@@ -518,13 +471,161 @@ public class SharedApi
 	
 	public String getDebugMenuString()
 	{
-		String preUpdatingCountStr = F3Screen.NUMBER_FORMAT.format(CHUNK_UPDATE_QUEUE_MANAGER.preUpdateQueue.getQueuedCount());
-		String updatingCountStr = F3Screen.NUMBER_FORMAT.format(CHUNK_UPDATE_QUEUE_MANAGER.updateQueue.getQueuedCount());
-		String queuedCountStr = F3Screen.NUMBER_FORMAT.format(CHUNK_UPDATE_QUEUE_MANAGER.getQueuedCount());
+		String updatingCountStr = F3Screen.NUMBER_FORMAT.format(UPDATE_POS_MANAGER.closestQueue.size());
+		String maxUpdateCountStr = F3Screen.NUMBER_FORMAT.format(UPDATE_POS_MANAGER.maxSize);
+		return "Queued chunk updates: "+updatingCountStr+" / "+maxUpdateCountStr;
+	}
+	
+	
+	
+	//================//
+	// helper classes //
+	//================//
+	
+	/** contains the objects needed to update a chunk */
+	private static class UpdateChunkData
+	{
+		public IChunkWrapper chunkWrapper;
+		@Nullable
+		public ArrayList<IChunkWrapper> neighbourChunkList;
+		public IDhLevel dhLevel;
+		/** adjacent chunks will only update their light */
+		public boolean lightUpdateOnly;
 		
-		String maxUpdateCountStr = F3Screen.NUMBER_FORMAT.format(CHUNK_UPDATE_QUEUE_MANAGER.maxSize);
+		public UpdateChunkData(IChunkWrapper chunkWrapper, @Nullable ArrayList<IChunkWrapper> neighbourChunkList, IDhLevel dhLevel, boolean lightUpdateOnly)
+		{
+			this.chunkWrapper = chunkWrapper;
+			this.neighbourChunkList = neighbourChunkList;
+			this.dhLevel = dhLevel;
+			this.lightUpdateOnly = lightUpdateOnly;
+		}
+	}
+	
+	/** keeps track of which chunks need to be updated */
+	private static class UpdateChunkPosManager
+	{
+		private final PriorityBlockingQueue<DhChunkPos> closestQueue;
+		private final PriorityBlockingQueue<DhChunkPos> furthestQueue;
+		private final ConcurrentHashMap<DhChunkPos, UpdateChunkData> updateDataByChunkPos;
+		
+		private DhChunkPos center;
+		private int maxSize = 500;
+		
+		
+		
+		//=============//
+		// constructor //
+		//=============//
+		
+		public UpdateChunkPosManager()
+		{
+			this.closestQueue = new PriorityBlockingQueue<>(500, Comparator.comparingDouble(pos -> pos.squaredDistance(this.center)));
+			this.furthestQueue = new PriorityBlockingQueue<>(500, Comparator.comparingDouble(pos -> ((DhChunkPos)pos).squaredDistance(this.center)).reversed());
+			this.updateDataByChunkPos = new ConcurrentHashMap<>();
+			// defaulting to 0,0 is fine since it'll be updated once we start adding items 
+			this.center = new DhChunkPos(0, 0);
+		}
+		
+		
+		
+		//==================//
+		// list/set methods //
+		//==================//
+		
+		public boolean contains(DhChunkPos pos) { return this.updateDataByChunkPos.containsKey(pos); }
+		
+		public void clear()
+		{
+			this.updateDataByChunkPos.clear();
+			this.closestQueue.clear();
+			this.furthestQueue.clear();
+		}
+		
+		public void removeItem(DhChunkPos pos)
+		{
+			this.updateDataByChunkPos.remove(pos);
+			this.closestQueue.remove(pos);
+			this.furthestQueue.remove(pos);
+		}
+		
+		/**
+		 * Adds an item to the queue of chunks that need to be updated.
+		 * If there are no more slots, replaces the item furthest from the center.
+		 *
+		 * @return The number of remaining slots available in the queue.
+		 */
+		public int addItem(DhChunkPos pos, UpdateChunkData updateData)
+		{
+			int remainingSlots = this.maxSize - this.updateDataByChunkPos.size();
+			if (this.updateDataByChunkPos.containsKey(pos))
+			{
+				// Chunk is already present in queue, no need to insert
+				return remainingSlots;
+			}
+			
+			// If no slots are left, get one by removing the item furthest from the center
+			if (remainingSlots <= 0)
+			{
+				DhChunkPos furthest = this.furthestQueue.poll();
+				if (furthest != null)
+				{
+					this.closestQueue.remove(furthest);
+					this.updateDataByChunkPos.remove(furthest);
+				}
+			}
+			
+			this.updateDataByChunkPos.put(pos, updateData);
+			this.closestQueue.add(pos);
+			this.furthestQueue.add(pos);
+			
+			return remainingSlots;
+		}
+		
+		
+		
+		//==================//
+		// position methods //
+		//==================//
+		
+		public void setCenter(DhChunkPos newCenter)
+		{
+			// if the rebuild time takes too long 
+			// (in James' testing a queue of 500 items only took around 0.1 milliseconds)
+			// this equation could be changed to only update after moving 2 or 4 chunks from the center
+			if (newCenter.equals(this.center))
+			{
+				return;
+			}
+			
+			this.center = newCenter;
+			
+			// rebuild the priority queues to match the new center
+			this.closestQueue.clear();
+			this.furthestQueue.clear();
+			for (DhChunkPos pos : this.updateDataByChunkPos.keySet())
+			{
+				this.closestQueue.add(pos);
+				this.furthestQueue.add(pos);
+			}
+		}
+		
+		public UpdateChunkData popClosest()
+		{
+			if (this.closestQueue.isEmpty())
+			{
+				return null;
+			}
+			
+			DhChunkPos closest = this.closestQueue.poll();
+			if (closest == null)
+			{
+				return null;
+			}
+			
+			this.furthestQueue.remove(closest);
+			return this.updateDataByChunkPos.remove(closest);
+		}
 		
-		return "Queued chunk updates: "+"( "+preUpdatingCountStr+" + "+updatingCountStr+" )  [ "+queuedCountStr+" / "+maxUpdateCountStr+" ]";
 	}
 	
 	

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

@@ -1,125 +0,0 @@
-package com.seibel.distanthorizons.core.api.internal.chunkUpdating;
-
-import com.seibel.distanthorizons.core.api.internal.SharedApi;
-import com.seibel.distanthorizons.core.pos.DhChunkPos;
-
-import java.util.Comparator;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.PriorityBlockingQueue;
-
-public class ChunkPosQueue
-{
-	private final PriorityBlockingQueue<DhChunkPos> closestQueue;
-	private final PriorityBlockingQueue<DhChunkPos> furthestQueue;
-	private final ConcurrentHashMap<DhChunkPos, ChunkUpdateData> updateDataByChunkPos;
-	
-	private DhChunkPos center;
-	
-	
-	
-	//=============//
-	// constructor //
-	//=============//
-	
-	public ChunkPosQueue()
-	{
-		this.closestQueue = new PriorityBlockingQueue<>(500, Comparator.comparingDouble(pos -> pos.squaredDistance(this.center)));
-		this.furthestQueue = new PriorityBlockingQueue<>(500, Comparator.comparingDouble(pos -> ((DhChunkPos)pos).squaredDistance(this.center)).reversed());
-		this.updateDataByChunkPos = new ConcurrentHashMap<>();
-		// defaulting to 0,0 is fine since it'll be updated once we start adding items 
-		this.center = new DhChunkPos(0, 0);
-	}
-	
-	
-	
-	//==============//
-	// list methods //
-	//==============//
-	
-	public boolean contains(DhChunkPos pos) { return this.updateDataByChunkPos.containsKey(pos); }
-	
-	public void clear()
-	{
-		this.updateDataByChunkPos.clear();
-		this.closestQueue.clear();
-		this.furthestQueue.clear();
-	}
-	
-	public void addItem(DhChunkPos pos, ChunkUpdateData updateData)
-	{
-		if (this.updateDataByChunkPos.containsKey(pos))
-		{
-			// Chunk is already present in queue, no need to insert
-			return;
-		}
-		this.updateDataByChunkPos.put(pos, updateData);
-		this.closestQueue.add(pos);
-		this.furthestQueue.add(pos);
-	}
-	
-	public int getQueuedCount() { return this.updateDataByChunkPos.size(); }
-	
-	public boolean isEmpty() { return this.updateDataByChunkPos.isEmpty(); }
-	
-	
-	
-	//==================//
-	// position methods //
-	//==================//
-	
-	public void setCenter(DhChunkPos newCenter)
-	{
-		// if the rebuild time takes too long 
-		// (in James' testing a queue of 500 items only took around 0.1 milliseconds)
-		// this equation could be changed to only update after moving 2 or 4 chunks from the center
-		if (newCenter.equals(this.center))
-		{
-			return;
-		}
-		
-		this.center = newCenter;
-		
-		// rebuild the priority queues to match the new center
-		this.closestQueue.clear();
-		this.furthestQueue.clear();
-		for (DhChunkPos pos : this.updateDataByChunkPos.keySet())
-		{
-			this.closestQueue.add(pos);
-			this.furthestQueue.add(pos);
-		}
-	}
-	
-	public ChunkUpdateData popClosest()
-	{
-		if (this.closestQueue.isEmpty())
-		{
-			return null;
-		}
-		
-		DhChunkPos closest = this.closestQueue.poll();
-		if (closest == null)
-		{
-			return null;
-		}
-		
-		this.furthestQueue.remove(closest);
-		return this.updateDataByChunkPos.remove(closest);
-	}
-	public ChunkUpdateData popFurthest()
-	{
-		if (this.furthestQueue.isEmpty())
-		{
-			return null;
-		}
-		
-		DhChunkPos furthest = this.furthestQueue.poll();
-		if (furthest == null)
-		{
-			return null;
-		}
-		
-		this.closestQueue.remove(furthest);
-		return this.updateDataByChunkPos.remove(furthest);
-	}
-}
-		

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

@@ -1,26 +0,0 @@
-package com.seibel.distanthorizons.core.api.internal.chunkUpdating;
-
-import com.seibel.distanthorizons.core.level.IDhLevel;
-import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.ArrayList;
-
-public class ChunkUpdateData
-{
-	public IChunkWrapper chunkWrapper;
-	@Nullable
-	public ArrayList<IChunkWrapper> neighborChunkList;
-	public IDhLevel dhLevel;
-	public boolean canGetNeighboringChunks;
-	
-	
-	
-	public ChunkUpdateData(IChunkWrapper chunkWrapper, @Nullable ArrayList<IChunkWrapper> neighborChunkList, IDhLevel dhLevel, boolean canGetNeighborChunks)
-	{
-		this.chunkWrapper = chunkWrapper;
-		this.neighborChunkList = neighborChunkList;
-		this.dhLevel = dhLevel;
-		this.canGetNeighboringChunks = canGetNeighborChunks;
-	}
-}

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

@@ -1,165 +0,0 @@
-package com.seibel.distanthorizons.core.api.internal.chunkUpdating;
-
-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.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.pos.DhChunkPos;
-import com.seibel.distanthorizons.core.world.EWorldEnvironment;
-import com.seibel.distanthorizons.core.logging.DhLogger;
-
-import java.util.Collections;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
-public class ChunkUpdateQueueManager
-{
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
-	
-	
-	public final ChunkPosQueue updateQueue;
-	public final ChunkPosQueue preUpdateQueue;
-	public final Set<DhChunkPos> ignoredChunkPosSet = Collections.newSetFromMap(new ConcurrentHashMap<>());
-	
-	public int maxSize = 500;
-	
-	private static long lastOverloadedLogMessageMsTime = 0;
-	
-	
-	
-	//=============//
-	// constructor //
-	//=============//
-	
-	public ChunkUpdateQueueManager()
-	{
-		this.updateQueue = new ChunkPosQueue();
-		this.preUpdateQueue = new ChunkPosQueue();
-	}
-	
-	
-	
-	//==================//
-	// list/set methods //
-	//==================//
-	
-	public boolean contains(DhChunkPos pos) 
-	{ 
-		return this.updateQueue.contains(pos)
-			|| this.ignoredChunkPosSet.contains(pos)	
-			|| this.preUpdateQueue.contains(pos); 
-	}
-	
-	public void clear()
-	{
-		this.updateQueue.clear();
-		this.preUpdateQueue.clear();
-		this.ignoredChunkPosSet.clear();
-	}
-	public int getQueuedCount() { return this.updateQueue.getQueuedCount() + this.preUpdateQueue.getQueuedCount(); }
-	public boolean isEmpty()
-	{
-		return this.updateQueue.isEmpty()
-				&& this.preUpdateQueue.isEmpty();
-	}
-	
-	/**
-	 * Adds an item to the pre-update queue of chunks that might need to be updated.
-	 * If there are no more slots, replaces the item furthest from the center in the update queue.
-	 */
-	public void addItemToPreUpdateQueue(DhChunkPos pos, ChunkUpdateData updateData)
-	{
-		int remainingSlots = this.maxSize - this.getQueuedCount();
-		
-		// If no slots are left, get one by removing the item furthest from the center
-		if (remainingSlots <= 0)
-		{
-			if (!this.updateQueue.isEmpty())
-			{
-				this.updateQueue.popFurthest();
-			}
-			else
-			{
-				this.preUpdateQueue.popFurthest();
-			}
-		}
-		this.preUpdateQueue.addItem(pos, updateData);
-		
-		remainingSlots = this.maxSize - this.getQueuedCount();
-		if (remainingSlots <= 0)
-		{
-			this.sendOverloadMessage();
-		}
-	}
-	
-	public void addItemToUpdateQueue(DhChunkPos pos, ChunkUpdateData updateData)
-	{
-		int remainingSlots = this.maxSize - this.getQueuedCount();
-		
-		// If no slots are left, get one by removing the item furthest from the center
-		if (remainingSlots <= 0)
-		{
-			this.updateQueue.popFurthest();
-		}
-		
-		this.updateQueue.addItem(pos,updateData);
-		
-		remainingSlots = this.maxSize - this.getQueuedCount();
-		if (remainingSlots <= 0)
-		{
-			this.sendOverloadMessage();
-		}
-	}
-	
-	private void sendOverloadMessage()
-	{
-		// limit how often an overloaded message can be sent
-		long msBetweenLastLog = System.currentTimeMillis() - lastOverloadedLogMessageMsTime;
-		if (msBetweenLastLog >= SharedApi.MIN_MS_BETWEEN_OVERLOADED_LOG_MESSAGE)
-		{
-			lastOverloadedLogMessageMsTime = System.currentTimeMillis();
-			
-			String message = "\u00A76" + "Distant Horizons overloaded, too many chunks queued for LOD processing. " + "\u00A7r" +
-					"\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).";
-			
-			boolean showWarningInChat = Config.Common.Logging.Warning.showUpdateQueueOverloadedChatWarning.get();
-			if (showWarningInChat)
-			{
-				ClientApi.INSTANCE.showChatMessageNextFrame(message);
-			}
-			
-			// Don't log warnings in singleplayer or in hosted LAN since it usually isn't a problem (and if it is it's easy to notice).
-			// Servers should always log since being overloaded is harder to notice. 
-			EWorldEnvironment environment = SharedApi.getEnvironment();
-			if (showWarningInChat || environment == EWorldEnvironment.SERVER_ONLY)
-			{
-				LOGGER.warn(message);
-			}
-		}
-	}
-	
-	
-	
-	//=========//
-	// ignores //
-	//=========//
-	
-	public void addPosToIgnore(DhChunkPos chunkPos) { this.ignoredChunkPosSet.add(chunkPos); }
-	public void removePosToIgnore(DhChunkPos chunkPos) { this.ignoredChunkPosSet.remove(chunkPos); }
-	
-	
-	
-	//==================//
-	// position methods //
-	//==================//
-	
-	public void setCenter(DhChunkPos newCenter)
-	{
-		this.updateQueue.setCenter(newCenter);
-		this.preUpdateQueue.setCenter(newCenter);
-	}
-	
-	
-}

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

@@ -1,72 +0,0 @@
-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.world.IClientLevelWrapper;
-
-/**
- * Used to track the rendering state for the current frame.
- * 
- * @see ClientApi
- */
-public class DhRenderState
-{
-	public Mat4f mcModelViewMatrix = null;
-	public Mat4f mcProjectionMatrix = null;
-	public float frameTime = -1;
-	public IClientLevelWrapper clientLevelWrapper = null;
-	
-	
-	
-	//========//
-	// checks //
-	//========//
-	
-	public String unableToRenderBecause()
-	{
-		String errorReasons = "";
-		
-		// the matrix may be the identity matrix or and old/incorrect matrix
-		// but we did set it at least once before this
-		if (this.mcModelViewMatrix == null)
-		{
-			errorReasons += "no MVM Matrix, ";
-		}
-		
-		if (this.mcProjectionMatrix == null)
-		{
-			errorReasons += "no Projection Matrix, ";
-		}
-		
-		if (this.frameTime == -1)
-		{
-			errorReasons += "no Frame Time, ";
-		}
-		
-		if (this.clientLevelWrapper == null)
-		{
-			errorReasons += "no Level Wrapper, ";
-		}
-		
-		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();
-		if (!errorReasons.isEmpty())
-		{
-			throw new IllegalStateException(errorReasons);
-		}
-	}
-	
-	
-	
-}

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

@@ -17,9 +17,38 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor;
+package com.seibel.distanthorizons.core.config;
 
-public interface IC2meAccessor extends IModAccessor
+import com.seibel.distanthorizons.core.config.types.ConfigEntry;
+
+// TODO: Make this integrate with the config system
+public class AppliedConfigState<T>
 {
+	final ConfigEntry<T> entry;
+	T activeValue;
+	
+	
+	
+	public AppliedConfigState(ConfigEntry<T> entryToWatch)
+	{
+		this.entry = entryToWatch;
+		this.activeValue = entryToWatch.get();
+	}
+	
+	
+	
+	/** Returns true if the value was changed */
+	public boolean pollNewValue()
+	{
+		T newValue = this.entry.get();
+		if (newValue.equals(this.activeValue))
+		{
+			return false;
+		}
+		this.activeValue = newValue;
+		return true;
+	}
+	
+	public T get() { return this.activeValue; }
 	
 }

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

@@ -0,0 +1,275 @@
+/*
+ *    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;
+
+import com.seibel.distanthorizons.core.config.file.ConfigFileHandling;
+import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
+import com.seibel.distanthorizons.core.config.types.AbstractConfigType;
+import com.seibel.distanthorizons.core.config.types.ConfigCategory;
+import com.seibel.distanthorizons.core.config.types.ConfigEntry;
+import com.seibel.distanthorizons.core.config.types.ConfigUiLinkedEntry;
+import com.seibel.distanthorizons.core.wrapperInterfaces.config.ILangWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
+import java.lang.reflect.Field;
+import java.nio.file.Path;
+import java.util.*;
+
+/**
+ * Indexes and sets everything up for the file handling and gui
+ *
+ * @author coolGi
+ * @author Ran
+ * @version 2023-8-26
+ */
+// Init the config after singletons have been blinded
+public class ConfigBase
+{
+	/** Our own config instance, don't modify unless you are the DH mod */
+	public static ConfigBase INSTANCE;
+	public ConfigFileHandling configFileINSTANCE;
+	
+	private final Logger logger;
+	public final String modID;
+	public final String modName;
+	public final int configVersion;
+	
+	public boolean isLoaded = false;
+	
+	
+	
+	/**
+	 *      What the config works with
+	 * <br> 
+	 * <br> {@link Enum}
+	 * <br> {@link Boolean}
+	 * <br> {@link Byte}
+	 * <br> {@link Integer}
+	 * <br> {@link Double}
+	 * <br> {@link Short}
+	 * <br> {@link Long}
+	 * <br> {@link Float}
+	 * <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> List<T>
+	 * <br> ArrayList<T>
+	 * <br> Map<String, T>
+	 * <br> HashMap<String, T>
+	 */
+	public static final List<Class<?>> acceptableInputs = new ArrayList<Class<?>>()
+	{{
+		add(Boolean.class);
+		add(Byte.class);
+		add(Integer.class);
+		add(Double.class);
+		add(Short.class);
+		add(Long.class);
+		add(Float.class);
+		add(String.class);
+		
+		// TODO[CONFIG]: Check the type of these is valid
+		add(List.class);
+		add(ArrayList.class);
+		add(Map.class);
+		add(HashMap.class);
+	}};
+	
+	/** Disables the minimum and maximum of any variable */
+	public boolean disableMinMax = false; // Very fun to use, but should always be disabled by default
+	public final List<AbstractConfigType<?, ?>> entries = new ArrayList<>();
+	
+	
+	public ConfigBase(String modID, String modName, Class<?> configClass)
+	{
+		this(modID, modName, configClass, getConfigPath(modName), -1);
+	}
+	public ConfigBase(String modID, String modName, Class<?> configClass, Path configPath)
+	{
+		this(modID, modName, configClass, configPath, -1);
+	}
+	public ConfigBase(String modID, String modName, Class<?> configClass, int configVersion)
+	{
+		this(modID, modName, configClass, getConfigPath(modName), configVersion);
+	}
+	
+	public ConfigBase(String modID, String modName, Class<?> configClass, Path configPath, int configVersion)
+	{
+		this.logger = LogManager.getLogger(this.getClass().getSimpleName() + ", " + modID);
+		
+		this.logger.info("Initialising config for " + modName);
+		this.modID = modID;
+		this.modName = modName;
+		this.configVersion = configVersion;
+		
+		this.initNestedClass(configClass, ""); // Init root category
+		
+		// File handling (load from file)
+		this.configFileINSTANCE = new ConfigFileHandling(this, configPath);
+		this.configFileINSTANCE.loadFromFile();
+		
+		this.isLoaded = true;
+		this.logger.info("Config for " + modName + " initialised");
+	}
+	
+	private void initNestedClass(Class<?> configClass, String category)
+	{
+		// Put all the entries in entries
+		
+		for (Field field : configClass.getFields())
+		{
+			if (AbstractConfigType.class.isAssignableFrom(field.getType()))
+			{
+				try
+				{
+					this.entries.add((AbstractConfigType<?, ?>) field.get(field.getType()));
+				}
+				catch (IllegalAccessException exception)
+				{
+					this.logger.warn(exception);
+				}
+				
+				AbstractConfigType<?, ?> entry = this.entries.get(this.entries.size() - 1);
+				entry.category = category;
+				entry.name = field.getName();
+				entry.configBase = this;
+				
+				if (ConfigEntry.class.isAssignableFrom(field.getType()))
+				{ // If item is type ConfigEntry
+					if (!isAcceptableType(entry.getType()))
+					{
+						this.logger.error("Invalid variable type at [" + (category.isEmpty() ? "" : category + ".") + field.getName() + "].");
+						this.logger.error("Type [" + entry.getType() + "] is not one of these types [" + acceptableInputs.toString() + "]");
+						this.entries.remove(this.entries.size() - 1); // Delete the entry if it is invalid so the game can still run
+					}
+				}
+				
+				if (ConfigCategory.class.isAssignableFrom(field.getType()))
+				{ // If it's a category then init the stuff inside it and put it in the category list
+					assert entry instanceof ConfigCategory;
+					if (((ConfigCategory) entry).getDestination() == null)
+						((ConfigCategory) entry).destination = entry.getNameWCategory();
+					if (entry.get() != null)
+					{
+						this.initNestedClass(((ConfigCategory) entry).get(), ((ConfigCategory) entry).getDestination());
+					}
+				}
+			}
+		}
+	}
+	
+	private static boolean isAcceptableType(Class<?> Clazz)
+	{
+		if (Clazz.isEnum())
+			return true;
+		return acceptableInputs.contains(Clazz);
+	}
+	
+	
+	/** Gets the default config path given a mod name */
+	public static Path getConfigPath(String modName)
+	{
+		return SingletonInjector.INSTANCE.get(IMinecraftSharedWrapper.class)
+				.getInstallationDirectory().toPath().resolve("config").resolve(modName + ".toml");
+	}
+	
+	
+	/**
+	 * Used for checking that all the lang files for the config exist
+	 *
+	 * @param onlyShowNew If disabled then it would basically remake the config lang
+	 * @param checkEnums Checks if all the lang for the enum's exist
+	 */
+	// This is just to re-format the lang or check if there is something in the lang that is missing
+	@SuppressWarnings("unchecked")
+	public String generateLang(boolean onlyShowNew, boolean checkEnums)
+	{
+		ILangWrapper langWrapper = SingletonInjector.INSTANCE.get(ILangWrapper.class);
+		List<Class<? extends Enum<?>>> enumList = new ArrayList<>();
+		
+		String generatedLang = "";
+		
+		String starter = "  \"";
+		String separator = "\":\n    \"";
+		String ending = "\",\n";
+		
+		for (AbstractConfigType<?, ?> entry : this.entries)
+		{
+			String entryPrefix = "lod.config." + entry.getNameWCategory();
+			
+			if (checkEnums && entry.getType().isEnum() && !enumList.contains(entry.getType()))
+			{ // Put it in an enum list to work with at the end
+				enumList.add((Class<? extends Enum<?>>) entry.getType());
+			}
+			if (!onlyShowNew || langWrapper.langExists(entryPrefix))
+			{
+				if (!ConfigUiLinkedEntry.class.isAssignableFrom(entry.getClass()))
+				{ // If it is a linked item, dont generate the base lang
+					generatedLang += starter
+							+ entryPrefix
+							+ separator
+							+ langWrapper.getLang(entryPrefix)
+							+ ending
+					;
+				}
+				// Adds tooltips
+				if (langWrapper.langExists(entryPrefix + ".@tooltip"))
+				{
+					generatedLang += starter
+							+ entryPrefix + ".@tooltip"
+							+ separator
+							+ langWrapper.getLang(entryPrefix + ".@tooltip")
+							.replaceAll("\n", "\\\\n")
+							.replaceAll("\"", "\\\\\"")
+							+ ending
+					;
+				}
+			}
+		}
+		if (!enumList.isEmpty())
+		{
+			generatedLang += "\n"; // Separate the main lang with the enum's
+			
+			for (Class<? extends Enum> anEnum : enumList)
+			{
+				for (Object enumStr : new ArrayList<>(EnumSet.allOf(anEnum)))
+				{
+					String enumPrefix = "lod.config.enum." + anEnum.getSimpleName() + "." + enumStr.toString();
+					
+					if (!onlyShowNew || langWrapper.langExists(enumPrefix))
+					{
+						generatedLang += starter
+								+ enumPrefix
+								+ separator
+								+ langWrapper.getLang(enumPrefix)
+								+ ending
+						;
+					}
+				}
+			}
+		}
+		
+		return generatedLang;
+	}
+	
+}

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

@@ -24,7 +24,7 @@ import com.seibel.distanthorizons.core.config.types.ConfigEntry;
 import java.util.HashMap;
 import java.util.HashSet;
 
-public class ConfigPresetOptions<TQuickEnum, TConfig>
+public class ConfigEntryWithPresetOptions<TQuickEnum, TConfig>
 {
 	public final ConfigEntry<TConfig> configEntry;
 	
@@ -32,11 +32,7 @@ public class ConfigPresetOptions<TQuickEnum, TConfig>
 	
 	
 	
-	//=============//
-	// constructor //
-	//=============//
-	
-	public ConfigPresetOptions(ConfigEntry<TConfig> configEntry, HashMap<TQuickEnum, TConfig> configOptionByQualityOption)
+	public ConfigEntryWithPresetOptions(ConfigEntry<TConfig> configEntry, HashMap<TQuickEnum, TConfig> configOptionByQualityOption)
 	{
 		this.configEntry = configEntry;
 		this.configOptionByQualityOption = configOptionByQualityOption;
@@ -44,10 +40,6 @@ public class ConfigPresetOptions<TQuickEnum, TConfig>
 	
 	
 	
-	//=========//
-	// methods //
-	//=========//
-	
 	public void updateConfigEntry(TQuickEnum quickQuality)
 	{
 		TConfig newValue = this.configOptionByQualityOption.get(quickQuality);
@@ -56,9 +48,7 @@ public class ConfigPresetOptions<TQuickEnum, TConfig>
 	
 	public HashSet<TQuickEnum> getPossibleQualitiesFromCurrentOptionValue()
 	{
-		// get true value so we can ignore API overrides,
-		// users find this confusing if their preset is set to "CUSTOM" 
-		TConfig inputOptionValue = this.configEntry.getTrueValue();
+		TConfig inputOptionValue = this.configEntry.get();
 		HashSet<TQuickEnum> possibleQualities = new HashSet<>();
 		
 		for (TQuickEnum key : this.configOptionByQualityOption.keySet())

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

@@ -1,331 +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;
-
-import com.seibel.distanthorizons.core.config.file.ConfigFileHandler;
-import com.seibel.distanthorizons.core.config.types.*;
-import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.wrapperInterfaces.config.ILangWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper;
-import com.seibel.distanthorizons.coreapi.ModInfo;
-import com.seibel.distanthorizons.core.logging.DhLogger;
-
-import java.lang.reflect.Field;
-import java.nio.file.Path;
-import java.util.*;
-
-/**
- * Sets up everything in {@link Config} for the file/GUI and keeps track of all
- * entries therein. <br>
- * This should be run after the singletons have been bound.
- *
- * @author coolGi
- * @author Ran
- * 
- * @see Config
- */
-public class ConfigHandler
-{
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
-	
-	private static final IMinecraftSharedWrapper MC_SHARED = SingletonInjector.INSTANCE.get(IMinecraftSharedWrapper.class);
-	
-	/**
-	 * What the config works with
-	 * <br> 
-	 * <br> {@link Enum}
-	 * <br> {@link Boolean}
-	 * <br> {@link Byte}
-	 * <br> {@link Integer}
-	 * <br> {@link Double}
-	 * <br> {@link Short}
-	 * <br> {@link Long}
-	 * <br> {@link Float}
-	 * <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> List<T>
-	 * <br> ArrayList<T>
-	 * <br> Map<String, T>
-	 * <br> HashMap<String, T>
-	 */
-	private static final List<Class<?>> ACCEPTABLE_INPUTS = new ArrayList<Class<?>>()
-	{{
-		this.add(Boolean.class);
-		this.add(Byte.class);
-		this.add(Integer.class);
-		this.add(Double.class);
-		this.add(Short.class);
-		this.add(Long.class);
-		this.add(Float.class);
-		this.add(String.class);
-		
-		// partially implemented but not entirely
-		this.add(List.class);
-		this.add(ArrayList.class);
-		this.add(Map.class);
-		this.add(HashMap.class);
-	}};
-	
-	
-	
-	public static final ConfigHandler INSTANCE = new ConfigHandler();
-	
-	public final ConfigFileHandler configFileHandler = new ConfigFileHandler(getConfigPath());
-	public final List<AbstractConfigBase<?>> configBaseList = new ArrayList<>();
-	
-	public boolean isLoaded = false;
-	/** 
-	 * Disables the minimum and maximum validation. <Br>
-	 * Fun to use, but should be disabled by default.
-	 */
-	public boolean runMinMaxValidation = true;
-	
-	
-	
-	//=============//
-	// constructor //
-	//=============//
-	
-	public static void tryRunFirstTimeSetup()
-	{
-		if (INSTANCE.isLoaded)
-		{
-			LOGGER.debug("ConfigHandler setup already run, ignoring.");
-			return;
-		}
-		
-		INSTANCE.runFirstTimeSetup();
-	}
-	private void runFirstTimeSetup()
-	{
-		LOGGER.info("Initialising config for [" + ModInfo.NAME + "]");
-		
-		this.initNestedClass(Config.class, ""); // Init root category
-		
-		this.configFileHandler.loadFromFile();
-		this.runMinMaxValidation = !Config.Client.Advanced.Debugging.allowUnsafeValues.get();
-		
-		this.isLoaded = true;
-		LOGGER.info("[" + ModInfo.NAME + "] Config initialised");
-	}
-	/** Gets the default config path given a mod name */
-	private static Path getConfigPath()
-	{
-		return MC_SHARED
-				.getInstallationDirectory().toPath()
-				.resolve("config")
-				.resolve(ModInfo.NAME + ".toml");
-	}
-	/** Put all the config entries into configEntryList */
-	private void initNestedClass(Class<?> configClass, String category)
-	{
-		Field[] fields = configClass.getFields();
-		for (Field field : fields)
-		{
-			// ignore any non-config variables
-			if (!AbstractConfigBase.class.isAssignableFrom(field.getType()))
-			{
-				continue;
-			}
-			
-			
-			// add this config to the master list
-			try
-			{
-				this.configBaseList.add((AbstractConfigBase<?>) field.get(field.getType()));
-			}
-			catch (IllegalAccessException e)
-			{
-				LOGGER.warn("Unable to add config ["+field.getType().getName()+"], error: ["+e.getMessage()+"].", e);
-				continue;
-			}
-			
-			
-			// set any necessary variables in this config
-			AbstractConfigBase<?> configBase = this.configBaseList.get(this.configBaseList.size() - 1);
-			configBase.category = category;
-			configBase.name = field.getName();
-			
-			
-			// validate the config's input type
-			if (ConfigEntry.class.isAssignableFrom(field.getType()))
-			{
-				if (!isAcceptableType(configBase.getType()))
-				{
-					LOGGER.error("Invalid variable type at [" + (category.isEmpty() ? "" : category + ".") + field.getName() + "].");
-					LOGGER.error("Type [" + configBase.getType() + "] is not one of these types [" + ACCEPTABLE_INPUTS.toString() + "]");
-					this.configBaseList.remove(this.configBaseList.size() - 1); // Delete the entry if it is invalid so the game can still run
-				}
-			}
-			
-			// recursively add deeper categories if present
-			if (ConfigCategory.class.isAssignableFrom(field.getType()))
-			{
-				ConfigCategory configCategory = (ConfigCategory) configBase;
-				
-				if (configCategory.getDestination() == null)
-				{
-					configCategory.destination = configBase.getNameAndCategory();
-				}
-				
-				// shouldn't happen, but just in case
-				if (configBase.get() != null)
-				{
-					this.initNestedClass(configCategory.get(), configCategory.getDestination());
-				}
-			}
-		}
-	}
-	private static boolean isAcceptableType(Class<?> inputClass)
-	{
-		if (inputClass.isEnum())
-		{
-			return true;
-		}
-		
-		return ACCEPTABLE_INPUTS.contains(inputClass);
-	}
-	
-	
-	
-	//===============//
-	// lang handling //
-	//===============//
-	
-	/**
-	 * Used for checking that all the lang files for the config exist.
-	 * This is just to re-format the lang or check if there is something in the lang that is missing
-	 *
-	 * @param onlyShowMissing If false then this will remake the entire config lang
-	 * @param checkEnums Checks if all the lang for the enum's exist
-	 */
-	@SuppressWarnings("unchecked")
-	public String generateLang(boolean onlyShowMissing, boolean checkEnums)
-	{
-		ILangWrapper langWrapper = SingletonInjector.INSTANCE.get(ILangWrapper.class);
-		List<Class<? extends Enum<?>>> enumList = new ArrayList<>();
-		
-		String generatedLang = "";
-		
-		String starter = "  \"";
-		String separator = "\":\n    \"";
-		String ending = "\",\n";
-		
-		// config entries
-		for (AbstractConfigBase<?> entry : this.configBaseList)
-		{
-			String entryPrefix = "distanthorizons.config." + entry.getNameAndCategory();
-			
-			if (checkEnums 
-				&& entry.getType().isEnum() 
-				&& !enumList.contains(entry.getType()))
-			{ 
-				// Put it in an enum list to work with at the end
-				enumList.add((Class<? extends Enum<?>>) entry.getType());
-			}
-			
-			
-			// config file items don't need lang entries
-			if (!entry.getAppearance().showInGui)
-			{
-				continue;
-			}
-			
-			// some entries don't need localization
-			if (ConfigUiLinkedEntry.class.isAssignableFrom(entry.getClass())
-				|| ConfigUISpacer.class.isAssignableFrom(entry.getClass()))
-			{
-				continue;
-			}
-			
-			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;
-			}
-			
-			
-			if (langWrapper.langExists(entryPrefix)
-				&& onlyShowMissing)
-			{
-				continue;
-			}
-			
-			
-			generatedLang += starter
-					+ entryPrefix
-					+ separator
-					+ langWrapper.getLang(entryPrefix)
-					+ ending
-			;
-			
-			// only add tooltips for entries that are also missing
-			// their primary lang
-			// this is done since not all menu items need a tooltip
-			if (!langWrapper.langExists(entryPrefix + ".@tooltip") 
-				|| !onlyShowMissing)
-			{
-				generatedLang += starter
-						+ entryPrefix + ".@tooltip"
-						+ separator
-						+ langWrapper.getLang(entryPrefix + ".@tooltip")
-						.replaceAll("\n", "\\\\n")
-						.replaceAll("\"", "\\\\\"")
-						+ ending
-				;
-			}
-		}
-		
-		
-		// enums
-		if (!enumList.isEmpty())
-		{
-			generatedLang += "\n"; // Separate the main lang with the enum's
-			
-			for (Class<? extends Enum> anEnum : enumList)
-			{
-				for (Object enumStr : new ArrayList<Object>(EnumSet.allOf(anEnum)))
-				{
-					String enumPrefix = "distanthorizons.config.enum." + anEnum.getSimpleName() + "." + enumStr.toString();
-					
-					if (!langWrapper.langExists(enumPrefix) 
-						|| !onlyShowMissing)
-					{
-						generatedLang += starter
-								+ enumPrefix
-								+ separator
-								+ langWrapper.getLang(enumPrefix)
-								+ ending
-						;
-					}
-				}
-			}
-		}
-		
-		return generatedLang;
-	}
-	
-	
-	
-}

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

@@ -17,50 +17,54 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.distanthorizons.core.util;
+package com.seibel.distanthorizons.core.config;
 
 import java.util.HashMap;
 import java.util.Map;
 
 /**
- * Helps when working with numbers where the type is unknown.
+ * Helps with working with numbers that the value of which is unknown
  *
  * @author coolGi
+ * @version 2023-7-16
  */
+// TODO: Should this be moved out of here into somewhere like the util section
 public class NumberUtil
 {
 	// Is there no better way of doing this?
 	public static Map<Class<?>, Number> minValues = new HashMap<Class<?>, Number>()
 	{{
-		this.put(Byte.class, Byte.MIN_VALUE);
-		this.put(Short.class, Short.MIN_VALUE);
-		this.put(Integer.class, Integer.MIN_VALUE);
-		this.put(Long.class, Long.MIN_VALUE);
-		this.put(Double.class, Double.MIN_VALUE);
-		this.	put(Float.class, Float.MIN_VALUE);
+		put(Byte.class, Byte.MIN_VALUE);
+		put(Short.class, Short.MIN_VALUE);
+		put(Integer.class, Integer.MIN_VALUE);
+		put(Long.class, Long.MIN_VALUE);
+		put(Double.class, Double.MIN_VALUE);
+		put(Float.class, Float.MIN_VALUE);
 	}};
 	public static Map<Class<?>, Number> maxValues = new HashMap<Class<?>, Number>()
 	{{
-		this.put(Byte.class, Byte.MAX_VALUE);
-		this.put(Short.class, Short.MAX_VALUE);
-		this.put(Integer.class, Integer.MAX_VALUE);
-		this.put(Long.class, Long.MAX_VALUE);
-		this.put(Double.class, Double.MAX_VALUE);
-		this.put(Float.class, Float.MAX_VALUE);
+		put(Byte.class, Byte.MAX_VALUE);
+		put(Short.class, Short.MAX_VALUE);
+		put(Integer.class, Integer.MAX_VALUE);
+		put(Long.class, Long.MAX_VALUE);
+		put(Double.class, Double.MAX_VALUE);
+		put(Float.class, Float.MAX_VALUE);
 	}};
 	
-	
-	
-	public static Number getMinimum(Class<?> c) { return minValues.get(c); }
-	public static Number getMaximum(Class<?> c) { return maxValues.get(c); }
+	public static Number getMinimum(Class<?> c)
+	{
+		return minValues.get(c);
+	}
+	public static Number getMaximum(Class<?> c)
+	{
+		return maxValues.get(c);
+	}
 	
 	/** Does a greater than (>) operator on any number */
 	public static boolean greaterThan(Number a, Number b)
 	{
 		if (a.getClass() != b.getClass())
-		{
 			return false;
-		}
 		Class<?> typeClass = a.getClass();
 		
 		if (typeClass == Byte.class) return a.byteValue() > b.byteValue();
@@ -69,7 +73,6 @@ public class NumberUtil
 		if (typeClass == Long.class) return a.longValue() > b.longValue();
 		if (typeClass == Double.class) return a.doubleValue() > b.doubleValue();
 		if (typeClass == Float.class) return a.floatValue() > b.floatValue();
-		
 		return false;
 	}
 	
@@ -77,9 +80,7 @@ public class NumberUtil
 	public static boolean lessThan(Number a, Number b)
 	{
 		if (a.getClass() != b.getClass())
-		{
 			return false;
-		}
 		Class<?> typeClass = a.getClass();
 		
 		if (typeClass == Byte.class) return a.byteValue() < b.byteValue();
@@ -88,7 +89,6 @@ public class NumberUtil
 		if (typeClass == Long.class) return a.longValue() < b.longValue();
 		if (typeClass == Double.class) return a.doubleValue() < b.doubleValue();
 		if (typeClass == Float.class) return a.floatValue() < b.floatValue();
-		
 		return false;
 	}
 	

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

@@ -22,77 +22,13 @@ package com.seibel.distanthorizons.core.config.eventHandlers;
 import com.seibel.distanthorizons.api.DhApi;
 import com.seibel.distanthorizons.api.interfaces.render.IDhApiRenderProxy;
 import com.seibel.distanthorizons.core.config.listeners.IConfigListener;
-import com.seibel.distanthorizons.core.util.TimerUtil;
-
-import java.util.Timer;
-import java.util.TimerTask;
 
 public class ReloadLodsConfigEventHandler implements IConfigListener
 {
-	/** 
-	 * should be used for user facing UI options
-	 * this allows the user a second to click through options before they're applied
-	 */
-	public static ReloadLodsConfigEventHandler DELAYED_INSTANCE = new ReloadLodsConfigEventHandler(2_000L);
-	/** should be used for debug options so their change can be seen instantly */
-	public static ReloadLodsConfigEventHandler INSTANT_INSTANCE = new ReloadLodsConfigEventHandler(0);
-	
-	/** how long to wait in milliseconds before applying the config changes */
-	private final long timeoutInMs;
-	private Timer cacheClearingTimer;
-	
-	
-	
-	//=============//
-	// constructor //
-	//=============//
-	
-	public ReloadLodsConfigEventHandler(long timeoutInMs)
-	{
-		this.timeoutInMs = timeoutInMs;
-	}
-	
-	
-	
-	//========//
-	// events //
-	//========//
+	public static ReloadLodsConfigEventHandler INSTANCE = new ReloadLodsConfigEventHandler();
 	
 	@Override
 	public void onConfigValueSet()
-	{ 
-		if (this.timeoutInMs > 0)
-		{
-			this.refreshRenderDataAfterTimeout();
-		}
-		else
-		{
-			clearRenderDataCache();
-		}
-	}
-	
-	/** Calling this method multiple times will reset the timer */
-	private synchronized void refreshRenderDataAfterTimeout() // synchronized to prevent potential threading issues when adding/removing the timer
-	{
-		// stop the previous timer if one exists
-		if (this.cacheClearingTimer != null)
-		{
-			this.cacheClearingTimer.cancel();
-		}
-		
-		// create a new timer task
-		TimerTask timerTask = new TimerTask()
-		{
-			public void run()
-			{
-				clearRenderDataCache();
-			}
-		};
-		this.cacheClearingTimer = TimerUtil.CreateTimer("RenderCacheClearConfigTimer");
-		this.cacheClearingTimer.schedule(timerTask, this.timeoutInMs);
-	}
-	
-	private static void clearRenderDataCache()
 	{
 		IDhApiRenderProxy renderProxy = DhApi.Delayed.renderProxy;
 		if (renderProxy != null)
@@ -101,5 +37,4 @@ public class ReloadLodsConfigEventHandler implements IConfigListener
 		}
 	}
 	
-	
 }

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

@@ -0,0 +1,114 @@
+/*
+ *    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.*;
+import com.seibel.distanthorizons.api.enums.rendering.EDhApiDebugRendering;
+import com.seibel.distanthorizons.api.enums.rendering.EDhApiTransparency;
+import com.seibel.distanthorizons.core.config.listeners.ConfigChangeListener;
+import com.seibel.distanthorizons.core.config.Config;
+import com.seibel.distanthorizons.core.util.TimerUtil;
+
+import java.util.Timer;
+import java.util.TimerTask;
+
+/**
+ * Listens to the config and will automatically
+ * clear the current render cache if certain settings are changed. <br> <br>
+ *
+ * Note: if additional settings should clear the render cache, add those to this listener, don't create a new listener
+ */
+public class RenderCacheConfigEventHandler
+{
+	private static RenderCacheConfigEventHandler INSTANCE;
+	
+	
+	// previous values used to check if a watched setting was actually modified
+	private final ConfigChangeListener<EDhApiMaxHorizontalResolution> horizontalResolutionChangeListener;
+	private final ConfigChangeListener<EDhApiVerticalQuality> verticalQualityChangeListener;
+	private final ConfigChangeListener<EDhApiTransparency> transparencyChangeListener;
+	private final ConfigChangeListener<EDhApiBlocksToAvoid> blocksToIgnoreChangeListener;
+	private final ConfigChangeListener<Boolean> tintWithAvoidedBlocksChangeListener;
+	
+	private final ConfigChangeListener<Double> brightnessMultiplierChangeListener;
+	private final ConfigChangeListener<Double> saturationMultiplierChangeListener;
+	private final ConfigChangeListener<EDhApiLodShading> lodShadingChangeListener;
+	private final ConfigChangeListener<EDhApiGrassSideRendering> grassSideChangeListener;
+	
+	private final ConfigChangeListener<EDhApiDebugRendering> debugRenderingChangeListener;
+	
+	/** how long to wait in milliseconds before applying the config changes */
+	private static final long TIMEOUT_IN_MS = 4_000L;
+	private Timer cacheClearingTimer;
+	
+	
+	
+	public static RenderCacheConfigEventHandler getInstance()
+	{
+		if (INSTANCE == null)
+		{
+			INSTANCE = new RenderCacheConfigEventHandler();
+		}
+		
+		return INSTANCE;
+	}
+	
+	/** private since we only ever need one handler at a time */
+	private RenderCacheConfigEventHandler()
+	{
+		this.horizontalResolutionChangeListener = new ConfigChangeListener<>(Config.Client.Advanced.Graphics.Quality.maxHorizontalResolution, (newValue) -> this.refreshRenderDataAfterTimeout());
+		this.verticalQualityChangeListener = new ConfigChangeListener<>(Config.Client.Advanced.Graphics.Quality.verticalQuality, (newValue) -> this.refreshRenderDataAfterTimeout());
+		this.transparencyChangeListener = new ConfigChangeListener<>(Config.Client.Advanced.Graphics.Quality.transparency, (newValue) -> this.refreshRenderDataAfterTimeout());
+		this.blocksToIgnoreChangeListener = new ConfigChangeListener<>(Config.Client.Advanced.Graphics.Quality.blocksToIgnore, (newValue) -> this.refreshRenderDataAfterTimeout());
+		this.tintWithAvoidedBlocksChangeListener = new ConfigChangeListener<>(Config.Client.Advanced.Graphics.Quality.tintWithAvoidedBlocks, (newValue) -> this.refreshRenderDataAfterTimeout());
+		
+		this.brightnessMultiplierChangeListener = new ConfigChangeListener<>(Config.Client.Advanced.Graphics.Quality.brightnessMultiplier, (newValue) -> this.refreshRenderDataAfterTimeout());
+		this.saturationMultiplierChangeListener = new ConfigChangeListener<>(Config.Client.Advanced.Graphics.Quality.saturationMultiplier, (newValue) -> this.refreshRenderDataAfterTimeout());
+		this.lodShadingChangeListener = new ConfigChangeListener<>(Config.Client.Advanced.Graphics.Quality.lodShading, (newValue) -> this.refreshRenderDataAfterTimeout());
+		this.grassSideChangeListener = new ConfigChangeListener<>(Config.Client.Advanced.Graphics.Quality.grassSideRendering, (newValue) -> this.refreshRenderDataAfterTimeout());
+		
+		this.debugRenderingChangeListener = new ConfigChangeListener<>(Config.Client.Advanced.Debugging.debugRendering, (newValue) -> this.refreshRenderDataAfterTimeout());
+		
+	}
+	
+	
+	/** Calling this method multiple times will reset the timer */
+	private void refreshRenderDataAfterTimeout()
+	{
+		// stop the previous timer if one exists
+		if (this.cacheClearingTimer != null)
+		{
+			this.cacheClearingTimer.cancel();
+		}
+		
+		// create a new timer task
+		TimerTask timerTask = new TimerTask()
+		{
+			public void run()
+			{
+				DhApi.Delayed.renderProxy.clearRenderDataCache();
+			}
+		};
+		this.cacheClearingTimer = TimerUtil.CreateTimer("RenderCacheClearConfigTimer");
+		this.cacheClearingTimer.schedule(timerTask, TIMEOUT_IN_MS);
+	}
+	
+}

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

@@ -20,22 +20,23 @@
 package com.seibel.distanthorizons.core.config.eventHandlers;
 
 import com.seibel.distanthorizons.core.config.Config;
-import com.seibel.distanthorizons.core.config.ConfigHandler;
 import com.seibel.distanthorizons.core.config.listeners.IConfigListener;
 
-/** 
- * handles enabling/disabling config validation when the
- * {@link Config.Client.Advanced.Debugging#allowUnsafeValues} option
- * is changed.
- */
 public class UnsafeValuesConfigListener implements IConfigListener
 {
 	public static UnsafeValuesConfigListener INSTANCE = new UnsafeValuesConfigListener();
 	
 	@Override
 	public void onConfigValueSet()
-	{ ConfigHandler.INSTANCE.runMinMaxValidation = !Config.Client.Advanced.Debugging.allowUnsafeValues.get(); }
-	
+	{
+		Config.Client.Advanced.Debugging.allowUnsafeValues.configBase.disableMinMax =
+				Config.Client.Advanced.Debugging.allowUnsafeValues.get();
+	}
 	
+	@Override
+	public void onUiModify()
+	{
+		
+	}
 	
 }

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

@@ -19,30 +19,30 @@
 
 package com.seibel.distanthorizons.core.config.eventHandlers.presets;
 
-import com.seibel.distanthorizons.core.config.ConfigHandler;
-import com.seibel.distanthorizons.core.config.ConfigPresetOptions;
+import com.seibel.distanthorizons.core.config.ConfigBase;
+import com.seibel.distanthorizons.core.config.ConfigEntryWithPresetOptions;
 import com.seibel.distanthorizons.core.config.listeners.IConfigListener;
-import com.seibel.distanthorizons.core.config.types.AbstractConfigBase;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.util.TimerUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.config.IConfigGui;
+import com.seibel.distanthorizons.coreapi.interfaces.config.IConfigEntry;
 import com.seibel.distanthorizons.coreapi.util.StringUtil;
 import org.apache.logging.log4j.LogManager;
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
 
 public abstract class AbstractPresetConfigEventHandler<TPresetEnum extends Enum<?>> implements IConfigListener
 {
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = LogManager.getLogger();
 	private static final long MS_DELAY_BEFORE_APPLYING_PRESET = 3_000;
 	
 	@Nullable
-	private static final IConfigGui CONFIG_GUI = SingletonInjector.INSTANCE.get(IConfigGui.class);
+	private static IConfigGui configGui = SingletonInjector.INSTANCE.get(IConfigGui.class);
+	private static boolean guiListenersAdded = false;
 	
-	protected final ArrayList<ConfigPresetOptions<TPresetEnum, ?>> configList = new ArrayList<>();
+	protected final ArrayList<ConfigEntryWithPresetOptions<TPresetEnum, ?>> configList = new ArrayList<>();
 	/** this timer is used so each preset isn't applied while a user is clicking through the config options */
 	protected Timer applyPresetTimer = null;
 	/** the enum to apply after the timer expires or the UI screen changes. */
@@ -59,9 +59,9 @@ public abstract class AbstractPresetConfigEventHandler<TPresetEnum extends Enum<
 	public AbstractPresetConfigEventHandler()
 	{
 		// don't update the UI when running on a server
-		if (CONFIG_GUI != null) 
+		if (configGui != null) 
 		{
-			CONFIG_GUI.addOnScreenChangeListener(this::onConfigUiClosed);
+			configGui.addOnScreenChangeListener(this::onConfigUiClosed);
 		}
 	}
 	
@@ -90,7 +90,7 @@ public abstract class AbstractPresetConfigEventHandler<TPresetEnum extends Enum<
 	public void onConfigValueSet()
 	{
 		// don't try modifying the config before it's been loaded from file
-		if (!ConfigHandler.INSTANCE.isLoaded)
+		if (!ConfigBase.INSTANCE.isLoaded)
 		{
 			return;
 		}
@@ -140,11 +140,11 @@ public abstract class AbstractPresetConfigEventHandler<TPresetEnum extends Enum<
 		
 		
 		
-		LOGGER.debug("changing preset to: [" + newPresetEnum + "].");
+		LOGGER.info("changing preset to: " + newPresetEnum);
 		this.changingPreset = true;
 		
 		// update the controlled config values
-		for (ConfigPresetOptions<TPresetEnum, ?> configEntry : this.configList)
+		for (ConfigEntryWithPresetOptions<TPresetEnum, ?> configEntry : this.configList)
 		{
 			configEntry.updateConfigEntry(newPresetEnum);
 		}
@@ -152,7 +152,7 @@ public abstract class AbstractPresetConfigEventHandler<TPresetEnum extends Enum<
 		this.setUiOnlyConfigValues();
 		
 		this.changingPreset = false;
-		LOGGER.debug("preset active: [" + newPresetEnum + "].");
+		LOGGER.info("preset active: " + newPresetEnum);
 	}
 	
 	/**
@@ -200,7 +200,7 @@ public abstract class AbstractPresetConfigEventHandler<TPresetEnum extends Enum<
 		
 		
 		// remove any quick options that aren't possible with the currently selected options
-		for (ConfigPresetOptions<TPresetEnum, ?> configEntry : this.configList)
+		for (ConfigEntryWithPresetOptions<TPresetEnum, ?> configEntry : this.configList)
 		{
 			HashSet<TPresetEnum> optionPresetSet = configEntry.getPossibleQualitiesFromCurrentOptionValue();
 			possiblePresetSet.retainAll(optionPresetSet);
@@ -230,7 +230,7 @@ public abstract class AbstractPresetConfigEventHandler<TPresetEnum extends Enum<
 	// abstract methods //
 	//==================//
 	
-	protected abstract AbstractConfigBase<TPresetEnum> getPresetConfigEntry();
+	protected abstract IConfigEntry<TPresetEnum> getPresetConfigEntry();
 	
 	protected abstract List<TPresetEnum> getPresetEnumList();
 	protected abstract TPresetEnum getCustomPresetEnum();

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

@@ -0,0 +1,63 @@
+/*
+ *    This file is part of the Distant Horizons mod
+ *    licensed under the GNU LGPL v3 License.
+ *
+ *    Copyright (C) 2020 James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU Lesser General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.distanthorizons.core.config.eventHandlers.presets;
+
+import com.seibel.distanthorizons.api.enums.rendering.EDhApiRendererMode;
+import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiDistantGeneratorProgressDisplayLocation;
+import com.seibel.distanthorizons.core.config.Config;
+import com.seibel.distanthorizons.core.config.listeners.ConfigChangeListener;
+
+public class QuickShowWorldGenProgressConfigEventHandler
+{
+	public static QuickShowWorldGenProgressConfigEventHandler INSTANCE = new QuickShowWorldGenProgressConfigEventHandler();
+	
+	private final ConfigChangeListener<Boolean> quickChangeListener;
+	private final ConfigChangeListener<EDhApiDistantGeneratorProgressDisplayLocation> fullChangeListener;
+	
+	
+	
+	/** private since we only ever need one handler at a time */
+	private QuickShowWorldGenProgressConfigEventHandler()
+	{
+		this.quickChangeListener = new ConfigChangeListener<>(Config.Client.quickShowWorldGenProgress, 
+				(val) -> 
+				{
+					Config.Common.WorldGenerator.showGenerationProgress.set(Config.Client.quickShowWorldGenProgress.get() 
+							? Config.Common.WorldGenerator.showGenerationProgress.getDefaultValue()
+							: EDhApiDistantGeneratorProgressDisplayLocation.DISABLED); 
+				});
+		this.fullChangeListener = new ConfigChangeListener<>(Config.Common.WorldGenerator.showGenerationProgress, 
+				(val) -> 
+				{
+					Config.Client.quickShowWorldGenProgress.set(Config.Common.WorldGenerator.showGenerationProgress.get() != EDhApiDistantGeneratorProgressDisplayLocation.DISABLED); 
+				});
+	}
+	
+	/**
+	 * Set the UI only config based on what is set in the file. <br>
+	 * This should only be called once.
+	 */
+	public void setUiOnlyConfigValues()
+	{
+		boolean showProgress = Config.Common.WorldGenerator.showGenerationProgress.get() != EDhApiDistantGeneratorProgressDisplayLocation.DISABLED;
+		Config.Client.quickShowWorldGenProgress.set(showProgress);
+	}
+	
+}

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

@@ -26,11 +26,11 @@ import com.seibel.distanthorizons.api.enums.config.EDhApiVerticalQuality;
 import com.seibel.distanthorizons.api.enums.config.quickOptions.EDhApiQualityPreset;
 import com.seibel.distanthorizons.api.enums.rendering.EDhApiTransparency;
 import com.seibel.distanthorizons.core.config.Config;
-import com.seibel.distanthorizons.core.config.ConfigPresetOptions;
+import com.seibel.distanthorizons.core.config.ConfigEntryWithPresetOptions;
 import com.seibel.distanthorizons.core.config.listeners.ConfigChangeListener;
-import com.seibel.distanthorizons.core.config.types.AbstractConfigBase;
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import com.seibel.distanthorizons.coreapi.interfaces.config.IConfigEntry;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.util.*;
 
@@ -39,10 +39,10 @@ public class RenderQualityPresetConfigEventHandler extends AbstractPresetConfigE
 {
 	public static final RenderQualityPresetConfigEventHandler INSTANCE = new RenderQualityPresetConfigEventHandler();
 	
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = LogManager.getLogger();
 	
 	
-	private final ConfigPresetOptions<EDhApiQualityPreset, EDhApiMaxHorizontalResolution> drawResolution = new ConfigPresetOptions<>(Config.Client.Advanced.Graphics.Quality.maxHorizontalResolution,
+	private final ConfigEntryWithPresetOptions<EDhApiQualityPreset, EDhApiMaxHorizontalResolution> drawResolution = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.Graphics.Quality.maxHorizontalResolution,
 			new HashMap<EDhApiQualityPreset, EDhApiMaxHorizontalResolution>()
 			{{
 				this.put(EDhApiQualityPreset.MINIMUM, EDhApiMaxHorizontalResolution.TWO_BLOCKS);
@@ -51,7 +51,7 @@ public class RenderQualityPresetConfigEventHandler extends AbstractPresetConfigE
 				this.put(EDhApiQualityPreset.HIGH, EDhApiMaxHorizontalResolution.BLOCK);
 				this.put(EDhApiQualityPreset.EXTREME, EDhApiMaxHorizontalResolution.BLOCK);
 			}});
-	private final ConfigPresetOptions<EDhApiQualityPreset, EDhApiVerticalQuality> verticalQuality = new ConfigPresetOptions<>(Config.Client.Advanced.Graphics.Quality.verticalQuality,
+	private final ConfigEntryWithPresetOptions<EDhApiQualityPreset, EDhApiVerticalQuality> verticalQuality = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.Graphics.Quality.verticalQuality,
 			new HashMap<EDhApiQualityPreset, EDhApiVerticalQuality>()
 			{{
 				this.put(EDhApiQualityPreset.MINIMUM, EDhApiVerticalQuality.HEIGHT_MAP);
@@ -60,7 +60,7 @@ public class RenderQualityPresetConfigEventHandler extends AbstractPresetConfigE
 				this.put(EDhApiQualityPreset.HIGH, EDhApiVerticalQuality.HIGH);
 				this.put(EDhApiQualityPreset.EXTREME, EDhApiVerticalQuality.EXTREME);
 			}});
-	private final ConfigPresetOptions<EDhApiQualityPreset, EDhApiHorizontalQuality> horizontalQuality = new ConfigPresetOptions<>(Config.Client.Advanced.Graphics.Quality.horizontalQuality,
+	private final ConfigEntryWithPresetOptions<EDhApiQualityPreset, EDhApiHorizontalQuality> horizontalQuality = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.Graphics.Quality.horizontalQuality,
 			new HashMap<EDhApiQualityPreset, EDhApiHorizontalQuality>()
 			{{
 				this.put(EDhApiQualityPreset.MINIMUM, EDhApiHorizontalQuality.LOWEST);
@@ -69,7 +69,7 @@ public class RenderQualityPresetConfigEventHandler extends AbstractPresetConfigE
 				this.put(EDhApiQualityPreset.HIGH, EDhApiHorizontalQuality.HIGH);
 				this.put(EDhApiQualityPreset.EXTREME, EDhApiHorizontalQuality.EXTREME);
 			}});
-	private final ConfigPresetOptions<EDhApiQualityPreset, EDhApiTransparency> transparency = new ConfigPresetOptions<>(Config.Client.Advanced.Graphics.Quality.transparency,
+	private final ConfigEntryWithPresetOptions<EDhApiQualityPreset, EDhApiTransparency> transparency = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.Graphics.Quality.transparency,
 			new HashMap<EDhApiQualityPreset, EDhApiTransparency>()
 			{{
 				this.put(EDhApiQualityPreset.MINIMUM, EDhApiTransparency.DISABLED);
@@ -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 ConfigEntryWithPresetOptions<EDhApiQualityPreset, Boolean> ssaoEnabled = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.Graphics.Ssao.enableSsao,
 			new HashMap<EDhApiQualityPreset, Boolean>()
 			{{
 				this.put(EDhApiQualityPreset.MINIMUM, false);
@@ -87,7 +87,7 @@ public class RenderQualityPresetConfigEventHandler extends AbstractPresetConfigE
 				this.put(EDhApiQualityPreset.HIGH, true);
 				this.put(EDhApiQualityPreset.EXTREME, true);
 			}});
-	private final ConfigPresetOptions<EDhApiQualityPreset, EDhApiMcRenderingFadeMode> vanillaFade = new ConfigPresetOptions<>(Config.Client.Advanced.Graphics.Quality.vanillaFadeMode,
+	private final ConfigEntryWithPresetOptions<EDhApiQualityPreset, EDhApiMcRenderingFadeMode> vanillaFade = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.Graphics.Quality.vanillaFadeMode,
 			new HashMap<EDhApiQualityPreset, EDhApiMcRenderingFadeMode>()
 			{{
 				this.put(EDhApiQualityPreset.MINIMUM, EDhApiMcRenderingFadeMode.NONE);
@@ -96,16 +96,7 @@ public class RenderQualityPresetConfigEventHandler extends AbstractPresetConfigE
 				this.put(EDhApiQualityPreset.HIGH, EDhApiMcRenderingFadeMode.DOUBLE_PASS);
 				this.put(EDhApiQualityPreset.EXTREME, EDhApiMcRenderingFadeMode.DOUBLE_PASS);
 			}});
-	private final ConfigPresetOptions<EDhApiQualityPreset, Boolean> dhFadeFarClipPlane = new ConfigPresetOptions<>(Config.Client.Advanced.Graphics.Quality.dhFadeFarClipPlane,
-			new HashMap<EDhApiQualityPreset, Boolean>()
-			{{
-				this.put(EDhApiQualityPreset.MINIMUM, false);
-				this.put(EDhApiQualityPreset.LOW, false);
-				this.put(EDhApiQualityPreset.MEDIUM, true);
-				this.put(EDhApiQualityPreset.HIGH, true);
-				this.put(EDhApiQualityPreset.EXTREME, true);
-			}});
-	private final ConfigPresetOptions<EDhApiQualityPreset, Boolean> dhDither = new ConfigPresetOptions<>(Config.Client.Advanced.Graphics.Quality.ditherDhFade,
+	private final ConfigEntryWithPresetOptions<EDhApiQualityPreset, Boolean> dhDither = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.Graphics.Quality.ditherDhFade,
 			new HashMap<EDhApiQualityPreset, Boolean>()
 			{{
 				this.put(EDhApiQualityPreset.MINIMUM, false);
@@ -114,7 +105,7 @@ public class RenderQualityPresetConfigEventHandler extends AbstractPresetConfigE
 				this.put(EDhApiQualityPreset.HIGH, true);
 				this.put(EDhApiQualityPreset.EXTREME, true);
 			}});
-	private final ConfigPresetOptions<EDhApiQualityPreset, Boolean> caveCulling = new ConfigPresetOptions<>(Config.Client.Advanced.Graphics.Culling.enableCaveCulling,
+	private final ConfigEntryWithPresetOptions<EDhApiQualityPreset, Boolean> caveCulling = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.Graphics.Culling.enableCaveCulling,
 			new HashMap<EDhApiQualityPreset, Boolean>()
 			{{
 				this.put(EDhApiQualityPreset.MINIMUM, true);
@@ -123,15 +114,6 @@ public class RenderQualityPresetConfigEventHandler extends AbstractPresetConfigE
 				this.put(EDhApiQualityPreset.HIGH, false);
 				this.put(EDhApiQualityPreset.EXTREME, false);
 			}});
-	private final ConfigPresetOptions<EDhApiQualityPreset, Integer> biomeBlending = new ConfigPresetOptions<>(Config.Client.Advanced.Graphics.Quality.lodBiomeBlending,
-			new HashMap<EDhApiQualityPreset, Integer>()
-			{{
-				this.put(EDhApiQualityPreset.MINIMUM, 0);
-				this.put(EDhApiQualityPreset.LOW, 1);
-				this.put(EDhApiQualityPreset.MEDIUM, 3);
-				this.put(EDhApiQualityPreset.HIGH, 3);
-				this.put(EDhApiQualityPreset.EXTREME, 3);
-			}});
 		
 	
 	
@@ -148,14 +130,12 @@ public class RenderQualityPresetConfigEventHandler extends AbstractPresetConfigE
 		this.configList.add(this.horizontalQuality);
 		this.configList.add(this.transparency);
 		this.configList.add(this.ssaoEnabled);
-		this.configList.add(this.dhFadeFarClipPlane);
 		this.configList.add(this.vanillaFade);
 		this.configList.add(this.dhDither);
 		this.configList.add(this.caveCulling);
-		this.configList.add(this.biomeBlending);
 		
 		
-		for (ConfigPresetOptions<EDhApiQualityPreset, ?> config : this.configList)
+		for (ConfigEntryWithPresetOptions<EDhApiQualityPreset, ?> config : this.configList)
 		{
 			// ignore try-using, the listener should only ever be added once and should never be removed
 			new ConfigChangeListener<>(config.configEntry, (val) -> { this.onConfigValueChanged(); });
@@ -169,7 +149,7 @@ public class RenderQualityPresetConfigEventHandler extends AbstractPresetConfigE
 	//==============//
 	
 	@Override
-	protected AbstractConfigBase<EDhApiQualityPreset> getPresetConfigEntry() { return Config.Client.qualityPresetSetting; }
+	protected IConfigEntry<EDhApiQualityPreset> getPresetConfigEntry() { return Config.Client.qualityPresetSetting; }
 	
 	@Override
 	protected List<EDhApiQualityPreset> getPresetEnumList() { return Arrays.asList(EDhApiQualityPreset.values()); }

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

@@ -22,12 +22,11 @@ package com.seibel.distanthorizons.core.config.eventHandlers.presets;
 import com.seibel.distanthorizons.api.enums.config.quickOptions.EDhApiThreadPreset;
 import com.seibel.distanthorizons.core.config.listeners.ConfigChangeListener;
 import com.seibel.distanthorizons.core.config.Config;
-import com.seibel.distanthorizons.core.config.ConfigPresetOptions;
-import com.seibel.distanthorizons.core.config.types.AbstractConfigBase;
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.config.ConfigEntryWithPresetOptions;
+import com.seibel.distanthorizons.coreapi.interfaces.config.IConfigEntry;
 import com.seibel.distanthorizons.coreapi.util.MathUtil;
 import org.apache.logging.log4j.LogManager;
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.Logger;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -38,11 +37,11 @@ public class ThreadPresetConfigEventHandler extends AbstractPresetConfigEventHan
 {
 	public static final ThreadPresetConfigEventHandler INSTANCE = new ThreadPresetConfigEventHandler();
 	
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = LogManager.getLogger();
 	
 	
 	public static int getDefaultThreadCount() { return getThreadCountByPercent(0.5); }
-	private final ConfigPresetOptions<EDhApiThreadPreset, Integer> threadCount = new ConfigPresetOptions<>(Config.Common.MultiThreading.numberOfThreads,
+	private final ConfigEntryWithPresetOptions<EDhApiThreadPreset, Integer> threadCount = new ConfigEntryWithPresetOptions<>(Config.Common.MultiThreading.numberOfThreads,
 			new HashMap<EDhApiThreadPreset, Integer>()
 			{{
 				this.put(EDhApiThreadPreset.MINIMAL_IMPACT, getThreadCountByPercent(0.1));
@@ -52,7 +51,7 @@ public class ThreadPresetConfigEventHandler extends AbstractPresetConfigEventHan
 				this.put(EDhApiThreadPreset.I_PAID_FOR_THE_WHOLE_CPU, getThreadCountByPercent(1.0));
 			}});
 	public static double getDefaultRunTimeRatio() { return 1.0; }
-	private final ConfigPresetOptions<EDhApiThreadPreset, Double> threadRunTime = new ConfigPresetOptions<>(Config.Common.MultiThreading.threadRunTimeRatio,
+	private final ConfigEntryWithPresetOptions<EDhApiThreadPreset, Double> threadRunTime = new ConfigEntryWithPresetOptions<>(Config.Common.MultiThreading.threadRunTimeRatio,
 			new HashMap<EDhApiThreadPreset, Double>()
 			{{
 				this.put(EDhApiThreadPreset.MINIMAL_IMPACT, 0.5);
@@ -75,7 +74,7 @@ public class ThreadPresetConfigEventHandler extends AbstractPresetConfigEventHan
 		this.configList.add(this.threadCount);
 		this.configList.add(this.threadRunTime);
 		
-		for (ConfigPresetOptions<EDhApiThreadPreset, ?> config : this.configList)
+		for (ConfigEntryWithPresetOptions<EDhApiThreadPreset, ?> config : this.configList)
 		{
 			// ignore try-using, the listeners should only ever be added once and should never be removed
 			new ConfigChangeListener<>(config.configEntry, (val) -> { this.onConfigValueChanged(); });
@@ -120,7 +119,7 @@ public class ThreadPresetConfigEventHandler extends AbstractPresetConfigEventHan
 	//==============//
 	
 	@Override
-	protected AbstractConfigBase<EDhApiThreadPreset> getPresetConfigEntry() { return Config.Client.threadPresetSetting; }
+	protected IConfigEntry<EDhApiThreadPreset> getPresetConfigEntry() { return Config.Client.threadPresetSetting; }
 	
 	@Override
 	protected List<EDhApiThreadPreset> getPresetEnumList() { return Arrays.asList(EDhApiThreadPreset.values()); }

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

@@ -20,18 +20,16 @@
 package com.seibel.distanthorizons.core.config.file;
 
 import com.electronwill.nightconfig.core.file.CommentedFileConfig;
-import com.seibel.distanthorizons.core.config.ConfigHandler;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
-import com.seibel.distanthorizons.core.config.types.AbstractConfigBase;
+import com.seibel.distanthorizons.core.config.ConfigBase;
+import com.seibel.distanthorizons.core.config.types.AbstractConfigType;
 import com.seibel.distanthorizons.core.config.types.ConfigEntry;
-import com.seibel.distanthorizons.core.jar.EPlatform;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
-import com.seibel.distanthorizons.coreapi.ModInfo;
+import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper;
 import org.apache.logging.log4j.LogManager;
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.Logger;
 
-import java.io.File;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
@@ -43,13 +41,17 @@ import java.util.concurrent.locks.ReentrantLock;
  * @author coolGi
  * @version 2023-8-26
  */
-public class ConfigFileHandler
+public class ConfigFileHandling
 {
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final IMinecraftSharedWrapper MC_SHARED = SingletonInjector.INSTANCE.get(IMinecraftSharedWrapper.class);
 	
 	
+	public final ConfigBase configBase;
 	public final Path configPath;
 	
+	private final Logger logger;
+	
 	/** This is the object for night-config */
 	private final CommentedFileConfig nightConfig;
 	
@@ -62,8 +64,10 @@ public class ConfigFileHandler
 	// constructor //
 	//=============//
 	
-	public ConfigFileHandler(Path configPath)
+	public ConfigFileHandling(ConfigBase configBase, Path configPath)
 	{
+		this.logger = LogManager.getLogger(this.getClass().getSimpleName() + ", " + configBase.modID);
+		this.configBase = configBase;
 		this.configPath = configPath;
 		
 		this.nightConfig = CommentedFileConfig
@@ -76,9 +80,6 @@ public class ConfigFileHandler
 	
 	
 	
-	//====================//
-	// entire config file //
-	//====================//
 	
 	/** Saves the entire config to the file */
 	public void saveToFile() { this.saveToFile(this.nightConfig); }
@@ -100,7 +101,7 @@ public class ConfigFileHandler
 			this.loadNightConfig(nightConfig);
 			
 			
-			for (AbstractConfigBase<?> entry : ConfigHandler.INSTANCE.configBaseList)
+			for (AbstractConfigType<?, ?> entry : this.configBase.entries)
 			{
 				if (ConfigEntry.class.isAssignableFrom(entry.getClass()))
 				{
@@ -138,7 +139,7 @@ public class ConfigFileHandler
 		{
 			this.readWriteLock.lock();
 			
-			int currentCfgVersion = ModInfo.CONFIG_FILE_VERSION;
+			int currentCfgVersion = this.configBase.configVersion;
 			try
 			{
 				// Dont load the real `this.nightConfig`, instead create a tempoary one
@@ -150,29 +151,29 @@ public class ConfigFileHandler
 			}
 			catch (Exception ignored) { }
 			
-			if (currentCfgVersion == ModInfo.CONFIG_FILE_VERSION)
+			if (currentCfgVersion == this.configBase.configVersion)
 			{
 				// handle normally
 			}
-			else if (currentCfgVersion > ModInfo.CONFIG_FILE_VERSION)
+			else if (currentCfgVersion > this.configBase.configVersion)
 			{
-				LOGGER.warn("Found config version [" + currentCfgVersion + "] which is newer than current mods config version of [" + ModInfo.CONFIG_FILE_VERSION + "]. You may have downgraded the mod and items may have been moved, you have been warned");
+				this.logger.warn("Found config version [" + currentCfgVersion + "] which is newer than current mods config version of [" + this.configBase.configVersion + "]. You may have downgraded the mod and items may have been moved, you have been warned");
 			}
 			else // if (currentCfgVersion < configBase.configVersion)
 			{
-				LOGGER.warn(ModInfo.NAME + " config is of an older version, currently there is no config updater... so resetting config");
+				this.logger.warn(this.configBase.modName + " config is of an older version, currently there is no config updater... so resetting config");
 				try
 				{
 					Files.delete(this.configPath);
 				}
 				catch (Exception e)
 				{
-					LOGGER.error("Unable to delete outdated config file at: ["+this.configPath+"], error: ["+e.getMessage()+"].", e);
+					this.logger.error(e);
 				}
 			}
 			
 			this.loadFromFile(this.nightConfig);
-			this.nightConfig.set("_version", ModInfo.CONFIG_FILE_VERSION);
+			this.nightConfig.set("_version", this.configBase.configVersion);
 		}
 		finally
 		{
@@ -198,7 +199,7 @@ public class ConfigFileHandler
 		
 		
 		// Load all the entries
-		for (AbstractConfigBase<?> entry : ConfigHandler.INSTANCE.configBaseList)
+		for (AbstractConfigType<?, ?> entry : this.configBase.entries)
 		{
 			if (ConfigEntry.class.isAssignableFrom(entry.getClass())
 				&& entry.getAppearance().showInFile)
@@ -222,9 +223,6 @@ public class ConfigFileHandler
 	
 	
 	
-	//=======================//
-	// single config entries //
-	//=======================//
 	
 	// Save an entry when only given the entry
 	public void saveEntry(ConfigEntry<?> entry)
@@ -242,10 +240,10 @@ 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.");
+			throw new IllegalArgumentException("Entry [" + entry.getNameWCategory() + "] is null, this may be a problem with [" + this.configBase.modName + "]. Please contact the authors.");
 		}
 		
-		workConfig.set(entry.getNameAndCategory(), ConfigTypeConverters.attemptToConvertToString(entry.getType(), entry.getTrueValue()));
+		workConfig.set(entry.getNameWCategory(), ConfigTypeConverters.attemptToConvertToString(entry.getType(), entry.getTrueValue()));
 	}
 	
 	/** Loads an entry when only given the entry */
@@ -255,11 +253,9 @@ public class ConfigFileHandler
 	public <T> void loadEntry(ConfigEntry<T> entry, CommentedFileConfig nightConfig)
 	{
 		if (!entry.getAppearance().showInFile)
-		{
 			return;
-		}
 		
-		if (!nightConfig.contains(entry.getNameAndCategory()))
+		if (!nightConfig.contains(entry.getNameWCategory()))
 		{
 			this.saveEntry(entry, nightConfig);
 			return;
@@ -270,33 +266,34 @@ public class ConfigFileHandler
 		{
 			if (entry.getType().isEnum())
 			{
-				entry.setWithoutFiringEvents((T) (nightConfig.getEnum(entry.getNameAndCategory(), (Class<? extends Enum>) entry.getType())));
+				entry.pureSet((T) (nightConfig.getEnum(entry.getNameWCategory(), (Class<? extends Enum>) entry.getType())));
 				return;
 			}
 			
 			// try converting the value if necessary
 			Class<?> expectedValueClass = entry.getType();
-			Object value = nightConfig.get(entry.getNameAndCategory());
+			Object value = nightConfig.get(entry.getNameWCategory());
 			Object convertedValue = ConfigTypeConverters.attemptToConvertFromString(expectedValueClass, value);
 			if (!convertedValue.getClass().equals(expectedValueClass))
 			{
-				LOGGER.error("Unable to convert config value ["+value+"] from ["+(value != null ? value.getClass() : "NULL")+"] to ["+expectedValueClass+"] for config ["+entry.name+"], " +
+				this.logger.error("Unable to convert config value ["+value+"] from ["+(value != null ? value.getClass() : "NULL")+"] to ["+expectedValueClass+"] for config ["+entry.name+"], " +
 						"the default config value will be used instead ["+entry.getDefaultValue()+"]. " +
 						"Make sure a converter is defined in ["+ConfigTypeConverters.class.getSimpleName()+"].");
 				convertedValue = entry.getDefaultValue();
 			}
-			entry.setWithoutFiringEvents((T) convertedValue);
+			entry.pureSet((T) convertedValue);
 			
 			if (entry.getTrueValue() == null) 
 			{
-				LOGGER.warn("BlockBiomeWrapperPair [" + entry.getNameAndCategory() + "] returned as null from the config. Using default value.");
-				entry.setWithoutFiringEvents(entry.getDefaultValue());
+				this.logger.warn("Entry [" + entry.getNameWCategory() + "] returned as null from the config. Using default value.");
+				entry.pureSet(entry.getDefaultValue());
 			}
 		}
 		catch (Exception e)
 		{
-			LOGGER.warn("BlockBiomeWrapperPair [" + entry.getNameAndCategory() + "] had an invalid value when loading the config. Using default value.");
-			entry.setWithoutFiringEvents(entry.getDefaultValue());
+//                e.printStackTrace();
+			this.logger.warn("Entry [" + entry.getNameWCategory() + "] had an invalid value when loading the config. Using default value.");
+			entry.pureSet(entry.getDefaultValue());
 		}
 	}
 	
@@ -317,17 +314,15 @@ public class ConfigFileHandler
 		// the new line makes it easier to read and separate configs
 		// the space makes sure the first word of a comment isn't directly in line with the "#" 
 		comment = "\n " + comment;
-		nightConfig.setComment(entry.getNameAndCategory(), comment);
+		nightConfig.setComment(entry.getNameWCategory(), comment);
 	}
 	
 	
 	
-	//=============//
-	// nightconfig //
-	//=============//
+	
 	
 	/**
-	 * Uses {@link ConfigFileHandler#nightConfig} to do {@link CommentedFileConfig#load()} but with error checking
+	 * Uses {@link ConfigFileHandling#nightConfig} to do {@link CommentedFileConfig#load()} but with error checking
 	 *
 	 * @apiNote This overwrites any value currently stored in the config
 	 */
@@ -349,29 +344,23 @@ public class ConfigFileHandler
 			}
 			catch (Exception e)
 			{
-				LOGGER.warn("Loading file failed because of this expectation:\n" + e);
+				this.logger.warn("Loading file failed because of this expectation:\n" + e);
 				
 				reCreateFile(this.configPath);
 				
 				nightConfig.load();
 			}
 		}
-		catch (Exception e)
+		catch (Exception ex)
 		{
-			LOGGER.error("File creation failed at ["+this.configPath+"], error: ["+e.getMessage()+"].", e);
-			
-			// TODO is there a reason this is lazily gotten?
-			IMinecraftClientWrapper mc = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
-			mc.crashMinecraft("Loading file and resetting config file failed at path [" + this.configPath + "]. Please check the file is ok and you have the permissions", e);
+			System.out.println("Creating file failed");
+			this.logger.error(ex);
+			SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class).crashMinecraft("Loading file and resetting config file failed at path [" + this.configPath + "]. Please check the file is ok and you have the permissions", ex);
 		}
 	}
 	
 	
 	
-	//===============//
-	// file handling //
-	//===============//
-	
 	public static void reCreateFile(Path path)
 	{
 		try

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

@@ -23,7 +23,7 @@ import com.electronwill.nightconfig.core.Config;
 import com.electronwill.nightconfig.core.io.ParsingMode;
 import com.electronwill.nightconfig.json.JsonFormat;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.Logger;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -36,7 +36,7 @@ import java.util.Map;
  */
 public class ConfigTypeConverters
 {
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
 	// Once you've made a converter add it to here where the first value is the type you want to convert and the 2nd value is the converter
 	public static final Map<Class<?>, ConverterBase> convertObjects = new HashMap<Class<?>, ConverterBase>()

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

@@ -1,10 +0,0 @@
-package com.seibel.distanthorizons.core.config.gui;
-
-/** 
- * Points to a Common object that holds the GUI state.
- * Having this interface allows for cleaner casting.
- */
-public interface IConfigGuiInfo
-{
-	
-}

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

@@ -23,7 +23,6 @@ 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;
 
@@ -36,8 +35,6 @@ public class JavaScreenHandlerScreen extends AbstractScreen
 	public static boolean firstRun = true;
 	public final Component jComponent;
 	
-	
-	
 	static
 	{
 		// Note: this code can cause Mac
@@ -57,25 +54,19 @@ public class JavaScreenHandlerScreen extends AbstractScreen
 	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));
+		frame.add(jComponent);
 		
 		JavaScreenHandlerScreen thiss = this;
 		
-		frame.addKeyListener(new KeyListener() 
-		{
+		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
@@ -89,8 +80,8 @@ public class JavaScreenHandlerScreen extends AbstractScreen
 			EmbeddedFrameUtil.embeddedFrameSetBounds(frame, 0, 0, this.width, this.height);
 			firstRun = false;
 		}
-		
-		EmbeddedFrameUtil.showFrame(frame);
+		else
+			EmbeddedFrameUtil.showFrame(frame);
 	}
 	
 	/** A testing/debug screen */
@@ -98,43 +89,13 @@ public class JavaScreenHandlerScreen extends AbstractScreen
 	{
 		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");
-			}
+			setLayout(new GridBagLayout());
+			GridBagConstraints constraints = new GridBagConstraints();
+			constraints.fill = GridBagConstraints.HORIZONTAL;
+			constraints.weightx = 0.5;
+			constraints.gridx = 0;
+			constraints.gridy = 0;
+			add(new JLabel("Hello World!"), constraints);
 		}
 		
 	}
@@ -155,10 +116,8 @@ public class JavaScreenHandlerScreen extends AbstractScreen
 	@Override
 	public void onClose()
 	{
-		frame.remove(this.jComponent);
+		frame.remove(jComponent);
 		EmbeddedFrameUtil.hideFrame(frame);
 	}
 	
-	
-	
 }

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

@@ -0,0 +1,126 @@
+/*
+ *    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.api.enums.config.EDhApiGpuUploadMethod;
+import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
+import com.seibel.distanthorizons.core.render.glObject.buffer.GLVertexBuffer;
+import com.seibel.distanthorizons.core.render.glObject.shader.ShaderProgram;
+import com.seibel.distanthorizons.core.render.glObject.vertexAttribute.AbstractVertexAttribute;
+import com.seibel.distanthorizons.core.render.glObject.vertexAttribute.VertexPointer;
+import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftGLWrapper;
+import org.lwjgl.opengl.GL32;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+/**
+ * @author coolGi
+ */
+public class OpenGLConfigScreen extends AbstractScreen
+{
+	private static final IMinecraftGLWrapper GLMC = SingletonInjector.INSTANCE.get(IMinecraftGLWrapper.class);
+	
+	private ShaderProgram basicShader;
+	private GLVertexBuffer sameContextBuffer;
+	private GLVertexBuffer sharedContextBuffer;
+	private AbstractVertexAttribute va;
+	
+	
+	
+	@Override
+	public void init()
+	{
+		System.out.println("init");
+		
+		this.va = AbstractVertexAttribute.create();
+		this.va.bind();
+		// Pos
+		this.va.setVertexAttribute(0, 0, VertexPointer.addVec2Pointer(false));
+		// Color
+		this.va.setVertexAttribute(0, 1, VertexPointer.addVec4Pointer(false));
+		this.va.completeAndCheck(Float.BYTES * 6);
+		this.basicShader = new ShaderProgram("shaders/test/vert.vert", "shaders/test/frag.frag",
+						"fragColor", new String[]{"vPosition", "color"});
+		this.createBuffer();
+	}
+	
+	// Render a square with uv color
+	private static final float[] vertices = {
+			// PosX,Y, ColorR,G,B,A
+			-0.5f, -0.5f, 0.0f, 0.0f, 0.0f, 1.0f,
+			0.4f, -0.4f, 1.0f, 0.0f, 0.0f, 1.0f,
+			0.3f, 0.3f, 1.0f, 1.0f, 0.0f, 0.0f,
+			-0.2f, 0.2f, 0.0f, 1.0f, 1.0f, 1.0f
+	};
+	
+	private static GLVertexBuffer createTextingBuffer()
+	{
+		ByteBuffer buffer = ByteBuffer.allocateDirect(vertices.length * Float.BYTES);
+		// Fill buffer with the vertices.
+		buffer = buffer.order(ByteOrder.nativeOrder());
+		buffer.asFloatBuffer().put(vertices);
+		buffer.rewind();
+		GLVertexBuffer vbo = new GLVertexBuffer(false);
+		vbo.bind();
+		vbo.uploadBuffer(buffer, 4, EDhApiGpuUploadMethod.DATA, vertices.length * Float.BYTES);
+		return vbo;
+	}
+	
+	private void createBuffer()
+	{
+		this.sharedContextBuffer = createTextingBuffer();
+		this.sameContextBuffer = createTextingBuffer();
+	}
+	
+	@Override
+	public void render(float delta)
+	{
+		System.out.println("Updated config screen with the delta of " + delta);
+		
+		GL32.glViewport(0, 0, this.width, this.height);
+		GL32.glPolygonMode(GL32.GL_FRONT_AND_BACK, GL32.GL_FILL);
+		GLMC.disableFaceCulling();
+		GLMC.disableDepthTest();
+		GLMC.disableBlend();
+		
+		this.basicShader.bind();
+		this.va.bind();
+		
+		// Switch between the two buffers per second
+		if (System.currentTimeMillis() % 2000 < 1000)
+		{
+			this.sameContextBuffer.bind();
+			this.va.bindBufferToAllBindingPoints(this.sameContextBuffer.getId());
+		}
+		else
+		{
+			this.sameContextBuffer.bind();
+			this.va.bindBufferToAllBindingPoints(this.sharedContextBuffer.getId());
+		}
+		// Render the square
+		GL32.glDrawArrays(GL32.GL_TRIANGLE_FAN, 0, 4);
+		GL32.glClear(GL32.GL_DEPTH_BUFFER_BIT);
+	}
+	
+	@Override
+	public void tick() { System.out.println("Ticked"); }
+	
+}

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

@@ -19,27 +19,25 @@
 
 package com.seibel.distanthorizons.core.config.types;
 
-import com.seibel.distanthorizons.core.config.gui.IConfigGuiInfo;
+import com.seibel.distanthorizons.core.config.ConfigBase;
 import com.seibel.distanthorizons.core.config.types.enums.EConfigEntryAppearance;
 
 /**
- * The class all config options should extend
+ * The class where all config options should extend
  *
  * @author coolGi
  */
-public abstract class AbstractConfigBase<T>
+// Note for devs: The "S" is the class that is extending this
+public abstract class AbstractConfigType<T, S>
 {
 	public String category = "";    // This should only be set once in the init
 	public String name;            // This should only be set once in the init
 	protected final T defaultValue;
 	protected final boolean isFloatingPointNumber;
 	protected T value;
+	public ConfigBase configBase;
 	
-	/** 
-	 * This stores information related to the GUI state.
-	 * This is set during config UI setup.
-	 */
-	public IConfigGuiInfo guiValue;
+	public Object guiValue; // This is a storage variable something like the gui can use
 	
 	protected EConfigEntryAppearance appearance;
 	
@@ -49,7 +47,7 @@ public abstract class AbstractConfigBase<T>
 	// constructor //
 	//=============//
 	
-	protected AbstractConfigBase(EConfigEntryAppearance appearance, T defaultValue)
+	protected AbstractConfigType(EConfigEntryAppearance appearance, T defaultValue)
 	{
 		this.defaultValue = defaultValue;
 		this.value = defaultValue;
@@ -76,7 +74,7 @@ public abstract class AbstractConfigBase<T>
 	
 	public String getCategory() { return this.category; }
 	public String getName() { return this.name; }
-	public String getNameAndCategory() { return (this.category.isEmpty() ? "" : this.category + ".") + this.name; }
+	public String getNameWCategory() { return (this.category.isEmpty() ? "" : this.category + ".") + this.name; }
 	
 	
 	/** Gets the class of T */

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

@@ -27,19 +27,10 @@ import com.seibel.distanthorizons.core.config.types.enums.EConfigEntryAppearance
  *
  * @author coolGi
  */
-public class ConfigCategory extends AbstractConfigBase<Class<?>>
+public class ConfigCategory extends AbstractConfigType<Class<?>, ConfigCategory>
 {
-	/** 
-	 * Defines where this category points to. <br>
-	 * May be defined during config setup.
-	 */
-	public String destination;
-	
-	
-	
-	//=============//
-	// constructor //
-	//=============//
+	/** This should not be set by anything other than the config system itself */
+	public String destination;    // Where the category goes to
 	
 	private ConfigCategory(EConfigEntryAppearance appearance, Class<?> value, String destination)
 	{
@@ -47,26 +38,20 @@ public class ConfigCategory extends AbstractConfigBase<Class<?>>
 		this.destination = destination;
 	}
 	
-	
-	
-	//==================//
-	// property getters //
-	//==================//
-	
-	public String getDestination() { return this.destination; }
+	public String getDestination()
+	{
+		return this.destination;
+	}
 	
 	/** Use get() instead for category */
 	@Override
 	@Deprecated
-	public Class<?> getType() { return this.value; }
+	public Class<?> getType()
+	{
+		return value;
+	}
 	
-	
-	
-	//=========//
-	// builder //
-	//=========//
-	
-	public static class Builder extends AbstractConfigBase.Builder<Class<?>, Builder>
+	public static class Builder extends AbstractConfigType.Builder<Class<?>, Builder>
 	{
 		private String tmpDestination = null;
 		

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

@@ -20,13 +20,12 @@
 package com.seibel.distanthorizons.core.config.types;
 
 
-import com.seibel.distanthorizons.core.config.ConfigHandler;
-import com.seibel.distanthorizons.core.util.NumberUtil;
-import com.seibel.distanthorizons.core.config.file.ConfigFileHandler;
+import com.seibel.distanthorizons.core.config.NumberUtil;
 import com.seibel.distanthorizons.core.config.listeners.ConfigChangeListener;
 import com.seibel.distanthorizons.core.config.listeners.IConfigListener;
 import com.seibel.distanthorizons.core.config.types.enums.EConfigEntryAppearance;
-import com.seibel.distanthorizons.core.config.types.enums.EConfigValidity;
+import com.seibel.distanthorizons.core.config.types.enums.EConfigEntryPerformance;
+import com.seibel.distanthorizons.coreapi.interfaces.config.IConfigEntry;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
@@ -34,38 +33,40 @@ import java.util.Arrays;
 import java.util.function.Consumer;
 
 /**
- * This config type allows for entering text, number, or enum values.
+ * Use for making the config variables
+ * for types that are not supported by it look in ConfigBase
  *
  * @author coolGi
+ * @version 2023-7-16
  */
-public class ConfigEntry<T> extends AbstractConfigBase<T>
+public class ConfigEntry<T> extends AbstractConfigType<T, ConfigEntry<T>> implements IConfigEntry<T>
 {
-	private final String comment;
+	private String comment;
 	private T min;
 	private T max;
 	private final ArrayList<IConfigListener> listenerList;
 	private final String chatCommandName;
 	
+	private final EConfigEntryPerformance performance;
+	
+	// API control //
 	/**
 	 * If true this config can be controlled by the API <br>
 	 * and any get() method calls will return the apiValue if it is set.
 	 */
-	private final boolean allowApiOverride;
+	public final boolean allowApiOverride;
 	/** Will be null if un-set */
 	@Nullable
 	private T apiValue;
 	
 	
 	
-	//=============//
-	// constructor //
-	//=============//
-	
+	/** Creates the entry */
 	private ConfigEntry(
 			EConfigEntryAppearance appearance, 
-			String comment, String chatCommandName, 
-			T value, T min, T max,
-			boolean allowApiOverride, 
+			T value, String comment, T min, T max, 
+			String chatCommandName, boolean allowApiOverride, 
+			EConfigEntryPerformance performance, 
 			ArrayList<IConfigListener> listenerList)
 	{
 		super(appearance, value);
@@ -75,57 +76,38 @@ public class ConfigEntry<T> extends AbstractConfigBase<T>
 		this.max = max;
 		this.chatCommandName = chatCommandName;
 		this.allowApiOverride = allowApiOverride;
+		this.performance = performance;
 		this.listenerList = listenerList;
 	}
 	
 	
 	
-	//==========================//
-	// property getters/setters //
-	//==========================//
-	
-	/** the string used when entering the config into the command line or chat */
-	public String getChatCommandName() { return this.chatCommandName; }
-	
-	public String getComment() { return this.comment; }
-	
-	/**
-	 * If true this config can be controlled by the API <br>
-	 * and any get() method calls will return the apiValue if it is set.
-	 */
-	public boolean getAllowApiOverride() { return this.allowApiOverride; }
-	
-	public T getMin() { return this.min; }
-	public void setMin(T newMin) { this.min = newMin; }
-	public T getMax() { return this.max; }
-	public void setMax(T newMax) { this.max = newMax; }
-	
-	
-	
-	//===============//
-	// value setters //
-	//===============//
+	/** Gets the default value of the option */
+	@Override
+	public T getDefaultValue() { return super.defaultValue; }
 	
+	@Override
 	public void setApiValue(T newApiValue)
 	{
 		this.apiValue = newApiValue;
 		this.listenerList.forEach(IConfigListener::onConfigValueSet);
 	}
+	@Override
+	public T getApiValue() { return this.apiValue; }
+	@Override
+	public boolean getAllowApiOverride() { return this.allowApiOverride; }
 	
-	public boolean apiIsOverriding() 
-	{ 
-		return this.allowApiOverride 
-				&& this.apiValue != null; 
-	}
-		
 	/** 
-	 * Should only be used when loading the config from file. <Br>
-	 * Sets the value without informing the rest of the code (ie, it doesn't call listeners, or saving the value to file).
-	 * @see ConfigFileHandler
+	 * DONT USE THIS IN YOUR CODE <br>
+	 * Sets the value without informing the rest of the code (ie, doesnt call listeners, or saves the value). <br>
+	 * Should only be used when loading the config from the file (in places like the {@link com.seibel.distanthorizons.core.config.file.ConfigFileHandling} or {@link com.seibel.distanthorizons.core.config.ConfigBase})
 	 */
-	public void setWithoutFiringEvents(T newValue) { super.set(newValue); }
+	public void pureSet(T newValue) {
+		super.set(newValue);
+	}
 	
 	/** Sets the value without saving */
+	@Override
 	public void setWithoutSaving(T newValue)
 	{
 		super.set(newValue);
@@ -150,35 +132,74 @@ public class ConfigEntry<T> extends AbstractConfigBase<T>
 	}
 	
 	
-	
-	//===============//
-	// value getters //
-	//===============//
-	
 	@Override
 	public T get()
 	{
-		if (this.allowApiOverride 
-			&& this.apiValue != null)
+		if (this.allowApiOverride && this.apiValue != null)
 		{
 			return this.apiValue;
 		}
 		
 		return super.get();
 	}
-	/** Ignores the API value if set. */
-	public T getTrueValue() { return super.get(); }
-	
-	public T getDefaultValue() { return super.defaultValue; }
-	
-	@Nullable
-	public T getApiValue() { return this.apiValue; }
+	@Override
+	public T getTrueValue()
+	{
+		return super.get();
+	}
 	
 	
+	/** Gets the min value */
+	@Override
+	public T getMin() { return this.min; }
+	/** Sets the min value */
+	@Override
+	public void setMin(T newMin) { this.min = newMin; }
+	/** Gets the max value */
+	@Override
+	public T getMax() { return this.max; }
+	/** Sets the max value */
+	@Override
+	public void setMax(T newMax) { this.max = newMax; }
+	/** Sets the min and max within a single setter */
+	@Override
+	public void setMinMax(T newMin, T newMax)
+	{
+		this.setMin(newMin);
+		this.setMax(newMax);
+	}
 	
-	//===========//
-	// listeners //
-	//===========//
+	/**
+	 * Clamps the value within the set range
+	 *
+	 * @apiNote This does not save the value
+	 */
+	public void clampWithinRange() { this.clampWithinRange(this.min, this.max); }
+	/**
+	 * Clamps the value within a set range
+	 *
+	 * @param min The minimum that the value can be
+	 * @param max The maximum that the value can be
+	 * @apiNote This does not save the value
+	 */
+	@SuppressWarnings("unchecked") // Suppress due to its always safe
+	public void clampWithinRange(T min, T max)
+	{
+		byte validness = this.isValid(min, max);
+		if (validness == -1) this.value = (T) NumberUtil.getMinimum(this.value.getClass());
+		if (validness == 1) this.value = (T) NumberUtil.getMaximum(this.value.getClass());
+	}
+	
+	// TODO is this for command line use?
+	public String getChatCommandName() { return this.chatCommandName; }
+	
+	@Override
+	public String getComment() { return this.comment; }
+	@Override
+	public void setComment(String newComment) { this.comment = newComment; }
+	
+	/** Gets the performance impact of an option */
+	public EConfigEntryPerformance getPerformance() { return this.performance; }
 	
 	/** Fired whenever the config value changes to a new value. */
 	public void addValueChangeListener(Consumer<T> onValueChangeFunc)
@@ -203,114 +224,116 @@ public class ConfigEntry<T> extends AbstractConfigBase<T>
 	public void setListeners(IConfigListener... newListeners) { this.listenerList.addAll(Arrays.asList(newListeners)); }
 	
 	
-	
-	//====================//
-	// min/max validation //
-	//====================//
-	
-	/** Checks if this config's current value is valid */
-	public EConfigValidity getValidity() { return this.getValidity(this.value, this.min, this.max); }
-	/** Checks if the given value is valid */
-	public EConfigValidity getValidity(@Nullable T value) { return this.getValidity(value, this.min, this.max); }
-	/** Checks if the given value is valid */
-	public EConfigValidity getValidity(@Nullable T value, @Nullable T min, @Nullable T max)
+	/**
+	 * Checks if the option is valid
+	 *
+	 * @return 0 == valid
+	 * <p>  2 == invalid
+	 * <p>  1 == number too high
+	 * <p> -1 == number too low
+	 */
+	@Override
+	public byte isValid() { return isValid(this.value, this.min, this.max); }
+	/**
+	 * Checks if a new value is valid
+	 *
+	 * @param value Value that is being checked whether valid
+	 * @return 0 == valid
+	 * <p>  2 == invalid
+	 * <p>  1 == number too high
+	 * <p> -1 == number too low
+	 */
+	@Override
+	public byte isValid(T value) { return this.isValid(value, this.min, this.max); }
+	/**
+	 * Checks if a new value is valid
+	 *
+	 * @param min The minimum that the value can be
+	 * @param max The maximum that the value can be
+	 * @return 0 == valid
+	 * <p>  2 == invalid
+	 * <p>  1 == number too high
+	 * <p> -1 == number too low
+	 */
+	public byte isValid(T min, T max) { return this.isValid(this.value, min, max); }
+	/**
+	 * Checks if a new value is valid
+	 *
+	 * @param value Value that is being checked whether valid
+	 * @param min The minimum that the value can be
+	 * @param max The maximum that the value can be
+	 * @return 0 == valid
+	 * <p>  2 == invalid
+	 * <p>  1 == number too high
+	 * <p> -1 == number too low
+	 */
+	public byte isValid(T value, T min, T max)
 	{
-		if (!ConfigHandler.INSTANCE.runMinMaxValidation)
+		if (this.configBase.disableMinMax)
 		{
-			return EConfigValidity.VALID;
+			return 0;
 		}
-		else if (min == null 
-				&& max == null)
+		else if (min == null && max == null)
 		{
 			// no validation is needed for this field
-			return EConfigValidity.VALID;
+			return 0;
 		}
-		else if (value == null 
-				|| this.value == null
+		else if (value == null || this.value == null
 				|| value.getClass() != this.value.getClass())
 		{
-			// If the 2 variables aren't the same type
-			// or the input is missing
-			// then it will be invalid
-			return EConfigValidity.INVALID;
+			// If the 2 variables aren't the same type then it will be invalid
+			return 2;
 		}
-		else if (value instanceof Number)
+		else if (Number.class.isAssignableFrom(value.getClass()))
 		{ 
-			// Only check min/max if this config's type is a number
-			if (max != null 
-				&& NumberUtil.greaterThan((Number) value, (Number) max))
+			// Only check min max if it is a number
+			if (max != null && NumberUtil.greaterThan((Number) value, (Number) max))
 			{
-				return EConfigValidity.NUMBER_TOO_HIGH;
+				return 1;
+			}
+			if (min != null && NumberUtil.lessThan((Number) value, (Number) min))
+			{
+				return -1;
 			}
 			
-			if (min != null 
-				&& NumberUtil.lessThan((Number) value, (Number) min))
-			{
-				return EConfigValidity.NUMBER_TOO_LOW;
-			}
-			
-			return EConfigValidity.VALID;
+			return 0;
 		}
 		else
 		{
-			return EConfigValidity.VALID;
+			return 0;
 		}
 	}
 	
-	
-	
-	//===============//
-	// file handling //
-	//===============//
-	
 	/** This should normally not be called since set() automatically calls this */
-	public void save() { ConfigHandler.INSTANCE.configFileHandler.saveEntry(this); }
+	public void save() { configBase.configFileINSTANCE.saveEntry(this); }
 	/** This should normally not be called except for special circumstances */
-	public void load() { ConfigHandler.INSTANCE.configFileHandler.loadEntry(this); }
+	public void load() { configBase.configFileINSTANCE.loadEntry(this); }
 	
 	
-	
-	//================//
-	// base overrides //
-	//================//
-	
-	public boolean equals(AbstractConfigBase<?> obj) 
-	{
-		return obj.getClass() == ConfigEntry.class 
-				&& this.equals((ConfigEntry<?>) obj); 
-	}
+	@Override
+	public boolean equals(IConfigEntry<?> obj) { return obj.getClass() == ConfigEntry.class && equals((ConfigEntry<?>) obj); }
 	/** Is the value of this equal to another */
 	public boolean equals(ConfigEntry<?> obj)
 	{
 		// Can all of this just be "return this.value.equals(obj.value)"?
 		
 		if (Number.class.isAssignableFrom(this.value.getClass()))
-		{
 			return this.value == obj.value;
-		}
 		else
-		{
 			return this.value.equals(obj.value);
-		}
 	}
 	
 	
-	
-	//=========//
-	// builder //
-	//=========//
-	
-	public static class Builder<T> extends AbstractConfigBase.Builder<T, Builder<T>>
+	public static class Builder<T> extends AbstractConfigType.Builder<T, Builder<T>>
 	{
 		private String tmpComment = null;
 		private T tmpMin = null;
 		private T tmpMax = null;
 		protected String tmpChatCommandName = null;
 		private boolean tmpUseApiOverwrite = true;
+		private EConfigEntryPerformance tmpPerformance = EConfigEntryPerformance.DONT_SHOW;
 		protected ArrayList<IConfigListener> tmpIConfigListener = new ArrayList<>();
 		
-		
-		
 		public Builder<T> comment(String newComment)
 		{
 			this.tmpComment = newComment;
@@ -356,6 +379,12 @@ public class ConfigEntry<T> extends AbstractConfigBase<T>
 			return this;
 		}
 		
+		public Builder<T> setPerformance(EConfigEntryPerformance newPerformance)
+		{
+			this.tmpPerformance = newPerformance;
+			return this;
+		}
+		
 		
 		
 		public Builder<T> replaceListeners(ArrayList<IConfigListener> newConfigListener)
@@ -384,15 +413,13 @@ public class ConfigEntry<T> extends AbstractConfigBase<T>
 		
 		
 		
-		// build //
-		
 		public ConfigEntry<T> build()
 		{
 			return new ConfigEntry<>(
-					this.tmpAppearance,
-					this.tmpComment, this.tmpChatCommandName, this.tmpValue, this.tmpMin, this.tmpMax,
-					this.tmpUseApiOverwrite, 
-					this.tmpIConfigListener);
+					this.tmpAppearance, 
+					this.tmpValue, this.tmpComment, this.tmpMin, this.tmpMax, 
+					this.tmpChatCommandName, this.tmpUseApiOverwrite, 
+					this.tmpPerformance, this.tmpIConfigListener);
 		}
 		
 	}

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

@@ -21,42 +21,29 @@ package com.seibel.distanthorizons.core.config.types;
 
 import com.seibel.distanthorizons.core.config.types.enums.EConfigEntryAppearance;
 
-public class ConfigUIButton extends AbstractConfigBase<Runnable>
+public class ConfigUIButton extends AbstractConfigType<Runnable, ConfigUIButton>
 {
-	//=============//
-	// constructor //
-	//=============//
-	
 	public ConfigUIButton(Runnable runnable)
-	{ super(EConfigEntryAppearance.ONLY_IN_GUI, runnable); }
+	{
+		super(EConfigEntryAppearance.ONLY_IN_GUI, runnable);
+	}
 	
-	
-	
-	//=========//
-	// actions //
-	//=========//
-	
-	/** 
-	 * Runs the action of the button. 
-	 * NOTE: This will run on the render thread 
-	 * (so it can halt the main process if it takes too long and isn't offloaded to another thread)
-	 */
+	/** Runs the action of the button. NOTE: Will run on the main thread (so can halt the main process if not offloaded to a different thread) */
 	public void runAction() { this.value.run(); }
 	
-	
-	
-	//=========//
-	// builder //
-	//=========//
-	
-	public static class Builder extends AbstractConfigBase.Builder<Runnable, Builder>
+	public static class Builder extends AbstractConfigType.Builder<Runnable, Builder>
 	{
 		/** Appearance shouldn't be changed */
 		@Override
-		public Builder setAppearance(EConfigEntryAppearance newAppearance) { return this; }
+		public Builder setAppearance(EConfigEntryAppearance newAppearance)
+		{
+			return this;
+		}
 		
 		public ConfigUIButton build()
-		{ return new ConfigUIButton(this.tmpValue); }
+		{
+			return new ConfigUIButton(this.tmpValue);
+		}
 		
 	}
 	

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

@@ -19,47 +19,20 @@
 
 package com.seibel.distanthorizons.core.config.types;
 
-import com.seibel.distanthorizons.core.config.Config;
-import com.seibel.distanthorizons.core.config.types.enums.EConfigCommentTextPosition;
 import com.seibel.distanthorizons.core.config.types.enums.EConfigEntryAppearance;
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.logging.DhLogger;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 /**
  * Adds something like a ConfigEntry but without a button to change the input
  *
  * @author coolGi
  */
-public class ConfigUIComment extends AbstractConfigBase<String>
+public class ConfigUIComment extends AbstractConfigType<String, ConfigUIComment>
 {
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
-	
-	
-	public String parentConfigPath = null;
-	@Nullable
-	public EConfigCommentTextPosition textPosition = null;
-	
-	
-	
-	//=============//
-	// constructor //
-	//=============//
-	
-	public ConfigUIComment(String parentConfigPath, @Nullable EConfigCommentTextPosition textPosition)
+	public ConfigUIComment()
 	{
 		super(EConfigEntryAppearance.ONLY_IN_GUI, "");
-		this.parentConfigPath = parentConfigPath;
-		this.textPosition = textPosition;
 	}
 	
-	
-	
-	//=========//
-	// setters //
-	//=========//
-	
 	/** Appearance shouldn't be changed */
 	@Override
 	public void setAppearance(EConfigEntryAppearance newAppearance) { }
@@ -68,112 +41,27 @@ public class ConfigUIComment extends AbstractConfigBase<String>
 	@Override
 	public void set(String newValue) { }
 	
-	
-	
-	//=========//
-	// builder //
-	//=========//
-	
-	public static class Builder extends AbstractConfigBase.Builder<String, Builder>
+	public static class Builder extends AbstractConfigType.Builder<String, Builder>
 	{
-		public String tempParentConfigPath = null;
-		@Nullable
-		public EConfigCommentTextPosition tempTextPosition = null;
-		
-		
-		
 		/** Appearance shouldn't be changed */
-		@Deprecated
 		@Override
-		public Builder setAppearance(EConfigEntryAppearance newAppearance) { return this; }
-		
-		/** Pointless to set the value */
-		@Deprecated
-		@Override
-		public Builder set(String newValue)
-		{ return this; }
-		
-		
-		public Builder setParentConfigClass(@NotNull Class<?> parentConfigClass)
+		public Builder setAppearance(EConfigEntryAppearance newAppearance)
 		{
-			// expected format: "Config.Client.Advanced"
-			String packageName = parentConfigClass.getPackage().getName(); // com.seibel.distanthorizons.core.config
-			String fullName = parentConfigClass.getName(); // com.seibel.distanthorizons.core.config.Config$Common$MultiThreading
-			
-			try
-			{
-				String configPath = fullName.substring(
-						packageName.length() + // "com.seibel.distanthorizons.core.config"
-								1 + // "." before "Config"
-								Config.class.getSimpleName().length() + // "Config" 
-								1); // "$" before the inner class name
-				
-				// configPath after substring:
-				// Config$Common$MultiThreading
-				
-				this.tempParentConfigPath = convertPackageNameToLangPath(configPath); // client.advanced.graphics.Quality
-			}
-			catch (Exception e)
-			{
-				this.tempParentConfigPath = parentConfigClass.getSimpleName();
-				LOGGER.warn("Failed to parse config class: ["+fullName+"], error: ["+e.getMessage()+"], defaulting to: ["+this.tempParentConfigPath+"].", e);
-			}
-			
 			return this;
 		}
-		/** 
-		 * example:
-		 * input:  "Client$Advanced$multiThreading"
-		 * output: "client.advanced.multiThreading"
-		 */
-		public static String convertPackageNameToLangPath(String input)
+		
+		/** Pointless to set the value */
+		@Override
+		public Builder set(String newValue)
 		{
-			StringBuilder result = new StringBuilder(input.length());
-			
-			for (int i = 0; i < input.length(); i++)
-			{
-				char ch = input.charAt(i);
-				if (i == 0)
-				{
-					result.append(Character.toLowerCase(ch));
-					continue;
-				}
-				
-				// replace '$' -> '.' to match lang path naming
-				if (ch == '$')
-				{
-					result.append('.');
-					continue;
-				}
-				
-				char lastCh = input.charAt(i-1);
-				if (lastCh == '$')
-				{
-					result.append(Character.toLowerCase(ch));
-					continue;
-				}
-				
-				result.append(ch);
-			}
-			return result.toString();
+			return this;
 		}
 		
-		
-		public Builder setTextPosition(EConfigCommentTextPosition textPosition)
-		{
-			this.tempTextPosition = textPosition;
-			return this; 
-		}
-		
-		
-		
-		// build //
-		
 		public ConfigUIComment build()
-		{ return new ConfigUIComment(this.tempParentConfigPath, this.tempTextPosition); }
+		{
+			return new ConfigUIComment();
+		}
 		
 	}
 	
-	
-	
 }

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

@@ -1,71 +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.types;
-
-import com.seibel.distanthorizons.core.config.types.enums.EConfigEntryAppearance;
-
-/**
- * Adds empty space the height of a button.
- * Useful for separating different categories.
- */
-public class ConfigUISpacer extends AbstractConfigBase<String>
-{
-	//=============//
-	// constructor //
-	//=============//
-	
-	public ConfigUISpacer()
-	{ super(EConfigEntryAppearance.ONLY_IN_GUI, ""); }
-	
-	
-	
-	//=========//
-	// setters //
-	//=========//
-	
-	/** Appearance shouldn't be changed */
-	@Override
-	public void setAppearance(EConfigEntryAppearance newAppearance) { }
-	
-	/** Pointless to set the value */
-	@Override
-	public void set(String newValue) { }
-	
-	
-	
-	//=========//
-	// builder //
-	//=========//
-	
-	public static class Builder extends AbstractConfigBase.Builder<String, Builder>
-	{
-		/** Appearance shouldn't be changed */
-		@Override
-		public Builder setAppearance(EConfigEntryAppearance newAppearance) { return this; }
-		
-		/** Pointless to set the value */
-		@Override
-		public Builder set(String newValue) { return this; }
-		
-		public ConfigUISpacer build() { return new ConfigUISpacer(); }
-		
-	}
-	
-}

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

@@ -23,24 +23,17 @@ import com.seibel.distanthorizons.core.config.types.enums.EConfigEntryAppearance
 
 /**
  * Creates a UI element that copies everything from another element.
- * This element is only visible in the GUI.
+ * This only effects the UI
  *
  * @author coolGi
  */
-public class ConfigUiLinkedEntry extends AbstractConfigBase<AbstractConfigBase<?>>
+@Deprecated // FIXME doesn't work with localization
+public class ConfigUiLinkedEntry extends AbstractConfigType<AbstractConfigType<?, ?>, ConfigUiLinkedEntry>
 {
-	//=============//
-	// constructor //
-	//=============//
-	
-	public ConfigUiLinkedEntry(AbstractConfigBase<?> value)
-	{ super(EConfigEntryAppearance.ONLY_IN_GUI, value); }
-	
-	
-	
-	//=========//
-	// setters //
-	//=========//
+	public ConfigUiLinkedEntry(AbstractConfigType<?, ?> value)
+	{
+		super(EConfigEntryAppearance.ONLY_IN_GUI, value);
+	}
 	
 	/** Appearance shouldn't be changed */
 	@Override
@@ -48,15 +41,10 @@ public class ConfigUiLinkedEntry extends AbstractConfigBase<AbstractConfigBase<?
 	
 	/** Value shouldn't be changed after creation */
 	@Override
-	public void set(AbstractConfigBase<?> newValue) { }
+	public void set(AbstractConfigType<?, ?> newValue) { }
 	
 	
-	
-	//=========//
-	// builder //
-	//=========//
-	
-	public static class Builder extends AbstractConfigBase.Builder<AbstractConfigBase<?>, Builder>
+	public static class Builder extends AbstractConfigType.Builder<AbstractConfigType<?, ?>, Builder>
 	{
 		/** Appearance shouldn't be changed */
 		@Override
@@ -72,6 +60,4 @@ public class ConfigUiLinkedEntry extends AbstractConfigBase<AbstractConfigBase<?
 		
 	}
 	
-	
-	
 }

core/src/main/java/com/seibel/distanthorizons/core/config/types/enums/EConfigEntryPerformance.java

@@ -20,13 +20,19 @@
 package com.seibel.distanthorizons.core.config.types.enums;
 
 /**
- * RIGHT_OVER_BUTTONS <br/>
- * CENTER_OF_SCREEN <br/>
- * CENTERED_OVER_BUTTONS <br/>
+ * What is the performance impact of an entry
+ * (default is DONT_SHOW)
+ *
+ * @author coolGi
  */
-public enum EConfigCommentTextPosition
+public enum EConfigEntryPerformance
 {
-	RIGHT_JUSTIFIED,
-	CENTER_OF_SCREEN,
-	CENTERED_OVER_BUTTONS,
+	NONE,
+	VERY_LOW,
+	LOW,
+	MEDIUM,
+	HIGH,
+	VERY_HIGH,
+	
+	DONT_SHOW
 }

core/src/main/java/com/seibel/distanthorizons/core/config/types/enums/EConfigValidity.java

@@ -1,15 +0,0 @@
-package com.seibel.distanthorizons.core.config.types.enums;
-
-/**
- * VALID
- * INVALID
- * NUMBER_TOO_HIGH
- * NUMBER_TOO_LOW
- */
-public enum EConfigValidity
-{
-	VALID,
-	INVALID,
-	NUMBER_TOO_HIGH,
-	NUMBER_TOO_LOW,
-}

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

@@ -1,151 +0,0 @@
-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;
-
-/**
- * A pooled compound key between the biome and blockState. <br>
- * These objects are pooled since we will need this compound key
- * many times.
- * 
- * @see FullDataPointIdMap
- * @see IBlockStateWrapper
- * @see IBiomeWrapper
- */
-public class BlockBiomeWrapperPair
-{
-	private static final IWrapperFactory WRAPPER_FACTORY = SingletonInjector.INSTANCE.get(IWrapperFactory.class);
-	
-	/** two levels are present so we don't need to use a key object */
-	private static final ConcurrentHashMap<IBlockStateWrapper, ConcurrentHashMap<IBiomeWrapper, BlockBiomeWrapperPair>> CACHED_PAIR_BY_BIOME_BY_BLOCK = new ConcurrentHashMap<>();
-	
-	public final IBiomeWrapper biome;
-	public final IBlockStateWrapper blockState;
-	
-	private int hashCode = 0;
-	private boolean hashGenerated = false;
-	private String serialString = null;
-	
-	
-	
-	//=============//
-	// constructor //
-	//=============//
-	
-	public static BlockBiomeWrapperPair get(IBlockStateWrapper blockState, IBiomeWrapper biome)
-	{
-		// check for existing entry
-		ConcurrentHashMap<IBiomeWrapper, BlockBiomeWrapperPair> pairByBiomeWrapper = CACHED_PAIR_BY_BIOME_BY_BLOCK.get(blockState);
-		if (pairByBiomeWrapper != null)
-		{
-			BlockBiomeWrapperPair pair = pairByBiomeWrapper.get(biome);
-			if (pair != null)
-			{
-				return pair;
-			}
-		}
-		
-		// Lazily create the inner map and new BlockBiomeWrapperPair
-		return CACHED_PAIR_BY_BIOME_BY_BLOCK
-				.computeIfAbsent(blockState, newBlockState -> new ConcurrentHashMap<>())
-				.computeIfAbsent(biome, newBiome -> new BlockBiomeWrapperPair(biome, blockState));
-	}
-	private BlockBiomeWrapperPair(IBiomeWrapper biome, IBlockStateWrapper blockState)
-	{
-		this.biome = biome;
-		this.blockState = blockState;
-	}
-	
-	
-	
-	//===========//
-	// overrides //
-	//===========//
-	
-	/** 
-	 * Reminder: this hash code won't always be unique, collisions can occur;
-	 * because of that this hash shouldn't be the only unique identifier for this object.
-	 */
-	@Override
-	public int hashCode()
-	{
-		// cache the hash code to improve speed
-		if (!this.hashGenerated)
-		{
-			this.hashCode = generateHashCode(this);
-			this.hashGenerated = true;
-		}
-		
-		return this.hashCode;
-	}
-	private static int generateHashCode(BlockBiomeWrapperPair pair) { return generateHashCode(pair.biome, pair.blockState); }
-	private static int generateHashCode(IBiomeWrapper biome, IBlockStateWrapper blockState)
-	{
-		final int prime = 31;
-		
-		int result = 1;
-		// the biome and blockstate hashcode should be already calculated by the time
-		// we get here, so this operation should be very fast
-		result = prime * result + (biome == null ? 0 : biome.hashCode());
-		result = prime * result + (blockState == null ? 0 : blockState.hashCode());
-		return result;
-	}
-	
-	@Override
-	public boolean equals(Object otherObj)
-	{
-		if (otherObj == this)
-		{
-			return true;
-		}
-		
-		if (!(otherObj instanceof BlockBiomeWrapperPair))
-		{
-			return false;
-		}
-		
-		BlockBiomeWrapperPair other = (BlockBiomeWrapperPair) otherObj;
-		return other.biome.getSerialString().equals(this.biome.getSerialString())
-				&& other.blockState.getSerialString().equals(this.blockState.getSerialString());
-	}
-	
-	@Override
-	public String toString() { return this.serialize(); }
-	
-	
-	
-	//=================//
-	// (de)serializing //
-	//=================//
-	
-	public String serialize() 
-	{
-		if (this.serialString == null)
-		{
-			this.serialString = this.biome.getSerialString() + FullDataPointIdMap.BLOCK_STATE_SEPARATOR_STRING + this.blockState.getSerialString();
-		}
-		
-		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

@@ -19,8 +19,7 @@
 
 package com.seibel.distanthorizons.core.dataObjects.fullData;
 
-import com.seibel.distanthorizons.core.dataObjects.BlockBiomeWrapperPair;
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.pos.DhSectionPos;
 import com.seibel.distanthorizons.core.util.LodUtil;
 import com.seibel.distanthorizons.core.util.objects.DataCorruptedException;
@@ -28,8 +27,10 @@ import com.seibel.distanthorizons.core.util.objects.dataStreams.DhDataInputStrea
 import com.seibel.distanthorizons.core.util.objects.dataStreams.DhDataOutputStream;
 import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.io.*;
 import java.util.*;
@@ -50,7 +51,7 @@ import java.util.concurrent.ConcurrentHashMap;
  */
 public class FullDataPointIdMap
 {
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = LogManager.getLogger();
 	/**
 	 * Should only be enabled when debugging.
 	 * Has the system check if any duplicate Entries were read/written
@@ -58,15 +59,15 @@ public class FullDataPointIdMap
 	 */
 	private static final boolean RUN_SERIALIZATION_DUPLICATE_VALIDATION = false;
 	/** Distant Horizons - Block State Wrapper */
-	public static final String BLOCK_STATE_SEPARATOR_STRING = "_DH-BSW_";
+	private static final String BLOCK_STATE_SEPARATOR_STRING = "_DH-BSW_";
 	
 	
 	/** should only be used for debugging */
 	private long pos;
 	
-	/** The index should be the same as the BlockBiomeWrapperPair's ID */
-	private final ArrayList<BlockBiomeWrapperPair> blockBiomePairList = new ArrayList<>();
-	private final ConcurrentHashMap<BlockBiomeWrapperPair, Integer> idMap = new ConcurrentHashMap<>();
+	/** The index should be the same as the Entry's ID */
+	private final ArrayList<Entry> entryList = new ArrayList<>();
+	private final ConcurrentHashMap<Entry, Integer> idMap = new ConcurrentHashMap<>();
 	
 	private int cachedHashCode = 0;
 	
@@ -88,28 +89,28 @@ public class FullDataPointIdMap
 	public IBiomeWrapper getBiomeWrapper(int id) throws IndexOutOfBoundsException { return this.getEntry(id).biome; }
 	/** @see FullDataPointIdMap#getEntry(int) */
 	public IBlockStateWrapper getBlockStateWrapper(int id) throws IndexOutOfBoundsException { return this.getEntry(id).blockState; }
-	/** @throws IndexOutOfBoundsException if the given ID isn't in the {@link FullDataPointIdMap#blockBiomePairList} */
-	private BlockBiomeWrapperPair getEntry(int id) throws IndexOutOfBoundsException
+	/** @throws IndexOutOfBoundsException if the given ID isn't in the {@link FullDataPointIdMap#entryList} */
+	private Entry getEntry(int id) throws IndexOutOfBoundsException
 	{
-		BlockBiomeWrapperPair pair;
+		Entry entry;
 		try
 		{
-			pair = this.blockBiomePairList.get(id);
+			entry = this.entryList.get(id);
 		}
 		catch (IndexOutOfBoundsException e)
 		{
-			throw new IndexOutOfBoundsException("FullData ID Map out of sync for pos: "+DhSectionPos.toString(this.pos)+". ID: ["+id+"] greater than the number of known ID's: ["+this.blockBiomePairList.size()+"].");
+			throw new IndexOutOfBoundsException("FullData ID Map out of sync for pos: "+this.pos+". ID: ["+id+"] greater than the number of known ID's: ["+this.entryList.size()+"].");
 		}
 		
-		return pair;
+		return entry;
 	}
 	
 	
 	/** @return -1 if the list is empty */
-	public int getMaxValidId() { return this.blockBiomePairList.size() - 1; }
-	public int size() { return this.blockBiomePairList.size(); }
+	public int getMaxValidId() { return this.entryList.size() - 1; }
+	public int size() { return this.entryList.size(); }
 	
-	public boolean isEmpty() { return this.blockBiomePairList.isEmpty(); }
+	public boolean isEmpty() { return this.entryList.isEmpty(); }
 	
 	public long getPos() { return this.pos; }
 	
@@ -123,11 +124,11 @@ public class FullDataPointIdMap
 	 * If an entry with the given values already exists nothing will
 	 * be added but the existing item's ID will still be returned.
 	 */
-	public int addIfNotPresentAndGetId(IBiomeWrapper biome, IBlockStateWrapper blockState) { return this.addIfNotPresentAndGetId(BlockBiomeWrapperPair.get(blockState, biome)); }
-	private int addIfNotPresentAndGetId(BlockBiomeWrapperPair pair)
+	public int addIfNotPresentAndGetId(IBiomeWrapper biome, IBlockStateWrapper blockState) { return this.addIfNotPresentAndGetId(Entry.getEntry(biome, blockState)); }
+	private int addIfNotPresentAndGetId(Entry biomeBlockStateEntry)
 	{
 		// try getting the existing ID
-		Integer nullableId = this.idMap.get(pair);
+		Integer nullableId = this.idMap.get(biomeBlockStateEntry);
 		if (nullableId != null)
 		{
 			return nullableId;
@@ -135,7 +136,7 @@ public class FullDataPointIdMap
 		
 		
 		// create the new ID
-		return this.idMap.compute(pair, (BlockBiomeWrapperPair newPair, Integer currentId) -> 
+		return this.idMap.compute(biomeBlockStateEntry, (Entry newBiomeBlockStateEntry, Integer currentId) -> 
 		{
 			if (currentId != null)
 			{
@@ -144,8 +145,8 @@ public class FullDataPointIdMap
 			
 			
 			// Add the new ID
-			currentId = this.blockBiomePairList.size();
-			this.blockBiomePairList.add(newPair);
+			currentId = this.entryList.size();
+			this.entryList.add(biomeBlockStateEntry);
 			
 			// invalidate the cached hash code
 			this.cachedHashCode = 0;
@@ -155,7 +156,7 @@ public class FullDataPointIdMap
 	}
 	
 	/**
-	 * Adds every {@link BlockBiomeWrapperPair} from inputMap into this map. <br>
+	 * Adds every {@link Entry} from inputMap into this map. <br>
 	 * Allows duplicate entries. <br><br>
 	 * 
 	 * Allowing duplicate entries should be done if a datasource is just being read in and 
@@ -165,19 +166,19 @@ public class FullDataPointIdMap
 	 */
 	public void addAll(FullDataPointIdMap inputMap)
 	{
-		ArrayList<BlockBiomeWrapperPair> pairsToMerge = inputMap.blockBiomePairList;
-		for (int i = 0; i < pairsToMerge.size(); i++)
+		ArrayList<Entry> entriesToMerge = inputMap.entryList;
+		for (int i = 0; i < entriesToMerge.size(); i++)
 		{
-			BlockBiomeWrapperPair pair = pairsToMerge.get(i);
-			this.add(pair);
+			Entry entity = entriesToMerge.get(i);
+			this.add(entity);
 		}
 	}
-	/** allows for adding duplicate {@link BlockBiomeWrapperPair} */
-	private void add(BlockBiomeWrapperPair pair)
+	/** allows for adding duplicate {@link Entry} */
+	private void add(Entry biomeBlockStateEntry)
 	{
-		int id = this.blockBiomePairList.size();
-		this.blockBiomePairList.add(pair);
-		this.idMap.put(pair, id);
+		int id = this.entryList.size();
+		this.entryList.add(biomeBlockStateEntry);
+		this.idMap.put(biomeBlockStateEntry, id);
 		
 		// invalidate the cached hash code
 		this.cachedHashCode = 0;
@@ -194,23 +195,23 @@ public class FullDataPointIdMap
 	 */
 	public int[] mergeAndReturnRemappedEntityIds(FullDataPointIdMap inputMap)
 	{
-		ArrayList<BlockBiomeWrapperPair> entriesToMerge = inputMap.blockBiomePairList;
-		int[] remappedPairIds = new int[entriesToMerge.size()];
+		ArrayList<Entry> entriesToMerge = inputMap.entryList;
+		int[] remappedEntryIds = new int[entriesToMerge.size()];
 		for (int i = 0; i < entriesToMerge.size(); i++)
 		{
-			BlockBiomeWrapperPair entity = entriesToMerge.get(i);
+			Entry entity = entriesToMerge.get(i);
 			int id = this.addIfNotPresentAndGetId(entity);
-			remappedPairIds[i] = id;
+			remappedEntryIds[i] = id;
 		}
 		
-		return remappedPairIds;
+		return remappedEntryIds;
 	}
 	
 	/** Should only be used if this map is going to be reused, otherwise bad things will happen. */
 	public void clear(long pos)
 	{
 		this.pos = pos;
-		this.blockBiomePairList.clear();
+		this.entryList.clear();
 		this.idMap.clear();
 		this.cachedHashCode = 0;
 	}
@@ -224,27 +225,27 @@ public class FullDataPointIdMap
 	/** Serializes all contained entries into the given stream, formatted in UTF */
 	public void serialize(DhDataOutputStream outputStream) throws IOException
 	{
-		outputStream.writeInt(this.blockBiomePairList.size());
+		outputStream.writeInt(this.entryList.size());
 		
 		// only used when debugging
-		HashMap<String, BlockBiomeWrapperPair> dataPointEntryBySerialization = new HashMap<>();
+		HashMap<String, FullDataPointIdMap.Entry> dataPointEntryBySerialization = new HashMap<>();
 		
-		for (BlockBiomeWrapperPair pair : this.blockBiomePairList)
+		for (Entry entry : this.entryList)
 		{
-			String entryString = pair.serialize();
+			String entryString = entry.serialize();
 			outputStream.writeUTF(entryString);
 			
 			if (RUN_SERIALIZATION_DUPLICATE_VALIDATION)
 			{
 				if (dataPointEntryBySerialization.containsKey(entryString))
 				{
-					LOGGER.error("Duplicate serialized pair found with serial: " + entryString);
+					LOGGER.error("Duplicate serialized entry found with serial: " + entryString);
 				}
-				if (dataPointEntryBySerialization.containsValue(pair))
+				if (dataPointEntryBySerialization.containsValue(entry))
 				{
-					LOGGER.error("Duplicate serialized pair found with value: " + pair.serialize());
+					LOGGER.error("Duplicate serialized entry found with value: " + entry.serialize());
 				}
-				dataPointEntryBySerialization.put(entryString, pair);
+				dataPointEntryBySerialization.put(entryString, entry);
 			}
 		}
 	}
@@ -260,7 +261,7 @@ public class FullDataPointIdMap
 		
 		
 		// only used when debugging
-		HashMap<String, BlockBiomeWrapperPair> dataPointEntryBySerialization = new HashMap<>();
+		HashMap<String, FullDataPointIdMap.Entry> dataPointEntryBySerialization = new HashMap<>();
 		
 		FullDataPointIdMap newMap = new FullDataPointIdMap(pos);
 		for (int i = 0; i < entityCount; i++)
@@ -268,13 +269,13 @@ public class FullDataPointIdMap
 			// necessary to prevent issues with deserializing objects after the level has been closed
 			if (Thread.interrupted())
 			{
-				throw new InterruptedException("[" + FullDataPointIdMap.class.getSimpleName() + "] deserializing interrupted.");
+				throw new InterruptedException(FullDataPointIdMap.class.getSimpleName() + " task interrupted.");
 			}
 			
 			
 			String entryString = inputStream.readUTF();
-			BlockBiomeWrapperPair newPair = BlockBiomeWrapperPair.deserialize(entryString, levelWrapper);
-			newMap.blockBiomePairList.add(newPair);
+			Entry newEntry = Entry.deserialize(entryString, levelWrapper);
+			newMap.entryList.add(newEntry);
 			
 			if (RUN_SERIALIZATION_DUPLICATE_VALIDATION)
 			{
@@ -282,11 +283,11 @@ public class FullDataPointIdMap
 				{
 					LOGGER.error("Duplicate deserialized entry found with serial: " + entryString);
 				}
-				if (dataPointEntryBySerialization.containsValue(newPair))
+				if (dataPointEntryBySerialization.containsValue(newEntry))
 				{
-					LOGGER.error("Duplicate deserialized entry found with value: " + newPair.serialize());
+					LOGGER.error("Duplicate deserialized entry found with value: " + newEntry.serialize());
 				}
-				dataPointEntryBySerialization.put(entryString, newPair);
+				dataPointEntryBySerialization.put(entryString, newEntry);
 			}
 		}
 		
@@ -332,13 +333,149 @@ public class FullDataPointIdMap
 	private void generateHashCode()
 	{
 		int result = DhSectionPos.hashCode(this.pos);
-		for (int i = 0; i < this.blockBiomePairList.size(); i++)
+		for (int i = 0; i < this.entryList.size(); i++)
 		{
-			result = 31 * result + this.blockBiomePairList.hashCode();
+			result = 31 * result + this.entryList.hashCode();
 		}
 		this.cachedHashCode = result;
 	}
 	
 	
 	
+	//==============//
+	// helper class //
+	//==============//
+	
+	private static final class Entry
+	{
+		private static final IWrapperFactory WRAPPER_FACTORY = SingletonInjector.INSTANCE.get(IWrapperFactory.class);
+		
+		/** two levels are present so we don't need to use a key object */
+		private static final ConcurrentHashMap<IBiomeWrapper, ConcurrentHashMap<IBlockStateWrapper, Entry>> ENTRY_BY_BLOCKSTATE_BY_BIOMEWRAPPER = new ConcurrentHashMap<>();
+		
+		public final IBiomeWrapper biome;
+		public final IBlockStateWrapper blockState;
+		
+		private int hashCode = 0;
+		private boolean hashGenerated = false;
+		private String serialString = null;
+		
+		
+		
+		//=============//
+		// constructor //
+		//=============//
+		
+		public static Entry getEntry(IBiomeWrapper biome, IBlockStateWrapper blockState)
+		{
+			// check for existing entry
+			ConcurrentHashMap<IBlockStateWrapper, Entry> entryByBlockState = ENTRY_BY_BLOCKSTATE_BY_BIOMEWRAPPER.get(biome);
+			if (entryByBlockState != null)
+			{
+				Entry entry = entryByBlockState.get(blockState);
+				if (entry != null)
+				{
+					return entry;
+				}
+			}
+			
+			// Lazily create the inner map and new Entry
+			return ENTRY_BY_BLOCKSTATE_BY_BIOMEWRAPPER
+					.computeIfAbsent(biome, newBiome -> new ConcurrentHashMap<>())
+					.computeIfAbsent(blockState, newBlockState -> new Entry(biome, blockState));
+		}
+		private Entry(IBiomeWrapper biome, IBlockStateWrapper blockState)
+		{
+			this.biome = biome;
+			this.blockState = blockState;
+		}
+		
+		
+		
+		//===========//
+		// overrides //
+		//===========//
+		
+		/** 
+		 * Reminder: this hash code won't always be unique, collisions can occur;
+		 * because of that this hash shouldn't be the only unique identifier for this object.
+		 */
+		@Override
+		public int hashCode()
+		{
+			// cache the hash code to improve speed
+			if (!this.hashGenerated)
+			{
+				this.hashCode = generateHashCode(this);
+				this.hashGenerated = true;
+			}
+			
+			return this.hashCode;
+		}
+		private static int generateHashCode(Entry entry) { return generateHashCode(entry.biome, entry.blockState); }
+		private static int generateHashCode(IBiomeWrapper biome, IBlockStateWrapper blockState)
+		{
+			final int prime = 31;
+			
+			int result = 1;
+			// the biome and blockstate hashcode should be already calculated by the time
+			// we get here, so this operation should be very fast
+			result = prime * result + (biome == null ? 0 : biome.hashCode());
+			result = prime * result + (blockState == null ? 0 : blockState.hashCode());
+			return result;
+		}
+		
+		@Override
+		public boolean equals(Object otherObj)
+		{
+			if (otherObj == this)
+			{
+				return true;
+			}
+			
+			if (!(otherObj instanceof Entry))
+			{
+				return false;
+			}
+			
+			Entry other = (Entry) otherObj;
+			return other.biome.getSerialString().equals(this.biome.getSerialString())
+					&& other.blockState.getSerialString().equals(this.blockState.getSerialString());
+		}
+		
+		@Override
+		public String toString() { return this.serialize(); }
+		
+		
+		
+		//=================//
+		// (de)serializing //
+		//=================//
+		
+		public String serialize() 
+		{
+			if (this.serialString == null)
+			{
+				this.serialString = this.biome.getSerialString() + BLOCK_STATE_SEPARATOR_STRING + this.blockState.getSerialString();
+			}
+			
+			return this.serialString;
+		}
+		
+		public static Entry deserialize(String str, ILevelWrapper levelWrapper) throws DataCorruptedException
+		{
+			int separatorIndex = str.indexOf(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+BLOCK_STATE_SEPARATOR_STRING.length()), levelWrapper);
+			return Entry.getEntry(biome, blockState);
+		}
+		
+	}
+	
+	
 }

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

@@ -20,8 +20,8 @@
 package com.seibel.distanthorizons.core.dataObjects.fullData.sources;
 
 import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGenerationStep;
+import com.seibel.distanthorizons.core.file.IDataSource;
 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.sql.dto.FullDataSourceV1DTO;
@@ -33,6 +33,7 @@ import com.seibel.distanthorizons.core.util.objects.dataStreams.DhDataOutputStre
 import com.seibel.distanthorizons.core.dataObjects.fullData.FullDataPointIdMap;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
 import com.seibel.distanthorizons.coreapi.util.BitShiftUtil;
+import org.apache.logging.log4j.Logger;
 
 import java.io.*;
 import java.util.Arrays;
@@ -46,9 +47,9 @@ import java.util.Arrays;
  * @see FullDataPointUtil
  * @see FullDataSourceV2
  */
-public class FullDataSourceV1
+public class FullDataSourceV1 implements IDataSource<IDhLevel>
 {
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
 	public static final byte SECTION_SIZE_OFFSET = DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL;
 	/** measured in dataPoints */
@@ -93,14 +94,29 @@ public class FullDataSourceV1
 	}
 	
 	
+	
+	
+	//======//
+	// data //
+	//======//
+	
+	@Deprecated
+	@Override
+	public boolean update(FullDataSourceV2 dataSource, IDhLevel level) { throw new UnsupportedOperationException("Deprecated"); }
+	
+	
+	
 	//=====================//
 	// setters and getters //
 	//=====================//
 	
+	@Override
 	public Long getKey() { return this.pos; }
+	@Override
 	public String getKeyDisplayString() { return DhSectionPos.toString(this.pos); }
 	
-	public long getPos() { return this.pos; }
+	@Override
+	public Long getPos() { return this.pos; }
 	
 	public void resizeDataStructuresForRepopulation(long pos)
 	{
@@ -108,6 +124,7 @@ public class FullDataSourceV1
 		this.pos = pos;
 	}
 	
+	@Override
 	public byte getDataDetailLevel() { return (byte) (DhSectionPos.getDetailLevel(this.pos) - SECTION_SIZE_OFFSET); }
 	
 	public boolean isEmpty() { return this.isEmpty; }
@@ -180,7 +197,7 @@ public class FullDataSourceV1
 	{
 		outputStream.writeInt(this.getDataDetailLevel());
 		outputStream.writeInt(WIDTH);
-		outputStream.writeInt(level.getLevelWrapper().getMinHeight());
+		outputStream.writeInt(level.getMinY());
 		outputStream.writeByte(this.worldGenStep.value);
 		
 	}
@@ -189,19 +206,19 @@ public class FullDataSourceV1
 		int dataDetail = inputStream.readInt();
 		if (dataDetail != dto.dataDetailLevel)
 		{
-			throw new IOException("Data level mismatch. Expected: ["+dto.dataDetailLevel+"], found ["+dataDetail+"].");
+			throw new IOException(LodUtil.formatLog("Data level mismatch. Expected: ["+dto.dataDetailLevel+"], found ["+dataDetail+"]."));
 		}
 		
 		int width = inputStream.readInt();
 		if (width != WIDTH)
 		{
-			throw new IOException("Section width mismatch: [" + width + "] != [" + WIDTH + "] (Currently only 1 section width is supported)");
+			throw new IOException(LodUtil.formatLog("Section width mismatch: " + width + " != " + WIDTH + " (Currently only 1 section width is supported)"));
 		}
 		
 		int minY = inputStream.readInt();
-		if (minY != level.getLevelWrapper().getMinHeight())
+		if (minY != level.getMinY())
 		{
-			LOGGER.warn("Data minY mismatch: [" + minY + "] != [" + level.getLevelWrapper().getMinHeight() + "]. Will ignore data's y level");
+			LOGGER.warn("Data minY mismatch: " + minY + " != " + level.getMinY() + ". Will ignore data's y level");
 		}
 		
 		byte worldGenByte = inputStream.readByte();
@@ -360,6 +377,15 @@ public class FullDataSourceV1
 	public void setIdMapping(FullDataPointIdMap mappings) { this.mapping.mergeAndReturnRemappedEntityIds(mappings); }
 	
 	
+	//==================//
+	// override methods //
+	//==================//
+	
+	@Override
+	public void close()
+	{ /* not currently needed */ }
+	
+	
 	
 	//================//
 	// helper classes //

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

@@ -23,32 +23,25 @@ import com.seibel.distanthorizons.api.enums.config.EDhApiWorldCompressionMode;
 import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGenerationStep;
 import com.seibel.distanthorizons.api.objects.data.DhApiTerrainDataPoint;
 import com.seibel.distanthorizons.api.objects.data.IDhApiFullDataSource;
-import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.dataObjects.fullData.FullDataPointIdMap;
-import com.seibel.distanthorizons.core.dataObjects.transformers.FullDataOcclusionCuller;
 import com.seibel.distanthorizons.core.dataObjects.transformers.LodDataBuilder;
-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.file.AbstractDataSourceHandler;
+import com.seibel.distanthorizons.core.file.IDataSource;
+import com.seibel.distanthorizons.core.level.IDhLevel;
 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.PhantomArrayListParent;
 import com.seibel.distanthorizons.core.pooling.PhantomArrayListPool;
-import com.seibel.distanthorizons.core.pos.DhLodPos;
 import com.seibel.distanthorizons.core.pos.DhSectionPos;
-import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos;
-import com.seibel.distanthorizons.core.sql.dto.util.FullDataMinMaxPosUtil;
 import com.seibel.distanthorizons.core.util.*;
 import com.seibel.distanthorizons.core.util.objects.DataCorruptedException;
 import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
 import com.seibel.distanthorizons.coreapi.ModInfo;
 import it.unimi.dsi.fastutil.bytes.ByteArrayList;
-import it.unimi.dsi.fastutil.ints.IntArrayList;
 import it.unimi.dsi.fastutil.longs.LongArrayList;
+import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
+import javax.annotation.Nullable;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -60,10 +53,10 @@ import java.util.List;
  * @see FullDataSourceV1
  */
 public class FullDataSourceV2 
-		extends AbstractPhantomArrayList
-		implements IDhApiFullDataSource
+		extends PhantomArrayListParent
+		implements IDataSource<IDhLevel>, IDhApiFullDataSource
 {
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	/** useful for debugging, but can slow down update operations quite a bit due to being called so often. */
 	private static final boolean RUN_UPDATE_DEV_VALIDATION = false;
 	/** 
@@ -78,6 +71,8 @@ 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 byte DATA_FORMAT_VERSION = 1;
+	
 	public static final PhantomArrayListPool ARRAY_LIST_POOL = new PhantomArrayListPool("FullDataV2");
 	
 	
@@ -85,6 +80,10 @@ public class FullDataSourceV2
 	private int cachedHashCode = 0;
 	
 	private final long pos;
+	@Override
+	public Long getKey() { return this.pos; }
+	@Override
+	public String getKeyDisplayString() { return DhSectionPos.toString(this.pos); }
 	
 	
 	public final FullDataPointIdMap mapping;
@@ -93,6 +92,8 @@ public class FullDataSourceV2
 	public long lastModifiedUnixDateTime;
 	public long createdUnixDateTime;
 	
+	public int levelMinY;
+	
 	/** 
 	 * stores how far each column has been generated should start with {@link EDhApiWorldGenerationStep#EMPTY}
 	 *
@@ -108,7 +109,9 @@ public class FullDataSourceV2
 	
 	/** 
 	 * stored x/z, y <br>
-	 * The y data should be sorted from top to bottom
+	 * The y data should be sorted from top to bottom <br>
+	 * TODO that ordering feels weird, it'd be nice to reverse that order, unfortunately
+	 *      there's something in the render data logic that expects this order so we can't change it right now
 	 */
 	public final LongArrayList[] dataPoints;
 	
@@ -129,7 +132,7 @@ public class FullDataSourceV2
 	// constructors //
 	//==============//
 	
-	public static FullDataSourceV2 createFromChunk(ILevelWrapper levelWrapper, IChunkWrapper chunkWrapper) { return LodDataBuilder.createFromChunk(levelWrapper, chunkWrapper); }
+	public static FullDataSourceV2 createFromChunk(IChunkWrapper chunkWrapper) { return LodDataBuilder.createFromChunk(chunkWrapper); }
 	
 	public static FullDataSourceV2 createFromLegacyDataSourceV1(FullDataSourceV1 legacyData)
 	{
@@ -218,7 +221,7 @@ public class FullDataSourceV2
 	private FullDataSourceV2(
 			long pos,
 			FullDataPointIdMap mapping, @Nullable LongArrayList[] data,
-			byte @Nullable [] columnGenerationSteps, byte @Nullable [] columnWorldCompressionMode,
+			@Nullable byte[] columnGenerationSteps, @Nullable byte[] columnWorldCompressionMode,
 			boolean empty)
 	{
 		super(ARRAY_LIST_POOL, 2, 0, WIDTH * WIDTH);
@@ -275,98 +278,15 @@ public class FullDataSourceV2
 	
 	
 	
-	//=========//
-	// getters //
-	//=========//
+	//======//
+	// data //
+	//======//
 	
-	public LongArrayList getColumnAtRelPos(int relX, int relZ) throws IndexOutOfBoundsException 
-	{ return this.dataPoints[relativePosToIndex(relX, relZ)]; }
+	public LongArrayList get(int relX, int relZ) throws IndexOutOfBoundsException { return this.dataPoints[relativePosToIndex(relX, relZ)]; }
 	
-	@Nullable
-	public LongArrayList tryGetColumnAtRelPos(int relX, int relZ)
-	{
-		int index = tryGetRelativePosToIndex(relX, relZ);
-		if (index == -1)
-		{
-			return null;
-		}
-		
-		return this.dataPoints[index];
-	}
-	
-	/** 
-	 * returns {@link FullDataPointUtil#EMPTY_DATA_POINT} if the given {@link DhBlockPos}
-	 * is outside this data source's boundaries.
-	 */
-	public long getDataPointAtBlockPos(int blockPosX, int blockPosY, int blockPosZ, int levelMinY)
-	{
-		DhLodPos requestedPos = new DhLodPos(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);
-			if (!DhSectionPos.contains(this.pos, sectionPos))
-			{
-				return FullDataPointUtil.EMPTY_DATA_POINT;
-			}
-		}
-		
-		
-		// get the relative data source position
-		byte requestDetailLevel = (byte) (DhSectionPos.getDetailLevel(this.pos) - DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL);
-		DhLodPos relativePos = requestedPos.getDhSectionRelativePositionForDetailLevel(requestDetailLevel);
-		
-		// get the data column
-		LongArrayList dataColumn = this.getColumnAtRelPos(relativePos.x, relativePos.z);
-		if (dataColumn == null)
-		{
-			return FullDataPointUtil.EMPTY_DATA_POINT;
-		}
-		
-		
-		// search for a datapoint that contains the given block y position
-		int relBlockPosY = blockPosY - levelMinY;
-		long dataPoint;
-		for (int i = 0; i < dataColumn.size(); i++)
-		{
-			dataPoint = dataColumn.getLong(i);
-			
-			// we are looking for a specific datapoint,
-			// don't look at null ones
-			if (dataPoint == FullDataPointUtil.EMPTY_DATA_POINT)
-			{
-				continue;
-			}
-			
-			
-			
-			int bottomY = FullDataPointUtil.getBottomY(dataPoint);
-			int height = FullDataPointUtil.getHeight(dataPoint);
-			int topY = bottomY + height;
-			
-			// does this datapoint contain the requested Y position? 
-			if (bottomY <= relBlockPosY
-				&& relBlockPosY < topY) // blockPositions start from the bottom of the block, thus "<=" for bottomY, just "<" for topY
-			{
-				return dataPoint;
-			}
-		}
-		
-		return FullDataPointUtil.EMPTY_DATA_POINT;
-	}
-	
-	
-	
-	//==========//
-	// updating //
-	//==========//
-	
-	public boolean updateFromDataSource(@NotNull FullDataSourceV2 inputDataSource)
+	@Override
+	public boolean update(@NotNull FullDataSourceV2 inputDataSource, @Nullable IDhLevel level) { return this.update(inputDataSource); }
+	public boolean update(@NotNull FullDataSourceV2 inputDataSource)
 	{
 		// don't try updating if the input is empty
 		if (inputDataSource.mapping.isEmpty())
@@ -394,7 +314,7 @@ public class FullDataSourceV2
 						// copy over application flag if either are set to continue propagating
 						(BoolUtil.falseIfNull(this.applyToParent) || BoolUtil.falseIfNull(inputDataSource.applyToParent))
 						// don't propagate past the top of the tree
-						&& (DhSectionPos.getDetailLevel(this.pos) < FullDataSourceProviderV2.ROOT_SECTION_DETAIL_LEVEL);
+						&& (DhSectionPos.getDetailLevel(this.pos) < AbstractDataSourceHandler.TOP_SECTION_DETAIL_LEVEL);
 			}
 			
 			// null check to prevent setting a flag we don't want to save in the DB
@@ -403,7 +323,7 @@ public class FullDataSourceV2
 				this.applyToChildren =
 						(BoolUtil.falseIfNull(this.applyToChildren) || BoolUtil.falseIfNull(inputDataSource.applyToChildren))
 						// don't propagate past the bottom of the tree
-						&& (DhSectionPos.getDetailLevel(this.pos) > FullDataSourceProviderV2.LEAF_SECTION_DETAIL_LEVEL);
+						&& (DhSectionPos.getDetailLevel(this.pos) > AbstractDataSourceHandler.MIN_SECTION_DETAIL_LEVEL);
 			}
 		}
 		else if (inputDetailLevel + 1 == thisDetailLevel)
@@ -414,7 +334,7 @@ public class FullDataSourceV2
 			this.applyToParent =
 					dataChanged
 					&& (BoolUtil.falseIfNull(this.applyToParent) || BoolUtil.falseIfNull(inputDataSource.applyToParent))
-					&& (DhSectionPos.getDetailLevel(this.pos) < FullDataSourceProviderV2.ROOT_SECTION_DETAIL_LEVEL);
+					&& (DhSectionPos.getDetailLevel(this.pos) < AbstractDataSourceHandler.TOP_SECTION_DETAIL_LEVEL);
 			
 		}
 		else if (inputDetailLevel - 1 == thisDetailLevel)
@@ -426,7 +346,7 @@ public class FullDataSourceV2
 			this.applyToChildren =
 					dataChanged
 					&& (BoolUtil.falseIfNull(this.applyToChildren) || BoolUtil.falseIfNull(inputDataSource.applyToChildren))
-					&& (DhSectionPos.getDetailLevel(this.pos) > FullDataSourceProviderV2.LEAF_SECTION_DETAIL_LEVEL);
+					&& (DhSectionPos.getDetailLevel(this.pos) > AbstractDataSourceHandler.MIN_SECTION_DETAIL_LEVEL);
 		}
 		else
 		{
@@ -437,31 +357,8 @@ public class FullDataSourceV2
 			throw new UnsupportedOperationException("Unsupported data source update. Expected input detail level of ["+(thisDetailLevel-1)+"], ["+thisDetailLevel+"], or ["+(thisDetailLevel+1)+"], received detail level ["+inputDetailLevel+"].");
 		}
 		
-		
-		
-		
-		
 		if (dataChanged)
 		{
-			EDhApiWorldCompressionMode worldCompressionMode = Config.Common.LodBuilding.worldCompression.get();
-			boolean cullHiddenBlocks = (worldCompressionMode != EDhApiWorldCompressionMode.MERGE_SAME_BLOCKS);
-			if (cullHiddenBlocks)
-			{
-				for (int x = 0; x < WIDTH; x++)
-				{
-					for (int z = 0; z < WIDTH; z++)
-					{
-						LongArrayList dataColumn = this.getColumnAtRelPos(x, z);
-						if (dataColumn != null
-							&& dataColumn.size() > 1)
-						{
-							FullDataOcclusionCuller.cullHiddenDatapointsInColumn(this, x, z);
-						}
-					}
-				}
-			}
-			
-			
 			// update the hash code
 			this.generateHashCode();
 		}
@@ -469,7 +366,7 @@ public class FullDataSourceV2
 		return dataChanged;
 	}
 	
-	private boolean updateFromSameDetailLevel(FullDataSourceV2 inputDataSource, int[] remappedIds)
+	public boolean updateFromSameDetailLevel(FullDataSourceV2 inputDataSource, int[] remappedIds)
 	{
 		// both data sources should have the same detail level
 		if (DhSectionPos.getDetailLevel(inputDataSource.pos) != DhSectionPos.getDetailLevel(this.pos))
@@ -485,103 +382,96 @@ public class FullDataSourceV2
 			for (int z = 0; z < WIDTH; z++)
 			{
 				int index = relativePosToIndex(x, z);
+				
 				LongArrayList inputDataArray = inputDataSource.dataPoints[index];
-				if (inputDataArray == null)
+				if (inputDataArray != null)
 				{
-					continue;
-				}
+					byte thisGenState = this.columnGenerationSteps.getByte(index);
+					byte inputGenState = inputDataSource.columnGenerationSteps.getByte(index);
 				
-				
-				
-				byte thisGenState = this.columnGenerationSteps.getByte(index);
-				byte inputGenState = inputDataSource.columnGenerationSteps.getByte(index);
-				
-				
-				// determine if this column should be updated
-				boolean genStateAllowsUpdating = false;
-				// if the input is downsampled, we only want to replace empty or downsampled values
-				if (inputGenState == EDhApiWorldGenerationStep.DOWN_SAMPLED.value
-					&&
-					(
-						thisGenState == EDhApiWorldGenerationStep.EMPTY.value
-						|| thisGenState == EDhApiWorldGenerationStep.DOWN_SAMPLED.value
-					))
-				{
-					genStateAllowsUpdating = true;
-				}
-				// if the input is any other non-empty value,
-				// replace anything that is less-complete
-				else if (inputGenState != EDhApiWorldGenerationStep.EMPTY.value
-					&& thisGenState <= inputGenState)
-				{
-					// don't apply less-complete generation data
-					genStateAllowsUpdating = true;
-				}
-				
-				if (!genStateAllowsUpdating)
-				{
-					continue;
-				}
-				
-				
-				
-				// check if the data changed
-				if (this.dataPoints[index] == null)
-				{
-					// no data was present previously
-					this.dataPoints[index] = new LongArrayList(inputDataArray);
-					dataChanged = true;
-				}
-				else if (this.dataPoints[index].size() != inputDataArray.size())
-				{
-					// data is present, but the size is different
-					dataChanged = true;
-				}
-				
-				int oldDataHash = 0;
-				if (!dataChanged)
-				{
-					// some old data existed with the same length,
-					// we'll have to compare the caches
-					oldDataHash = this.dataPoints[index].hashCode();
-				}
-				
-				
-				// copy over the new data
-				this.dataPoints[index].clear();
-				this.dataPoints[index].addAll(inputDataArray);
-				this.remapDataColumn(index, remappedIds);
-				
-				if (RUN_DATA_ORDER_VALIDATION)
-				{
-					throwIfDataColumnInWrongOrder(inputDataSource.pos, this.dataPoints[index]);
-				}
-				
-				
-				
-				if (!dataChanged)
-				{
-					// check if the identical length data column hashes are the same
-					// hashes need to be compared after the ID's have been remapped otherwise the ID's won't match even if the data is the same
-					if (oldDataHash != this.dataPoints[index].hashCode())
+					
+					// determine if this column should be updated
+					boolean genStateAllowsUpdating = false;
+					// if the input is downsampled, we only want to replace empty or downsampled values
+					if (inputGenState == EDhApiWorldGenerationStep.DOWN_SAMPLED.value
+						&&
+						(
+							thisGenState == EDhApiWorldGenerationStep.EMPTY.value
+							|| thisGenState == EDhApiWorldGenerationStep.DOWN_SAMPLED.value
+						))
 					{
-						// the hashes are different, something was changed
-						dataChanged = true;
+						genStateAllowsUpdating = true;
+					}
+					// if the input is any other non-empty value,
+					// replace anything that is less-complete
+					else if (inputGenState != EDhApiWorldGenerationStep.EMPTY.value
+							&& thisGenState <= inputGenState)
+					{
+						// don't apply less-complete generation data
+						genStateAllowsUpdating = true;
+					}
+					
+					
+					if (genStateAllowsUpdating)
+					{
+						// check if the data changed
+						if (this.dataPoints[index] == null)
+						{
+							// no data was present previously
+							this.dataPoints[index] = new LongArrayList(inputDataArray);
+							dataChanged = true;
+						}
+						else if (this.dataPoints[index].size() != inputDataArray.size())
+						{
+							// data is present, but the size is different
+							dataChanged = true;
+						}
+						
+						int oldDataHash = 0;
+						if (!dataChanged)
+						{
+							// some old data existed with the same length,
+							// we'll have to compare the caches
+							oldDataHash = this.dataPoints[index].hashCode();
+						}
+						
+						
+						// copy over the new data
+						this.dataPoints[index].clear();
+						this.dataPoints[index].addAll(inputDataArray);
+						this.remapDataColumn(index, remappedIds);
+						
+						if (RUN_DATA_ORDER_VALIDATION)
+						{
+							throwIfDataColumnInWrongOrder(inputDataSource.pos, this.dataPoints[index]);
+						}
+						
+						
+						
+						if (!dataChanged)
+						{
+							// check if the identical length data column hashes are the same
+							// hashes need to be compared after the ID's have been remapped otherwise the ID's won't match even if the data is the same
+							if (oldDataHash != this.dataPoints[index].hashCode())
+							{
+								// the hashes are different, something was changed
+								dataChanged = true;
+							}
+						}
+						
+						
+						this.columnGenerationSteps.set(index, inputGenState);
+						// always overwrite the compression mode since we're replacing this column
+						this.columnWorldCompressionMode.set(index, inputDataSource.columnWorldCompressionMode.getByte(index));
+						this.isEmpty = false;
 					}
 				}
-				
-				
-				this.columnGenerationSteps.set(index, inputGenState);
-				// always overwrite the compression mode since we're replacing this column
-				this.columnWorldCompressionMode.set(index, inputDataSource.columnWorldCompressionMode.getByte(index));
-				this.isEmpty = false;
 			}
 		}
 		
 		return dataChanged;
 	}
-	
-	private boolean updateFromOneBelowDetailLevel(FullDataSourceV2 inputDataSource, int[] remappedIds)
+	public boolean updateFromOneBelowDetailLevel(FullDataSourceV2 inputDataSource, int[] remappedIds)
 	{
 		if (DhSectionPos.getDetailLevel(inputDataSource.pos) + 1 != DhSectionPos.getDetailLevel(this.pos))
 		{
@@ -717,221 +607,176 @@ public class FullDataSourceV2
 	{
 		LongArrayList newColumnList = new LongArrayList();
 		
-		
-		//=========================//
-		// get the 4 input columns //
-		//=========================//
-		
-		LongArrayList[] inputColumns = new LongArrayList[4];
-		int colIndex = 0;
-		for (int inputX = x; inputX < x + 2; inputX++)
-		{
-			for (int inputZ = z; inputZ < z + 2; inputZ++, colIndex++)
-			{
-				inputColumns[colIndex] = inputDataSource.dataPoints[relativePosToIndex(inputX, inputZ)];
-				if (inputColumns[colIndex] != null 
-					&& RUN_DATA_ORDER_VALIDATION)
-				{
-					throwIfDataColumnInWrongOrder(inputDataSource.pos, inputColumns[colIndex]);
-				}
-			}
-		}
-		
-		
-		
-		//========================================//
-		// find all y levels where changes happen //
-		//========================================//
-		
-		IntArrayList yTransitions = new IntArrayList();
-		for (int i = 0; i < 4; i++)
-		{
-			if (inputColumns[i] == null 
-				|| inputColumns[i].isEmpty())
-			{
-				continue;
-			}
-			
-			for (int j = 0; j < inputColumns[i].size(); j++)
-			{
-				long datapoint = inputColumns[i].getLong(j);
-				int minY = FullDataPointUtil.getBottomY(datapoint);
-				int maxY = minY + FullDataPointUtil.getHeight(datapoint);
-				
-				if (!yTransitions.contains(minY))
-				{
-					yTransitions.add(minY);
-				}
-				
-				if (!yTransitions.contains(maxY))
-				{
-					yTransitions.add(maxY);
-				}
-			}
-		}
-		
-		// can happen if the columns are empty
-		if (yTransitions.isEmpty())
-		{
-			return newColumnList;
-		}
-		
-		// sort the transitions from bottom to top // TODO
-		yTransitions.sort(null);
-		
-		// create index trackers for each column, 
-		// starting with the top-most datapoint
-		int[] currentIndices = new int[4];
-		for (int i = 0; i < 4; i++)
-		{
-			if (inputColumns[i] != null 
-				&& !inputColumns[i].isEmpty())
-			{
-				currentIndices[i] = inputColumns[i].size() - 1;
-			}
-			else
-			{
-				currentIndices[i] = -1;
-			}
-		}
-		
-		
-		
-		//=======================//
-		// process each Y change //
-		//=======================//
+		// special numbers:
+		// -2 = the column's height hasn't been determined yet
+		// -1 = we've reached the end of the column
+		int[] currentDatapointIndex = new int[] { -2, -2, -2, -2 };
 		
 		int lastId = 0;
 		byte lastBlockLight = 0;
 		byte lastSkyLight = 0;
-		int currentMinY = yTransitions.getInt(0);
-		int accumulatedHeight = 0;
+		int height = 0;
+		int minY = 0;
 		
+		
+		// these arrays will be reused quite often, so re-using them helps reduce some GC pressure
+		long[] datapointsForYSlice = new long[4];
 		int[] mergeIds = new int[4];
 		int[] mergeBlockLights = new int[4];
 		int[] mergeSkyLights = new int[4];
 		
-		for (int yIndex = 0; yIndex < yTransitions.size() - 1; yIndex++)
+		
+		for (int blockY = 0; blockY < RenderDataPointUtil.MAX_WORLD_Y_SIZE; blockY++, height++)
 		{
-			int sliceMinY = yTransitions.getInt(yIndex);
-			int sliceMaxY = yTransitions.getInt(yIndex + 1);
-			int sliceHeight = sliceMaxY - sliceMinY;
+			// if each column has reached the end of their data, nothing more needs to be done
+			if (currentDatapointIndex[0] == -1
+				&& currentDatapointIndex[1] == -1
+				&& currentDatapointIndex[2] == -1
+				&& currentDatapointIndex[3] == -1
+				)
+			{
+				break;
+			}
+			
+			
+			// scary double loop but, 
+			// this will only ever loop 4 times, 
+			// once for each of the 4 input columns
+			Arrays.fill(datapointsForYSlice, 0L);
+			int colIndex = 0;
+			for (int inputX = x; inputX < x + 2; inputX++)
+			{
+				for (int inputZ = z; inputZ < z + 2; inputZ++, colIndex++)
+				{
+					// TODO throw an assertion if the column isn't in top-down order or just fix it...
+					LongArrayList inputDataArray = inputDataSource.dataPoints[relativePosToIndex(inputX, inputZ)];
+					if (inputDataArray == null || inputDataArray.size() == 0)
+					{
+						currentDatapointIndex[colIndex] = -1;
+						continue;
+					}
+					
+					// determine the last index (the lowest data point) for each column
+					if (currentDatapointIndex[colIndex] == -2)
+					{
+						currentDatapointIndex[colIndex] = inputDataArray.size() - 1;
+						
+						if (RUN_DATA_ORDER_VALIDATION)
+						{
+							throwIfDataColumnInWrongOrder(inputDataSource.pos, inputDataArray);
+						}
+					}
+					
+					
+					int dataPointIndex = currentDatapointIndex[colIndex];
+					if (dataPointIndex == -1)
+					{
+						// went over the end 
+						continue;
+					}
+					long datapoint = inputDataArray.getLong(dataPointIndex);
+					
+					int datapointMinY = FullDataPointUtil.getBottomY(datapoint);
+					int numbOfBlocksTall = FullDataPointUtil.getHeight(datapoint);
+					int datapointMaxY = (datapointMinY + numbOfBlocksTall);
+					
+					
+					// check if y position is inside this datapoint
+					if (blockY < datapointMinY)
+					{
+						// this y-slice is below this datapoint, nothing can be added
+						continue;
+					}
+					else if (blockY >= datapointMaxY)
+					{
+						// this y-slice is above the current datapoint,
+						// try the next data point
+						
+						int newDatapointIndex = currentDatapointIndex[colIndex] - 1;
+						if (newDatapointIndex < 0)
+						{
+							// went to far, no additional data present
+							newDatapointIndex = -1;
+						}
+						currentDatapointIndex[colIndex] = newDatapointIndex;
+						
+						
+						// try again with the next data point
+						inputZ--;
+						colIndex--;
+						continue;
+					}
+					
+					
+					
+					datapointsForYSlice[colIndex] = datapoint;
+				}
+			}
+			
 			
-			// Sample at the midpoint of this slice
-			int sampleY = sliceMinY + (sliceHeight / 2);
 			
-			// Get data from each column at this Y level
 			Arrays.fill(mergeIds, 0);
 			Arrays.fill(mergeBlockLights, 0);
 			Arrays.fill(mergeSkyLights, 0);
-			
 			for (int i = 0; i < 4; i++)
 			{
-				// skip columns that are empty or where we have already reached the bottom
-				if (currentIndices[i] == -1)
-				{
-					continue;
-				}
-				
-				
-				LongArrayList column = inputColumns[i];
-				if (column == null)
-				{
-					continue;
-				}
-				
-				// move the index down if we've passed the current datapoint
-				while (currentIndices[i] >= 0)
-				{
-					long datapoint = column.getLong(currentIndices[i]);
-					int inputMinY = FullDataPointUtil.getBottomY(datapoint);
-					int inputMaxY = inputMinY + FullDataPointUtil.getHeight(datapoint);
-					
-					if (sampleY >= inputMaxY)
-					{
-						// Sample point is above this datapoint, move to next (lower) one
-						currentIndices[i]--;
-					}
-					else if (sampleY >= inputMinY 
-							&& sampleY < inputMaxY)
-					{
-						// Sample point is within this datapoint
-						mergeIds[i] = FullDataPointUtil.getId(datapoint);
-						mergeBlockLights[i] = FullDataPointUtil.getBlockLight(datapoint);
-						mergeSkyLights[i] = FullDataPointUtil.getSkyLight(datapoint);
-						break;
-					}
-					else
-					{
-						// Sample point is below this datapoint
-						break;
-					}
-				}
+				mergeIds[i] = FullDataPointUtil.getId(datapointsForYSlice[i]);
+				mergeBlockLights[i] = FullDataPointUtil.getBlockLight(datapointsForYSlice[i]);
+				mergeSkyLights[i] = FullDataPointUtil.getSkyLight(datapointsForYSlice[i]);
 			}
 			
 			
-			
-			// Determine merged values for this slice
-			int id = determineMostCommonValueInColumnSlice(mergeIds, inputDataSource.mapping);
+			// determine the most common values for this slice
+			int id = determineMostValueInColumnSlice(mergeIds, inputDataSource.mapping);
 			byte blockLight = (byte) determineAverageValueInColumnSlice(mergeBlockLights);
 			byte skyLight = (byte) determineAverageValueInColumnSlice(mergeSkyLights);
 			
-			// Check if we need to start a new datapoint
-			if (accumulatedHeight == 0)
+			// if this slice is different then the last one, create a new one
+			if (id != lastId
+				// block and sky light might not be necessary
+				|| blockLight != lastBlockLight
+				|| skyLight != lastSkyLight)
 			{
-				// first datapoint
-				lastId = id;
-				lastBlockLight = blockLight;
-				lastSkyLight = skyLight;
-				currentMinY = sliceMinY;
-				accumulatedHeight = sliceHeight;
-			}
-			else if (id != lastId 
-					|| blockLight != lastBlockLight 
-					|| skyLight != lastSkyLight)
-			{
-				// the data changed, create a new datapoint
-				try
+				if (height != 0)
 				{
-					long datapoint = FullDataPointUtil.encode(lastId, accumulatedHeight, currentMinY, lastBlockLight, lastSkyLight);
-					newColumnList.add(datapoint);
-				}
-				catch (DataCorruptedException e)
-				{
-					LOGGER.warn("Skipping corrupt datapoint for pos ["+DhSectionPos.toString(inputDataSource.pos)+"] at relative position ["+x+","+z+"] with data: ID["+lastId+"], Height["+accumulatedHeight+"], minY["+currentMinY+"], lastBlockLight["+lastBlockLight+"], lastSkyLight["+lastSkyLight+"].");
+					try
+					{
+						long datapoint = FullDataPointUtil.encode(lastId, height, minY, lastBlockLight, lastSkyLight);
+						newColumnList.add(datapoint);
+					}
+					catch (DataCorruptedException e)
+					{
+						// shouldn't happen, (especially if validation is disabled) but just in case
+						LOGGER.warn("Skipping corrupt datapoint for pos "+inputDataSource.pos+" at relative position ["+x+","+z+"] with data: ID["+lastId+"], Height["+height+"], minY["+minY+"], lastBlockLight["+lastBlockLight+"], lastSkyLight["+lastSkyLight+"].");
+					}
 				}
 				
-				// start the next datapoint
 				lastId = id;
 				lastBlockLight = blockLight;
 				lastSkyLight = skyLight;
-				currentMinY = sliceMinY;
-				accumulatedHeight = sliceHeight;
-			}
-			else
-			{
-				// this datapoint is the same as the last one, 
-				// just extend it's height
-				accumulatedHeight += sliceHeight;
+				height = 0;
+				minY = blockY;
 			}
 		}
 		
-		
-		// add the final datapoint if needed
-		if (accumulatedHeight > 0)
+		// add the last slice if present
+		if (height != 0)
 		{
 			try
 			{
-				newColumnList.add(FullDataPointUtil.encode(lastId, accumulatedHeight, currentMinY, lastBlockLight, lastSkyLight));
+				newColumnList.add(FullDataPointUtil.encode(lastId, height, minY, lastBlockLight, lastSkyLight));
 			}
 			catch (DataCorruptedException e)
 			{
-				LOGGER.warn("Skipping corrupt datapoint for pos ["+DhSectionPos.toString(inputDataSource.pos)+"] at relative position ["+x+","+z+"] with data: ID["+lastId+"], Height["+accumulatedHeight+"], minY["+currentMinY+"], lastBlockLight["+lastBlockLight+"], lastSkyLight["+lastSkyLight+"].");
+				// shouldn't happen, (especially if validation is disabled) but just in case
+				LOGGER.warn("Skipping corrupt datapoint for pos "+inputDataSource.pos+" at relative position ["+x+","+z+"] with data: ID["+lastId+"], Height["+height+"], minY["+minY+"], lastBlockLight["+lastBlockLight+"], lastSkyLight["+lastSkyLight+"].");
 			}
 		}
 		
 		
-		// confirm the array is in the correct order
+		// flip the array if necessary
+		// TODO why is this sometimes necessary? What did I (James) screw up that causes the mergedInputDataArray
+		//  to sometimes be in a different order? Is it potentially related to what detail level is coming in?
 		ensureDataColumnOrder(newColumnList);
 		
 		return newColumnList;
@@ -949,8 +794,23 @@ public class FullDataSourceV2
 			dataColumn.set(i, FullDataPointUtil.remap(remappedIds, dataColumn.getLong(i)));
 		}
 	}
+	private static boolean areDataColumnsDifferent(long[] oldDataArray, long[] newDataArray)
+	{
+		if (oldDataArray == null || oldDataArray.length != newDataArray.length)
+		{
+			// new data was added/removed
+			return true;
+		}
+		else
+		{
+			// check if the new column data is different
+			int oldArrayHash = Arrays.hashCode(oldDataArray);
+			int newArrayHash = Arrays.hashCode(newDataArray);
+			return (newArrayHash != oldArrayHash);
+		}
+	}
 	/** @param mapping can be included to ignore air ID's, otherwise all 4 values are treated equally */
-	private static int determineMostCommonValueInColumnSlice(int[] sliceArray, @Nullable FullDataPointIdMap mapping)
+	private static int determineMostValueInColumnSlice(int[] sliceArray, @Nullable FullDataPointIdMap mapping)
 	{
 		if (RUN_UPDATE_DEV_VALIDATION)
 		{
@@ -994,7 +854,7 @@ public class FullDataSourceV2
 			}
 		}
 		
-		// return the most common occurrence
+		// return the most common occurance
 		int maxCount = Math.max(count0, Math.max(count1, Math.max(count2, count3)));
 		if (maxCount == count0)
 		// if the max count is 1 then we'll just go with the first column
@@ -1129,73 +989,23 @@ public class FullDataSourceV2
 	}
 	
 	
-	
-	//===================//
-	// adjacent clearing //
-	//===================//
-	
-	/** Removes any non-adjacent data from the given direction. */
-	public void clearAllNonAdjData(EDhDirection direction)
-	{
-		long encodedMinMaxPos = FullDataMinMaxPosUtil.getEncodedMinMaxPos(direction);
-		int minX = FullDataMinMaxPosUtil.getAdjMinX(encodedMinMaxPos);
-		int maxX = FullDataMinMaxPosUtil.getAdjMaxX(encodedMinMaxPos);
-		int minZ = FullDataMinMaxPosUtil.getAdjMinZ(encodedMinMaxPos);
-		int maxZ = FullDataMinMaxPosUtil.getAdjMaxZ(encodedMinMaxPos);
-		
-		for (int relX = 0; relX < FullDataSourceV2.WIDTH; relX++)
-		{
-			for (int relZ = 0; relZ < FullDataSourceV2.WIDTH; relZ++)
-			{
-				// skip non-adjacent data
-				if (relX >= minX && relX < maxX
-						&& relZ >= minZ && relZ < maxZ)
-				{
-					continue;
-				}
-				
-				LongArrayList dataColumn = this.getColumnAtRelPos(relX, relZ);
-				dataColumn.clear();
-				dataColumn.add(FullDataPointUtil.EMPTY_DATA_POINT);
-			}
-		}
-	}
-	
-	
 	//================//
 	// helper methods //
 	//================//
 	
-	/** 
-	 * Usually this should just be used internally, but there may be instances
-	 * where the raw data arrays are available without the data source object.
-	 * 	 
-	 * @return -1 if given an out-of-bounds relative position 
-	 */
-	public static int tryGetRelativePosToIndex(int relX, int relZ)
-	{
-		if (relX < 0 || relZ < 0
-				|| relX >= WIDTH || relZ >= WIDTH)
-		{
-			return -1;
-		}
-		
-		return (relX * WIDTH) + relZ;
-	}
-	
 	/** 
 	 * Usually this should just be used internally, but there may be instances
 	 * where the raw data arrays are available without the data source object.
 	 */
 	public static int relativePosToIndex(int relX, int relZ) throws IndexOutOfBoundsException
 	{ 
-		int index = tryGetRelativePosToIndex(relX, relZ);
-		if (index < 0)
+		if (relX < 0 || relZ < 0 ||
+			relX > WIDTH || relZ > WIDTH)
 		{
-			throw new IndexOutOfBoundsException("Relative data source positions must be between [0] (inclusive) and ["+WIDTH+"] (exclusive) the relative pos: ["+relX+","+relZ+"] is outside those boundaries.");
+			throw new IndexOutOfBoundsException("Relative data source positions must be between [0] and ["+WIDTH+"] (inclusive) the relative pos: ["+relX+","+relZ+"] is outside of those boundaries.");
 		}
 		
-		return index; 
+		return (relX * WIDTH) + relZ; 
 	}
 	
 	/** 
@@ -1262,10 +1072,18 @@ public class FullDataSourceV2
 	// setters and getters //
 	//=====================//
 	
-	public long getPos() { return this.pos; }
+	@Override
+	public Long getPos() { return this.pos; }
 	
+	@Override
 	public byte getDataDetailLevel() { return (byte) (DhSectionPos.getDetailLevel(this.pos) - DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL); }
 	
+	public EDhApiWorldGenerationStep getWorldGenStepAtRelativePos(int relX, int relZ) 
+	{
+		int index = relativePosToIndex(relX, relZ);
+		return EDhApiWorldGenerationStep.fromValue(this.columnGenerationSteps.getByte(index)); 
+	}
+	
 	public void setSingleColumn(LongArrayList longArray, int relX, int relZ, EDhApiWorldGenerationStep worldGenStep, EDhApiWorldCompressionMode worldCompressionMode)
 	{
 		int index = relativePosToIndex(relX, relZ);
@@ -1307,13 +1125,13 @@ public class FullDataSourceV2
 	{
 		try
 		{
-			LodDataBuilder.putListInTopDownOrder(columnDataPoints);
+			LodDataBuilder.correctDataColumnOrder(columnDataPoints);
 			if (this.runApiChunkValidation)
 			{
 				LodDataBuilder.validateOrThrowApiDataColumn(columnDataPoints);
 			}
 			
-			LongArrayList packedDataPoints = LodDataBuilder.convertApiDataPointListToPackedLongArray(columnDataPoints, this, 0, true);
+			LongArrayList packedDataPoints = LodDataBuilder.convertApiDataPointListToPackedLongArray(columnDataPoints, this, 0);
 			
 			// 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);
@@ -1329,14 +1147,14 @@ public class FullDataSourceV2
 	@Override 
 	public List<DhApiTerrainDataPoint> getApiDataPointColumn(int relX, int relZ) throws IndexOutOfBoundsException
 	{
-		LongArrayList dataColumn = this.getColumnAtRelPos(relX, relZ);
+		LongArrayList dataColumn = this.get(relX, relZ);
 		
 		ArrayList<DhApiTerrainDataPoint> apiList = new ArrayList<>();
 		for (int i = 0; i < dataColumn.size(); i++)
 		{
 			long datapoint = dataColumn.getLong(i);
 			
-			DhApiTerrainDataPoint apiDataPoint = DhApiTerrainDataPointUtil.createApiDatapoint(0, this.mapping, DhSectionPos.getDetailLevel(this.pos), datapoint);
+			DhApiTerrainDataPoint apiDataPoint = DhApiTerrainDataPointUtil.createApiDatapoint(this.levelMinY, this.mapping, DhSectionPos.getDetailLevel(this.pos), datapoint);
 			apiList.add(apiDataPoint);
 		}
 		
@@ -1345,15 +1163,6 @@ public class FullDataSourceV2
 	
 	
 	
-	//============//
-	// unit tests //
-	//============//
-	
-	public PhantomArrayListCheckout getPhantomArrayCheckoutForUnitTesting()
-	{ return this.pooledArraysCheckout; }
-	
-	
-	
 	//================//
 	// base overrides //
 	//================//

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

@@ -0,0 +1,101 @@
+package com.seibel.distanthorizons.core.dataObjects.render;
+
+import com.google.common.cache.Cache;
+import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
+import com.seibel.distanthorizons.core.dataObjects.transformers.FullDataToRenderDataTransformer;
+import com.seibel.distanthorizons.core.file.fullDatafile.FullDataSourceProviderV2;
+import com.seibel.distanthorizons.core.util.threading.PriorityTaskPicker;
+import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.ReentrantLock;
+
+/** 
+ * Wrapper for {@link ColumnRenderSource} that handles reference counting
+ * and cache tracking.
+ */
+public class CachedColumnRenderSource implements AutoCloseable
+{
+	/** an externally handled future that will complete once the {@link CachedColumnRenderSource#columnRenderSource} has finished loading */
+	public final CompletableFuture<CachedColumnRenderSource> loadFuture;
+	/** will be null initially, should be non-null once the corresponding load future is done */
+	@Nullable
+	public ColumnRenderSource columnRenderSource = null;
+	
+	private final AtomicInteger referenceCount;
+	private final Cache<Long, CachedColumnRenderSource> cachedRenderSourceByPos;
+	private final ReentrantLock getterLock;
+	
+	
+	
+	//=============//
+	// constructor //
+	//=============//
+	
+	public CachedColumnRenderSource(
+			@NotNull CompletableFuture<CachedColumnRenderSource> loadFuture,
+			@NotNull ReentrantLock getterLock,
+			@NotNull Cache<Long, CachedColumnRenderSource> cachedRenderSourceByPos)
+	{
+		this.loadFuture = loadFuture;
+		this.getterLock = getterLock;
+		this.referenceCount = new AtomicInteger(1);
+		this.cachedRenderSourceByPos = cachedRenderSourceByPos;
+	}
+	
+	
+	
+	//====================//
+	// reference counting //
+	//====================//
+	
+	public void markInUse() { this.referenceCount.getAndIncrement(); }
+	
+	
+	
+	//================//
+	// base overrides //
+	//================//
+	
+	/** 
+	 * Will be called multiple times,
+	 * however it will only close the underlying data once
+	 * all references have closed.
+	 */
+	@Override 
+	public void close() throws IllegalStateException
+	{
+		try
+		{
+			// lock to prevent other threads for accessing the cache if we invalidate it
+			this.getterLock.lock();
+			
+			// should only happen if something goes wrong up-stream
+			if (this.columnRenderSource == null)
+			{
+				return;
+			}
+			
+			
+			// only close once everyone is done with this datasource
+			int refCount = this.referenceCount.decrementAndGet();
+			if (refCount == 0)
+			{
+				this.cachedRenderSourceByPos.invalidate(this.columnRenderSource.pos);
+				this.columnRenderSource.close();
+			}
+			else if (refCount < 0)
+			{
+				throw new IllegalStateException("Render source ["+this.columnRenderSource.pos+"] reference count incorrect. Object already closed.");
+			}
+		}
+		finally
+		{
+			this.getterLock.unlock();
+		}
+	}
+	
+}

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

@@ -19,28 +19,43 @@
 
 package com.seibel.distanthorizons.core.dataObjects.render;
 
+import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGenerationStep;
+import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
+import com.seibel.distanthorizons.core.dataObjects.transformers.FullDataToRenderDataTransformer;
+import com.seibel.distanthorizons.core.file.IDataSource;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.pooling.AbstractPhantomArrayList;
+import com.seibel.distanthorizons.core.pooling.PhantomArrayListParent;
 import com.seibel.distanthorizons.core.pooling.PhantomArrayListPool;
+import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos2D;
 import com.seibel.distanthorizons.core.pos.DhSectionPos;
+import com.seibel.distanthorizons.core.util.ListUtil;
+import com.seibel.distanthorizons.coreapi.ModInfo;
 import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnArrayView;
 import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnQuadView;
+import com.seibel.distanthorizons.core.level.IDhClientLevel;
+import com.seibel.distanthorizons.coreapi.util.BitShiftUtil;
 import com.seibel.distanthorizons.core.util.ColorUtil;
 import com.seibel.distanthorizons.core.util.RenderDataPointUtil;
 import it.unimi.dsi.fastutil.longs.LongArrayList;
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import org.apache.logging.log4j.Logger;
+
+import java.util.concurrent.atomic.AtomicLong;
 
 /**
  * Stores the render data used to generate OpenGL buffers.
  *
  * @see RenderDataPointUtil
  */
-public class ColumnRenderSource extends AbstractPhantomArrayList
+public class ColumnRenderSource
+		extends PhantomArrayListParent
+		implements IDataSource<IDhClientLevel>
 {
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
-	/** measured in data columns */
-	public static final int WIDTH = 64;
+	public static final boolean DO_SAFETY_CHECKS = ModInfo.IS_DEV_BUILD;
+	public static final byte SECTION_SIZE_OFFSET = DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL;
+	/** width of this data in columns */
+	public static final int SECTION_SIZE = BitShiftUtil.powerOfTwo(SECTION_SIZE_OFFSET); // 64
 	
 	public static final PhantomArrayListPool ARRAY_LIST_POOL = new PhantomArrayListPool("Render Source");
 	
@@ -57,6 +72,8 @@ public class ColumnRenderSource extends AbstractPhantomArrayList
 	
 	private boolean isEmpty = true;
 	
+	public AtomicLong localVersion = new AtomicLong(0); // used to track changes to the data source, so that buffers can be updated when necessary
+	
 	
 	
 	//==============//
@@ -80,9 +97,9 @@ public class ColumnRenderSource extends AbstractPhantomArrayList
 		
 		this.verticalDataCount = maxVerticalSize;
 		
-		this.renderDataContainer = this.pooledArraysCheckout.getLongArray(0, WIDTH * WIDTH * this.verticalDataCount);
+		this.renderDataContainer = this.pooledArraysCheckout.getLongArray(0, SECTION_SIZE * SECTION_SIZE * this.verticalDataCount);
 		
-		this.debugSourceFlags = new DebugSourceFlag[WIDTH * WIDTH];
+		this.debugSourceFlags = new DebugSourceFlag[SECTION_SIZE * SECTION_SIZE];
 	}
 	
 	
@@ -91,19 +108,19 @@ public class ColumnRenderSource extends AbstractPhantomArrayList
 	// datapoint manipulation //
 	//========================//
 	
-	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 * SECTION_SIZE * this.verticalDataCount + posZ * this.verticalDataCount + verticalIndex); }
 	
 	public ColumnArrayView getVerticalDataPointView(int posX, int posZ)
 	{
-		int offset = posX * WIDTH * this.verticalDataCount + posZ * this.verticalDataCount;
+		int offset = posX * SECTION_SIZE * this.verticalDataCount + posZ * this.verticalDataCount;
 		
 		// don't allow returning views that are outside this render source's bounds
 		if (offset >= this.renderDataContainer.size())
 		{
 			return null;
 		}
-		else if (posX < 0 || posX >= WIDTH
-				|| posZ < 0 || posZ >= WIDTH)
+		else if (posX < 0 || posX >= SECTION_SIZE
+				|| posZ < 0 || posZ >= SECTION_SIZE)
 		{
 			return null;
 		}
@@ -112,8 +129,74 @@ public class ColumnRenderSource extends AbstractPhantomArrayList
 				offset, this.verticalDataCount);
 	}
 	
-	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); }
+	public ColumnQuadView getFullQuadView() { return this.getQuadViewOverRange(0, 0, SECTION_SIZE, SECTION_SIZE); }
+	public ColumnQuadView getQuadViewOverRange(int quadX, int quadZ, int quadXSize, int quadZSize) { return new ColumnQuadView(this.renderDataContainer, SECTION_SIZE, this.verticalDataCount, quadX, quadZ, quadXSize, quadZSize); }
+	
+	
+	
+	//=============//
+	// data update //
+	//=============//
+	
+	@Override
+	public boolean update(FullDataSourceV2 inputFullDataSource, IDhClientLevel level)
+	{
+		final String errorMessagePrefix = "Unable to complete update for RenderSource pos: [" + this.pos + "] and pos: [" + inputFullDataSource.getPos() + "]. Error:";
+		
+		boolean dataChanged = false;
+		if (DhSectionPos.getDetailLevel(inputFullDataSource.getPos()) == DhSectionPos.getDetailLevel(this.pos))
+		{
+			try
+			{
+				if (Thread.interrupted())
+				{
+					LOGGER.warn(errorMessagePrefix + "write interrupted.");
+					return false;
+				}
+				
+				
+				
+				DhBlockPos2D centerBlockPos = DhSectionPos.getCenterBlockPos(inputFullDataSource.getPos());
+				int halfBlockWidth = DhSectionPos.getBlockWidth(inputFullDataSource.getPos()) / 2;
+				DhBlockPos2D minBlockPos = new DhBlockPos2D(centerBlockPos.x - halfBlockWidth, centerBlockPos.z - halfBlockWidth);
+				
+				for (int x = 0; x < FullDataSourceV2.WIDTH; x++)
+				{
+					for (int z = 0; z < FullDataSourceV2.WIDTH; z++)
+					{
+						ColumnArrayView columnArrayView = this.getVerticalDataPointView(x, z);
+						int columnHash = columnArrayView.getDataHash();
+						
+						LongArrayList dataColumn = inputFullDataSource.get(x, z);
+						EDhApiWorldGenerationStep worldGenStep = inputFullDataSource.getWorldGenStepAtRelativePos(x, z);
+						if (dataColumn != null && worldGenStep != EDhApiWorldGenerationStep.EMPTY)
+						{
+							FullDataToRenderDataTransformer.updateOrReplaceRenderDataViewColumnWithFullDataColumn(
+									level, inputFullDataSource.mapping,
+									minBlockPos.x + x,
+									minBlockPos.z + z,
+									columnArrayView, dataColumn);
+							dataChanged |= columnHash != columnArrayView.getDataHash();
+							
+							this.fillDebugFlag(x, z, 1, 1, ColumnRenderSource.DebugSourceFlag.DIRECT);
+						}
+					}
+				}
+			}
+			catch (Exception e)
+			{
+				LOGGER.error(errorMessagePrefix + e.getMessage(), e);
+			}
+		}
+		
+		if (dataChanged)
+		{
+			this.localVersion.incrementAndGet();
+			this.markNotEmpty();
+		}
+		
+		return dataChanged;
+	}
 	
 	
 	
@@ -122,9 +205,12 @@ public class ColumnRenderSource extends AbstractPhantomArrayList
 	//=====================//
 	
 	public Long getPos() { return this.pos; }
+	@Override
 	public Long getKey() { return this.pos; }
+	@Override
+	public String getKeyDisplayString() { return DhSectionPos.toString(this.pos); }
 	
-	public byte getDataDetailLevel() { return (byte) (DhSectionPos.getDetailLevel(this.pos) - DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL); }
+	public byte getDataDetailLevel() { return (byte) (DhSectionPos.getDetailLevel(this.pos) - SECTION_SIZE_OFFSET); }
 	
 	public boolean isEmpty() { return this.isEmpty; }
 	public void markNotEmpty() { this.isEmpty = false; }
@@ -138,15 +224,15 @@ public class ColumnRenderSource extends AbstractPhantomArrayList
 		}
 		
 		
-		for (int x = 0; x < WIDTH; x++)
+		for (int x = 0; x < SECTION_SIZE; x++)
 		{
-			for (int z = 0; z < WIDTH; z++)
+			for (int z = 0; z < SECTION_SIZE; z++)
 			{
 				ColumnArrayView columnArrayView = this.getVerticalDataPointView(x,z);
 				for (int i = 0; i < columnArrayView.size; i++)
 				{
 					long dataPoint = columnArrayView.get(i);
-					if (!RenderDataPointUtil.hasZeroHeight(dataPoint))
+					if (!RenderDataPointUtil.isVoid(dataPoint))
 					{
 						return true;
 					}
@@ -170,12 +256,12 @@ public class ColumnRenderSource extends AbstractPhantomArrayList
 		{
 			for (int z = zStart; z < zStart + zWidth; z++)
 			{
-				this.debugSourceFlags[x * WIDTH + z] = flag;
+				this.debugSourceFlags[x * SECTION_SIZE + z] = flag;
 			}
 		}
 	}
 	
-	public DebugSourceFlag debugGetFlag(int ox, int oz) { return this.debugSourceFlags[ox * WIDTH + oz]; }
+	public DebugSourceFlag debugGetFlag(int ox, int oz) { return this.debugSourceFlags[ox * SECTION_SIZE + oz]; }
 	
 	
 	

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

@@ -35,7 +35,7 @@ public final class BufferQuad
 	public static final int NORMAL_MAX_QUAD_WIDTH = 2048;
 	/**
 	 * The maximum number of blocks wide a quad can be
-	 * when {@link Config.Client.Advanced.Graphics.Experimental#earthCurveRatio earthCurveRatio}
+	 * when {@link Config.Client.Advanced.Graphics.AdvancedGraphics#earthCurveRatio earthCurveRatio}
 	 * is enabled.
 	 */
 	public static final int MAX_QUAD_WIDTH_FOR_EARTH_CURVATURE = LodUtil.CHUNK_WIDTH;
@@ -99,7 +99,7 @@ public final class BufferQuad
 		
 		if (compareDirection == BufferMergeDirectionEnum.EastWest)
 		{
-			switch (this.direction.axis)
+			switch (this.direction.getAxis())
 			{
 				case X:
 					return threeDimensionalCompare(this.x, this.y, this.z, quad.x, quad.y, quad.z);
@@ -109,12 +109,12 @@ public final class BufferQuad
 					return threeDimensionalCompare(this.z, this.y, this.x, quad.z, quad.y, quad.x);
 				
 				default:
-					throw new IllegalArgumentException("Invalid Axis enum: [" + this.direction.axis + "].");
+					throw new IllegalArgumentException("Invalid Axis enum: " + this.direction.getAxis());
 			}
 		}
 		else
 		{
-			switch (this.direction.axis)
+			switch (this.direction.getAxis())
 			{
 				case X:
 					return threeDimensionalCompare(this.x, this.z, this.y, quad.x, quad.z, quad.y);
@@ -124,7 +124,7 @@ public final class BufferQuad
 					return threeDimensionalCompare(this.z, this.x, this.y, quad.z, quad.x, quad.y);
 				
 				default:
-					throw new IllegalArgumentException("Invalid Axis enum: [" + this.direction.axis + "].");
+					throw new IllegalArgumentException("Invalid Axis enum: " + this.direction.getAxis());
 			}
 		}
 	}
@@ -157,8 +157,8 @@ public final class BufferQuad
 			return false;
 		
 		// make sure these quads share the same perpendicular axis
-		if ((mergeDirection == BufferMergeDirectionEnum.EastWest && this.y != quad.y)
-			|| (mergeDirection == BufferMergeDirectionEnum.NorthSouthOrUpDown && this.x != quad.x))
+		if ((mergeDirection == BufferMergeDirectionEnum.EastWest && this.y != quad.y) ||
+				(mergeDirection == BufferMergeDirectionEnum.NorthSouthOrUpDown && this.x != quad.x))
 		{
 			return false;
 		}
@@ -169,7 +169,7 @@ public final class BufferQuad
 		short thisParallelCompareStartPos; // edge parallel to the merge direction
 		short otherPerpendicularCompareStartPos;
 		short otherParallelCompareStartPos;
-		switch (this.direction.axis)
+		switch (this.direction.getAxis())
 		{
 			default: // shouldn't normally happen, just here to make the compiler happy
 			case X:

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

@@ -23,26 +23,38 @@ 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.ColorUtil;
 import com.seibel.distanthorizons.core.util.LodUtil;
 import com.seibel.distanthorizons.core.util.RenderDataPointUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnArrayView;
-import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
+import com.seibel.distanthorizons.core.render.renderer.LodRenderer;
 import com.seibel.distanthorizons.coreapi.util.MathUtil;
-import it.unimi.dsi.fastutil.longs.LongArrayList;
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Arrays;
+
 public class ColumnBox
 {
-	private static final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
+	private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
 	
 	/** 
-	 * if the skylight has this value that means
-	 * that block position is covered/occluded by an adjacent block/column.
+	 * if the skylight has this value that means 
+	 * no data is expected 
 	 */
-	private static final byte SKYLIGHT_COVERED = -1;
+	private static final byte SKYLIGHT_EMPTY = -1;
+	/** 
+	 * if the skylight has this value that means
+	 * that block position is covered/occuled by an adjacent block/column.
+	 */
+	private static final byte SKYLIGHT_COVERED = -2;
+	
+	private static final ThreadLocal<byte[]> THREAD_LOCAL_SKY_LIGHT_ARRAY = ThreadLocal.withInitial(() ->
+	{
+		byte[] array = new byte[RenderDataPointUtil.MAX_WORLD_Y_SIZE];
+		Arrays.fill(array, SKYLIGHT_EMPTY);
+		return array;
+	});
 	
 	
 	
@@ -51,8 +63,8 @@ public class ColumnBox
 	//=========//
 	
 	public static void addBoxQuadsToBuilder(
-			LodQuadBuilder builder, PhantomArrayListCheckout phantomArrayCheckout, IDhClientLevel clientLevel,
-			short width, short yHeight,
+			LodQuadBuilder builder, IDhClientLevel clientLevel,
+			short xSize, short ySize, short zSize,
 			short minX, short minY, short minZ,
 			int color, byte irisBlockMaterialId, byte skyLight, byte blockLight,
 			long topData, long bottomData, ColumnArrayView[] adjData, boolean[] isAdjDataSameDetailLevel)
@@ -61,26 +73,23 @@ public class ColumnBox
 		// variable setup //
 		//================//
 		
-		short maxX = (short) (minX + width);
-		short maxY = (short) (minY + yHeight);
-		short maxZ = (short) (minZ + width);
+		short maxX = (short) (minX + xSize);
+		short maxY = (short) (minY + ySize);
+		short maxZ = (short) (minZ + zSize);
 		byte skyLightTop = skyLight;
 		byte skyLightBot = RenderDataPointUtil.doesDataPointExist(bottomData) ? RenderDataPointUtil.getLightSky(bottomData) : 0;
 		
-		boolean transparencyEnabled = Config.Client.Advanced.Graphics.Quality.transparency.get().transparencyEnabled;
-		boolean fakeOceanFloor = Config.Client.Advanced.Graphics.Quality.transparency.get().fakeTransparencyEnabled;
-		
-		boolean isTransparent = ColorUtil.getAlpha(color) < 255 && transparencyEnabled;
+		boolean isTransparent = ColorUtil.getAlpha(color) < 255 && LodRenderer.transparencyEnabled;
 		boolean overVoid = !RenderDataPointUtil.doesDataPointExist(bottomData);
-		boolean isTopTransparent = RenderDataPointUtil.getAlpha(topData) < 255 && transparencyEnabled;
-		boolean isBottomTransparent = RenderDataPointUtil.getAlpha(bottomData) < 255 && transparencyEnabled;
+		boolean isTopTransparent = RenderDataPointUtil.getAlpha(topData) < 255 && LodRenderer.transparencyEnabled;
+		boolean isBottomTransparent = RenderDataPointUtil.getAlpha(bottomData) < 255 && LodRenderer.transparencyEnabled;
 		
 		// defaulting to a value far below what we can normally render means we
 		// don't need to have an additional "is cave culling enabled" check
 		int caveCullingMaxY = Integer.MIN_VALUE;
 		if (Config.Client.Advanced.Graphics.Culling.enableCaveCulling.get())
 		{
-			caveCullingMaxY = Config.Client.Advanced.Graphics.Culling.caveCullingHeight.get() - clientLevel.getLevelWrapper().getMinHeight();
+			caveCullingMaxY = Config.Client.Advanced.Graphics.Culling.caveCullingHeight.get() - clientLevel.getMinY();
 		}
 		
 		
@@ -94,20 +103,20 @@ public class ColumnBox
 		
 		
 		// fake ocean transparency
-		if (transparencyEnabled && fakeOceanFloor)
+		if (LodRenderer.transparencyEnabled && LodRenderer.fakeOceanFloor)
 		{
 			if (!isTransparent && isTopTransparent && RenderDataPointUtil.doesDataPointExist(topData))
 			{
 				skyLightTop = (byte) MathUtil.clamp(0, 15 - (RenderDataPointUtil.getYMax(topData) - minY), 15);
-				yHeight = (short) (RenderDataPointUtil.getYMax(topData) - minY - 1);
+				ySize = (short) (RenderDataPointUtil.getYMax(topData) - minY - 1);
 			}
 			else if (isTransparent && !isBottomTransparent && RenderDataPointUtil.doesDataPointExist(bottomData))
 			{
-				minY = (short) (minY + yHeight - 1);
-				yHeight = 1;
+				minY = (short) (minY + ySize - 1);
+				ySize = 1;
 			}
 			
-			maxY = (short) (minY + yHeight);
+			maxY = (short) (minY + ySize);
 		}
 		
 		
@@ -116,26 +125,16 @@ public class ColumnBox
 		// add top and bottom faces //
 		//==========================//
 		
-		// top face
+		boolean skipTop = RenderDataPointUtil.doesDataPointExist(topData) && (RenderDataPointUtil.getYMin(topData) == maxY) && !isTopTransparent;
+		if (!skipTop)
 		{
-			boolean skipTop = RenderDataPointUtil.doesDataPointExist(topData)
-					&& (RenderDataPointUtil.getYMin(topData) == maxY)
-					&& !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, xSize, zSize, ColorUtil.applyShade(color, MC.getShade(EDhDirection.UP)), irisBlockMaterialId, skyLightTop, blockLight);
 		}
 		
-		// bottom face 
+		boolean skipBottom = RenderDataPointUtil.doesDataPointExist(bottomData) && (RenderDataPointUtil.getYMax(bottomData) == minY) && !isBottomTransparent;
+		if (!skipBottom)
 		{
-			boolean skipBottom = RenderDataPointUtil.doesDataPointExist(bottomData)
-					&& (RenderDataPointUtil.getYMax(bottomData) == minY)
-					&& !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, xSize, zSize, ColorUtil.applyShade(color, MC.getShade(EDhDirection.DOWN)), irisBlockMaterialId, skyLightBot, blockLight);
 		}
 		
 		
@@ -146,285 +145,258 @@ public class ColumnBox
 		
 		// NORTH face
 		{
-			ColumnArrayView adjCol = adjData[EDhDirection.NORTH.compassIndex];
-			boolean adjSameDetailLevel = isAdjDataSameDetailLevel[EDhDirection.NORTH.compassIndex];
+			ColumnArrayView adjCol = adjData[EDhDirection.NORTH.ordinal() - 2]; // TODO can we use something other than ordinal-2?
+			boolean adjSameDetailLevel = isAdjDataSameDetailLevel[EDhDirection.NORTH.ordinal() - 2];
 			// if the adjacent column is null that generally means the adjacent area hasn't been generated yet
 			if (adjCol == null)
 			{
 				// Add an adjacent face if this is opaque face or transparent over the void.
 				if (!isTransparent || overVoid)
 				{
-					builder.addQuadAdj(
-							EDhDirection.NORTH, 
-							minX, minY, minZ, 
-							width, yHeight, 
-							color, irisBlockMaterialId, LodUtil.MAX_MC_LIGHT, blockLight);
+					builder.addQuadAdj(EDhDirection.NORTH, minX, minY, minZ, xSize, ySize, color, irisBlockMaterialId, LodUtil.MAX_MC_LIGHT, blockLight);
 				}
 			}
 			else
 			{
-				makeAdjVerticalQuad(
-						builder, phantomArrayCheckout, 
-						adjCol, adjSameDetailLevel, caveCullingMaxY, EDhDirection.NORTH, 
-						minX, minY, minZ, width, yHeight,
+				makeAdjVerticalQuad(builder, adjCol, adjSameDetailLevel, caveCullingMaxY, EDhDirection.NORTH, minX, minY, minZ, xSize, ySize,
 						color, irisBlockMaterialId, blockLight);
 			}
 		}
 		
 		// SOUTH face
 		{
-			ColumnArrayView adjCol = adjData[EDhDirection.SOUTH.compassIndex];
-			boolean adjSameDetailLevel = isAdjDataSameDetailLevel[EDhDirection.SOUTH.compassIndex];
+			ColumnArrayView adjCol = adjData[EDhDirection.SOUTH.ordinal() - 2];
+			boolean adjSameDetailLevel = isAdjDataSameDetailLevel[EDhDirection.SOUTH.ordinal() - 2];
 			if (adjCol == null)
 			{
 				if (!isTransparent || overVoid)
 				{
-					builder.addQuadAdj(
-							EDhDirection.SOUTH, 
-							minX, minY, maxZ, 
-							width, yHeight, 
-							color, irisBlockMaterialId, LodUtil.MAX_MC_LIGHT, blockLight);
+					builder.addQuadAdj(EDhDirection.SOUTH, minX, minY, maxZ, xSize, ySize, color, irisBlockMaterialId, LodUtil.MAX_MC_LIGHT, blockLight);
 				}
 			}
 			else
 			{
-				makeAdjVerticalQuad(
-						builder, phantomArrayCheckout,
-						adjCol, adjSameDetailLevel, caveCullingMaxY, EDhDirection.SOUTH,
-						minX, minY, maxZ, width, yHeight,
+				makeAdjVerticalQuad(builder, adjCol, adjSameDetailLevel, caveCullingMaxY, EDhDirection.SOUTH, minX, minY, maxZ, xSize, ySize,
 						color, irisBlockMaterialId, blockLight);
 			}
 		}
 		
 		// WEST face
 		{
-			ColumnArrayView adjCol = adjData[EDhDirection.WEST.compassIndex];
-			boolean adjSameDetailLevel = isAdjDataSameDetailLevel[EDhDirection.WEST.compassIndex];
+			ColumnArrayView adjCol = adjData[EDhDirection.WEST.ordinal() - 2];
+			boolean adjSameDetailLevel = isAdjDataSameDetailLevel[EDhDirection.WEST.ordinal() - 2];
 			if (adjCol == null)
 			{
 				if (!isTransparent || overVoid)
 				{
-					builder.addQuadAdj(
-							EDhDirection.WEST, 
-							minX, minY, minZ, 
-							width, yHeight, 
-							color, irisBlockMaterialId, LodUtil.MAX_MC_LIGHT, blockLight);
+					builder.addQuadAdj(EDhDirection.WEST, minX, minY, minZ, zSize, ySize, color, irisBlockMaterialId, LodUtil.MAX_MC_LIGHT, blockLight);
 				}
 			}
 			else
 			{
-				makeAdjVerticalQuad(
-						builder, phantomArrayCheckout,
-						adjCol, adjSameDetailLevel, caveCullingMaxY, EDhDirection.WEST, 
-						minX, minY, minZ, width, yHeight,
+				makeAdjVerticalQuad(builder, adjCol, adjSameDetailLevel, caveCullingMaxY, EDhDirection.WEST, minX, minY, minZ, zSize, ySize,
 						color, irisBlockMaterialId, blockLight);
 			}
 		}
 		
 		// EAST face
 		{
-			ColumnArrayView adjCol = adjData[EDhDirection.EAST.compassIndex];
-			boolean adjSameDetailLevel = isAdjDataSameDetailLevel[EDhDirection.EAST.compassIndex];
+			ColumnArrayView adjCol = adjData[EDhDirection.EAST.ordinal() - 2];
+			boolean adjSameDetailLevel = isAdjDataSameDetailLevel[EDhDirection.EAST.ordinal() - 2];
 			if (adjCol == null)
 			{
 				if (!isTransparent || overVoid)
 				{
-					builder.addQuadAdj(
-							EDhDirection.EAST, 
-							maxX, minY, minZ, 
-							width, yHeight, 
-							color, irisBlockMaterialId, LodUtil.MAX_MC_LIGHT, blockLight);
+					builder.addQuadAdj(EDhDirection.EAST, maxX, minY, minZ, zSize, ySize, color, irisBlockMaterialId, LodUtil.MAX_MC_LIGHT, blockLight);
 				}
 			}
 			else
 			{
-				makeAdjVerticalQuad(
-						builder, phantomArrayCheckout,
-						adjCol, adjSameDetailLevel, caveCullingMaxY, EDhDirection.EAST, 
-						maxX, minY, minZ, width, yHeight,
+				makeAdjVerticalQuad(builder, adjCol, adjSameDetailLevel, caveCullingMaxY, EDhDirection.EAST, maxX, minY, minZ, zSize, ySize,
 						color, irisBlockMaterialId, blockLight);
 			}
 		}
 	}
 	
 	private static void makeAdjVerticalQuad(
-		LodQuadBuilder builder, PhantomArrayListCheckout phantomArrayCheckout,
-		@NotNull ColumnArrayView adjColumnView, boolean adjacentIsSameDetailLevel, int caveCullingMaxY, EDhDirection direction,
-		short x, short yMin, short z, short horizontalWidth, short ySize,
-		int color, byte irisBlockMaterialId, byte blockLight)
+			LodQuadBuilder builder, @NotNull ColumnArrayView adjColumnView, boolean adjacentIsSameDetailLevel, int caveCullingMaxY, EDhDirection direction, 
+			short x, short yMin, short z, short horizontalWidth, short ySize,
+			int color, byte irisBlockMaterialId, byte blockLight)
 	{
-		// pooled arrays
-		LongArrayList segments = phantomArrayCheckout.getLongArray(0, 0);
-		LongArrayList newSegments = phantomArrayCheckout.getLongArray(1, 0);
-		
-		
-		
 		//==================//
 		// create face with //
 		// no adjacent data //
 		//==================//
 		
-		color = ColorUtil.applyShade(color, MC_RENDER.getShade(direction));
+		color = ColorUtil.applyShade(color, MC.getShade(direction));
 		
-		if (adjColumnView.size == 0
-			|| RenderDataPointUtil.hasZeroHeight(adjColumnView.get(0)))
+		// if there isn't any data adjacent to this LOD,
+		// just add the full vertical quad
+		if (adjColumnView.size == 0 || RenderDataPointUtil.isVoid(adjColumnView.get(0)))
 		{
+			
 			builder.addQuadAdj(direction, x, yMin, z, horizontalWidth, ySize, color, irisBlockMaterialId, LodUtil.MAX_MC_LIGHT, blockLight);
 			return;
 		}
 		
 		
 		
-		//=================================//
-		// determine face visibility/light //
-		//=================================//
+		//===========================//
+		// Determine face visibility //
+		// based on it's neighbors   //
+		//===========================//
 		
-		boolean transparencyEnabled = Config.Client.Advanced.Graphics.Quality.transparency.get().transparencyEnabled;
-		boolean inputTransparent = ColorUtil.getAlpha(color) < 255 && transparencyEnabled;
-		short yMax = (short) (yMin + ySize);
+		short yMax = (short) (yMin + ySize); // min is inclusive, max is exclusive
+		byte[] skyLightAtInputPos = THREAD_LOCAL_SKY_LIGHT_ARRAY.get();
 		
-		
-		int adjCount = adjColumnView.size();
-		
-		// Start with the entire range at max light
-		segments.add(YSegmentUtil.encode(yMin, yMax, LodUtil.MAX_MC_LIGHT));
-		
-		// Process each adjacent datapoint and split segments as needed
-		for (int adjIndex = 0; adjIndex < adjCount; adjIndex++)
+		try
 		{
-			long adjPoint = adjColumnView.get(adjIndex);
-			short adjMinY = RenderDataPointUtil.getYMin(adjPoint);
-			short adjMaxY = RenderDataPointUtil.getYMax(adjPoint);
+			// set the initial sky-lights for this face,
+			// if nothing overlaps or overhangs the face should have max sky light
+			Arrays.fill(skyLightAtInputPos, yMin, yMax, LodUtil.MAX_MC_LIGHT);
 			
-			// skip empty adjacent points
-			// or points below this one
-			if (!RenderDataPointUtil.doesDataPointExist(adjPoint)
-				|| RenderDataPointUtil.hasZeroHeight(adjPoint)
-				|| yMax <= adjMinY)
+			// iterate top down
+			int adjCount = adjColumnView.size();
+			for (int adjIndex = 0; adjIndex < adjCount; adjIndex++)
 			{
-				continue;
-			}
-			
-			
-			long adjAbovePoint = (adjIndex != 0) ? adjColumnView.get(adjIndex - 1) : RenderDataPointUtil.EMPTY_DATA;
-			long adjBelowPoint = (adjIndex + 1 < adjCount) ? adjColumnView.get(adjIndex + 1) : RenderDataPointUtil.EMPTY_DATA;
-			
-			boolean adjOverVoid = !RenderDataPointUtil.doesDataPointExist(adjBelowPoint);
-			boolean adjTransparent = 
-				!adjOverVoid
-				&& RenderDataPointUtil.getAlpha(adjPoint) < 255
-				&& transparencyEnabled;
-			
-			byte adjSkyLight = RenderDataPointUtil.getLightSky(adjPoint);
-			byte lightToApply;
-			
-			if (!adjTransparent)
-			{
-				// Adjacent is opaque
-				boolean adjacentCoversThis =
-					!adjacentIsSameDetailLevel
-						&& RenderDataPointUtil.getYMax(adjPoint) >= caveCullingMaxY
-						&&
-						(
-							(x == 0 && direction == EDhDirection.WEST)
-							|| (z == 0 && direction == EDhDirection.NORTH)
-							|| (x == 256 && direction == EDhDirection.EAST)
-							|| (z == 256 && direction == EDhDirection.SOUTH)
-						);
+				long adjPoint = adjColumnView.get(adjIndex);
+				short adjMinY = RenderDataPointUtil.getYMin(adjPoint);
+				short adjMaxY = RenderDataPointUtil.getYMax(adjPoint);
 				
-				lightToApply = adjacentCoversThis ? adjSkyLight : SKYLIGHT_COVERED;
-			}
-			else
-			{
-				// Adjacent is transparent, use below light
-				lightToApply = RenderDataPointUtil.getLightSky(adjBelowPoint);
+				// skip empty adjacent datapoints
+				if (!RenderDataPointUtil.doesDataPointExist(adjPoint)
+						|| RenderDataPointUtil.isVoid(adjPoint))
+				{
+					continue;
+				}
+				
+				// skip this adjacent datapoint if it's above the input datapoint (since it can't affect the input data point)
+				if (yMax <= adjMinY)
+				{
+					continue;
+				}
+				
+				
+				long adjAbovePoint = (adjIndex != 0) ? adjColumnView.get(adjIndex - 1) : RenderDataPointUtil.EMPTY_DATA;
+				long adjBelowPoint = (adjIndex + 1 < adjCount) ? adjColumnView.get(adjIndex + 1) : RenderDataPointUtil.EMPTY_DATA;
+				
+				// if the adjacent data point is over the void
+				// don't consider it as transparent
+				boolean adjOverVoid = !RenderDataPointUtil.doesDataPointExist(adjBelowPoint);
+				boolean adjTransparent = !adjOverVoid && RenderDataPointUtil.getAlpha(adjPoint) < 255 && LodRenderer.transparencyEnabled;
+				
+				
+				
+				//=================================//
+				// set sky light based on adjacent //
+				//=================================//
+				
+				// set light based on overlapping adjacent
+				if (!adjTransparent)
+				{
+					// adj opaque
+					// mark positions adjacent is covering
+					byte adjSkyLight = RenderDataPointUtil.getLightSky(adjPoint);
+					for (int i = adjMinY; i < adjMaxY; i++)
+					{
+						byte skyLightAtPos = skyLightAtInputPos[i];
+						
+						// if the adjacent is a different detail level, we want to render adjacent opaque
+						// faces to try and reduce the chance of holes on detail level borders
+						boolean adjacentCoversThis = 
+								// if the adjacent is the same detail level, no special handling is necessary
+								!adjacentIsSameDetailLevel
+								// if the adjacent face is underground we probably don't need it
+								&& RenderDataPointUtil.getYMax(adjPoint) >= caveCullingMaxY
+								// check if this face is on a border
+								&& 
+								(
+									(x == 0 && direction == EDhDirection.WEST)
+									|| (z == 0 && direction == EDhDirection.NORTH)
+									// TODO why does 256 represent a border? aren't LODs only 64 datapoints wide?
+									|| (x == 256 && direction == EDhDirection.EAST)
+									|| (z == 256 && direction == EDhDirection.SOUTH)
+								);
+						
+						byte newSkyLightAtPos = adjacentCoversThis ? adjSkyLight : SKYLIGHT_COVERED;
+						skyLightAtInputPos[i] = (byte) Math.min(newSkyLightAtPos, skyLightAtPos);
+					}
+				}
+				else
+				{
+					// adjacent is transparent,
+					// use datapoint below adjacent for lighting
+					byte belowSkyLight = RenderDataPointUtil.getLightSky(adjBelowPoint);
+					for (int i = adjMinY; i < adjMaxY; i++)
+					{
+						byte skyLightAtPos = skyLightAtInputPos[i];
+						skyLightAtInputPos[i] = (byte) Math.min(belowSkyLight, skyLightAtPos);
+					}
+				}
+				
+				
+				// fill in sky light up to the next DP,
+				// this is done to handle overhangs
+				byte adjSkyLight = RenderDataPointUtil.getLightSky(adjPoint);
+				int adjAboveMinY = RenderDataPointUtil.getYMin(adjAbovePoint);
+				for (int i = adjMaxY; i < adjAboveMinY; i++)
+				{
+					byte skyLightAtPos = skyLightAtInputPos[i];
+					skyLightAtInputPos[i] = (byte) Math.min(adjSkyLight, skyLightAtPos);
+				}
 			}
 			
 			
-			// Apply light to the range [adjMinY, adjMaxY)
-			applyLightToRange(segments, newSegments, adjMinY, adjMaxY, lightToApply);
 			
-			// Fill overhang area [adjMaxY, adjAboveMinY) with adjSkyLight
-			short adjAboveMinY = RenderDataPointUtil.getYMin(adjAbovePoint);
-			if (adjMaxY < adjAboveMinY)
+			//=======================//
+			// create vertical faces //
+			//=======================//
+			
+			boolean inputTransparent = ColorUtil.getAlpha(color) < 255 && LodRenderer.transparencyEnabled;
+			byte lastSkyLight = skyLightAtInputPos[yMin];
+			int quadBottomY = yMin;
+			int quadTopY = -1;
+			
+			// walk up the sky lights and create a new face
+			// whenever the light changes to different valid value
+			for (int i = yMin; i < yMax; i++)
 			{
-				applyLightToRange(segments, newSegments, adjMaxY, adjAboveMinY, adjSkyLight);
+				byte skyLight = skyLightAtInputPos[i];
+				if (skyLight != lastSkyLight)
+				{
+					// the sky light changed, create the in-progress face
+					tryAddVerticalFaceWithSkyLightToBuilder(
+							builder, direction,
+							x, z, horizontalWidth,
+							color, irisBlockMaterialId, blockLight,
+							lastSkyLight, inputTransparent, quadTopY, quadBottomY
+					);
+					
+					lastSkyLight = skyLight;
+					quadBottomY = i;
+				}
+				
+				quadTopY = (i + 1);
+			}
+			
+			// add the in-progress face if present
+			if (quadTopY != -1)
+			{
+				tryAddVerticalFaceWithSkyLightToBuilder(
+						builder, direction,
+						x, z, horizontalWidth,
+						color, irisBlockMaterialId, blockLight,
+						lastSkyLight, inputTransparent, quadTopY, quadBottomY
+				);
 			}
 		}
-		
-		
-		
-		//=======================//
-		// Create vertical faces //
-		// from segments         //
-		//=======================//
-		
-		for (int i = 0; i < segments.size(); i++)
+		finally
 		{
-			long segment = segments.getLong(i);
-			tryAddVerticalFaceWithSkyLightToBuilder(
-				builder, direction,
-				x, z, horizontalWidth,
-				color, irisBlockMaterialId, blockLight,
-				YSegmentUtil.getSkyLight(segment), inputTransparent, YSegmentUtil.getEndY(segment), YSegmentUtil.getStartY(segment)
-			);
+			// clean up the array before the next thread uses it
+			// (may be unnecessary since we only work between the yMin-yMax anyway, but is helpful for debugging)
+			Arrays.fill(skyLightAtInputPos, yMin, yMax, SKYLIGHT_EMPTY);
 		}
 	}
-	
-	/**
-	 * Apply the new light value over the given y range,
-	 * splitting segments as needed
-	 * <p>
-	 * source: claude.ai
-	 */
-	private static void applyLightToRange(
-			LongArrayList segments, LongArrayList newSegments, 
-			short rangeStart, short rangeEnd, 
-			byte newLight)
-	{
-		// clear the pooled array that the new segments will go into
-		newSegments.clear();
-		
-		for (int i = 0; i < segments.size(); i++)
-		{
-			long seg = segments.getLong(i);
-			short endY = YSegmentUtil.getEndY(seg);
-			short startY = YSegmentUtil.getStartY(seg);
-			byte skyLight = YSegmentUtil.getSkyLight(seg);
-			
-			// No overlap
-			if (endY <= rangeStart 
-				|| startY >= rangeEnd)
-			{
-				newSegments.add(seg);
-				continue;
-			}
-			
-			// Partial or complete overlap - need to split
-			
-			// Part before the range
-			if (startY < rangeStart)
-			{
-				newSegments.add(YSegmentUtil.encode(startY, rangeStart, skyLight));
-			}
-			
-			// Overlapping part - take minimum light
-			short overlapStart = (short)Math.max(startY, rangeStart);
-			short overlapEnd = (short)Math.min(endY, rangeEnd);
-			byte minLight = (byte) Math.min(newLight, skyLight);
-			newSegments.add(YSegmentUtil.encode(overlapStart, overlapEnd, minLight));
-			
-			// Part after the range
-			if (endY > rangeEnd)
-			{
-				newSegments.add(YSegmentUtil.encode(rangeEnd, endY, skyLight));
-			}
-		}
-		
-		segments.clear();
-		segments.addAll(newSegments);
-	}
-	
 	private static void tryAddVerticalFaceWithSkyLightToBuilder(
 			LodQuadBuilder builder, EDhDirection direction,
 			short x, short z, short horizontalWidth,
@@ -433,72 +405,22 @@ public class ColumnBox
 			)
 	{
 		// invalid positions will have a negative skylight
-		if (lastSkyLight < 0)
+		if (lastSkyLight >= 0)
 		{
-			return;
+			// Don't add transparent vertical faces
+			// unless the adjacent position is empty.
+			// This is done to prevent walls between water blocks in the ocean.
+			if (!inputTransparent
+				|| (lastSkyLight == LodUtil.MAX_MC_LIGHT))
+			{
+				// don't add negative/empty height faces
+				short height = (short) (quadTopY - quadBottomY);
+				if (height > 0)
+				{
+					builder.addQuadAdj(direction, x, (short) quadBottomY, z, horizontalWidth, height, color, irisBlockMaterialId, lastSkyLight, blockLight);
+				}
+			}
 		}
-		
-		// Don't add transparent vertical faces
-		// unless the adjacent position is empty.
-		// This is done to prevent walls between water blocks in the ocean.
-		if (inputTransparent
-			&& (lastSkyLight != LodUtil.MAX_MC_LIGHT))
-		{
-			return;
-		}
-		
-		// don't add negative/empty height faces
-		short height = (short) (quadTopY - quadBottomY);
-		if (height <= 0)
-		{
-			return;
-		}
-		
-		builder.addQuadAdj(
-				direction, 
-				x, (short) quadBottomY, z, 
-				horizontalWidth, height, 
-				color, irisBlockMaterialId, lastSkyLight, blockLight);
-	}
-	
-	
-	
-	//================//
-	// helper classes //
-	//================//
-	
-	/** 
-	 * encodes height/light data into a long
-	 * to reduce object allocations.
-	 */
-	private static class YSegmentUtil
-	{
-		private static final int HEIGHT_WIDTH = Short.SIZE;
-		private static final int SKY_LIGHT_WIDTH = Byte.SIZE;
-		
-		private static final int START_Y_MASK = (int) Math.pow(2, HEIGHT_WIDTH) - 1;
-		private static final int END_Y_MASK = (int) Math.pow(2, HEIGHT_WIDTH) - 1;
-		private static final int SKY_LIGHT_MASK = (int) Math.pow(2, SKY_LIGHT_WIDTH) - 1;
-		
-		private static final int START_Y_OFFSET = 0;
-		private static final int END_Y_OFFSET = START_Y_OFFSET + HEIGHT_WIDTH;
-		private static final int SKY_LIGHT_OFFSET = END_Y_OFFSET + HEIGHT_WIDTH;
-		
-		
-		
-		public static long encode(short startY, short endY, byte skyLight)
-		{
-			long data = 0L;
-			data |= (long) (startY & START_Y_MASK) << START_Y_OFFSET;
-			data |= (long) (endY & END_Y_MASK) << END_Y_OFFSET;
-			data |= (long) (skyLight & SKY_LIGHT_MASK) << SKY_LIGHT_OFFSET;
-			return data;
-		}
-		
-		public static short getStartY(long data) { return (short) ((data >> START_Y_OFFSET) & START_Y_MASK); }
-		public static short getEndY(long data) { return (short) ((data >> END_Y_OFFSET) & END_Y_MASK); }
-		public static byte getSkyLight(long data) { return (byte) ((data >> SKY_LIGHT_OFFSET) & SKY_LIGHT_MASK); }
-		
 	}
 	
 	

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

@@ -19,14 +19,16 @@
 
 package com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding;
 
-import com.seibel.distanthorizons.core.logging.DhLogger;
+import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiRenderParam;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 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.renderer.LodRenderer;
 import com.seibel.distanthorizons.core.util.LodUtil;
 import com.seibel.distanthorizons.core.util.objects.StatsMap;
 import com.seibel.distanthorizons.api.enums.config.EDhApiGpuUploadMethod;
+import org.apache.logging.log4j.Logger;
 import org.lwjgl.system.MemoryUtil;
 
 import java.nio.ByteBuffer;
@@ -38,9 +40,9 @@ import java.util.concurrent.*;
  *
  * @see ColumnRenderBufferBuilder
  */
-public class LodBufferContainer implements AutoCloseable
+public class ColumnRenderBuffer implements AutoCloseable
 {
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
 	/** number of bytes a single quad takes */
 	public static final int QUADS_BYTE_SIZE = LodUtil.LOD_VERTEX_FORMAT.getByteSize() * 4;
@@ -50,16 +52,15 @@ public class LodBufferContainer implements AutoCloseable
 	public static final int FULL_SIZED_BUFFER = MAX_QUADS_PER_BUFFER * QUADS_BYTE_SIZE;
 	
 	
-	/** the position closest to minimum X/Z infinity and the level's lowest Y */
-	public final DhBlockPos minCornerBlockPos;
-	public final long pos;
+	
+	public final DhBlockPos blockPos;
 	
 	public boolean buffersUploaded = false;
 	
-	public GLVertexBuffer[] vbos;
-	public GLVertexBuffer[] vbosTransparent;
+	private GLVertexBuffer[] vbos;
+	private GLVertexBuffer[] vbosTransparent;
 	
-	private CompletableFuture<LodBufferContainer> uploadFuture = null;
+	private CompletableFuture<ColumnRenderBuffer> uploadFuture = null;
 	
 	
 	
@@ -67,10 +68,9 @@ public class LodBufferContainer implements AutoCloseable
 	// constructors //
 	//==============//
 	
-	public LodBufferContainer(long pos, DhBlockPos minCornerBlockPos)
+	public ColumnRenderBuffer(DhBlockPos blockPos)
 	{
-		this.pos = pos;
-		this.minCornerBlockPos = minCornerBlockPos;
+		this.blockPos = blockPos;
 		this.vbos = new GLVertexBuffer[0];
 		this.vbosTransparent = new GLVertexBuffer[0];
 	}
@@ -82,10 +82,10 @@ public class LodBufferContainer implements AutoCloseable
 	//==================//
 	
 	/** Should be run on a DH thread. */
-	public synchronized CompletableFuture<LodBufferContainer> makeAndUploadBuffersAsync(LodQuadBuilder builder)
+	public synchronized CompletableFuture<ColumnRenderBuffer> makeAndUploadBuffersAsync(LodQuadBuilder builder, EDhApiGpuUploadMethod gpuUploadMethod)
 	{
 		// separate variable to prevent race condition when checking null
-		CompletableFuture<LodBufferContainer> future = this.uploadFuture;
+		CompletableFuture<ColumnRenderBuffer> future = this.uploadFuture;
 		if (future != null)
 		{
 			// upload already in process
@@ -112,14 +112,11 @@ public class LodBufferContainer implements AutoCloseable
 			try
 			{
 				// skip this event if requested
-				if (Thread.interrupted() 
-					|| this.uploadFuture.isCancelled())
+				if (Thread.interrupted() || this.uploadFuture.isCancelled())
 				{
 					throw new InterruptedException();
 				}
 				
-				EDhApiGpuUploadMethod gpuUploadMethod = GLProxy.getInstance().getGpuUploadMethod();
-				
 				// upload on the render thread
 				uploadBuffersDirect(this.vbos, opaqueBuffers, gpuUploadMethod);
 				uploadBuffersDirect(this.vbosTransparent, transparentBuffers, gpuUploadMethod);
@@ -136,7 +133,7 @@ public class LodBufferContainer implements AutoCloseable
 			}
 			catch (Exception e)
 			{
-				LOGGER.error("Unexpected issue uploading buffer ["+this.minCornerBlockPos +"], error: ["+e.getMessage()+"].", e);
+				LOGGER.error("Unexpected issue uploading buffer ["+this.blockPos +"], error: ["+e.getMessage()+"].", e);
 				
 				this.uploadFuture.completeExceptionally(e);
 				this.uploadFuture = null;
@@ -180,9 +177,7 @@ public class LodBufferContainer implements AutoCloseable
 		}
 		return newVbos;
 	}
-	private static void uploadBuffersDirect(
-			GLVertexBuffer[] vbos, ArrayList<ByteBuffer> byteBuffers, 
-			EDhApiGpuUploadMethod uploadMethod) throws InterruptedException
+	private static void uploadBuffersDirect(GLVertexBuffer[] vbos, ArrayList<ByteBuffer> byteBuffers, EDhApiGpuUploadMethod method) throws InterruptedException
 	{
 		int vboIndex = 0;
 		for (int i = 0; i < byteBuffers.size(); i++)
@@ -196,7 +191,7 @@ public class LodBufferContainer implements AutoCloseable
 			// get or create the VBO
 			if (vbos[vboIndex] == null)
 			{
-				vbos[vboIndex] = new GLVertexBuffer(uploadMethod.useBufferStorage);
+				vbos[vboIndex] = new GLVertexBuffer(method.useBufferStorage);
 			}
 			GLVertexBuffer vbo = vbos[vboIndex];
 			
@@ -207,13 +202,13 @@ public class LodBufferContainer implements AutoCloseable
 			try
 			{
 				vbo.bind();
-				vbo.uploadBuffer(buffer, size / LodUtil.LOD_VERTEX_FORMAT.getByteSize(), uploadMethod, FULL_SIZED_BUFFER);
+				vbo.uploadBuffer(buffer, size / LodUtil.LOD_VERTEX_FORMAT.getByteSize(), method, FULL_SIZED_BUFFER);
 			}
 			catch (Exception e)
 			{
 				vbos[vboIndex] = null;
 				vbo.close();
-				LOGGER.error("Failed to upload buffer. Error: ["+e.getMessage()+"].", e);
+				LOGGER.error("Failed to upload buffer: ", e);
 			}
 			
 			vboIndex++;
@@ -227,6 +222,69 @@ public class LodBufferContainer implements AutoCloseable
 	
 	
 	
+	//========//
+	// render //
+	//========//
+	
+	/** @return true if something was rendered, false otherwise */
+	public boolean renderOpaque(LodRenderer renderContext, DhApiRenderParam renderEventParam)
+	{
+		boolean hasRendered = false;
+		renderContext.setModelViewMatrixOffset(this.blockPos, renderEventParam);
+		for (GLVertexBuffer vbo : this.vbos)
+		{
+			if (vbo == null)
+			{
+				continue;
+			}
+			
+			if (vbo.getVertexCount() == 0)
+			{
+				continue;
+			}
+			
+			hasRendered = true;
+			renderContext.drawVbo(vbo, this);
+		}
+		return hasRendered;
+	}
+	
+	/** @return true if something was rendered, false otherwise */
+	public boolean renderTransparent(LodRenderer renderContext, DhApiRenderParam renderEventParam)
+	{
+		boolean hasRendered = false;
+		
+		try
+		{
+			// can throw an IllegalStateException if the GL program was freed before it should've been
+			renderContext.setModelViewMatrixOffset(this.blockPos, renderEventParam);
+			
+			for (GLVertexBuffer vbo : this.vbosTransparent)
+			{
+				if (vbo == null)
+				{
+					continue;
+				}
+				
+				if (vbo.getVertexCount() == 0)
+				{
+					continue;
+				}
+				
+				hasRendered = true;
+				renderContext.drawVbo(vbo, this);
+			}
+		}
+		catch (IllegalStateException e)
+		{
+			LOGGER.error("renderContext program doesn't exist for pos: "+this.blockPos, e);
+		}
+		
+		return hasRendered;
+	}
+	
+	
+	
 	//================//
 	// helper methods //
 	//================//
@@ -270,7 +328,7 @@ public class LodBufferContainer implements AutoCloseable
 				
 				if (vertexBuffer.getSize() == 0)
 				{
-					GLProxy.LOGGER.warn("VBO with size 0");
+					GLProxy.GL_LOGGER.warn("VBO with size 0");
 				}
 				statsMap.incBytesStat("TotalUsage", vertexBuffer.getSize());
 			}

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

@@ -25,17 +25,20 @@ import com.seibel.distanthorizons.core.enums.EDhDirection;
 import com.seibel.distanthorizons.core.config.Config;
 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.ConfigBasedLogger;
 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.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.util.objects.UncheckedInterruptedException;
 import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnArrayView;
+import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
+import com.seibel.distanthorizons.coreapi.util.BitShiftUtil;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 
 import java.util.concurrent.CompletableFuture;
 
@@ -46,9 +49,9 @@ import java.util.concurrent.CompletableFuture;
  */
 public class ColumnRenderBufferBuilder
 {
-	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
-	
-	public static final PhantomArrayListPool ARRAY_LIST_POOL = new PhantomArrayListPool("Column Buffer Builder");
+	public static final ConfigBasedLogger EVENT_LOGGER = new ConfigBasedLogger(LogManager.getLogger(),
+			() -> Config.Common.Logging.logRendererBufferEvent.get());
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
 	
 	
@@ -57,15 +60,14 @@ public class ColumnRenderBufferBuilder
 	//==============//
 	
 	/** @link adjData should be null for adjacent sections that cross detail level boundaries */
-	public static CompletableFuture<LodBufferContainer> uploadBuffersAsync(
+	public static CompletableFuture<ColumnRenderBuffer> uploadBuffersAsync(
 			IDhClientLevel clientLevel,
 			long pos,
 			LodQuadBuilder quadBuilder
 		)
 	{
-		DhBlockPos minBlockPos = new DhBlockPos(DhSectionPos.getMinCornerBlockX(pos), clientLevel.getLevelWrapper().getMinHeight(), DhSectionPos.getMinCornerBlockZ(pos));
-		LodBufferContainer bufferContainer = new LodBufferContainer(pos, minBlockPos);
-		CompletableFuture<LodBufferContainer> uploadFuture = bufferContainer.makeAndUploadBuffersAsync(quadBuilder);
+		ColumnRenderBuffer buffer = new ColumnRenderBuffer(new DhBlockPos(DhSectionPos.getMinCornerBlockX(pos), clientLevel.getMinY(), DhSectionPos.getMinCornerBlockZ(pos)));
+		CompletableFuture<ColumnRenderBuffer> uploadFuture = buffer.makeAndUploadBuffersAsync(quadBuilder, GLProxy.getInstance().getGpuUploadMethod());
 		uploadFuture.whenComplete((uploadedBuffer, exception) -> 
 		{
 			// clean up if not uploaded
@@ -107,209 +109,208 @@ public class ColumnRenderBufferBuilder
 		// build each column //
 		//===================//
 		
-		// pooled arrays for ColumnBox use
-		try (PhantomArrayListCheckout phantomArrayCheckout = ARRAY_LIST_POOL.checkoutArrays(0, 0, 2))
+		byte thisDetailLevel = renderSource.getDataDetailLevel();
+		for (int relX = 0; relX < ColumnRenderSource.SECTION_SIZE; relX++)
 		{
-			byte thisDetailLevel = renderSource.getDataDetailLevel();
-			for (int relX = 0; relX < ColumnRenderSource.WIDTH; relX++)
+			for (int relZ = 0; relZ < ColumnRenderSource.SECTION_SIZE; relZ++)
 			{
-				for (int relZ = 0; relZ < ColumnRenderSource.WIDTH; relZ++)
+				// stop the builder if requested
+				UncheckedInterruptedException.throwIfInterrupted();
+				
+				// ignore empty/null columns
+				ColumnArrayView columnRenderData = renderSource.getVerticalDataPointView(relX, relZ);
+				if (columnRenderData.size() == 0
+						|| !RenderDataPointUtil.doesDataPointExist(columnRenderData.get(0))
+						|| RenderDataPointUtil.isVoid(columnRenderData.get(0)))
 				{
-					// ignore empty/null columns
-					ColumnArrayView columnRenderData = renderSource.getVerticalDataPointView(relX, relZ);
-					if (columnRenderData.size() == 0
-							|| !RenderDataPointUtil.doesDataPointExist(columnRenderData.get(0))
-							|| RenderDataPointUtil.hasZeroHeight(columnRenderData.get(0)))
+					continue;
+				}
+				
+				
+				
+				//=============//
+				// debug limit //
+				//=============//
+				
+				// can be used to limit the buffer building to a specific relative position.
+				// useful for debugging a single column
+				if (columnBuilderDebugEnabled)
+				{
+					int wantedX = Config.Client.Advanced.Debugging.ColumnBuilderDebugging.columnBuilderDebugXRow.get();
+					if (wantedX >= 0 && relX != wantedX)
 					{
 						continue;
 					}
-					
-					
-					
-					//=============//
-					// debug limit //
-					//=============//
-					
-					// can be used to limit the buffer building to a specific relative position.
-					// useful for debugging a single column
-					if (columnBuilderDebugEnabled)
+					int wantedZ = Config.Client.Advanced.Debugging.ColumnBuilderDebugging.columnBuilderDebugZRow.get();
+					if (wantedZ >= 0 && relZ != wantedZ)
 					{
-						int wantedX = Config.Client.Advanced.Debugging.ColumnBuilderDebugging.columnBuilderDebugXRow.get();
-						if (wantedX >= 0 && relX != wantedX)
-						{
-							continue;
-						}
-						int wantedZ = Config.Client.Advanced.Debugging.ColumnBuilderDebugging.columnBuilderDebugZRow.get();
-						if (wantedZ >= 0 && relZ != wantedZ)
-						{
-							continue;
-						}
+						continue;
 					}
-					
-					
-					
-					//==================================//
-					// get adjacent render data columns //
-					//==================================//
-					
-					ColumnArrayView[] adjColumnViews = new ColumnArrayView[EDhDirection.CARDINAL_COMPASS.length];
-					for (EDhDirection direction : EDhDirection.CARDINAL_COMPASS)
+				}
+				
+				
+				
+				//==================================//
+				// get adjacent render data columns //
+				//==================================//
+				
+				ColumnArrayView[] adjColumnViews = new ColumnArrayView[EDhDirection.ADJ_DIRECTIONS.length];
+				for (EDhDirection lodDirection : EDhDirection.ADJ_DIRECTIONS)
+				{
+					try
 					{
-						try
+						int xAdj = relX + lodDirection.getNormal().x;
+						int zAdj = relZ + lodDirection.getNormal().z;
+						boolean isCrossRenderSourceBoundary =
+								(xAdj < 0 || xAdj >= ColumnRenderSource.SECTION_SIZE) ||
+								(zAdj < 0 || zAdj >= ColumnRenderSource.SECTION_SIZE);
+						
+						ColumnRenderSource adjRenderSource;
+						byte adjDetailLevel;
+						
+						
+						
+						//=========================//
+						// get the adjacent render //
+						// source if present       //
+						//=========================//
+						
+						if (!isCrossRenderSourceBoundary)
 						{
-							int xAdj = relX + direction.normal.x;
-							int zAdj = relZ + direction.normal.z;
-							boolean isCrossRenderSourceBoundary =
-									(xAdj < 0 || xAdj >= ColumnRenderSource.WIDTH) ||
-											(zAdj < 0 || zAdj >= ColumnRenderSource.WIDTH);
-							
-							ColumnRenderSource adjRenderSource;
-							byte adjDetailLevel;
-							
-							
-							
-							//=========================//
-							// get the adjacent render //
-							// source if present       //
-							//=========================//
-							
-							if (!isCrossRenderSourceBoundary)
-							{
-								// the adjacent position is inside this same render source
-								adjRenderSource = renderSource;
-								adjDetailLevel = thisDetailLevel;
-							}
-							else
-							{
-								// the adjacent position is outside this render source
-								
-								// skip empty sections
-								adjRenderSource = adjRegions[direction.compassIndex];
-								if (adjRenderSource == null)
-								{
-									continue;
-								}
-								
-								adjDetailLevel = adjRenderSource.getDataDetailLevel();
-								if (adjDetailLevel == thisDetailLevel)
-								{
-									// if the adjacent position is outside this render source,
-									// wrap the position around so it's inside the adjacent source
-									
-									if (xAdj < 0)
-									{
-										xAdj += ColumnRenderSource.WIDTH;
-									}
-									if (xAdj >= ColumnRenderSource.WIDTH)
-									{
-										xAdj -= ColumnRenderSource.WIDTH;
-									}
-									
-									if (zAdj < 0)
-									{
-										zAdj += ColumnRenderSource.WIDTH;
-									}
-									if (zAdj >= ColumnRenderSource.WIDTH)
-									{
-										zAdj -= ColumnRenderSource.WIDTH;
-									}
-								}
-							}
-							
-							
-							
-							//========================//
-							// get the adjacent views //
-							//========================//
-							
-							// the old logic handled additional cases, but they never appeared to fire,
-							// so just these two cases should be fine
-							boolean expectedDetailLevels = (adjDetailLevel == thisDetailLevel) || (adjDetailLevel > thisDetailLevel);
-							if (!expectedDetailLevels)
-							{
-								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);
+							// the adjacent position is inside this same render source
+							adjRenderSource = renderSource;
+							adjDetailLevel = thisDetailLevel;
 						}
-						catch (RuntimeException e)
+						else
 						{
-							LOGGER.warn("Failed to get adj data for relative pos: [" + thisDetailLevel + ":" + relX + "," + relZ + "] at [" + direction + "], Error: [" + e.getMessage() + "].", e);
-						}
-					} // for adjacent directions
-					
-					
-					
-					//==========================//
-					// build this render column //
-					//==========================//
-					
-					ColumnRenderSource.DebugSourceFlag debugSourceFlag = renderSource.debugGetFlag(relX, relZ);
-					
-					for (int i = 0; i < columnRenderData.size(); i++)
-					{
-						// can be uncommented to limit which vertical LOD is generated
-						if (Config.Client.Advanced.Debugging.ColumnBuilderDebugging.columnBuilderDebugEnable.get())
-						{
-							int wantedColumnIndex = Config.Client.Advanced.Debugging.ColumnBuilderDebugging.columnBuilderDebugColumnIndex.get();
-							if (wantedColumnIndex >= 0
-									&& i != wantedColumnIndex)
+							// the adjacent position is outside this render source
+							
+							// skip empty sections
+							adjRenderSource = adjRegions[lodDirection.ordinal() - 2];
+							if (adjRenderSource == null)
 							{
 								continue;
 							}
+							
+							adjDetailLevel = adjRenderSource.getDataDetailLevel();
+							if (adjDetailLevel == thisDetailLevel)
+							{
+								// if the adjacent position is outside this render source,
+								// wrap the position around so it's inside the adjacent source
+								
+								if (xAdj < 0)
+								{
+									xAdj += ColumnRenderSource.SECTION_SIZE;
+								}
+								if (xAdj >= ColumnRenderSource.SECTION_SIZE)
+								{
+									xAdj -= ColumnRenderSource.SECTION_SIZE;
+								}
+								
+								if (zAdj < 0)
+								{
+									zAdj += ColumnRenderSource.SECTION_SIZE;
+								}
+								if (zAdj >= ColumnRenderSource.SECTION_SIZE)
+								{
+									zAdj -= ColumnRenderSource.SECTION_SIZE;
+								}
+							}
 						}
 						
-						long data = columnRenderData.get(i);
-						// If the data is not render-able (Void or non-existing) we stop since there is
-						// no data left in this position
-						if (RenderDataPointUtil.hasZeroHeight(data)
-								|| !RenderDataPointUtil.doesDataPointExist(data))
+						
+						
+						//========================//
+						// get the adjacent views //
+						//========================//
+						
+						// the old logic handled additional cases, but they never appeared to fire,
+						// so just these two cases should be fine
+						boolean expectedDetailLevels = (adjDetailLevel == thisDetailLevel) || (adjDetailLevel > thisDetailLevel);
+						if (!expectedDetailLevels)
 						{
-							break;
+							LodUtil.assertNotReach("Mismatch between adjacent detail level ["+adjDetailLevel+"] and this render source's detail level ["+thisDetailLevel+"]. Detail levels should be adj >= this.");	
 						}
 						
-						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;
-						
-						addRenderDataPointToBuilder(
-								clientLevel, phantomArrayCheckout,
-								data, topDataPoint, bottomDataPoint,
-								adjColumnViews, isSameDetailLevel,
-								thisDetailLevel, relX, relZ,
-								quadBuilder, debugSourceFlag);
+						adjColumnViews[lodDirection.ordinal() - 2] = adjRenderSource.getVerticalDataPointView(xAdj, zAdj);
+					}
+					catch (RuntimeException e)
+					{
+						EVENT_LOGGER.warn("Failed to get adj data for relative pos: [" + thisDetailLevel + ":" + relX + "," + relZ + "] at [" + lodDirection + "], Error: "+e.getMessage(), e);
+					}
+				} // for adjacent directions
+				
+				
+				
+				//==========================//
+				// build this render column //
+				//==========================//
+				
+				ColumnRenderSource.DebugSourceFlag debugSourceFlag = renderSource.debugGetFlag(relX, relZ);
+				
+				// We render every vertical lod present in this position
+				// We only stop when we find a block that is void or non-existing block
+				for (int i = 0; i < columnRenderData.size(); i++)
+				{
+					// can be uncommented to limit which vertical LOD is generated
+					if (Config.Client.Advanced.Debugging.ColumnBuilderDebugging.columnBuilderDebugEnable.get())
+					{
+						int wantedColumnIndex = Config.Client.Advanced.Debugging.ColumnBuilderDebugging.columnBuilderDebugColumnIndex.get();
+						if (wantedColumnIndex >= 0 && i != wantedColumnIndex)
+						{
+							continue;
+						}
 					}
 					
-				}// for z
-			}// for x
-		}// phantom checkout
+					long data = columnRenderData.get(i);
+					// If the data is not render-able (Void or non-existing) we stop since there is
+					// no data left in this position
+					if (RenderDataPointUtil.isVoid(data) || !RenderDataPointUtil.doesDataPointExist(data))
+					{
+						break;
+					}
+					
+					long topDataPoint = (i - 1) >= 0 ? columnRenderData.get(i - 1) : RenderDataPointUtil.EMPTY_DATA;
+					long bottomDataPoint = (i + 1) < columnRenderData.size() ? columnRenderData.get(i + 1) : RenderDataPointUtil.EMPTY_DATA;
+					
+					addLodToBuffer(
+							clientLevel,
+							data, topDataPoint, bottomDataPoint, 
+							adjColumnViews, isSameDetailLevel,
+							thisDetailLevel, relX, relZ, 
+							quadBuilder, debugSourceFlag);
+				}
+				
+			}// for z
+		}// for x
 		
-		quadBuilder.mergeQuads();
+		quadBuilder.finalizeData();
 	}
-	private static void addRenderDataPointToBuilder(
-			IDhClientLevel clientLevel, PhantomArrayListCheckout phantomArrayCheckout,
-			long renderData, long topRenderData, long bottomRenderData, 
+	private static void addLodToBuffer(
+			IDhClientLevel clientLevel,
+			long data, long topData, long bottomData, 
 			ColumnArrayView[] adjColumnViews, boolean[] isSameDetailLevel,
 			byte detailLevel, int renderSourceOffsetPosX, int renderSourceOffsetPosZ, 
 			LodQuadBuilder quadBuilder, ColumnRenderSource.DebugSourceFlag debugSource)
 	{
 		long sectionPos = DhSectionPos.encode(detailLevel, renderSourceOffsetPosX, renderSourceOffsetPosZ);
 		
-		short blockWidth = (short) DhSectionPos.getDetailLevelWidthInBlocks(detailLevel);
-		short blockMinX = (short) DhSectionPos.getMinCornerBlockX(sectionPos);
-		short blockMinY = RenderDataPointUtil.getYMin(renderData);
-		short blockMinZ = (short) DhSectionPos.getMinCornerBlockZ(sectionPos);
-		short blockMaxY = (short) (RenderDataPointUtil.getYMax(renderData) - blockMinY);
+		short width = (short) BitShiftUtil.powerOfTwo(detailLevel);
+		short xMin = (short) DhSectionPos.getMinCornerBlockX(sectionPos);
+		short yMin = RenderDataPointUtil.getYMin(data);
+		short zMin = (short) DhSectionPos.getMinCornerBlockZ(sectionPos);
+		short ySize = (short) (RenderDataPointUtil.getYMax(data) - yMin);
 		
-		if (blockMaxY == 0)
+		if (ySize == 0)
 		{
 			return;
 		}
-		else if (blockMaxY < 0)
+		else if (ySize < 0)
 		{
-			throw new IllegalArgumentException("Negative y size for the renderDataPoint! Data: [" + RenderDataPointUtil.toString(renderData) + "].");
+			throw new IllegalArgumentException("Negative y size for the data! Data: [" + RenderDataPointUtil.toString(data) + "].");
 		}
 		
-		byte blockMaterialId = RenderDataPointUtil.getBlockMaterialId(renderData);
+		byte blockMaterialId = RenderDataPointUtil.getBlockMaterialId(data);
 		
 		
 		
@@ -324,11 +325,11 @@ public class ColumnRenderBufferBuilder
 				float brightnessMultiplier = Config.Client.Advanced.Graphics.Quality.brightnessMultiplier.get().floatValue();
 				if (saturationMultiplier == 1.0 && brightnessMultiplier == 1.0)
 				{
-					color = RenderDataPointUtil.getColor(renderData);
+					color = RenderDataPointUtil.getColor(data);
 				}
 				else
 				{
-					float[] ahsv = ColorUtil.argbToAhsv(RenderDataPointUtil.getColor(renderData));
+					float[] ahsv = ColorUtil.argbToAhsv(RenderDataPointUtil.getColor(data));
 					color = ColorUtil.ahsvToArgb(ahsv[0], ahsv[1], ahsv[2] * saturationMultiplier, ahsv[3] * brightnessMultiplier);
 				}
 				break;
@@ -418,14 +419,14 @@ public class ColumnRenderBufferBuilder
 		}
 		
 		ColumnBox.addBoxQuadsToBuilder(
-				quadBuilder, phantomArrayCheckout, clientLevel,
-				blockWidth, blockMaxY,
-				blockMinX, blockMinY, blockMinZ,
+				quadBuilder, clientLevel,
+				width, ySize, width,
+				xMin, yMin, zMin,
 				color,
 				blockMaterialId,
-				RenderDataPointUtil.getLightSky(renderData),
-				fullBright ? LodUtil.MAX_MC_LIGHT : RenderDataPointUtil.getLightBlock(renderData),
-				topRenderData, bottomRenderData, adjColumnViews, isSameDetailLevel);
+				RenderDataPointUtil.getLightSky(data),
+				fullBright ? 15 : RenderDataPointUtil.getLightBlock(data),
+				topData, bottomData, adjColumnViews, isSameDetailLevel);
 	}
 	
 }