Speed up shutdown and reduce logging

Closes Merge !93
Thanks Ryan Hitchman!

.editorconfig

@@ -4,7 +4,6 @@
 
 [*]
 charset = utf-8
-end_of_line = crlf
 indent_size = 4
 indent_style = space
 insert_final_newline = false
@@ -537,7 +536,7 @@ ij_groovy_wrap_chain_calls_after_dot = false
 ij_groovy_wrap_long_lines = false
 
 [{*.har,*.json,*.png.mcmeta,mcmod.info,pack.mcmeta}]
-indent_size = 2
+indent_size = 4
 ij_json_array_wrapping = split_into_lines
 ij_json_keep_blank_lines_in_code = 0
 ij_json_keep_indents_on_empty_lines = false

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

@@ -22,7 +22,8 @@ package com.seibel.distanthorizons.api.enums.config;
 /**
  * UNCOMPRESSED <br>
  * LZ4 <br>
- * XZ <br><br>
+ * Z_STD <br>
+ * LZMA2 <br><br>
  * 
  * Note: speed and compression ratios are examples
  * and should only be used for estimated comparisons.
@@ -39,8 +40,8 @@ public enum EDhApiDataCompressionMode
 	/** 
 	 * Should only be used internally and for unit testing. <br><br> 
 	 * 
-	 * Read Speed: 1.64 MS / DTO <br>
+	 * Read Speed: 6.09 MS / DTO <br>
-	 * Write Speed: 12.44 MS / DTO <br>
+	 * Write Speed: 6.01 MS / DTO <br>
 	 * Compression ratio: 1.0 <br>
 	 */
 	@DisallowSelectingViaConfigGui
@@ -49,28 +50,28 @@ public enum EDhApiDataCompressionMode
 	/** 
 	 * Extremely fast (often faster than uncompressed), but generally poor compression. <br><br> 
 	 * 
-	 * Read Speed: 1.85 MS / DTO <br>
+	 * Read Speed: 3.25 MS / DTO <br>
-	 * Write Speed: 9.46 MS / DTO <br>
+	 * Write Speed: 5.99 MS / DTO <br>
-	 * Compression ratio: 0.3638 <br>
+	 * Compression ratio: 0.4513 <br>
 	 */
 	LZ4(1),
 	
-	/*
+	/**
 	 * Decent speed and good compression. <br><br> 
 	 *
-	 * Read Speed: 11.78 MS / DTO <br>
+	 * Read Speed: 9.31 MS / DTO <br>
-	 * Write Speed: 16.76 MS / DTO <br>
+	 * Write Speed: 15.13 MS / DTO <br>
-	 * Compression ratio: 0.2199 <br>
+	 * Compression ratio: 0.2606 <br>
 	 */
-	//@Deprecated
+	Z_STD(2),
-	//Z_STD(2),
+	
 	
 	/** 
 	 * Extremely slow, but very good compression. <br><br> 
 	 *
-	 * Read Speed: 12.25 MS / DTO <br>
+	 * Read Speed: 13.29 MS / DTO <br>
-	 * Write Speed: 490.07 MS / DTO <br>
+	 * Write Speed: 70.95 MS / DTO <br>
-	 * Compression ratio: 0.1242 <br>
+	 * Compression ratio: 0.2068 <br>
 	 */
 	LZMA2(3);
 	

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

@@ -44,6 +44,10 @@ public enum EDhApiGpuUploadMethod
 	/** Fast rendering but may stutter when uploading. */
 	SUB_DATA(false, false),
 	
+	/** Don't upload, only should be used for debugging */
+	@Deprecated // TODO remove before release
+	NONE(false, false),
+	
 	/**
 	 * 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/EDhApiLoggerLevel.java

@@ -17,38 +17,37 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.distanthorizons.core.config;
+package com.seibel.distanthorizons.api.enums.config;
 
-import com.seibel.distanthorizons.core.config.types.ConfigEntry;
+import org.apache.logging.log4j.Level;
 
-// TODO: Make this integrate with the config system
+/**
-public class AppliedConfigState<T>
+ * ALL
+ * DEBUG
+ * INFO
+ * WARN
+ * ERROR
+ * DISABLED
+ * 
+ * @since API 5.0.0
+ * @version 2024-4-6
+ */
+public enum EDhApiLoggerLevel
 {
-	final ConfigEntry<T> entry;
+	// ordered from most to least broad
-	T activeValue;
+	ALL(Level.ALL),
+	DEBUG(Level.DEBUG),
+	INFO(Level.INFO),
+	WARN(Level.WARN),
+	ERROR(Level.ERROR),
+	DISABLED(Level.OFF),
+	;
+	
+	public final Level level;
+	
+	EDhApiLoggerLevel(Level level)
+	{ this.level = level; }
 	
 	
 	
-	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; }
-	
 }

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

@@ -1,54 +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.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),
-	;
-	
-	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,10 +64,7 @@ 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/methods/events/abstractEvents/DhApiAfterColorDepthTextureCreatedEvent.java

@@ -0,0 +1,48 @@
+/*
+ *    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.methods.events.interfaces.IDhApiEvent;
+import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiEventParam;
+import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiTextureCreatedParam;
+
+/**
+ * Called after Distant Horizons (re)creates 
+ * the color and depth textures it renders to. <br>
+ * 
+ * @author James Seibel
+ * @version 2025-6-9
+ * @since API 4.1.0
+ */
+public abstract class DhApiAfterColorDepthTextureCreatedEvent implements IDhApiEvent<DhApiTextureCreatedParam>
+{
+	/** Fired before Distant Horizons creates. */
+	public abstract void onResize(DhApiEventParam<DhApiTextureCreatedParam> event);
+	
+	
+	//=========================//
+	// internal DH API methods //
+	//=========================//
+	
+	@Override
+	public final void fireEvent(DhApiEventParam<DhApiTextureCreatedParam> event) { this.onResize(event); }
+	
+	
+}

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

@@ -0,0 +1,49 @@
+/*
+ *    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.methods.events.interfaces.IDhApiEvent;
+import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEventParam;
+import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiEventParam;
+import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiTextureCreatedParam;
+
+/**
+ * Called before Distant Horizons (re)creates 
+ * the color and depth textures it renders to. <br>
+ * 
+ * @author James Seibel
+ * @version 2025-6-9
+ * @since API 4.1.0
+ */
+public abstract class DhApiBeforeColorDepthTextureCreatedEvent implements IDhApiEvent<DhApiTextureCreatedParam>
+{
+	/** Fired before Distant Horizons creates. */
+	public abstract void onResize(DhApiEventParam<DhApiTextureCreatedParam> event);
+	
+	
+	//=========================//
+	// internal DH API methods //
+	//=========================//
+	
+	@Override
+	public final void fireEvent(DhApiEventParam<DhApiTextureCreatedParam> event) { this.onResize(event); }
+	
+	
+}

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

@@ -0,0 +1,197 @@
+/*
+ *    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

@@ -22,15 +22,18 @@ package com.seibel.distanthorizons.api.methods.events.abstractEvents;
 import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEvent;
 import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEventParam;
 import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiEventParam;
+import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiTextureCreatedParam;
 
 /**
- * Called whenever Distant Horizons (re)creates 
+ * Called before Distant Horizons (re)creates 
  * the color and depth textures it renders to. <br>
  * 
  * @author James Seibel
  * @version 2024-3-2
  * @since API 2.0.0
+ * @deprecated Replaced by {@link DhApiBeforeColorDepthTextureCreatedEvent} since this event's name isn't obvious when it fires.
  */
+@Deprecated // internal notes: this method must be kept around due to Iris using it and we don't want to break old Iris support
 public abstract class DhApiColorDepthTextureCreatedEvent implements IDhApiEvent<DhApiColorDepthTextureCreatedEvent.EventParam>
 {
 	/** Fired before Distant Horizons creates. */
@@ -73,6 +76,15 @@ public abstract class DhApiColorDepthTextureCreatedEvent implements IDhApiEvent<
 			this.newHeight = newHeight;
 			
 		}
+		public EventParam(DhApiTextureCreatedParam textureCreatedParam)
+		{
+			this.previousWidth = textureCreatedParam.previousWidth;
+			this.previousHeight = textureCreatedParam.previousHeight;
+			
+			this.newWidth = textureCreatedParam.newWidth;
+			this.newHeight = textureCreatedParam.newHeight;
+			
+		}
 		
 		
 		@Override

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

@@ -9,5 +9,23 @@ 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

@@ -67,7 +67,6 @@ public class DhApiRenderParam implements IDhApiEventParam
 	// constructors //
 	//==============//
 	
-	
 	public DhApiRenderParam(DhApiRenderParam parent)
 	{
 		this(
@@ -112,9 +111,8 @@ public class DhApiRenderParam implements IDhApiEventParam
 	//================//
 	
 	@Override
-	public DhApiRenderParam copy()
+	public DhApiRenderParam copy() { return new DhApiRenderParam(this); }
-	{
+	
-		return new DhApiRenderParam(this); 
+	
-	}
 	
 }

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

@@ -0,0 +1,68 @@
+/*
+ *    This file is part of the Distant Horizons mod
+ *    licensed under the GNU LGPL v3 License.
+ *
+ *    Copyright (C) 2020 James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU Lesser General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.distanthorizons.api.methods.events.sharedParameterObjects;
+
+import com.seibel.distanthorizons.api.enums.rendering.EDhApiRenderPass;
+import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEventParam;
+import com.seibel.distanthorizons.api.objects.math.DhApiMat4f;
+
+/**
+ * Contains information relevant to when Distant Horizons (re)creates
+ * depth/color textures for rendering.
+ *
+ * @author James Seibel
+ * @version 2025-6-9
+ * @since API 4.1.0
+ */
+public class DhApiTextureCreatedParam implements IDhApiEventParam
+{
+	/** Measured in pixels */
+	public final int previousWidth;
+	/** Measured in pixels */
+	public final int previousHeight;
+	
+	/** Measured in pixels */
+	public final int newWidth;
+	/** Measured in pixels */
+	public final int newHeight;
+	
+	
+	public DhApiTextureCreatedParam(
+			int previousWidth, int previousHeight,
+			int newWidth, int newHeight)
+	{
+		this.previousWidth = previousWidth;
+		this.previousHeight = previousHeight;
+		
+		this.newWidth = newWidth;
+		this.newHeight = newHeight;
+		
+	}
+	
+	
+	@Override
+	public DhApiTextureCreatedParam copy()
+	{
+		return new DhApiTextureCreatedParam(
+				this.previousWidth, this.previousHeight,
+				this.newWidth, this.newHeight
+		);
+	}
+}

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

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

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

@@ -43,11 +43,9 @@ public class DependencyInjector<BindableType extends IBindable> implements IDepe
 	protected final boolean allowDuplicateBindings;
 	
 	
-	public DependencyInjector(Class<BindableType> newBindableInterface)
+	//==============//
-	{
+	// constructors //
-		this.bindableInterface = newBindableInterface;
+	//==============//
-		this.allowDuplicateBindings = false;
-	}
 	
 	public DependencyInjector(Class<BindableType> newBindableInterface, boolean newAllowDuplicateBindings)
 	{
@@ -57,12 +55,16 @@ 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.");
 		}
@@ -130,6 +132,54 @@ 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,19 +31,19 @@ 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 = 10;
+	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.3.2-b";
+	public static final String VERSION = "2.3.7-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 = 4;
+	public static final int API_MAJOR_VERSION = 5;
 	/** This version should be updated whenever new methods are added to the DH API */
 	public static final int API_MINOR_VERSION = 0;
 	/** This version should be updated whenever non-breaking fixes are added to the DH API */

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

@@ -1,83 +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.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);
-	
-}

core/build.gradle

@@ -61,3 +61,9 @@ shadowJar {
 //    relocate "it.unimi.dsi.fastutil", "${librariesLocation}.unimi.dsi.fastutil"
     mergeServiceFiles()
 }
+
+test {
+    // this is necessary specifically for the Compression tests since those
+    // need more than the default 512 MB of RAM
+    jvmArgs '-Xmx4096m'
+}

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

@@ -19,7 +19,9 @@
 
 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;
@@ -32,7 +34,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 org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 import org.sqlite.SQLiteJDBCLoader;
 import org.sqlite.util.OSInfo;
 import org.tukaani.xz.XZOutputStream;
@@ -43,8 +45,7 @@ import java.io.File;
 /** Handles first time Core setup. */
 public class Initializer
 {
-	private static final Logger LOGGER = LogManager.getLogger(ModInfo.NAME + "-" + Initializer.class.getSimpleName());
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
-	private static final IMinecraftClientWrapper MC_CLIENT = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
 	
 	
 	public static void init()
@@ -54,8 +55,9 @@ public class Initializer
 		{
 			// if any library isn't present in the jar its class
 			// will throw an error (not an exception)
-			Class<?> fastCompressor = LZ4FrameOutputStream.class;
+			Class<?> lz4Compressor = LZ4FrameOutputStream.class;
-			Class<?> smallCompressor = XZOutputStream.class;
+			Class<?> zstdCompressor = ZstdOutputStream.class;
+			Class<?> lzmaCompressor = 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
@@ -63,30 +65,6 @@ 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.api.objects.config.DhApiConfigValue;
+import com.seibel.distanthorizons.core.config.api.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.api.objects.config.DhApiConfigValue;
+import com.seibel.distanthorizons.core.config.api.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.api.objects.config.DhApiConfigValue;
+import com.seibel.distanthorizons.core.config.api.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.api.objects.config.DhApiConfigValue;
+import com.seibel.distanthorizons.core.config.api.DhApiConfigValue;
 import com.seibel.distanthorizons.core.config.Config;
-import com.seibel.distanthorizons.coreapi.util.converters.ApiFogDrawModeConverter;
+import com.seibel.distanthorizons.core.config.api.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.api.objects.config.DhApiConfigValue;
+import com.seibel.distanthorizons.core.config.api.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,9 +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.api.objects.config.DhApiConfigValue;
+import com.seibel.distanthorizons.core.config.api.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;
 
 public class DhApiGraphicsConfig implements IDhApiGraphicsConfig
 {
@@ -60,7 +61,7 @@ public class DhApiGraphicsConfig implements IDhApiGraphicsConfig
 	
 	@Override
 	public IDhApiConfigValue<Boolean> renderingEnabled()
-	{ return new DhApiConfigValue<Boolean, Boolean>(Config.Client.quickEnableRendering); }
+	{ return new DhApiConfigValue<EDhApiRendererMode, Boolean>(Config.Client.Advanced.Debugging.rendererMode, new RenderModeEnabledConverter()); }
 	
 	@Override
 	public IDhApiConfigValue<EDhApiRendererMode> renderingMode()

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.api.objects.config.DhApiConfigValue;
+import com.seibel.distanthorizons.core.config.api.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.api.objects.config.DhApiConfigValue;
+import com.seibel.distanthorizons.core.config.api.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.api.objects.config.DhApiConfigValue;
+import com.seibel.distanthorizons.core.config.api.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.api.objects.config.DhApiConfigValue;
+import com.seibel.distanthorizons.core.config.api.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.api.objects.config.DhApiConfigValue;
+import com.seibel.distanthorizons.core.config.api.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 Logger LOGGER = LogManager.getLogger(DhApiTerrainDataCache.class.getSimpleName());
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	
 	

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

@@ -31,6 +31,7 @@ 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;
@@ -48,8 +49,7 @@ 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 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.awt.*;
@@ -64,7 +64,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 {
 	public static DhApiTerrainDataRepo INSTANCE = new DhApiTerrainDataRepo();
 	
-	private static final Logger LOGGER = LogManager.getLogger(DhApiTerrainDataRepo.class.getSimpleName());
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	// debugging values
 	private static volatile boolean debugThreadRunning = false;
@@ -258,7 +258,7 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 			//===============================//
 			
 			FullDataPointIdMap mapping = dataSource.mapping;
-			LongArrayList dataColumn = dataSource.get(relativePos.x, relativePos.z);
+			LongArrayList dataColumn = dataSource.getColumnAtRelPos(relativePos.x, relativePos.z);
 			if (dataColumn != null)
 			{
 				int dataColumnIndexCount = dataColumn.size();
@@ -503,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);
+		SharedApi.INSTANCE.applyChunkUpdate(chunk, dhLevel.getLevelWrapper(), true, true);
 		
 		
 		return DhApiResult.createSuccess();

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

@@ -23,17 +23,19 @@ import com.seibel.distanthorizons.api.DhApi;
 import com.seibel.distanthorizons.api.enums.config.EDhApiMcRenderingFadeMode;
 import com.seibel.distanthorizons.api.enums.rendering.EDhApiRenderPass;
 import com.seibel.distanthorizons.api.methods.events.abstractEvents.*;
-import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiRenderParam;
+import com.seibel.distanthorizons.core.api.internal.rendering.DhRenderState;
 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.FadeRenderer;
+import com.seibel.distanthorizons.core.render.renderer.VanillaFadeRenderer;
+import com.seibel.distanthorizons.core.render.renderer.LodRenderer;
+import com.seibel.distanthorizons.core.render.renderer.RenderParams;
 import com.seibel.distanthorizons.core.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,13 +44,8 @@ import com.seibel.distanthorizons.api.enums.rendering.EDhApiDebugRendering;
 import com.seibel.distanthorizons.api.enums.rendering.EDhApiRendererMode;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.level.IServerKeyedClientLevel;
-import com.seibel.distanthorizons.core.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;
@@ -57,15 +54,14 @@ 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 org.apache.logging.log4j.LogManager;
+import com.seibel.distanthorizons.core.logging.DhLogger;
-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
@@ -74,7 +70,7 @@ import java.util.concurrent.TimeUnit;
  */
 public class ClientApi
 {
-	private static final Logger LOGGER = LogManager.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	public static boolean prefLoggerEnabled = false;
 	
@@ -84,18 +80,24 @@ 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;
 	
+	/** 
+	 * This isn't the cleanest way of storing variables before passing them to the LOD renderer, 
+	 * but due to how mixins work and the inconsistency between MC versions,
+	 * having a static object that stores a single frame's data
+	 * is often the easiest solution. <br><br>
+	 * 
+	 * Only downside is making sure each variable is populated before rendering.
+	 */
+	public static final DhRenderState RENDER_STATE = new DhRenderState();
 	
 	
 	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<>();
@@ -103,8 +105,6 @@ 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 */
@@ -116,8 +116,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<>();
 	
-	/** re-set every frame during the opaque rendering stage */
+	@Nullable
-	private boolean renderingCancelledForThisFrame;
+	public String lastRenderParamValidationMessage = null;
 	
 	
 	
@@ -322,10 +322,11 @@ public class ClientApi
 	
 	
 	
-	//===============//
+	//============//
-	// render events //
+	// clint tick //
-	//===============//
+	//============//
 	
+	@Deprecated
 	public void clientTickEvent()
 	{
 		IProfilerWrapper profiler = MC_CLIENT.getProfiler();
@@ -333,16 +334,7 @@ public class ClientApi
 		
 		try
 		{
-			boolean doFlush = System.nanoTime() - this.lastFlushNanoTime >= SPAM_LOGGER_FLUSH_NS;
+			IDhClientWorld clientWorld = SharedApi.tryGetDhClientWorld();
-			if (doFlush)
-			{
-				this.lastFlushNanoTime = System.nanoTime();
-				SpamReducedLogger.flushAll();
-			}
-			ConfigBasedLogger.updateAll();
-			ConfigBasedSpamLogger.updateAll(doFlush);
-			
-			IDhClientWorld clientWorld = SharedApi.getIDhClientWorld();
 			if (clientWorld != null)
 			{
 				clientWorld.clientTick();
@@ -385,26 +377,24 @@ public class ClientApi
 	
 	
 	
-	//===========//
+	//===============//
-	// rendering //
+	// LOD rendering //
-	//===========//
+	//===============//
 	
-	/** Should be called before {@link ClientApi#renderDeferredLods} */
+	/** Should be called before {@link ClientApi#renderDeferredLodsForShaders} */
-	public void renderLods(IClientLevelWrapper levelWrapper, Mat4f mcModelViewMatrix, Mat4f mcProjectionMatrix, float partialTicks)
+	public void renderLods() { this.renderLodLayer(false); }
-	{ this.renderLodLayer(levelWrapper, mcModelViewMatrix, mcProjectionMatrix, partialTicks, false); }
 	
 	/** 
 	 * Only necessary when Shaders are in use.
 	 * Should be called after {@link ClientApi#renderLods} 
 	 */
-	public void renderDeferredLods(IClientLevelWrapper levelWrapper, Mat4f mcModelViewMatrix, Mat4f mcProjectionMatrix, float partialTicks)
+	public void renderDeferredLodsForShaders() { this.renderLodLayer(true); }
-	{ this.renderLodLayer(levelWrapper, mcModelViewMatrix, mcProjectionMatrix, partialTicks, true); }
 	
-	private void renderLodLayer(
+	private void renderLodLayer(boolean renderingDeferredLayer)
-			IClientLevelWrapper levelWrapper, Mat4f mcModelViewMatrix, Mat4f mcProjectionMatrix, float partialTicks,
-			boolean renderingDeferredLayer)
 	{
+		//=========//
 		// logging //
+		//=========//
 		
 		this.sendQueuedChatMessages();
 		
@@ -414,7 +404,33 @@ public class ClientApi
 		
 		
 		
-		// render parameter setup //
+		//=====================//
+		// 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 //
+		//=================//
 		
 		EDhApiRenderPass renderPass;
 		if (DhApiRenderProxy.INSTANCE.getDeferTransparentRendering())
@@ -433,42 +449,36 @@ public class ClientApi
 			renderPass = EDhApiRenderPass.OPAQUE_AND_TRANSPARENT;
 		}
 		
-		DhApiRenderParam renderEventParam =
+		// A global render state variable is used since MC has split up their
-				new DhApiRenderParam(
+		// 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,
-						partialTicks,
+				RENDER_STATE.frameTime,
-						RenderUtil.getNearClipPlaneDistanceInBlocks(partialTicks), RenderUtil.getFarClipPlaneDistanceInBlocks(),
+				RENDER_STATE.mcProjectionMatrix, RENDER_STATE.mcModelViewMatrix,
-						mcProjectionMatrix, mcModelViewMatrix,
+				RENDER_STATE.clientLevelWrapper
-						RenderUtil.createLodProjectionMatrix(mcProjectionMatrix, partialTicks), RenderUtil.createLodModelViewMatrix(mcModelViewMatrix),
-						levelWrapper.getMinHeight()
 			);
 		
 		
 		
-		// render validation //
+		//============//
+		// 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);
+		String validationMessage = renderParams.getValidationErrorMessage();
-			if (reasonLodsCannotRender != null)
+		if (validationMessage != null)
 		{
+			this.lastRenderParamValidationMessage = validationMessage;
 			return;
 		}
-			
+		else
-			IDhClientWorld dhClientWorld = SharedApi.getIDhClientWorld();
-			if (dhClientWorld == null)
 		{
-				return;
+			this.lastRenderParamValidationMessage = null;
 		}
 		
-			IDhClientLevel level = (IDhClientLevel) dhClientWorld.getLevel(levelWrapper);
-			if (level == null)
-			{
-				return;
-			}
-			
-			
 		if (this.rendererDisabledBecauseOfExceptions)
 		{
 			// re-enable rendering if the user toggles DH rendering
@@ -484,16 +494,22 @@ public class ClientApi
 		
 		
 		
+		//===========//
+		// rendering //
+		//===========//
+		
+		try
+		{
 			// render pass //
 			
 			if (!renderingDeferredLayer)
 			{
 				if (Config.Client.Advanced.Debugging.rendererMode.get() == EDhApiRendererMode.DEFAULT)
 				{
-					this.renderingCancelledForThisFrame = ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeRenderEvent.class, renderEventParam);
+					boolean renderingCancelledForThisFrame = ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeRenderEvent.class, renderParams);
-					if (!this.renderingCancelledForThisFrame)
+					if (!renderingCancelledForThisFrame)
 					{
-						level.render(renderEventParam, profiler);
+						LodRenderer.INSTANCE.render(renderParams, profiler);
 					}
 					
 					if (!DhApi.Delayed.renderProxy.getDeferTransparentRendering())
@@ -510,10 +526,10 @@ public class ClientApi
 			}
 			else
 			{
-				boolean renderingCancelled = ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeDeferredRenderEvent.class, renderEventParam);
+				boolean renderingCancelled = ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeDeferredRenderEvent.class, renderParams);
 				if (!renderingCancelled)
 				{
-					level.renderDeferred(renderEventParam, profiler);
+					LodRenderer.INSTANCE.renderDeferred(renderParams, profiler);
 				}
 				
 				
@@ -533,50 +549,60 @@ public class ClientApi
 			MC_CLIENT.sendChatMessage("\u00A74Toggle DH rendering via the config UI to re-activate DH rendering.");
 			MC_CLIENT.sendChatMessage("\u00A74Error: " + e);
 		}
-		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"
 	}
-	}
 	
-	/** 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)
+	
+	//================//
+	// fade rendering //
+	//================//
+	
+	/** 
+	 * The first fade pass.
+	 * Called after MC finishes rendering the opaque passes. 
+	 */
+	public void renderFadeOpaque()
+	{
+		// 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
+			// 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);
+		}
+	}
+	/** 
+	 * The second fade pass.
+	 * Called after MC finishes rendering both opaque
+	 * and transparent passes. 
+	 */
+	public void renderFadeTransparent()
 	{
 		// only fade when DH is rendering
 		if (Config.Client.Advanced.Debugging.rendererMode.get() == EDhApiRendererMode.DEFAULT)
 		{
-			if (Config.Client.Advanced.Graphics.Quality.vanillaFadeMode.get() == EDhApiMcRenderingFadeMode.DOUBLE_PASS)
+			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)
 			{
-				FadeRenderer.INSTANCE.render(mcModelViewMatrix, mcProjectionMatrix, partialTicks, level);
+				VanillaFadeRenderer.INSTANCE.render(RENDER_STATE.mcModelViewMatrix, RENDER_STATE.mcProjectionMatrix, RENDER_STATE.frameTime, RENDER_STATE.clientLevelWrapper);
 			}
 		}
 	}
-	/** 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)
-		{
-			// fade if any level fading is active
-			if (Config.Client.Advanced.Graphics.Quality.vanillaFadeMode.get() != EDhApiMcRenderingFadeMode.NONE)
-			{
-				FadeRenderer.INSTANCE.render(mcModelViewMatrix, mcProjectionMatrix, partialTicks, level);
-			}
-		}
-	}
-	
 	
 	
 	
@@ -652,7 +678,8 @@ public class ClientApi
 	private void detectAndSendBootTimeWarnings()
 	{
 		// dev build
-		if (ModInfo.IS_DEV_BUILD && !this.isDevBuildMessagePrinted && MC_CLIENT.playerExists())
+		if (ModInfo.IS_DEV_BUILD 
+			&& !this.isDevBuildMessagePrinted && MC_CLIENT.playerExists())
 		{
 			this.isDevBuildMessagePrinted = true;
 			this.lastStaticWarningMessageSentMsTime = System.currentTimeMillis();
@@ -669,7 +696,8 @@ public class ClientApi
 		
 		// memory
 		if (this.staticStartupMessageSentRecently()) return;
-		if (!this.lowMemoryWarningPrinted && Config.Common.Logging.Warning.showLowMemoryWarningOnStartup.get())
+		if (!this.lowMemoryWarningPrinted 
+			&& Config.Common.Logging.Warning.showLowMemoryWarningOnStartup.get())
 		{
 			this.lowMemoryWarningPrinted = true;
 			this.lastStaticWarningMessageSentMsTime = System.currentTimeMillis();
@@ -694,7 +722,8 @@ public class ClientApi
 		
 		// high vanilla render distance
 		if (this.staticStartupMessageSentRecently()) return;
-		if (!this.highVanillaRenderDistanceWarningPrinted && Config.Common.Logging.Warning.showHighVanillaRenderDistanceWarning.get())
+		if (!this.highVanillaRenderDistanceWarningPrinted 
+			&& Config.Common.Logging.Warning.showHighVanillaRenderDistanceWarning.get())
 		{
 			// DH generally doesn't need a vanilla render distance above 12 
 			if (MC_RENDER.getRenderDistance() > 12)
@@ -721,7 +750,8 @@ public class ClientApi
 	{
 		if (this.lastStaticWarningMessageSentMsTime == 0)
 		{
-			return true;
+			// no static message has ever been sent
+			return false;
 		}
 		
 		long timeSinceLastMessage = System.currentTimeMillis() - this.lastStaticWarningMessageSentMsTime; 
@@ -740,4 +770,6 @@ public class ClientApi
 	 */
 	public void showOverlayMessageNextFrame(String message) { this.overlayMessageQueueForNextFrame.add(message); }
 	
+	
+	
 }

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

@@ -4,14 +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.ConfigBasedLogger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.network.event.internal.CloseInternalEvent;
 import com.seibel.distanthorizons.core.network.messages.base.LevelInitMessage;
 import com.seibel.distanthorizons.core.network.session.NetworkSession;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
-import org.apache.logging.log4j.LogManager;
+import org.jetbrains.annotations.NotNull;
-import org.checkerframework.checker.nullness.qual.NonNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.Objects;
@@ -22,8 +22,10 @@ import java.util.function.Consumer;
  */
 public class ClientPluginChannelApi
 {
-	private static final ConfigBasedLogger LOGGER = new ConfigBasedLogger(LogManager.getLogger(),
+	private static final DhLogger LOGGER = new DhLoggerBuilder()
-			() -> Config.Common.Logging.logNetworkEvent.get());
+			.fileLevelConfig(Config.Common.Logging.logNetworkEventToFile)
+			.build();  
+			
 	private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
 	private static final IKeyedClientLevelManager KEYED_CLIENT_LEVEL_MANAGER = SingletonInjector.INSTANCE.get(IKeyedClientLevelManager.class);
 	
@@ -65,7 +67,7 @@ public class ClientPluginChannelApi
 	//================//
 	
 	/** fired when this client connects to a server with DH support */
-	public void onJoinServer(@NonNull NetworkSession networkSession)
+	public void onJoinServer(@NotNull NetworkSession networkSession)
 	{
 		Objects.requireNonNull(networkSession);
 		this.networkSession = networkSession;
@@ -75,7 +77,12 @@ public class ClientPluginChannelApi
 	
 	private void onLevelInitMessage(LevelInitMessage msg)
 	{
-		if (!msg.levelKey.matches(LevelInitMessage.VALIDATION_REGEX))
+		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))
 		{
 			throw new IllegalArgumentException("Server sent invalid level key.");
 		}
@@ -105,10 +112,12 @@ public class ClientPluginChannelApi
 				this.levelUnloadHandler.accept(clientLevel);
 			}
 			
-			if (existingKeyedClientLevel == null || !existingKeyedClientLevel.getServerLevelKey().equals(msg.levelKey))
+			if (existingKeyedClientLevel == null
+					|| !existingKeyedClientLevel.getServerKey().equals(msg.serverKey)
+					|| !existingKeyedClientLevel.getServerLevelKey().equals(msg.levelKey))
 			{
 				LOGGER.info("Loading level with key: [" + msg.levelKey + "].");
-				IServerKeyedClientLevel keyedLevel = KEYED_CLIENT_LEVEL_MANAGER.setServerKeyedLevel(clientLevel, msg.levelKey);
+				IServerKeyedClientLevel keyedLevel = KEYED_CLIENT_LEVEL_MANAGER.setServerKeyedLevel(clientLevel, msg.serverKey, 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 org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 import org.jetbrains.annotations.NotNull;
 
 /**
@@ -41,7 +41,7 @@ public class ServerApi
 {
 	public static final ServerApi INSTANCE = new ServerApi();
 	
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	
 	
@@ -61,7 +61,7 @@ public class ServerApi
 	{
 		try
 		{
-			IDhServerWorld serverWorld = SharedApi.getIDhServerWorld();
+			IDhServerWorld serverWorld = SharedApi.tryGetDhServerWorld();
 			if (serverWorld != null)
 			{
 				serverWorld.serverTick();
@@ -136,8 +136,8 @@ public class ServerApi
 	// chunk modified events //
 	//=======================//
 	
-	public void serverChunkLoadEvent(IChunkWrapper chunkWrapper, ILevelWrapper level) { SharedApi.INSTANCE.applyChunkUpdate(chunkWrapper, level, false); }
+	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); }
+	public void serverChunkSaveEvent(IChunkWrapper chunkWrapper, ILevelWrapper level) { SharedApi.INSTANCE.applyChunkUpdate(chunkWrapper, level, true, false); }
 	
 	
 	
@@ -152,7 +152,7 @@ public class ServerApi
 			return;
 		}
 		
-		IDhServerWorld serverWorld = SharedApi.getIDhServerWorld();
+		IDhServerWorld serverWorld = SharedApi.tryGetDhServerWorld();
 		LOGGER.info("Player ["+player.getName()+"] joined.");
 		if (serverWorld != null)
 		{
@@ -166,7 +166,7 @@ public class ServerApi
 			return;
 		}
 		
-		IDhServerWorld serverWorld = SharedApi.getIDhServerWorld();
+		IDhServerWorld serverWorld = SharedApi.tryGetDhServerWorld();
 		LOGGER.info("Player ["+player.getName()+"] disconnected.");
 		if (serverWorld != null)
 		{
@@ -180,7 +180,7 @@ public class ServerApi
 			return;
 		}
 		
-		IDhServerWorld serverWorld = SharedApi.getIDhServerWorld();
+		IDhServerWorld serverWorld = SharedApi.tryGetDhServerWorld();
 		LOGGER.info("Player ["+player.getName()+"] changed level: ["+originLevel.getKeyedLevelDimensionName()+"] -> ["+destinationLevel.getKeyedLevelDimensionName()+"].");
 		if (serverWorld != null)
 		{
@@ -200,7 +200,7 @@ public class ServerApi
 			return;
 		}
 		
-		IDhServerWorld serverWorld = SharedApi.getIDhServerWorld();
+		IDhServerWorld serverWorld = SharedApi.tryGetDhServerWorld();
 		if (serverWorld != null)
 		{
 			serverWorld.getServerPlayerStateManager().handlePluginMessage(player, message);

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

@@ -22,6 +22,8 @@ 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;
@@ -45,7 +47,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 org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
@@ -56,7 +58,7 @@ public class SharedApi
 {
 	public static final SharedApi INSTANCE = new SharedApi();
 	
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	/** will be null on the server-side */
 	@Nullable
 	private static final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
@@ -65,20 +67,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);
 	
-	private static final UpdateChunkPosManager UPDATE_POS_MANAGER = new UpdateChunkPosManager();
+	public static final ChunkUpdateQueueManager CHUNK_UPDATE_QUEUE_MANAGER = new ChunkUpdateQueueManager();
 	/** 
 	 * how many chunks can be queued for updating per thread + player (in multiplayer), 
 	 * used to prevent updates from infinitely pilling up if the user flies around extremely fast 
 	 */
-	private static final int MAX_UPDATING_CHUNK_COUNT_PER_THREAD_AND_PLAYER = 1_000;
+	public static final int MAX_UPDATING_CHUNK_COUNT_PER_THREAD_AND_PLAYER = 1_000;
 	
 	/** how many milliseconds must pass before an overloaded message can be sent in chat or the log */
-	private static final int MIN_MS_BETWEEN_OVERLOADED_LOG_MESSAGE = 30_000;
+	public 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;
 	
 	
 	
@@ -127,7 +129,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
-			UPDATE_POS_MANAGER.clear();
+			CHUNK_UPDATE_QUEUE_MANAGER.clear();
 			
 			// recommend that the garbage collector cleans up any objects from the old world and thread pools
 			System.gc();
@@ -149,13 +151,16 @@ public class SharedApi
 		}
 	}
 	
+	@Nullable
 	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} */
-	public static IDhClientWorld getIDhClientWorld() { return (currentWorld instanceof IDhClientWorld) ? (IDhClientWorld) currentWorld : null; }
+	@Nullable
+	public static IDhClientWorld tryGetDhClientWorld() { return (currentWorld instanceof IDhClientWorld) ? (IDhClientWorld) currentWorld : null; }
+	
 	/** returns null if the {@link SharedApi#currentWorld} isn't a {@link DhServerWorld} or {@link DhClientServerWorld} */
-	public static IDhServerWorld getIDhServerWorld() { return (currentWorld instanceof IDhServerWorld) ? (IDhServerWorld) currentWorld : null; }
+	@Nullable
+	public static IDhServerWorld tryGetDhServerWorld() { return (currentWorld instanceof IDhServerWorld) ? (IDhServerWorld) currentWorld : null; }
 	
 	
 	
@@ -168,10 +173,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 UPDATE_POS_MANAGER.contains(new DhChunkPos(new DhBlockPos2D(blockPosX, blockPosZ))); }
+	{ return CHUNK_UPDATE_QUEUE_MANAGER.contains(new DhChunkPos(new DhBlockPos2D(blockPosX, blockPosZ))); }
 	
 	public static boolean isChunkAtChunkPosAlreadyUpdating(int chunkPosX, int chunkPosZ)
-	{ return UPDATE_POS_MANAGER.contains(new DhChunkPos(chunkPosX, chunkPosZ)); }
+	{ return CHUNK_UPDATE_QUEUE_MANAGER.contains(new DhChunkPos(chunkPosX, chunkPosZ)); }
 	
 	/** 
 	 * This is often fired when unloading a level.
@@ -179,17 +184,18 @@ public class SharedApi
 	 * rapidly changing dimensions.
 	 * (IE prevent DH from infinitely allocating memory 
 	 */
-	public void clearQueuedChunkUpdates() { UPDATE_POS_MANAGER.clear(); }
+	public void clearQueuedChunkUpdates() { CHUNK_UPDATE_QUEUE_MANAGER.clear(); }
 	
-	public int getQueuedChunkUpdateCount() { return UPDATE_POS_MANAGER.closestQueue.size(); }
+	public int getQueuedChunkUpdateCount() { return CHUNK_UPDATE_QUEUE_MANAGER.getQueuedCount(); }
 	
 	
 	
 	/** handles both block place and break events */
-	public void chunkBlockChangedEvent(IChunkWrapper chunk, ILevelWrapper level) { this.applyChunkUpdate(chunk, level, true); }
+	public void chunkBlockChangedEvent(IChunkWrapper chunk, ILevelWrapper level) { this.applyChunkUpdate(chunk, level, true, false); }
-	public void chunkLoadEvent(IChunkWrapper chunk, ILevelWrapper level) { this.applyChunkUpdate(chunk, level, false); }
+	public void chunkLoadEvent(IChunkWrapper chunk, ILevelWrapper level) { this.applyChunkUpdate(chunk, level, true, true); }
 	
-	public void applyChunkUpdate(IChunkWrapper chunkWrapper, ILevelWrapper level, boolean updateNeighborChunks)
+	//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)
 	{
 		//========================//
 		// world and level checks //
@@ -245,7 +251,7 @@ public class SharedApi
 		}
 		
 		// shoudln't normally happen, but just in case
-		if (UPDATE_POS_MANAGER.contains(chunkWrapper.getChunkPos()))
+		if (CHUNK_UPDATE_QUEUE_MANAGER.contains(chunkWrapper.getChunkPos()))
 		{
 			// TODO this will prevent some LODs from updating across dimensions if multiple levels are loaded
 			return;
@@ -257,23 +263,53 @@ public class SharedApi
 		// update the necessary chunk(s) //
 		//===============================//
 		
-		if (!updateNeighborChunks)
+		if (!canGetNeighboringChunks)
 		{
 			// only update the center chunk
+			queueChunkUpdate(chunkWrapper, null, dhLevel, false);
+			return;
+		}
 		
-			queueChunkUpdate(chunkWrapper, null, dhLevel);
+		
+		ArrayList<IChunkWrapper> neighboringChunkList = getNeighborChunkListForChunk(chunkWrapper, dhLevel);
+		
+		if (newlyLoaded)
+		{
+			// this means this chunkWrapper is a newly loaded chunk 
+			// which may be missing some neighboring chunk data
+			// because it is bordering the render distance
+			// thus, only the chunks neighboring this chunkWrapper will get updated
+			// because those are more likely to have their full neighboring chunk data
+			//TODO this does not prevent those neighboring chunks from updating
+			// this newly loaded chunk that were just skipped
+			// leading to occasional lighting issues
+			for (IChunkWrapper neighboringChunk : neighboringChunkList)
+			{
+				if (neighboringChunk == chunkWrapper)
+				{
+					continue;
+				}
+				
+				this.applyChunkUpdate(neighboringChunk, level, true, false);
+			}
 		}
 		else
 		{
+			// if not all neighboring chunk data is available, do not try to update
+			if (neighboringChunkList.size() < 9)
+			{
+				return;
+			}
+			
 			// update the center with any existing neighbour chunks. 
 			// this is done so lighting changes are propagated correctly
-			queueChunkUpdate(chunkWrapper, getNeighbourChunkListForChunk(chunkWrapper,dhLevel), dhLevel);
+			queueChunkUpdate(chunkWrapper, neighboringChunkList, dhLevel, true);
 		}
 	}
-	private static ArrayList<IChunkWrapper> getNeighbourChunkListForChunk(IChunkWrapper chunkWrapper, IDhLevel dhLevel)
+	private static ArrayList<IChunkWrapper> getNeighborChunkListForChunk(IChunkWrapper chunkWrapper, IDhLevel dhLevel)
 	{
 		// get the neighboring chunk list
-		ArrayList<IChunkWrapper> neighbourChunkList = new ArrayList<>(9);
+		ArrayList<IChunkWrapper> neighborChunkList = new ArrayList<>(9);
 		for (int xOffset = -1; xOffset <= 1; xOffset++)
 		{
 			for (int zOffset = -1; zOffset <= 1; zOffset++)
@@ -281,80 +317,36 @@ public class SharedApi
 				if (xOffset == 0 && zOffset == 0)
 				{
 					// center chunk
-					neighbourChunkList.add(chunkWrapper);
+					neighborChunkList.add(chunkWrapper);
 				}
 				else
 				{
 					// neighboring chunk 
-					DhChunkPos neighbourPos = new DhChunkPos(chunkWrapper.getChunkPos().getX() + xOffset, chunkWrapper.getChunkPos().getZ() + zOffset);
+					DhChunkPos neighborPos = new DhChunkPos(chunkWrapper.getChunkPos().getX() + xOffset, chunkWrapper.getChunkPos().getZ() + zOffset);
-					IChunkWrapper neighbourChunk = dhLevel.getLevelWrapper().tryGetChunk(neighbourPos);
+					IChunkWrapper neighborChunk = dhLevel.getLevelWrapper().tryGetChunk(neighborPos);
-					if (neighbourChunk != null)
+					if (neighborChunk != null)
 					{
-						neighbourChunkList.add(neighbourChunk);
+						neighborChunkList.add(neighborChunk);
 					}
 				}
 			}
 		}
-		return neighbourChunkList;
+		return neighborChunkList;
 	}
 	
-	private static void queueChunkUpdate(IChunkWrapper chunkWrapper, @Nullable ArrayList<IChunkWrapper> neighbourChunkList, IDhLevel dhLevel) 
+	private static void queueChunkUpdate(IChunkWrapper chunkWrapper, @Nullable ArrayList<IChunkWrapper> neighborChunkList, IDhLevel dhLevel, boolean canGetNeighboringChunks)
-	{ queueChunkUpdate(chunkWrapper, neighbourChunkList, dhLevel,false); }
-	private static void queueChunkUpdate(IChunkWrapper chunkWrapper, @Nullable ArrayList<IChunkWrapper> neighbourChunkList, IDhLevel dhLevel, boolean lightUpdateOnly)
 	{
-		int maxUpdateSizeMultiplier;
+				
-		if (MC_CLIENT != null && MC_CLIENT.playerExists())
+		// return if the chunk is already queued
+		if (CHUNK_UPDATE_QUEUE_MANAGER.contains(chunkWrapper.getChunkPos()))
 		{
-			// Local worlds & multiplayer
+			return;
-			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
@@ -365,7 +357,7 @@ public class SharedApi
 		{
 			try
 			{
-				executor.execute(SharedApi::processQueuedChunkUpdate);
+				executor.execute(SharedApi::processQueue);
 			}
 			catch (RejectedExecutionException ignore)
 			{
@@ -373,94 +365,159 @@ 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());
 		
-		UpdateChunkData updateData = UPDATE_POS_MANAGER.popClosest();
+		ChunkUpdateData updateData = CHUNK_UPDATE_QUEUE_MANAGER.updateQueue.popClosest();
 		if (updateData == null)
 		{
 			return;
 		}
 		
 		IChunkWrapper chunkWrapper = updateData.chunkWrapper;
-		@Nullable ArrayList<IChunkWrapper> neighbourChunkList = updateData.neighbourChunkList;
 		IDhLevel dhLevel = updateData.dhLevel;
-		
+		ILevelWrapper levelWrapper = dhLevel.getLevelWrapper();
-		
-		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;
+		@Nullable ArrayList<IChunkWrapper> nearbyChunkList = updateData.neighborChunkList; 
-			if (neighbourChunkList != null)
+		
+		// a non-null list is needed for the lighting engine
+		if (nearbyChunkList == null)
 		{
-				nearbyChunkList = neighbourChunkList;
+			nearbyChunkList = new ArrayList<IChunkWrapper>();
-			}
-			else
-			{
-				nearbyChunkList = new ArrayList<>(1);
 			nearbyChunkList.add(chunkWrapper);
 		}
 		
-			// if this chunk will update its lighting
+		try
-			// 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, dhLevel.hasSkyLight() ? LodUtil.MAX_MC_LIGHT : LodUtil.MIN_MC_LIGHT);
+			DhLightingEngine.INSTANCE.bakeChunkBlockLighting(chunkWrapper, nearbyChunkList, levelWrapper.hasSkyLight() ? LodUtil.MAX_MC_LIGHT : LodUtil.MIN_MC_LIGHT);
 			
 			dhLevel.updateBeaconBeamsForChunk(chunkWrapper, nearbyChunkList);
+			
+			int newChunkHash = chunkWrapper.getBlockBiomeHashCode();
 			dhLevel.updateChunkAsync(chunkWrapper, newChunkHash);
 		}
 		catch (Exception e)
 		{
 			LOGGER.error("Unexpected error when updating chunk at pos: [" + chunkWrapper.getChunkPos() + "]", e);
 		}
-		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
-				}
-			}
-		}
 	}
 	
 	
@@ -471,161 +528,13 @@ public class SharedApi
 	
 	public String getDebugMenuString()
 	{
-		String updatingCountStr = F3Screen.NUMBER_FORMAT.format(UPDATE_POS_MANAGER.closestQueue.size());
+		String preUpdatingCountStr = F3Screen.NUMBER_FORMAT.format(CHUNK_UPDATE_QUEUE_MANAGER.preUpdateQueue.getQueuedCount());
-		String maxUpdateCountStr = F3Screen.NUMBER_FORMAT.format(UPDATE_POS_MANAGER.maxSize);
+		String updatingCountStr = F3Screen.NUMBER_FORMAT.format(CHUNK_UPDATE_QUEUE_MANAGER.updateQueue.getQueuedCount());
-		return "Queued chunk updates: "+updatingCountStr+" / "+maxUpdateCountStr;
+		String queuedCountStr = F3Screen.NUMBER_FORMAT.format(CHUNK_UPDATE_QUEUE_MANAGER.getQueuedCount());
-	}
 		
+		String maxUpdateCountStr = F3Screen.NUMBER_FORMAT.format(CHUNK_UPDATE_QUEUE_MANAGER.maxSize);
 		
-	
+		return "Queued chunk updates: "+"( "+preUpdatingCountStr+" + "+updatingCountStr+" )  [ "+queuedCountStr+" / "+maxUpdateCountStr+" ]";
-	//================//
-	// 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;
-		
-		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);
-		}
-		
 	}
 	
 	

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

@@ -0,0 +1,125 @@
+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

@@ -0,0 +1,26 @@
+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

@@ -0,0 +1,145 @@
+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;
+
+public class ChunkUpdateQueueManager
+{
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	
+	
+	public final ChunkPosQueue updateQueue;
+	public final ChunkPosQueue preUpdateQueue;
+	
+	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.preUpdateQueue.contains(pos); }
+	
+	public void clear()
+	{
+		this.updateQueue.clear();
+		this.preUpdateQueue.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);
+			}
+		}
+	}
+	
+	
+	
+	//==================//
+	// 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

@@ -0,0 +1,72 @@
+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/Config.java

@@ -36,7 +36,7 @@ import com.seibel.distanthorizons.core.pos.DhSectionPos;
 import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper;
 import com.seibel.distanthorizons.coreapi.ModInfo;
-import org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 import org.lwjgl.util.tinyfd.TinyFileDialogs;
 
 import java.awt.*;
@@ -45,19 +45,16 @@ import java.util.*;
 import java.util.List;
 
 /**
- * This handles any configuration the user has access to. <br><br>
+ * This handles any configuration the user has access to.
- *
- * Note: <br>
- * Only add simpler listeners here (IE listeners that only depend on 1 config entry).
- * For listeners that depend on 2 or more config entries, add them before the config menu is opened.
- * Otherwise, you will have issues where only some of the config entries will exist when your listener is created.
  *
  * @author coolGi
+ * 
+ * @see ConfigHandler
  */
 @SuppressWarnings("ConcatenationWithEmptyString")
 public class Config
 {
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	public static ConfigCategory client = new ConfigCategory.Builder().set(Client.class).build();
 	
@@ -107,7 +104,7 @@ public class Config
 		public static ConfigUiLinkedEntry quickEnableWorldGenerator = new ConfigUiLinkedEntry(Common.WorldGenerator.enableDistantGeneration);
 		
 		public static ConfigEntry<Boolean> quickShowWorldGenProgress = new ConfigEntry.Builder<Boolean>()
-				.set(true)
+				.set(false) // TODO should be set by the underlying world gen progress button, not a static default
 				.setAppearance(EConfigEntryAppearance.ONLY_IN_GUI)
 				.build();
 		
@@ -131,6 +128,8 @@ public class Config
 			// since they aren't part of "client" config class
 			// TODO determine their destination programically instead of hard coding the value
 			
+			public static ConfigUIComment advancedHeader = new ConfigUIComment.Builder().setParentConfigClass(Advanced.class).build();
+			
 			public static ConfigCategory graphics = new ConfigCategory.Builder().set(Graphics.class).build();
 			public static ConfigCategory worldGenerator = new ConfigCategory.Builder().set(Common.WorldGenerator.class).setDestination("common.worldGenerator").build();
 			public static ConfigCategory multiplayer = new ConfigCategory.Builder().set(Multiplayer.class).build();
@@ -146,23 +145,32 @@ public class Config
 			
 			public static class Graphics
 			{
+				public static ConfigUIComment advancedGraphicsHeader = new ConfigUIComment.Builder().setParentConfigClass(Graphics.class).build();
+				
 				public static ConfigCategory quality = new ConfigCategory.Builder().set(Quality.class).build();
+				public static ConfigUISpacer qualitySpacer = new ConfigUISpacer.Builder().build();
 				
 				public static ConfigUiLinkedEntry quickEnableSsao = new ConfigUiLinkedEntry(Ssao.enableSsao);
 				public static ConfigCategory ssao = new ConfigCategory.Builder().set(Ssao.class).build();
+				public static ConfigUISpacer ssaoSpacer = new ConfigUISpacer.Builder().build();
+				
 				
 				public static ConfigUiLinkedEntry quickEnableGenericRendering = new ConfigUiLinkedEntry(GenericRendering.enableGenericRendering);
 				public static ConfigCategory genericRendering = new ConfigCategory.Builder().set(GenericRendering.class).build();
+				public static ConfigUISpacer genericRenderingSpacer = new ConfigUISpacer.Builder().build();
 				
 				public static ConfigUiLinkedEntry quickEnableDhFog = new ConfigUiLinkedEntry(Fog.enableDhFog);
 				public static ConfigUiLinkedEntry quickEnableMcFog = new ConfigUiLinkedEntry(Fog.enableVanillaFog);
 				public static ConfigCategory fog = new ConfigCategory.Builder().set(Fog.class).build();
+				public static ConfigUISpacer fogSpacer = new ConfigUISpacer.Builder().build();
 				
 				public static ConfigUiLinkedEntry quickEnableNoiseTexture = new ConfigUiLinkedEntry(NoiseTexture.enableNoiseTexture);
 				public static ConfigCategory noiseTexture = new ConfigCategory.Builder().set(NoiseTexture.class).build();
+				public static ConfigUISpacer noiseTextureSpacer = new ConfigUISpacer.Builder().build();
 				
 				public static ConfigUiLinkedEntry quickEnableCaveCulling = new ConfigUiLinkedEntry(Culling.enableCaveCulling);
 				public static ConfigCategory culling = new ConfigCategory.Builder().set(Culling.class).build();
+				public static ConfigUISpacer cullingSpacer = new ConfigUISpacer.Builder().build();
 				
 				public static ConfigCategory experimental = new ConfigCategory.Builder().set(Experimental.class).build();
 				
@@ -170,12 +178,13 @@ public class Config
 				
 				public static class Quality
 				{
+					public static ConfigUIComment qualityHeader = new ConfigUIComment.Builder().setParentConfigClass(Quality.class).build();
+					
 					public static ConfigEntry<Integer> lodChunkRenderDistanceRadius = new ConfigEntry.Builder<Integer>()
 							.setMinDefaultMax(32, 256, 4096)
 							.comment("" +
 									"The radius of the mod's render distance. (measured in chunks)\n" +
 									"")
-							.setPerformance(EConfigEntryPerformance.HIGH)
 							.build();
 					
 					public static ConfigEntry<EDhApiHorizontalQuality> horizontalQuality = new ConfigEntry.Builder<EDhApiHorizontalQuality>()
@@ -184,7 +193,7 @@ public class Config
 									+ "This indicates how quickly LODs decrease in quality the further away they are. \n"
 									+ "Higher settings will render higher quality fake chunks farther away, \n"
 									+ "but will increase memory and GPU usage.")
-							.setPerformance(EConfigEntryPerformance.MEDIUM)
+							.addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE)
 							.build();
 					
 					public static ConfigEntry<EDhApiMaxHorizontalResolution> maxHorizontalResolution = new ConfigEntry.Builder<EDhApiMaxHorizontalResolution>()
@@ -201,7 +210,7 @@ public class Config
 									+ "\n"
 									+ "Lowest Quality: " + EDhApiMaxHorizontalResolution.CHUNK + "\n"
 									+ "Highest Quality: " + EDhApiMaxHorizontalResolution.BLOCK)
-							.setPerformance(EConfigEntryPerformance.MEDIUM)
+							.addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE)
 							.build();
 					
 					public static ConfigEntry<EDhApiVerticalQuality> verticalQuality = new ConfigEntry.Builder<EDhApiVerticalQuality>()
@@ -214,8 +223,7 @@ public class Config
 									+ "\n"
 									+ "Lowest Quality: " + EDhApiVerticalQuality.HEIGHT_MAP + "\n"
 									+ "Highest Quality: " + EDhApiVerticalQuality.EXTREME)
-							.setPerformance(EConfigEntryPerformance.VERY_HIGH)
+							.addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE)
-							.addListener(ReloadLodsConfigEventHandler.INSTANCE)
 							.build();
 					
 					public static ConfigEntry<EDhApiTransparency> transparency = new ConfigEntry.Builder<EDhApiTransparency>()
@@ -227,8 +235,7 @@ public class Config
 									+ EDhApiTransparency.FAKE + ": LODs will be opaque, but shaded to match the blocks underneath. \n"
 									+ EDhApiTransparency.DISABLED + ": LODs will be opaque. \n"
 									+ "")
-							.setPerformance(EConfigEntryPerformance.MEDIUM)
+							.addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE)
-							.addListener(ReloadLodsConfigEventHandler.INSTANCE)
 							.build();
 					
 					public static ConfigEntry<EDhApiBlocksToAvoid> blocksToIgnore = new ConfigEntry.Builder<EDhApiBlocksToAvoid>()
@@ -239,8 +246,7 @@ public class Config
 									+ EDhApiBlocksToAvoid.NONE + ": Represent all blocks in the LODs \n"
 									+ EDhApiBlocksToAvoid.NON_COLLIDING + ": Only represent solid blocks in the LODs (tall grass, torches, etc. won't count for a LOD's height) \n"
 									+ "")
-							.setPerformance(EConfigEntryPerformance.NONE)
+							.addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE)
-							.addListener(ReloadLodsConfigEventHandler.INSTANCE)
 							.build();
 					
 					public static ConfigEntry<Boolean> tintWithAvoidedBlocks = new ConfigEntry.Builder<Boolean>()
@@ -251,8 +257,7 @@ public class Config
 									+ "True: a red flower will tint the grass below it red. \n"
 									+ "False: skipped blocks will not change color of surface below them. "
 									+ "")
-							.setPerformance(EConfigEntryPerformance.NONE)
+							.addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE)
-							.addListener(ReloadLodsConfigEventHandler.INSTANCE)
 							.build();
 					
 					public static ConfigEntry<Double> lodBias = new ConfigEntry.Builder<Double>()
@@ -272,8 +277,7 @@ public class Config
 									+ "              Can be used to force LOD shading when using some shaders. \n"
 									+ EDhApiLodShading.DISABLED + ": All LOD sides will be rendered with the same brightness. \n"
 									+ "")
-							.setPerformance(EConfigEntryPerformance.NONE)
+							.addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE)
-							.addListener(ReloadLodsConfigEventHandler.INSTANCE)
 							.build();
 					
 					public static ConfigEntry<EDhApiGrassSideRendering> grassSideRendering = new ConfigEntry.Builder<EDhApiGrassSideRendering>()
@@ -285,8 +289,7 @@ public class Config
 									+ EDhApiGrassSideRendering.FADE_TO_DIRT + ": sides fade from grass to dirt. \n"
 									+ EDhApiGrassSideRendering.AS_DIRT + ": sides render entirely as dirt. \n"
 									+ "")
-							.setPerformance(EConfigEntryPerformance.NONE)
+							.addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE)
-							.addListener(ReloadLodsConfigEventHandler.INSTANCE)
 							.build();
 					
 					public static ConfigEntry<Boolean> ditherDhFade = new ConfigEntry.Builder<Boolean>()
@@ -296,7 +299,6 @@ public class Config
 									+ "If false LODs will cut off abruptly at a set distance from the camera. \n"
 									+ "This setting is affected by the vanilla overdraw prevention config. \n"
 									+ "")
-							.setPerformance(EConfigEntryPerformance.LOW)
 							.build();
 					
 					public static ConfigEntry<EDhApiMcRenderingFadeMode> vanillaFadeMode = new ConfigEntry.Builder<EDhApiMcRenderingFadeMode>()
@@ -308,7 +310,14 @@ public class Config
 									+ EDhApiMcRenderingFadeMode.SINGLE_PASS + ": Fades after MC's transparent pass, opaque blocks underwater won't be faded. \n"
 									+ EDhApiMcRenderingFadeMode.DOUBLE_PASS + ": Slowest, fades after both MC's opaque and transparent passes, provides the smoothest transition. \n"
 									+ "")
-							.setPerformance(EConfigEntryPerformance.LOW)
+							.build();
+					
+					public static ConfigEntry<Boolean> dhFadeFarClipPlane = new ConfigEntry.Builder<Boolean>()
+							.set(true)
+							.comment(""
+									+ "Should DH fade out before reaching the far clip plane? \n"
+									+ "This is helpful to prevent DH clouds from cutting off in the distance. \n"
+									+ "")
 							.build();
 					
 					public static ConfigEntry<Double> brightnessMultiplier = new ConfigEntry.Builder<Double>() // TODO: Make this a float (the ClassicConfigGUI doesnt support floats)
@@ -319,7 +328,7 @@ public class Config
 									+ "0 = black \n"
 									+ "1 = normal \n"
 									+ "2 = near white")
-							.addListener(ReloadLodsConfigEventHandler.INSTANCE)
+							.addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE)
 							.build();
 					
 					public static ConfigEntry<Double> saturationMultiplier = new ConfigEntry.Builder<Double>() // TODO: Make this a float (the ClassicConfigGUI doesnt support floats)
@@ -330,30 +339,29 @@ public class Config
 									+ "0 = black and white \n"
 									+ "1 = normal \n"
 									+ "2 = very saturated")
-							.addListener(ReloadLodsConfigEventHandler.INSTANCE)
+							.addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE)
 							.build();
 					
-					// TODO fixme
+					public static ConfigEntry<Integer> lodBiomeBlending = new ConfigEntry.Builder<Integer>()
-					//public static ConfigEntry<Integer> lodBiomeBlending = new ConfigEntry.Builder<Integer>()
+							.setMinDefaultMax(0,3,3) // going higher than 3 causes banding issues for blending across LOD borders and an exponential increase in load times
-					//		.setMinDefaultMax(0,1,7)
+							.comment(""
-					//		.comment(""
+									+ "This is the same as vanilla Biome Blending settings for Lod area. \n"
-					//				+ "This is the same as vanilla Biome Blending settings for Lod area. \n"
+									+ "    Note that anything other than '0' will greatly effect Lod building time. \n"
-					//				+ "    Note that anything other than '0' will greatly effect Lod building time \n"
+									+ "\n"
-					//				+ "     and increase triangle count. The cost on chunk generation speed is also \n"
+									+ "    '0' equals to Vanilla Biome Blending of '1x1' or 'OFF', \n"
-					//				+ "     quite large if set too high.\n"
+									+ "    '1' equals to Vanilla Biome Blending of '3x3', \n"
-					//				+ "\n"
+									+ "    '2' equals to Vanilla Biome Blending of '5x5'...")
-					//				+ "    '0' equals to Vanilla Biome Blending of '1x1' or 'OFF', \n"
+							.addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE)
-					//				+ "    '1' equals to Vanilla Biome Blending of '3x3', \n"
+							.build();	
-					//				+ "    '2' equals to Vanilla Biome Blending of '5x5'...")
-					//		.build();	
 				}
 				
 				public static class Ssao
 				{
+					public static ConfigUIComment ssaoHeader = new ConfigUIComment.Builder().setParentConfigClass(Ssao.class).build();
+					
 					public static ConfigEntry<Boolean> enableSsao = new ConfigEntry.Builder<Boolean>()
 							.set(true)
 							.comment("Enable Screen Space Ambient Occlusion")
-							.setPerformance(EConfigEntryPerformance.MEDIUM)
 							.build();
 					
 					public static ConfigEntry<Integer> sampleCount = new ConfigEntry.Builder<Integer>()
@@ -362,7 +370,6 @@ public class Config
 									"Determines how many points in space are sampled for the occlusion test. \n" +
 									"Higher numbers will improve quality and reduce banding, but will increase GPU load." +
 									"")
-							.setPerformance(EConfigEntryPerformance.MEDIUM)
 							.build();
 					
 					public static ConfigEntry<Double> radius = new ConfigEntry.Builder<Double>()
@@ -370,7 +377,6 @@ public class Config
 							.comment("" +
 									"Determines the radius Screen Space Ambient Occlusion is applied, measured in blocks." +
 									"")
-							.setPerformance(EConfigEntryPerformance.NONE)
 							.build();
 					
 					public static ConfigEntry<Double> strength = new ConfigEntry.Builder<Double>()
@@ -378,7 +384,6 @@ public class Config
 							.comment("" +
 									"Determines how dark the Screen Space Ambient Occlusion effect will be." +
 									"")
-							.setPerformance(EConfigEntryPerformance.NONE)
 							.build();
 					
 					public static ConfigEntry<Double> bias = new ConfigEntry.Builder<Double>()
@@ -386,7 +391,6 @@ public class Config
 							.comment("" +
 									"Increasing the value can reduce banding at the cost of reducing the strength of the effect." +
 									"")
-							.setPerformance(EConfigEntryPerformance.NONE)
 							.build();
 					
 					public static ConfigEntry<Double> minLight = new ConfigEntry.Builder<Double>()
@@ -396,7 +400,6 @@ public class Config
 									"0 = totally black at the corners \n" +
 									"1 = no shadow" +
 									"")
-							.setPerformance(EConfigEntryPerformance.NONE)
 							.build();
 					
 					public static ConfigEntry<Integer> blurRadius = new ConfigEntry.Builder<Integer>()
@@ -405,13 +408,14 @@ public class Config
 									"The radius, measured in pixels, that blurring is calculated for the SSAO. \n" +
 									"Higher numbers will reduce banding at the cost of GPU performance." +
 									"")
-							.setPerformance(EConfigEntryPerformance.HIGH)
 							.build();
 					
 				}
 				
 				public static class GenericRendering
 				{
+					public static ConfigUIComment genericRendererHeader = new ConfigUIComment.Builder().setParentConfigClass(GenericRendering.class).build();
+					
 					public static ConfigEntry<Boolean> enableGenericRendering = new ConfigEntry.Builder<Boolean>()
 							.set(true)
 							.comment(""
@@ -459,12 +463,13 @@ public class Config
 					
 					
 					
+					public static ConfigUIComment fogHeader = new ConfigUIComment.Builder().setParentConfigClass(Fog.class).build();
+					
 					public static ConfigEntry<Boolean> enableDhFog = new ConfigEntry.Builder<Boolean>()
 							.set(true)
 							.comment(""
 									+ "Determines if fog is drawn on DH LODs. \n"
 									+ "")
-							.setPerformance(EConfigEntryPerformance.MEDIUM)
 							.build();
 					
 					public static ConfigEntry<EDhApiFogColorMode> colorMode = new ConfigEntry.Builder<EDhApiFogColorMode>()
@@ -474,7 +479,6 @@ public class Config
 									+ "\n"
 									+ EDhApiFogColorMode.USE_WORLD_FOG_COLOR + ": Use the world's fog color. \n"
 									+ EDhApiFogColorMode.USE_SKY_COLOR + ": Use the sky's color.")
-							.setPerformance(EConfigEntryPerformance.NONE)
 							.build();
 					
 					public static ConfigEntry<Boolean> enableVanillaFog = new ConfigEntry.Builder<Boolean>()
@@ -560,6 +564,8 @@ public class Config
 					
 					public static class HeightFog
 					{
+						public static ConfigUIComment heightFogHeader = new ConfigUIComment.Builder().setParentConfigClass(HeightFog.class).build();
+						
 						public static ConfigEntry<EDhApiHeightFogMixMode> heightFogMixMode = new ConfigEntry.Builder<EDhApiHeightFogMixMode>()
 								.set(EDhApiHeightFogMixMode.SPHERICAL)
 								.comment(""
@@ -655,6 +661,8 @@ public class Config
 				
 				public static class NoiseTexture
 				{
+					public static ConfigUIComment noiseTextureHeader = new ConfigUIComment.Builder().setParentConfigClass(NoiseTexture.class).build();
+					
 					public static ConfigEntry<Boolean> enableNoiseTexture = new ConfigEntry.Builder<Boolean>()
 							.set(true)
 							.comment(""
@@ -689,8 +697,10 @@ public class Config
 				
 				public static class Culling
 				{
+					public static ConfigUIComment cullingHeader = new ConfigUIComment.Builder().setParentConfigClass(Culling.class).build();
+					
 					public static ConfigEntry<Double> overdrawPrevention = new ConfigEntry.Builder<Double>()
-							.setMinDefaultMax(0.0, 0.0, 1.0)
+							.setMinDefaultMax(0.0, 0.0, 1.0) // TODO change -1 to auto
 							.comment(""
 									+ "Determines how far from the camera Distant Horizons will start rendering. \n"
 									+ "Measured as a percentage of the vanilla render distance.\n"
@@ -703,12 +713,10 @@ public class Config
 									+ "\n"
 									+ "Increasing the vanilla render distance increases the effectiveness of this setting."
 									+ "")
-							.setPerformance(EConfigEntryPerformance.NONE)
 							.build();
 					
 					public static ConfigEntry<Boolean> enableCaveCulling = new ConfigEntry.Builder<Boolean>()
 							.set(true)
-							.setPerformance(EConfigEntryPerformance.HIGH)
 							.comment(""
 									+ "If enabled caves won't be rendered. \n"
 									+ "\n"
@@ -717,7 +725,7 @@ public class Config
 									+ " Tweaking the caveCullingHeight, can resolve some \n"
 									+ " of those issues. \n"
 									+ "")
-							.addListener(ReloadLodsConfigEventHandler.INSTANCE)
+							.addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE)
 							.build();
 					
 					public static ConfigEntry<Integer> caveCullingHeight = new ConfigEntry.Builder<Integer>()
@@ -725,7 +733,7 @@ public class Config
 							.comment(""
 									+ "At what Y value should cave culling start? \n"
 									+ "Lower this value if you get walls for areas with 0 light.")
-							.addListener(ReloadLodsConfigEventHandler.INSTANCE)
+							.addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE)
 							.build();
 					
 					public static ConfigEntry<Boolean> disableBeaconDistanceCulling = new ConfigEntry.Builder<Boolean>()
@@ -813,6 +821,8 @@ public class Config
 				
 				public static class Experimental
 				{
+					public static ConfigUIComment experimentalHeader = new ConfigUIComment.Builder().setParentConfigClass(Experimental.class).build();
+					
 					public static ConfigEntry<Integer> earthCurveRatio = new ConfigEntry.Builder<Integer>()
 							.setMinDefaultMax(0, 0, 5000)
 							.comment(""
@@ -829,12 +839,27 @@ public class Config
 									+ "will be set to 0 (disabled).")
 							.addListener(WorldCurvatureConfigEventHandler.INSTANCE)
 							.build();
+					
+					// TODO should be replaced with a better long-term solution
+					@Deprecated
+					public static ConfigEntry<Boolean> onlyLoadCenterLods = new ConfigEntry.Builder<Boolean>()
+							.set(false)
+							.comment(""
+									+ "For internal testing:\n"
+									+ "Skips loading adjacent LODs to significantly reduce load times (~5x)\n"
+									+ "but causes lighting on LOD borders to appear as full-bright\n"
+									+ "and other graphical bugs.\n"
+									+ "")
+							.addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE)
+							.build();
 				}
 				
 			}
 			
 			public static class AutoUpdater
 			{
+				public static ConfigUIComment autoUpdaterHeader = new ConfigUIComment.Builder().setParentConfigClass(AutoUpdater.class).build();
+				
 				public static ConfigEntry<Boolean> enableAutoUpdater = new ConfigEntry.Builder<Boolean>()
 						.set(!isRunningInDevEnvironment())
 						.comment(""
@@ -862,6 +887,8 @@ public class Config
 			
 			public static class Multiplayer
 			{
+				public static ConfigUIComment multiplayerHeader = new ConfigUIComment.Builder().setParentConfigClass(Multiplayer.class).build();
+				
 				public static ConfigEntry<EDhApiServerFolderNameMode> serverFolderNameMode = new ConfigEntry.Builder<EDhApiServerFolderNameMode>()
 						.set(EDhApiServerFolderNameMode.NAME_ONLY)
 						.comment(""
@@ -878,6 +905,8 @@ public class Config
 			
 			public static class Debugging
 			{
+				public static ConfigUIComment debuggingHeader = new ConfigUIComment.Builder().setParentConfigClass(Debugging.class).build();
+				
 				public static ConfigEntry<EDhApiRendererMode> rendererMode = new ConfigEntry.Builder<EDhApiRendererMode>()
 						.set(EDhApiRendererMode.DEFAULT)
 						.comment(""
@@ -898,6 +927,7 @@ public class Config
 								+ EDhApiDebugRendering.SHOW_BLOCK_MATERIAL + ": LODs' color will be based on their material. \n"
 								+ EDhApiDebugRendering.SHOW_OVERLAPPING_QUADS + ": LODs will be drawn with total white, but overlapping quads will be drawn with red. \n"
 								+ "")
+						.addListener(ReloadLodsConfigEventHandler.DELAYED_INSTANCE)
 						.build();
 				
 				public static ConfigEntry<Boolean> lodOnlyMode = new ConfigEntry.Builder<Boolean>()
@@ -965,6 +995,8 @@ public class Config
 				
 				public static class DebugWireframe
 				{
+					public static ConfigUIComment debugWireframeHeader = new ConfigUIComment.Builder().setParentConfigClass(DebugWireframe.class).build();
+					
 					public static ConfigEntry<Boolean> enableRendering = new ConfigEntry.Builder<Boolean>()
 							.set(false)
 							.comment(""
@@ -1014,6 +1046,8 @@ public class Config
 				
 				public static class OpenGl
 				{
+					public static ConfigUIComment openGlHeader = new ConfigUIComment.Builder().setParentConfigClass(OpenGl.class).build();
+					
 					public static ConfigEntry<Boolean> overrideVanillaGLLogger = new ConfigEntry.Builder<Boolean>()
 							.set(true)
 							.comment(""
@@ -1049,11 +1083,10 @@ public class Config
 									+ "")
 							.build();
 					
-					public static ConfigEntry<Boolean> validateBufferIdsBeforeRendering = new ConfigEntry.Builder<Boolean>()
+					public static ConfigEntry<EDhApiGpuUploadMethod> glUploadMode = new ConfigEntry.Builder<EDhApiGpuUploadMethod>()
-							.set(false)
+							.set(EDhApiGpuUploadMethod.AUTO)
 							.comment(""
-									+ "Massively reduces FPS. \n"
+									+ "\n"
-									+ "Should only be used if mysterious EXCEPTION_ACCESS_VIOLATION crashes are happening in DH's rendering code for troubleshooting. \n"
 									+ "")
 							.build();
 					
@@ -1061,50 +1094,54 @@ public class Config
 				
 				public static class ColumnBuilderDebugging
 				{
+					public static ConfigUIComment columnBuilderDebuggingHeader = new ConfigUIComment.Builder().setParentConfigClass(ColumnBuilderDebugging.class).build();
+					
 					public static ConfigEntry<Boolean> columnBuilderDebugEnable = new ConfigEntry.Builder<Boolean>()
 							.set(false)
 							.setAppearance(EConfigEntryAppearance.ONLY_IN_GUI)
-							.addListener(ReloadLodsConfigEventHandler.INSTANCE)
+							.addListener(ReloadLodsConfigEventHandler.INSTANT_INSTANCE)
 							.build();
 					public static ConfigEntry<Integer> columnBuilderDebugDetailLevel = new ConfigEntry.Builder<Integer>()
 							.set((int) DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL)
 							.setAppearance(EConfigEntryAppearance.ONLY_IN_GUI)
-							.addListener(ReloadLodsConfigEventHandler.INSTANCE)
+							.addListener(ReloadLodsConfigEventHandler.INSTANT_INSTANCE)
 							.build();
 					public static ConfigEntry<Integer> columnBuilderDebugXPos = new ConfigEntry.Builder<Integer>()
 							.set(0)
 							.setAppearance(EConfigEntryAppearance.ONLY_IN_GUI)
-							.addListener(ReloadLodsConfigEventHandler.INSTANCE)
+							.addListener(ReloadLodsConfigEventHandler.INSTANT_INSTANCE)
 							.build();
 					public static ConfigEntry<Integer> columnBuilderDebugZPos = new ConfigEntry.Builder<Integer>()
 							.set(0)
 							.setAppearance(EConfigEntryAppearance.ONLY_IN_GUI)
-							.addListener(ReloadLodsConfigEventHandler.INSTANCE)
+							.addListener(ReloadLodsConfigEventHandler.INSTANT_INSTANCE)
 							.build();
 					
 					public static ConfigEntry<Integer> columnBuilderDebugXRow = new ConfigEntry.Builder<Integer>()
 							.set(-1)
 							.setAppearance(EConfigEntryAppearance.ONLY_IN_GUI)
-							.addListener(ReloadLodsConfigEventHandler.INSTANCE)
+							.addListener(ReloadLodsConfigEventHandler.INSTANT_INSTANCE)
 							.build();
 					public static ConfigEntry<Integer> columnBuilderDebugZRow = new ConfigEntry.Builder<Integer>()
 							.set(-1)
 							.setAppearance(EConfigEntryAppearance.ONLY_IN_GUI)
-							.addListener(ReloadLodsConfigEventHandler.INSTANCE)
+							.addListener(ReloadLodsConfigEventHandler.INSTANT_INSTANCE)
 							.build();
 					public static ConfigEntry<Integer> columnBuilderDebugColumnIndex = new ConfigEntry.Builder<Integer>()
 							.set(-1)
 							.setAppearance(EConfigEntryAppearance.ONLY_IN_GUI)
-							.addListener(ReloadLodsConfigEventHandler.INSTANCE)
+							.addListener(ReloadLodsConfigEventHandler.INSTANT_INSTANCE)
 							.build();
 					
 				}
 				
 				public static class F3Screen
 				{
+					public static ConfigUIComment f3ScreenHeader = new ConfigUIComment.Builder().setParentConfigClass(F3Screen.class).build();
+					
 					public static ConfigEntry<Boolean> showPlayerPos = new ConfigEntry.Builder<Boolean>()
 							.set(true)
-							.comment("Shows info about each thread pool.")
+							.comment("Shows the player's LOD position.")
 							.build();
 					public static ConfigEntry<Integer> playerPosSectionDetailLevel = new ConfigEntry.Builder<Integer>()
 							.setMinDefaultMax(6, 6, 16)
@@ -1145,8 +1182,10 @@ public class Config
 				// This will throw a warning when opened in the default ui to tell you about it not showing
 				public static class ExampleConfigScreen
 				{
+					public static ConfigUIComment exampleConfigHeader = new ConfigUIComment.Builder().setParentConfigClass(ExampleConfigScreen.class).build();
+					
 					// Defined in the lang, just a note about this screen
-					public static ConfigUIComment debugConfigScreenNote = new ConfigUIComment();
+					public static ConfigUIComment debugConfigScreenNote = new ConfigUIComment.Builder().setTextPosition(EConfigCommentTextPosition.CENTER_OF_SCREEN).build();
 					
 					public static ConfigEntry<Boolean> boolTest = new ConfigEntry.Builder<Boolean>()
 							.set(false)
@@ -1154,6 +1193,7 @@ public class Config
 					
 					public static ConfigEntry<Byte> byteTest = new ConfigEntry.Builder<Byte>()
 							.set((byte) 8)
+							.setAppearance(EConfigEntryAppearance.ONLY_IN_FILE) // no GUI renderer set up currently
 							.build();
 					
 					public static ConfigEntry<Integer> intTest = new ConfigEntry.Builder<Integer>()
@@ -1166,14 +1206,17 @@ public class Config
 					
 					public static ConfigEntry<Short> shortTest = new ConfigEntry.Builder<Short>()
 							.set((short) 69)
+							.setAppearance(EConfigEntryAppearance.ONLY_IN_FILE) // no GUI renderer set up currently
 							.build();
 					
 					public static ConfigEntry<Long> longTest = new ConfigEntry.Builder<Long>()
 							.set(42069L)
+							.setAppearance(EConfigEntryAppearance.ONLY_IN_FILE) // no GUI renderer set up currently
 							.build();
 					
 					public static ConfigEntry<Float> floatTest = new ConfigEntry.Builder<Float>()
 							.set(0.42069f)
+							.setAppearance(EConfigEntryAppearance.ONLY_IN_FILE) // no GUI renderer set up currently
 							.build();
 					
 					public static ConfigEntry<String> stringTest = new ConfigEntry.Builder<String>()
@@ -1182,10 +1225,12 @@ public class Config
 					
 					public static ConfigEntry<List<String>> listTest = new ConfigEntry.Builder<List<String>>()
 							.set(new ArrayList<String>(Arrays.asList("option 1", "option 2", "option 3")))
+							.setAppearance(EConfigEntryAppearance.ONLY_IN_FILE) // no GUI renderer set up currently
 							.build();
 					
 					public static ConfigEntry<Map<String, String>> mapTest = new ConfigEntry.Builder<Map<String, String>>()
 							.set(new HashMap<String, String>())
+							.setAppearance(EConfigEntryAppearance.ONLY_IN_FILE) // no GUI renderer set up currently
 							.build();
 					
 					public static ConfigUIButton uiButtonTest = new ConfigUIButton(() -> 
@@ -1229,6 +1274,8 @@ public class Config
 	{
 		public static class WorldGenerator
 		{
+			public static ConfigUIComment worldGeneratorHeader = new ConfigUIComment.Builder().setParentConfigClass(WorldGenerator.class).build();
+			
 			public static ConfigEntry<Boolean> enableDistantGeneration = new ConfigEntry.Builder<Boolean>()
 					.setChatCommandName("generation.enable")
 					.set(true)
@@ -1282,7 +1329,7 @@ public class Config
 					.build();
 			
 			public static ConfigEntry<EDhApiDistantGeneratorProgressDisplayLocation> showGenerationProgress = new ConfigEntry.Builder<EDhApiDistantGeneratorProgressDisplayLocation>()
-					.set(EDhApiDistantGeneratorProgressDisplayLocation.OVERLAY)
+					.set(EDhApiDistantGeneratorProgressDisplayLocation.DISABLED)
 					.comment(""
 							+ "How should distant generator progress be displayed? \n"
 							+ "\n"
@@ -1309,10 +1356,21 @@ public class Config
 							+ "")
 					.build();
 			
+			public static ConfigEntry<Boolean> generationProgressIncludeChunksPerSecond = new ConfigEntry.Builder<Boolean>()
+					.set(true)
+					.comment(""
+							+ "When logging generation progress also include the rate at which chunks \n"
+							+ "are being generated. \n"
+							+ "This can be useful for troubleshooting performance. \n"
+							+ "")
+					.build();
+			
 		}
 		
 		public static class LodBuilding
 		{
+			public static ConfigUIComment lodBuildingHeader = new ConfigUIComment.Builder().setParentConfigClass(LodBuilding.class).build();
+			
 			public static ConfigEntry<Boolean> disableUnchangedChunkCheck = new ConfigEntry.Builder<Boolean>()
 					.set(false)
 					// enabling this can be quite detrimental to performance,
@@ -1332,7 +1390,7 @@ public class Config
 					.build();
 			
 			public static ConfigEntry<EDhApiDataCompressionMode> dataCompression = new ConfigEntry.Builder<EDhApiDataCompressionMode>()
-					.set(EDhApiDataCompressionMode.LZMA2)
+					.set(EDhApiDataCompressionMode.Z_STD)
 					.comment(""
 							+ "What algorithm should be used to compress new LOD data? \n"
 							+ "This setting will only affect new or updated LOD data, \n"
@@ -1342,20 +1400,26 @@ public class Config
 							+ EDhApiDataCompressionMode.UNCOMPRESSED + " \n"
 							+ "Should only be used for testing, is worse in every way vs ["+EDhApiDataCompressionMode.LZ4+"].\n"
 							+ "Expected Compression Ratio: 1.0\n"
-							+ "Estimated average DTO read speed: 1.64 milliseconds\n"
+							+ "Estimated average DTO read speed: 6.09 milliseconds\n"
-							+ "Estimated average DTO write speed: 12.44 milliseconds\n"
+							+ "Estimated average DTO write speed: 6.01 milliseconds\n"
 							+ "\n"
 							+ EDhApiDataCompressionMode.LZ4 + " \n"
 							+ "A good option if you're CPU limited and have plenty of hard drive space.\n"
-							+ "Expected Compression Ratio: 0.36\n"
+							+ "Expected Compression Ratio: 0.4513\n"
-							+ "Estimated average DTO read speed: 1.85 ms\n"
+							+ "Estimated average DTO read speed: 3.25 ms\n"
-							+ "Estimated average DTO write speed: 9.46 ms\n"
+							+ "Estimated average DTO write speed: 5.99 ms\n"
+							+ "\n"
+							+ EDhApiDataCompressionMode.Z_STD + " \n"
+							+ "A good option if you're CPU limited and have plenty of hard drive space.\n"
+							+ "Expected Compression Ratio: 0.2606\n"
+							+ "Estimated average DTO read speed: 9.31 ms\n"
+							+ "Estimated average DTO write speed: 15.13 ms\n"
 							+ "\n"
 							+ EDhApiDataCompressionMode.LZMA2 + " \n"
 							+ "Slow but very good compression.\n"
-							+ "Expected Compression Ratio: 0.14\n"
+							+ "Expected Compression Ratio: 0.2\n"
-							+ "Estimated average DTO read speed: 11.89 ms\n"
+							+ "Estimated average DTO read speed: 13.29 ms\n"
-							+ "Estimated average DTO write speed: 192.01 ms\n"
+							+ "Estimated average DTO write speed: 70.95 ms\n"
 							+ "")
 					.build();
 			
@@ -1428,6 +1492,8 @@ public class Config
 			
 			public static class Experimental
 			{
+				public static ConfigUIComment experimentalHeader = new ConfigUIComment.Builder().setParentConfigClass(Experimental.class).build();
+				
 				public static ConfigEntry<Boolean> upsampleLowerDetailLodsToFillHoles = new ConfigEntry.Builder<Boolean>()
 						.set(false)
 						.comment(""
@@ -1450,6 +1516,8 @@ public class Config
 		
 		public static class MultiThreading
 		{
+			public static ConfigUIComment multiThreadingHeader = new ConfigUIComment.Builder().setParentConfigClass(MultiThreading.class).build();
+			
 			public static final ConfigEntry<Integer> numberOfThreads = new ConfigEntry.Builder<Integer>()
 					.setChatCommandName("threading.numberOfThreads")
 					.setMinDefaultMax(1,
@@ -1478,49 +1546,76 @@ public class Config
 		
 		public static class Logging
 		{
-			// TODO add change all option
+			public static ConfigUIComment loggingHeader = new ConfigUIComment.Builder().setParentConfigClass(Logging.class).build();
-			// TODO default to error chat and info file
+			
-			public static ConfigEntry<EDhApiLoggerMode> logWorldGenEvent = new ConfigEntry.Builder<EDhApiLoggerMode>()
+			
+			public static ConfigEntry<EDhApiLoggerLevel> globalFileMaxLevel = new ConfigEntry.Builder<EDhApiLoggerLevel>()
+					.setChatCommandName("logging.globalFileMaxLevel")
+					.set(EDhApiLoggerLevel.INFO)
+					.comment(""
+							+ ""
+							+ "")
+					.build();
+			
+			public static ConfigEntry<EDhApiLoggerLevel> globalChatMaxLevel = new ConfigEntry.Builder<EDhApiLoggerLevel>()
+					.setChatCommandName("logging.globalChatMaxLevel")
+					.set(EDhApiLoggerLevel.ERROR)
+					.comment(""
+							+ ""
+							+ "")
+					.build();
+			
+			public static ConfigUISpacer globalLoggingSpacer = new ConfigUISpacer.Builder().build();
+			
+			
+			public static ConfigEntry<EDhApiLoggerLevel> logWorldGenEventToFile = new ConfigEntry.Builder<EDhApiLoggerLevel>()
 					.setChatCommandName("logging.logWorldGenEvent")
-					.set(EDhApiLoggerMode.LOG_ERROR_TO_CHAT_AND_INFO_TO_FILE)
+					.set(EDhApiLoggerLevel.INFO)
 					.comment(""
 							+ "If enabled, the mod will log information about the world generation process. \n"
 							+ "This can be useful for debugging.")
 					.build();
 			
-			public static ConfigEntry<EDhApiLoggerMode> logWorldGenPerformance = new ConfigEntry.Builder<EDhApiLoggerMode>()
+			public static ConfigEntry<EDhApiLoggerLevel> logWorldGenPerformanceToFile = new ConfigEntry.Builder<EDhApiLoggerLevel>()
 					.setChatCommandName("logging.logWorldGenPerformance")
-					.set(EDhApiLoggerMode.LOG_ERROR_TO_CHAT_AND_INFO_TO_FILE)
+					.set(EDhApiLoggerLevel.INFO)
 					.comment(""
 							+ "If enabled, the mod will log performance about the world generation process. \n"
 							+ "This can be useful for debugging.")
 					.build();
 			
-			public static ConfigEntry<EDhApiLoggerMode> logWorldGenLoadEvent = new ConfigEntry.Builder<EDhApiLoggerMode>()
+			public static ConfigEntry<EDhApiLoggerLevel> logWorldGenChunkLoadEventToFile = new ConfigEntry.Builder<EDhApiLoggerLevel>()
 					.setChatCommandName("logging.logWorldGenLoadEvent")
-					.set(EDhApiLoggerMode.LOG_ERROR_TO_CHAT_AND_INFO_TO_FILE)
+					.set(EDhApiLoggerLevel.INFO)
 					.comment(""
 							+ "If enabled, the mod will log information about the world generation process. \n"
 							+ "This can be useful for debugging.")
 					.build();
 			
-			public static ConfigEntry<EDhApiLoggerMode> logRendererBufferEvent = new ConfigEntry.Builder<EDhApiLoggerMode>()
+			public static ConfigEntry<EDhApiLoggerLevel> logRendererEventToFile = new ConfigEntry.Builder<EDhApiLoggerLevel>()
-					.set(EDhApiLoggerMode.LOG_ERROR_TO_CHAT_AND_INFO_TO_FILE)
+					.set(EDhApiLoggerLevel.INFO)
 					.comment(""
-							+ "If enabled, the mod will log information about the renderer buffer process. \n"
+							+ "If enabled, the mod will log information about the renderer setup, cleanup, and any issues it may encounter. \n"
 							+ "This can be useful for debugging.")
 					.build();
 			
-			public static ConfigEntry<EDhApiLoggerMode> logRendererGLEvent = new ConfigEntry.Builder<EDhApiLoggerMode>()
+			public static ConfigEntry<EDhApiLoggerLevel> logRendererGLEventToFile = new ConfigEntry.Builder<EDhApiLoggerLevel>()
-					.set(EDhApiLoggerMode.LOG_ERROR_TO_CHAT_AND_INFO_TO_FILE)
+					.set(EDhApiLoggerLevel.INFO)
 					.comment(""
 							+ "If enabled, the mod will log information about the renderer OpenGL process. \n"
 							+ "This can be useful for debugging.")
 					.build();
 			
-			public static ConfigEntry<EDhApiLoggerMode> logNetworkEvent = new ConfigEntry.Builder<EDhApiLoggerMode>()
+			public static ConfigEntry<EDhApiLoggerLevel> logRendererGLEventToChat = new ConfigEntry.Builder<EDhApiLoggerLevel>()
+					.set(EDhApiLoggerLevel.ERROR)
+					.comment(""
+							+ "If enabled, the mod will log information about the renderer OpenGL process. \n"
+							+ "This can be useful for debugging.")
+					.build();
+			
+			public static ConfigEntry<EDhApiLoggerLevel> logNetworkEventToFile = new ConfigEntry.Builder<EDhApiLoggerLevel>()
 					.setChatCommandName("logging.logNetworkEvent")
-					.set(EDhApiLoggerMode.LOG_ERROR_TO_CHAT_AND_INFO_TO_FILE)
+					.set(EDhApiLoggerLevel.INFO)
 					.comment(""
 							+ "If enabled, the mod will log information about network operations. \n"
 							+ "This can be useful for debugging.")
@@ -1532,6 +1627,7 @@ public class Config
 			
 			public static class Warning
 			{
+				public static ConfigUIComment warningHeader = new ConfigUIComment.Builder().setParentConfigClass(Warning.class).build();
 				
 				public static ConfigEntry<Boolean> showLowMemoryWarningOnStartup = new ConfigEntry.Builder<Boolean>()
 						.set(true)
@@ -1599,6 +1695,28 @@ public class Config
 						+ "")
 				.build();
 		
+		public static ConfigEntry<Integer> serverId = new ConfigEntry.Builder<Integer>()
+				.set(new Random().nextInt())
+				.setAppearance(EConfigEntryAppearance.ONLY_IN_FILE)
+				.comment(""
+						+ "DO NOT CHANGE UNLESS YOU KNOW WHAT YOU'RE DOING.\n"
+						+ "Autogenerated ID used to prevent multiple independent servers from accidentally\n"
+						+ "writing over each other's LODs when the same serverKey is set on both.\n"
+						+ "")
+				.build();
+		
+		public static ConfigEntry<String> serverKey = new ConfigEntry.Builder<String>()
+				.setChatCommandName("levelKeys.serverKey")
+				.setAppearance(EConfigEntryAppearance.ONLY_IN_FILE)
+				.set("")
+				.comment(""
+						+ "Custom server key used which can be used to always reuse the same LOD data folder,\n"
+						+ "for cases when the server doesn't have a static IP for some reason.\n"
+						+ "If this value is empty, the client itself decides which folder name to use.\n"
+						+ "Requires rejoining the server to apply after changing.\n"
+						+ "")
+				.build();
+		
 		public static ConfigEntry<String> levelKeyPrefix = new ConfigEntry.Builder<String>()
 				.setChatCommandName("levelKeys.prefix")
 				.set("")
@@ -1626,7 +1744,6 @@ public class Config
 				.comment("" +
 						"Defines the distance allowed to generate around the player." +
 						"")
-				.setPerformance(EConfigEntryPerformance.HIGH)
 				.build();
 		
 		public static ConfigEntry<Integer> generationBoundsX = new ConfigEntry.Builder<Integer>()
@@ -1671,7 +1788,6 @@ public class Config
 				.comment("" +
 						"Defines the distance the player will receive updates around." +
 						"")
-				.setPerformance(EConfigEntryPerformance.HIGH)
 				.build();
 		
 		
@@ -1700,19 +1816,35 @@ public class Config
 						"Defines the distance allowed to be synchronized around the player. \n" +
 						"Should be the same or larger than maxGenerationRequestDistance in most cases." +
 						"")
-				.setPerformance(EConfigEntryPerformance.HIGH)
 				.build();
 		
 		
 		// Common
-		public static ConfigEntry<Integer> maxDataTransferSpeed = new ConfigEntry.Builder<Integer>()
+		public static ConfigEntry<Integer> playerBandwidthLimit = new ConfigEntry.Builder<Integer>()
-				.setChatCommandName("common.maxDataTransferSpeed")
+				.setChatCommandName("common.playerBandwidthLimit")
 				.setMinDefaultMax(0, 500, 1000000 /* 1 GB/s */)
 				.comment(""
-						+ "Maximum speed for uploading LODs to the clients, in KB/s.\n"
+						+ "Maximum per-player speed for uploading LODs to the clients, in KB/s.\n"
 						+ "Value of 0 disables the limit."
 						+ "")
 				.build();
+		public static ConfigEntry<Integer> globalBandwidthLimit = new ConfigEntry.Builder<Integer>()
+				.setChatCommandName("common.globalBandwidthLimit")
+				.setMinDefaultMax(0, 0, 10000000 /* 10 GB/s */)
+				.comment(""
+						+ "Maximum global speed for uploading LODs to the clients, in KB/s.\n"
+						+ "Value of 0 disables the limit."
+						+ "")
+				.build();
+		public static ConfigEntry<Boolean> enableAdaptiveTransferSpeed = new ConfigEntry.Builder<Boolean>()
+				.set(false)
+				.comment(""
+						+ "Enables adaptive transfer speed based on client performance.\n"
+						+ "If true, DH will automatically adjust transfer rate to minimize connection lag.\n"
+						+ "If false, transfer speed will remain fixed.\n"
+						+ "")
+				.build();
+		
 		
 		public static ConfigCategory experimental = new ConfigCategory.Builder().set(Experimental.class).build();
 		
@@ -1757,12 +1889,10 @@ public class Config
 			
 			try
 			{
-				// TODO automatically get all instances of AbstractPresetConfigEventHandler and fire "setUiOnlyConfigValues"
 				ThreadPresetConfigEventHandler.INSTANCE.setUiOnlyConfigValues();
 				RenderQualityPresetConfigEventHandler.INSTANCE.setUiOnlyConfigValues();
 				QuickRenderToggleConfigEventHandler.INSTANCE.setUiOnlyConfigValues();
 				QuickShowWorldGenProgressConfigEventHandler.INSTANCE.setUiOnlyConfigValues();
-				RenderCacheConfigEventHandler.getInstance();
 			}
 			catch (Exception e)
 			{

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

@@ -1,275 +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.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/ConfigHandler.java

@@ -0,0 +1,331 @@
+/*
+ *    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/ConfigPresetOptions.java

@@ -24,7 +24,7 @@ import com.seibel.distanthorizons.core.config.types.ConfigEntry;
 import java.util.HashMap;
 import java.util.HashSet;
 
-public class ConfigEntryWithPresetOptions<TQuickEnum, TConfig>
+public class ConfigPresetOptions<TQuickEnum, TConfig>
 {
 	public final ConfigEntry<TConfig> configEntry;
 	
@@ -32,7 +32,11 @@ public class ConfigEntryWithPresetOptions<TQuickEnum, TConfig>
 	
 	
 	
-	public ConfigEntryWithPresetOptions(ConfigEntry<TConfig> configEntry, HashMap<TQuickEnum, TConfig> configOptionByQualityOption)
+	//=============//
+	// constructor //
+	//=============//
+	
+	public ConfigPresetOptions(ConfigEntry<TConfig> configEntry, HashMap<TQuickEnum, TConfig> configOptionByQualityOption)
 	{
 		this.configEntry = configEntry;
 		this.configOptionByQualityOption = configOptionByQualityOption;
@@ -40,6 +44,10 @@ public class ConfigEntryWithPresetOptions<TQuickEnum, TConfig>
 	
 	
 	
+	//=========//
+	// methods //
+	//=========//
+	
 	public void updateConfigEntry(TQuickEnum quickQuality)
 	{
 		TConfig newValue = this.configOptionByQualityOption.get(quickQuality);
@@ -48,7 +56,9 @@ public class ConfigEntryWithPresetOptions<TQuickEnum, TConfig>
 	
 	public HashSet<TQuickEnum> getPossibleQualitiesFromCurrentOptionValue()
 	{
-		TConfig inputOptionValue = this.configEntry.get();
+		// 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();
 		HashSet<TQuickEnum> possibleQualities = new HashSet<>();
 		
 		for (TQuickEnum key : this.configOptionByQualityOption.keySet())

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

@@ -17,12 +17,12 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.distanthorizons.api.objects.config;
+package com.seibel.distanthorizons.core.config.api;
 
 import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
-import com.seibel.distanthorizons.coreapi.interfaces.config.IConfigEntry;
+import com.seibel.distanthorizons.core.config.types.ConfigEntry;
 import com.seibel.distanthorizons.coreapi.interfaces.config.IConverter;
-import com.seibel.distanthorizons.coreapi.util.converters.DefaultConverter;
+import com.seibel.distanthorizons.core.config.api.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 IConfigEntry<coreType> configEntry;
+	private final ConfigEntry<coreType> configBase;
 	
 	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(IConfigEntry<coreType> newConfigEntry)
+	public DhApiConfigValue(ConfigEntry<coreType> configBase)
 	{
-		this.configEntry = newConfigEntry;
+		this.configBase = configBase;
 		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(IConfigEntry<coreType> newConfigEntry, IConverter<coreType, apiType> newConverter)
+	public DhApiConfigValue(ConfigEntry<coreType> configBase, IConverter<coreType, apiType> newConverter)
 	{
-		this.configEntry = newConfigEntry;
+		this.configBase = configBase;
 		this.configConverter = newConverter;
 	}
 	
 	
-	public apiType getValue() { return this.configConverter.convertToApiType(this.configEntry.get()); }
+	public apiType getValue() { return this.configConverter.convertToApiType(this.configBase.get()); }
-	public apiType getTrueValue() { return this.configConverter.convertToApiType(this.configEntry.getTrueValue()); }
+	public apiType getTrueValue() { return this.configConverter.convertToApiType(this.configBase.getTrueValue()); }
-	public apiType getApiValue() { return this.configConverter.convertToApiType(this.configEntry.getApiValue()); }
+	public apiType getApiValue() { return this.configConverter.convertToApiType(this.configBase.getApiValue()); }
 	
 	public boolean setValue(apiType newValue)
 	{
-		if (this.configEntry.getAllowApiOverride())
+		if (this.configBase.getAllowApiOverride())
 		{
-			this.configEntry.setApiValue(this.configConverter.convertToCoreType(newValue));
+			this.configBase.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.configEntry.getAllowApiOverride())
+		if (this.configBase.getAllowApiOverride())
 		{
 			// no converter should be used here since null objects may need to be handled differently
 			// TODO the API should just have a bool to keep track of whether the API value is in use instead of using NULL
-			this.configEntry.setApiValue(null);
+			this.configBase.setApiValue(null);
 			return true;
 		}
 		else
@@ -102,16 +102,16 @@ public class DhApiConfigValue<coreType, apiType> implements IDhApiConfigValue<ap
 		}
 	}
 	
-	public boolean getCanBeOverrodeByApi() { return this.configEntry.getAllowApiOverride(); }
+	public boolean getCanBeOverrodeByApi() { return this.configBase.getAllowApiOverride(); }
 	
-	public apiType getDefaultValue() { return this.configConverter.convertToApiType(this.configEntry.getDefaultValue()); }
+	public apiType getDefaultValue() { return this.configConverter.convertToApiType(this.configBase.getDefaultValue()); }
-	public apiType getMaxValue() { return this.configConverter.convertToApiType(this.configEntry.getMax()); }
+	public apiType getMaxValue() { return this.configConverter.convertToApiType(this.configBase.getMax()); }
-	public apiType getMinValue() { return this.configConverter.convertToApiType(this.configEntry.getMin()); }
+	public apiType getMinValue() { return this.configConverter.convertToApiType(this.configBase.getMin()); }
 	
 	
 	public void addChangeListener(Consumer<apiType> onValueChangeFunc) 
 	{
-		this.configEntry.addValueChangeListener((coreValue) -> 
+		this.configBase.addValueChangeListener((coreValue) -> 
 		{
 			apiType apiValue = this.configConverter.convertToApiType(coreValue);
 			onValueChangeFunc.accept(apiValue);

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

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

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

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

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

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.distanthorizons.coreapi.util.converters;
+package com.seibel.distanthorizons.core.config.api.converters;
 
 import com.seibel.distanthorizons.api.enums.rendering.EDhApiRendererMode;
 import com.seibel.distanthorizons.coreapi.interfaces.config.IConverter;
@@ -31,14 +31,12 @@ import com.seibel.distanthorizons.coreapi.interfaces.config.IConverter;
 public class RenderModeEnabledConverter implements IConverter<EDhApiRendererMode, Boolean>
 {
 	
-	@Override public EDhApiRendererMode convertToCoreType(Boolean renderingEnabled)
+	@Override 
-	{
+	public EDhApiRendererMode convertToCoreType(Boolean renderingEnabled)
-		return renderingEnabled ? EDhApiRendererMode.DEFAULT : EDhApiRendererMode.DISABLED;
+	{ return renderingEnabled ? EDhApiRendererMode.DEFAULT : EDhApiRendererMode.DISABLED; }
-	}
 	
-	@Override public Boolean convertToApiType(EDhApiRendererMode renderingMode)
+	@Override 
-	{
+	public Boolean convertToApiType(EDhApiRendererMode renderingMode)
-		return renderingMode == EDhApiRendererMode.DEFAULT;
+	{ return renderingMode == EDhApiRendererMode.DEFAULT; }
-	}
 	
 }

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

@@ -22,13 +22,77 @@ 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
 {
-	public static ReloadLodsConfigEventHandler INSTANCE = new ReloadLodsConfigEventHandler();
+	/** 
+	 * 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 //
+	//========//
 	
 	@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)
@@ -37,4 +101,5 @@ public class ReloadLodsConfigEventHandler implements IConfigListener
 		}
 	}
 	
+	
 }

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

@@ -1,114 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.core.config.eventHandlers;
-
-import com.seibel.distanthorizons.api.DhApi;
-import com.seibel.distanthorizons.api.enums.config.*;
-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,23 +20,22 @@
 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.ConfigBase;
+import com.seibel.distanthorizons.core.config.ConfigHandler;
-import com.seibel.distanthorizons.core.config.ConfigEntryWithPresetOptions;
+import com.seibel.distanthorizons.core.config.ConfigPresetOptions;
 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 org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
 
 public abstract class AbstractPresetConfigEventHandler<TPresetEnum extends Enum<?>> implements IConfigListener
 {
-	private static final Logger LOGGER = LogManager.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	private static final long MS_DELAY_BEFORE_APPLYING_PRESET = 3_000;
 	
 	@Nullable
-	private static IConfigGui configGui = SingletonInjector.INSTANCE.get(IConfigGui.class);
+	private static final IConfigGui CONFIG_GUI = SingletonInjector.INSTANCE.get(IConfigGui.class);
-	private static boolean guiListenersAdded = false;
 	
-	protected final ArrayList<ConfigEntryWithPresetOptions<TPresetEnum, ?>> configList = new ArrayList<>();
+	protected final ArrayList<ConfigPresetOptions<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 (configGui != null) 
+		if (CONFIG_GUI != null) 
 		{
-			configGui.addOnScreenChangeListener(this::onConfigUiClosed);
+			CONFIG_GUI.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 (!ConfigBase.INSTANCE.isLoaded)
+		if (!ConfigHandler.INSTANCE.isLoaded)
 		{
 			return;
 		}
@@ -140,11 +140,11 @@ public abstract class AbstractPresetConfigEventHandler<TPresetEnum extends Enum<
 		
 		
 		
-		LOGGER.info("changing preset to: " + newPresetEnum);
+		LOGGER.debug("changing preset to: [" + newPresetEnum + "].");
 		this.changingPreset = true;
 		
 		// update the controlled config values
-		for (ConfigEntryWithPresetOptions<TPresetEnum, ?> configEntry : this.configList)
+		for (ConfigPresetOptions<TPresetEnum, ?> configEntry : this.configList)
 		{
 			configEntry.updateConfigEntry(newPresetEnum);
 		}
@@ -152,7 +152,7 @@ public abstract class AbstractPresetConfigEventHandler<TPresetEnum extends Enum<
 		this.setUiOnlyConfigValues();
 		
 		this.changingPreset = false;
-		LOGGER.info("preset active: " + newPresetEnum);
+		LOGGER.debug("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 (ConfigEntryWithPresetOptions<TPresetEnum, ?> configEntry : this.configList)
+		for (ConfigPresetOptions<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 IConfigEntry<TPresetEnum> getPresetConfigEntry();
+	protected abstract AbstractConfigBase<TPresetEnum> getPresetConfigEntry();
 	
 	protected abstract List<TPresetEnum> getPresetEnumList();
 	protected abstract TPresetEnum getCustomPresetEnum();

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

@@ -39,14 +39,17 @@ public class QuickShowWorldGenProgressConfigEventHandler
 		this.quickChangeListener = new ConfigChangeListener<>(Config.Client.quickShowWorldGenProgress, 
 				(val) -> 
 				{
-					Config.Common.WorldGenerator.showGenerationProgress.set(Config.Client.quickShowWorldGenProgress.get() 
+					boolean quickShowProgress = Config.Client.quickShowWorldGenProgress.get();
-							? Config.Common.WorldGenerator.showGenerationProgress.getDefaultValue()
+					Config.Common.WorldGenerator.showGenerationProgress.set(
+							quickShowProgress
+							? EDhApiDistantGeneratorProgressDisplayLocation.OVERLAY
 							: EDhApiDistantGeneratorProgressDisplayLocation.DISABLED); 
 				});
 		this.fullChangeListener = new ConfigChangeListener<>(Config.Common.WorldGenerator.showGenerationProgress, 
 				(val) -> 
 				{
-					Config.Client.quickShowWorldGenProgress.set(Config.Common.WorldGenerator.showGenerationProgress.get() != EDhApiDistantGeneratorProgressDisplayLocation.DISABLED); 
+					boolean showProgress = Config.Common.WorldGenerator.showGenerationProgress.get() != EDhApiDistantGeneratorProgressDisplayLocation.DISABLED;
+					Config.Client.quickShowWorldGenProgress.setWithoutFiringEvents(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.ConfigEntryWithPresetOptions;
+import com.seibel.distanthorizons.core.config.ConfigPresetOptions;
 import com.seibel.distanthorizons.core.config.listeners.ConfigChangeListener;
-import com.seibel.distanthorizons.coreapi.interfaces.config.IConfigEntry;
+import com.seibel.distanthorizons.core.config.types.AbstractConfigBase;
-import org.apache.logging.log4j.LogManager;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 
 import java.util.*;
 
@@ -39,10 +39,10 @@ public class RenderQualityPresetConfigEventHandler extends AbstractPresetConfigE
 {
 	public static final RenderQualityPresetConfigEventHandler INSTANCE = new RenderQualityPresetConfigEventHandler();
 	
-	private static final Logger LOGGER = LogManager.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	
-	private final ConfigEntryWithPresetOptions<EDhApiQualityPreset, EDhApiMaxHorizontalResolution> drawResolution = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.Graphics.Quality.maxHorizontalResolution,
+	private final ConfigPresetOptions<EDhApiQualityPreset, EDhApiMaxHorizontalResolution> drawResolution = new ConfigPresetOptions<>(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 ConfigEntryWithPresetOptions<EDhApiQualityPreset, EDhApiVerticalQuality> verticalQuality = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.Graphics.Quality.verticalQuality,
+	private final ConfigPresetOptions<EDhApiQualityPreset, EDhApiVerticalQuality> verticalQuality = new ConfigPresetOptions<>(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 ConfigEntryWithPresetOptions<EDhApiQualityPreset, EDhApiHorizontalQuality> horizontalQuality = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.Graphics.Quality.horizontalQuality,
+	private final ConfigPresetOptions<EDhApiQualityPreset, EDhApiHorizontalQuality> horizontalQuality = new ConfigPresetOptions<>(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 ConfigEntryWithPresetOptions<EDhApiQualityPreset, EDhApiTransparency> transparency = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.Graphics.Quality.transparency,
+	private final ConfigPresetOptions<EDhApiQualityPreset, EDhApiTransparency> transparency = new ConfigPresetOptions<>(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 ConfigEntryWithPresetOptions<EDhApiQualityPreset, Boolean> ssaoEnabled = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.Graphics.Ssao.enableSsao,
+	private final ConfigPresetOptions<EDhApiQualityPreset, Boolean> ssaoEnabled = new ConfigPresetOptions<>(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 ConfigEntryWithPresetOptions<EDhApiQualityPreset, EDhApiMcRenderingFadeMode> vanillaFade = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.Graphics.Quality.vanillaFadeMode,
+	private final ConfigPresetOptions<EDhApiQualityPreset, EDhApiMcRenderingFadeMode> vanillaFade = new ConfigPresetOptions<>(Config.Client.Advanced.Graphics.Quality.vanillaFadeMode,
 			new HashMap<EDhApiQualityPreset, EDhApiMcRenderingFadeMode>()
 			{{
 				this.put(EDhApiQualityPreset.MINIMUM, EDhApiMcRenderingFadeMode.NONE);
@@ -96,7 +96,16 @@ public class RenderQualityPresetConfigEventHandler extends AbstractPresetConfigE
 				this.put(EDhApiQualityPreset.HIGH, EDhApiMcRenderingFadeMode.DOUBLE_PASS);
 				this.put(EDhApiQualityPreset.EXTREME, EDhApiMcRenderingFadeMode.DOUBLE_PASS);
 			}});
-	private final ConfigEntryWithPresetOptions<EDhApiQualityPreset, Boolean> dhDither = new ConfigEntryWithPresetOptions<>(Config.Client.Advanced.Graphics.Quality.ditherDhFade,
+	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,
 			new HashMap<EDhApiQualityPreset, Boolean>()
 			{{
 				this.put(EDhApiQualityPreset.MINIMUM, false);
@@ -105,6 +114,24 @@ 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,
+			new HashMap<EDhApiQualityPreset, Boolean>()
+			{{
+				this.put(EDhApiQualityPreset.MINIMUM, true);
+				this.put(EDhApiQualityPreset.LOW, true);
+				this.put(EDhApiQualityPreset.MEDIUM, true);
+				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);
+			}});
 		
 	
 	
@@ -121,11 +148,14 @@ 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 (ConfigEntryWithPresetOptions<EDhApiQualityPreset, ?> config : this.configList)
+		for (ConfigPresetOptions<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(); });
@@ -139,7 +169,7 @@ public class RenderQualityPresetConfigEventHandler extends AbstractPresetConfigE
 	//==============//
 	
 	@Override
-	protected IConfigEntry<EDhApiQualityPreset> getPresetConfigEntry() { return Config.Client.qualityPresetSetting; }
+	protected AbstractConfigBase<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,11 +22,12 @@ 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.ConfigEntryWithPresetOptions;
+import com.seibel.distanthorizons.core.config.ConfigPresetOptions;
-import com.seibel.distanthorizons.coreapi.interfaces.config.IConfigEntry;
+import com.seibel.distanthorizons.core.config.types.AbstractConfigBase;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.coreapi.util.MathUtil;
 import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 
 import java.util.Arrays;
 import java.util.HashMap;
@@ -37,11 +38,11 @@ public class ThreadPresetConfigEventHandler extends AbstractPresetConfigEventHan
 {
 	public static final ThreadPresetConfigEventHandler INSTANCE = new ThreadPresetConfigEventHandler();
 	
-	private static final Logger LOGGER = LogManager.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	
 	public static int getDefaultThreadCount() { return getThreadCountByPercent(0.5); }
-	private final ConfigEntryWithPresetOptions<EDhApiThreadPreset, Integer> threadCount = new ConfigEntryWithPresetOptions<>(Config.Common.MultiThreading.numberOfThreads,
+	private final ConfigPresetOptions<EDhApiThreadPreset, Integer> threadCount = new ConfigPresetOptions<>(Config.Common.MultiThreading.numberOfThreads,
 			new HashMap<EDhApiThreadPreset, Integer>()
 			{{
 				this.put(EDhApiThreadPreset.MINIMAL_IMPACT, getThreadCountByPercent(0.1));
@@ -51,7 +52,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 ConfigEntryWithPresetOptions<EDhApiThreadPreset, Double> threadRunTime = new ConfigEntryWithPresetOptions<>(Config.Common.MultiThreading.threadRunTimeRatio,
+	private final ConfigPresetOptions<EDhApiThreadPreset, Double> threadRunTime = new ConfigPresetOptions<>(Config.Common.MultiThreading.threadRunTimeRatio,
 			new HashMap<EDhApiThreadPreset, Double>()
 			{{
 				this.put(EDhApiThreadPreset.MINIMAL_IMPACT, 0.5);
@@ -74,7 +75,7 @@ public class ThreadPresetConfigEventHandler extends AbstractPresetConfigEventHan
 		this.configList.add(this.threadCount);
 		this.configList.add(this.threadRunTime);
 		
-		for (ConfigEntryWithPresetOptions<EDhApiThreadPreset, ?> config : this.configList)
+		for (ConfigPresetOptions<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(); });
@@ -119,7 +120,7 @@ public class ThreadPresetConfigEventHandler extends AbstractPresetConfigEventHan
 	//==============//
 	
 	@Override
-	protected IConfigEntry<EDhApiThreadPreset> getPresetConfigEntry() { return Config.Client.threadPresetSetting; }
+	protected AbstractConfigBase<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/ConfigFileHandler.java

@@ -20,15 +20,15 @@
 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.ConfigBase;
+import com.seibel.distanthorizons.core.config.types.AbstractConfigBase;
-import com.seibel.distanthorizons.core.config.types.AbstractConfigType;
 import com.seibel.distanthorizons.core.config.types.ConfigEntry;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper;
+import com.seibel.distanthorizons.coreapi.ModInfo;
 import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 
 import java.io.IOException;
 import java.nio.file.Files;
@@ -41,17 +41,13 @@ import java.util.concurrent.locks.ReentrantLock;
  * @author coolGi
  * @version 2023-8-26
  */
-public class ConfigFileHandling
+public class ConfigFileHandler
 {
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
-	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;
 	
@@ -64,17 +60,23 @@ public class ConfigFileHandling
 	// constructor //
 	//=============//
 	
-	public ConfigFileHandling(ConfigBase configBase, Path configPath)
+	public ConfigFileHandler(Path configPath)
 	{
-		this.logger = LogManager.getLogger(this.getClass().getSimpleName() + ", " + configBase.modID);
-		this.configBase = configBase;
 		this.configPath = configPath;
 		
-		this.nightConfig = CommentedFileConfig.builder(this.configPath.toFile()).build();
+		this.nightConfig = CommentedFileConfig
+				.builder(this.configPath.toFile())
+				// sync is needed so file reading/writing only happens during locked sections,
+				// otherwise some GUI changes may be lost when changing screens
+				.sync()
+				.build();
 	}
 	
 	
 	
+	//====================//
+	// entire config file //
+	//====================//
 	
 	/** Saves the entire config to the file */
 	public void saveToFile() { this.saveToFile(this.nightConfig); }
@@ -96,7 +98,7 @@ public class ConfigFileHandling
 			this.loadNightConfig(nightConfig);
 			
 			
-			for (AbstractConfigType<?, ?> entry : this.configBase.entries)
+			for (AbstractConfigBase<?> entry : ConfigHandler.INSTANCE.configBaseList)
 			{
 				if (ConfigEntry.class.isAssignableFrom(entry.getClass()))
 				{
@@ -134,7 +136,7 @@ public class ConfigFileHandling
 		{
 			this.readWriteLock.lock();
 			
-			int currentCfgVersion = this.configBase.configVersion;
+			int currentCfgVersion = ModInfo.CONFIG_FILE_VERSION;
 			try
 			{
 				// Dont load the real `this.nightConfig`, instead create a tempoary one
@@ -146,29 +148,29 @@ public class ConfigFileHandling
 			}
 			catch (Exception ignored) { }
 			
-			if (currentCfgVersion == this.configBase.configVersion)
+			if (currentCfgVersion == ModInfo.CONFIG_FILE_VERSION)
 			{
 				// handle normally
 			}
-			else if (currentCfgVersion > this.configBase.configVersion)
+			else if (currentCfgVersion > ModInfo.CONFIG_FILE_VERSION)
 			{
-				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");
+				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");
 			}
 			else // if (currentCfgVersion < configBase.configVersion)
 			{
-				this.logger.warn(this.configBase.modName + " config is of an older version, currently there is no config updater... so resetting config");
+				LOGGER.warn(ModInfo.NAME + " config is of an older version, currently there is no config updater... so resetting config");
 				try
 				{
 					Files.delete(this.configPath);
 				}
 				catch (Exception e)
 				{
-					this.logger.error(e);
+					LOGGER.error("Unable to delete outdated config file at: ["+this.configPath+"], error: ["+e.getMessage()+"].", e);
 				}
 			}
 			
 			this.loadFromFile(this.nightConfig);
-			this.nightConfig.set("_version", this.configBase.configVersion);
+			this.nightConfig.set("_version", ModInfo.CONFIG_FILE_VERSION);
 		}
 		finally
 		{
@@ -194,7 +196,7 @@ public class ConfigFileHandling
 		
 		
 		// Load all the entries
-		for (AbstractConfigType<?, ?> entry : this.configBase.entries)
+		for (AbstractConfigBase<?> entry : ConfigHandler.INSTANCE.configBaseList)
 		{
 			if (ConfigEntry.class.isAssignableFrom(entry.getClass())
 				&& entry.getAppearance().showInFile)
@@ -218,6 +220,9 @@ public class ConfigFileHandling
 	
 	
 	
+	//=======================//
+	// single config entries //
+	//=======================//
 	
 	// Save an entry when only given the entry
 	public void saveEntry(ConfigEntry<?> entry)
@@ -235,10 +240,10 @@ public class ConfigFileHandling
 		else if (entry.getTrueValue() == null)
 		{
 			// TODO when can this happen?
-			throw new IllegalArgumentException("Entry [" + entry.getNameWCategory() + "] is null, this may be a problem with [" + this.configBase.modName + "]. Please contact the authors.");
+			throw new IllegalArgumentException("BlockBiomeWrapperPair [" + entry.getNameAndCategory() + "] is null, this may be a problem with [" + ModInfo.NAME + "]. Please contact the authors.");
 		}
 		
-		workConfig.set(entry.getNameWCategory(), ConfigTypeConverters.attemptToConvertToString(entry.getType(), entry.getTrueValue()));
+		workConfig.set(entry.getNameAndCategory(), ConfigTypeConverters.attemptToConvertToString(entry.getType(), entry.getTrueValue()));
 	}
 	
 	/** Loads an entry when only given the entry */
@@ -248,9 +253,11 @@ public class ConfigFileHandling
 	public <T> void loadEntry(ConfigEntry<T> entry, CommentedFileConfig nightConfig)
 	{
 		if (!entry.getAppearance().showInFile)
+		{
 			return;
+		}
 		
-		if (!nightConfig.contains(entry.getNameWCategory()))
+		if (!nightConfig.contains(entry.getNameAndCategory()))
 		{
 			this.saveEntry(entry, nightConfig);
 			return;
@@ -261,34 +268,33 @@ public class ConfigFileHandling
 		{
 			if (entry.getType().isEnum())
 			{
-				entry.pureSet((T) (nightConfig.getEnum(entry.getNameWCategory(), (Class<? extends Enum>) entry.getType())));
+				entry.setWithoutFiringEvents((T) (nightConfig.getEnum(entry.getNameAndCategory(), (Class<? extends Enum>) entry.getType())));
 				return;
 			}
 			
 			// try converting the value if necessary
 			Class<?> expectedValueClass = entry.getType();
-			Object value = nightConfig.get(entry.getNameWCategory());
+			Object value = nightConfig.get(entry.getNameAndCategory());
 			Object convertedValue = ConfigTypeConverters.attemptToConvertFromString(expectedValueClass, value);
 			if (!convertedValue.getClass().equals(expectedValueClass))
 			{
-				this.logger.error("Unable to convert config value ["+value+"] from ["+(value != null ? value.getClass() : "NULL")+"] to ["+expectedValueClass+"] for config ["+entry.name+"], " +
+				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.pureSet((T) convertedValue);
+			entry.setWithoutFiringEvents((T) convertedValue);
 			
 			if (entry.getTrueValue() == null) 
 			{
-				this.logger.warn("Entry [" + entry.getNameWCategory() + "] returned as null from the config. Using default value.");
+				LOGGER.warn("BlockBiomeWrapperPair [" + entry.getNameAndCategory() + "] returned as null from the config. Using default value.");
-				entry.pureSet(entry.getDefaultValue());
+				entry.setWithoutFiringEvents(entry.getDefaultValue());
 			}
 		}
 		catch (Exception e)
 		{
-//                e.printStackTrace();
+			LOGGER.warn("BlockBiomeWrapperPair [" + entry.getNameAndCategory() + "] had an invalid value when loading the config. Using default value.");
-			this.logger.warn("Entry [" + entry.getNameWCategory() + "] had an invalid value when loading the config. Using default value.");
+			entry.setWithoutFiringEvents(entry.getDefaultValue());
-			entry.pureSet(entry.getDefaultValue());
 		}
 	}
 	
@@ -309,22 +315,21 @@ public class ConfigFileHandling
 		// 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.getNameWCategory(), comment);
+		nightConfig.setComment(entry.getNameAndCategory(), comment);
 	}
 	
 	
 	
-	
+	//=============//
+	// nightconfig //
+	//=============//
 	
 	/**
-	 * Uses {@link ConfigFileHandling#nightConfig} to do {@link CommentedFileConfig#load()} but with error checking
+	 * Uses {@link ConfigFileHandler#nightConfig} to do {@link CommentedFileConfig#load()} but with error checking
 	 *
 	 * @apiNote This overwrites any value currently stored in the config
 	 */
-	public void loadNightConfig()
+	public void loadNightConfig() { this.loadNightConfig(this.nightConfig); }
-	{
-		loadNightConfig(this.nightConfig);
-	}
 	/**
 	 * Does {@link CommentedFileConfig#load()} but with error checking
 	 *
@@ -342,23 +347,29 @@ public class ConfigFileHandling
 			}
 			catch (Exception e)
 			{
-				this.logger.warn("Loading file failed because of this expectation:\n" + e);
+				LOGGER.warn("Loading file failed because of this expectation:\n" + e);
 				
 				reCreateFile(this.configPath);
 				
 				nightConfig.load();
 			}
 		}
-		catch (Exception ex)
+		catch (Exception e)
 		{
-			System.out.println("Creating file failed");
+			LOGGER.error("File creation failed at ["+this.configPath+"], error: ["+e.getMessage()+"].", e);
-			this.logger.error(ex);
+			
-			SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class).crashMinecraft("Loading file and resetting config file failed at path [" + configPath + "]. Please check the file is ok and you have the permissions", ex);
+			// 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);
 		}
 	}
 	
 	
 	
+	//===============//
+	// 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 org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -36,7 +36,7 @@ import java.util.Map;
  */
 public class ConfigTypeConverters
 {
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	// 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

@@ -0,0 +1,10 @@
+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,6 +23,7 @@ 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;
 
@@ -35,6 +36,8 @@ public class JavaScreenHandlerScreen extends AbstractScreen
 	public static boolean firstRun = true;
 	public final Component jComponent;
 	
+	
+	
 	static
 	{
 		// Note: this code can cause Mac
@@ -54,20 +57,26 @@ public class JavaScreenHandlerScreen extends AbstractScreen
 	public void init()
 	{
 		if (firstRun)
+		{
 			frame = EmbeddedFrameUtil.embeddedFrameCreate(this.minecraftWindow); // Don't call this multiple times
+		}
 		
-		frame.add(jComponent);
+		frame.add(this.jComponent);
+		frame.setBackground(new Color(0, 125, 155));
 		
 		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
 			public void keyTyped(KeyEvent keyEvent) { }
@@ -80,7 +89,7 @@ public class JavaScreenHandlerScreen extends AbstractScreen
 			EmbeddedFrameUtil.embeddedFrameSetBounds(frame, 0, 0, this.width, this.height);
 			firstRun = false;
 		}
-		else
+		
 		EmbeddedFrameUtil.showFrame(frame);
 	}
 	
@@ -89,13 +98,43 @@ public class JavaScreenHandlerScreen extends AbstractScreen
 	{
 		public ExampleScreen()
 		{
-			setLayout(new GridBagLayout());
+			this.setLayout(new GridBagLayout());
-			GridBagConstraints constraints = new GridBagConstraints();
+			this.setBackground(new Color(255, 0, 0)); // doesn't appear to be used
-			constraints.fill = GridBagConstraints.HORIZONTAL;
+			
-			constraints.weightx = 0.5;
+			GridBagConstraints helloWorldConstraints = new GridBagConstraints();
-			constraints.gridx = 0;
+			helloWorldConstraints.weightx = 0.5;
-			constraints.gridy = 0;
+			helloWorldConstraints.gridx = 0;
-			add(new JLabel("Hello World!"), constraints);
+			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");
+			}
 		}
 		
 	}
@@ -116,8 +155,10 @@ public class JavaScreenHandlerScreen extends AbstractScreen
 	@Override
 	public void onClose()
 	{
-		frame.remove(jComponent);
+		frame.remove(this.jComponent);
 		EmbeddedFrameUtil.hideFrame(frame);
 	}
 	
+	
+	
 }

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

@@ -1,126 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.core.config.gui;
-
-import com.seibel.distanthorizons.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/AbstractConfigBase.java

@@ -19,25 +19,27 @@
 
 package com.seibel.distanthorizons.core.config.types;
 
-import com.seibel.distanthorizons.core.config.ConfigBase;
+import com.seibel.distanthorizons.core.config.gui.IConfigGuiInfo;
 import com.seibel.distanthorizons.core.config.types.enums.EConfigEntryAppearance;
 
 /**
- * The class where all config options should extend
+ * The class all config options should extend
  *
  * @author coolGi
  */
-// Note for devs: The "S" is the class that is extending this
+public abstract class AbstractConfigBase<T>
-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;
 	
-	public Object guiValue; // This is a storage variable something like the gui can use
+	/** 
+	 * This stores information related to the GUI state.
+	 * This is set during config UI setup.
+	 */
+	public IConfigGuiInfo guiValue;
 	
 	protected EConfigEntryAppearance appearance;
 	
@@ -47,7 +49,7 @@ public abstract class AbstractConfigType<T, S>
 	// constructor //
 	//=============//
 	
-	protected AbstractConfigType(EConfigEntryAppearance appearance, T defaultValue)
+	protected AbstractConfigBase(EConfigEntryAppearance appearance, T defaultValue)
 	{
 		this.defaultValue = defaultValue;
 		this.value = defaultValue;
@@ -74,7 +76,7 @@ public abstract class AbstractConfigType<T, S>
 	
 	public String getCategory() { return this.category; }
 	public String getName() { return this.name; }
-	public String getNameWCategory() { return (this.category.isEmpty() ? "" : this.category + ".") + this.name; }
+	public String getNameAndCategory() { 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,10 +27,19 @@ import com.seibel.distanthorizons.core.config.types.enums.EConfigEntryAppearance
  *
  * @author coolGi
  */
-public class ConfigCategory extends AbstractConfigType<Class<?>, ConfigCategory>
+public class ConfigCategory extends AbstractConfigBase<Class<?>>
 {
-	/** This should not be set by anything other than the config system itself */
+	/** 
-	public String destination;    // Where the category goes to
+	 * Defines where this category points to. <br>
+	 * May be defined during config setup.
+	 */
+	public String destination;
+	
+	
+	
+	//=============//
+	// constructor //
+	//=============//
 	
 	private ConfigCategory(EConfigEntryAppearance appearance, Class<?> value, String destination)
 	{
@@ -38,20 +47,26 @@ public class ConfigCategory extends AbstractConfigType<Class<?>, ConfigCategory>
 		this.destination = destination;
 	}
 	
-	public String getDestination()
+	
-	{
+	
-		return this.destination;
+	//==================//
-	}
+	// property getters //
+	//==================//
+	
+	public String getDestination() { return this.destination; }
 	
 	/** Use get() instead for category */
 	@Override
 	@Deprecated
-	public Class<?> getType()
+	public Class<?> getType() { return this.value; }
-	{
-		return value;
-	}
 	
-	public static class Builder extends AbstractConfigType.Builder<Class<?>, Builder>
+	
+	
+	//=========//
+	// builder //
+	//=========//
+	
+	public static class Builder extends AbstractConfigBase.Builder<Class<?>, Builder>
 	{
 		private String tmpDestination = null;
 		

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

@@ -20,12 +20,13 @@
 package com.seibel.distanthorizons.core.config.types;
 
 
-import com.seibel.distanthorizons.core.config.NumberUtil;
+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.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.EConfigEntryPerformance;
+import com.seibel.distanthorizons.core.config.types.enums.EConfigValidity;
-import com.seibel.distanthorizons.coreapi.interfaces.config.IConfigEntry;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.ArrayList;
@@ -33,40 +34,38 @@ import java.util.Arrays;
 import java.util.function.Consumer;
 
 /**
- * Use for making the config variables
+ * This config type allows for entering text, number, or enum values.
- * for types that are not supported by it look in ConfigBase
  *
  * @author coolGi
- * @version 2023-7-16
  */
-public class ConfigEntry<T> extends AbstractConfigType<T, ConfigEntry<T>> implements IConfigEntry<T>
+public class ConfigEntry<T> extends AbstractConfigBase<T>
 {
-	private String comment;
+	private final 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.
 	 */
-	public final boolean allowApiOverride;
+	private final boolean allowApiOverride;
 	/** Will be null if un-set */
 	@Nullable
 	private T apiValue;
 	
 	
 	
-	/** Creates the entry */
+	//=============//
+	// constructor //
+	//=============//
+	
 	private ConfigEntry(
 			EConfigEntryAppearance appearance, 
-			T value, String comment, T min, T max, 
+			String comment, String chatCommandName, 
-			String chatCommandName, boolean allowApiOverride, 
+			T value, T min, T max,
-			EConfigEntryPerformance performance, 
+			boolean allowApiOverride, 
 			ArrayList<IConfigListener> listenerList)
 	{
 		super(appearance, value);
@@ -76,38 +75,57 @@ public class ConfigEntry<T> extends AbstractConfigType<T, ConfigEntry<T>> implem
 		this.max = max;
 		this.chatCommandName = chatCommandName;
 		this.allowApiOverride = allowApiOverride;
-		this.performance = performance;
 		this.listenerList = listenerList;
 	}
 	
 	
 	
-	/** Gets the default value of the option */
+	//==========================//
-	@Override
+	// property getters/setters //
-	public T getDefaultValue() { return super.defaultValue; }
+	//==========================//
+	
+	/** 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 //
+	//===============//
 	
-	@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() 
-	 * 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>
+		return this.allowApiOverride 
-	 * 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})
+				&& this.apiValue != null; 
-	 */
-	public void pureSet(T newValue) {
-		super.set(newValue);
 	}
 		
+	/** 
+	 * 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
+	 */
+	public void setWithoutFiringEvents(T newValue) { super.set(newValue); }
+	
 	/** Sets the value without saving */
-	@Override
 	public void setWithoutSaving(T newValue)
 	{
 		super.set(newValue);
@@ -132,74 +150,35 @@ public class ConfigEntry<T> extends AbstractConfigType<T, ConfigEntry<T>> implem
 	}
 	
 	
+	
+	//===============//
+	// value getters //
+	//===============//
+	
 	@Override
 	public T get()
 	{
-		if (this.allowApiOverride && this.apiValue != null)
+		if (this.allowApiOverride 
+			&& this.apiValue != null)
 		{
 			return this.apiValue;
 		}
 		
 		return super.get();
 	}
-	@Override
+	/** Ignores the API value if set. */
-	public T getTrueValue()
+	public T getTrueValue() { return super.get(); }
-	{
+	
-		return super.get();
+	public T getDefaultValue() { return super.defaultValue; }
-	}
+	
+	@Nullable
+	public T getApiValue() { return this.apiValue; }
 	
 	
-	/** 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);
-	}
 	
-	/**
+	//===========//
-	 * Clamps the value within the set range
+	// listeners //
-	 *
+	//===========//
-	 * @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)
@@ -224,116 +203,114 @@ public class ConfigEntry<T> extends AbstractConfigType<T, ConfigEntry<T>> implem
 	public void setListeners(IConfigListener... newListeners) { this.listenerList.addAll(Arrays.asList(newListeners)); }
 	
 	
-	/**
+	
-	 * Checks if the option is valid
+	//====================//
-	 *
+	// min/max validation //
-	 * @return 0 == valid
+	//====================//
-	 * <p>  2 == invalid
+	
-	 * <p>  1 == number too high
+	/** Checks if this config's current value is valid */
-	 * <p> -1 == number too low
+	public EConfigValidity getValidity() { return this.getValidity(this.value, this.min, this.max); }
-	 */
+	/** Checks if the given value is valid */
-	@Override
+	public EConfigValidity getValidity(@Nullable T value) { return this.getValidity(value, this.min, this.max); }
-	public byte isValid() { return isValid(this.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 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 (this.configBase.disableMinMax)
+		if (!ConfigHandler.INSTANCE.runMinMaxValidation)
 		{
-			return 0;
+			return EConfigValidity.VALID;
 		}
-		else if (min == null && max == null)
+		else if (min == null 
+				&& max == null)
 		{
 			// no validation is needed for this field
-			return 0;
+			return EConfigValidity.VALID;
 		}
-		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 then it will be invalid
+			// If the 2 variables aren't the same type
-			return 2;
+			// or the input is missing
+			// then it will be invalid
+			return EConfigValidity.INVALID;
 		}
-		else if (Number.class.isAssignableFrom(value.getClass()))
+		else if (value instanceof Number)
 		{ 
-			// Only check min max if it is a number
+			// Only check min/max if this config's type is a number
-			if (max != null && NumberUtil.greaterThan((Number) value, (Number) max))
+			if (max != null 
+				&& NumberUtil.greaterThan((Number) value, (Number) max))
 			{
-				return 1;
+				return EConfigValidity.NUMBER_TOO_HIGH;
-			}
-			if (min != null && NumberUtil.lessThan((Number) value, (Number) min))
-			{
-				return -1;
 			}
 			
-			return 0;
+			if (min != null 
+				&& NumberUtil.lessThan((Number) value, (Number) min))
+			{
+				return EConfigValidity.NUMBER_TOO_LOW;
+			}
+			
+			return EConfigValidity.VALID;
 		}
 		else
 		{
-			return 0;
+			return EConfigValidity.VALID;
 		}
 	}
 	
+	
+	
+	//===============//
+	// file handling //
+	//===============//
+	
 	/** This should normally not be called since set() automatically calls this */
-	public void save() { configBase.configFileINSTANCE.saveEntry(this); }
+	public void save() { ConfigHandler.INSTANCE.configFileHandler.saveEntry(this); }
 	/** This should normally not be called except for special circumstances */
-	public void load() { configBase.configFileINSTANCE.loadEntry(this); }
+	public void load() { ConfigHandler.INSTANCE.configFileHandler.loadEntry(this); }
 	
 	
-	@Override
+	
-	public boolean equals(IConfigEntry<?> obj) { return obj.getClass() == ConfigEntry.class && equals((ConfigEntry<?>) obj); }
+	//================//
+	// base overrides //
+	//================//
+	
+	public boolean equals(AbstractConfigBase<?> obj) 
+	{
+		return obj.getClass() == ConfigEntry.class 
+				&& this.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);
 		}
+	}
 	
 	
-	public static class Builder<T> extends AbstractConfigType.Builder<T, Builder<T>>
+	
+	//=========//
+	// builder //
+	//=========//
+	
+	public static class Builder<T> extends AbstractConfigBase.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;
@@ -379,12 +356,6 @@ public class ConfigEntry<T> extends AbstractConfigType<T, ConfigEntry<T>> implem
 			return this;
 		}
 		
-		public Builder<T> setPerformance(EConfigEntryPerformance newPerformance)
-		{
-			this.tmpPerformance = newPerformance;
-			return this;
-		}
-		
 		
 		
 		public Builder<T> replaceListeners(ArrayList<IConfigListener> newConfigListener)
@@ -413,13 +384,15 @@ public class ConfigEntry<T> extends AbstractConfigType<T, ConfigEntry<T>> implem
 		
 		
 		
+		// build //
+		
 		public ConfigEntry<T> build()
 		{
 			return new ConfigEntry<>(
 					this.tmpAppearance,
-					this.tmpValue, this.tmpComment, this.tmpMin, this.tmpMax, 
+					this.tmpComment, this.tmpChatCommandName, this.tmpValue, this.tmpMin, this.tmpMax,
-					this.tmpChatCommandName, this.tmpUseApiOverwrite, 
+					this.tmpUseApiOverwrite, 
-					this.tmpPerformance, this.tmpIConfigListener);
+					this.tmpIConfigListener);
 		}
 		
 	}

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

@@ -21,29 +21,42 @@ package com.seibel.distanthorizons.core.config.types;
 
 import com.seibel.distanthorizons.core.config.types.enums.EConfigEntryAppearance;
 
-public class ConfigUIButton extends AbstractConfigType<Runnable, ConfigUIButton>
+public class ConfigUIButton extends AbstractConfigBase<Runnable>
 {
-	public ConfigUIButton(Runnable runnable)
+	//=============//
-	{
+	// constructor //
-		super(EConfigEntryAppearance.ONLY_IN_GUI, runnable);
+	//=============//
-	}
 	
-	/** 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 ConfigUIButton(Runnable 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)
+	 */
 	public void runAction() { this.value.run(); }
 	
-	public static class Builder extends AbstractConfigType.Builder<Runnable, Builder>
+	
+	
+	//=========//
+	// builder //
+	//=========//
+	
+	public static class Builder extends AbstractConfigBase.Builder<Runnable, Builder>
 	{
 		/** Appearance shouldn't be changed */
 		@Override
-		public Builder setAppearance(EConfigEntryAppearance newAppearance)
+		public Builder setAppearance(EConfigEntryAppearance newAppearance) { return this; }
-		{
-			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,20 +19,47 @@
 
 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 AbstractConfigType<String, ConfigUIComment>
+public class ConfigUIComment extends AbstractConfigBase<String>
 {
-	public 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)
 	{
 		super(EConfigEntryAppearance.ONLY_IN_GUI, "");
+		this.parentConfigPath = parentConfigPath;
+		this.textPosition = textPosition;
 	}
 	
+	
+	
+	//=========//
+	// setters //
+	//=========//
+	
 	/** Appearance shouldn't be changed */
 	@Override
 	public void setAppearance(EConfigEntryAppearance newAppearance) { }
@@ -41,27 +68,112 @@ public class ConfigUIComment extends AbstractConfigType<String, ConfigUIComment>
 	@Override
 	public void set(String newValue) { }
 	
-	public static class Builder extends AbstractConfigType.Builder<String, Builder>
+	
+	
+	//=========//
+	// builder //
+	//=========//
+	
+	public static class Builder extends AbstractConfigBase.Builder<String, Builder>
 	{
+		public String tempParentConfigPath = null;
+		@Nullable
+		public EConfigCommentTextPosition tempTextPosition = null;
+		
+		
+		
 		/** Appearance shouldn't be changed */
+		@Deprecated
 		@Override
-		public Builder setAppearance(EConfigEntryAppearance newAppearance)
+		public Builder setAppearance(EConfigEntryAppearance newAppearance) { return this; }
-		{
-			return this;
-		}
 		
 		/** Pointless to set the value */
+		@Deprecated
 		@Override
 		public Builder set(String newValue)
+		{ return this; }
+		
+		
+		public Builder setParentConfigClass(@NotNull Class<?> parentConfigClass)
 		{
+			// 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)
+		{
+			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();
+		}
+		
+		
+		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

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

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

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

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

@@ -0,0 +1,15 @@
+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

@@ -0,0 +1,151 @@
+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,7 +19,8 @@
 
 package com.seibel.distanthorizons.core.dataObjects.fullData;
 
-import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
+import com.seibel.distanthorizons.core.dataObjects.BlockBiomeWrapperPair;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.pos.DhSectionPos;
 import com.seibel.distanthorizons.core.util.LodUtil;
 import com.seibel.distanthorizons.core.util.objects.DataCorruptedException;
@@ -27,16 +28,12 @@ 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 it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap;
+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.*;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 /**
  * WARNING: This is not THREAD-SAFE! <br><br>
@@ -53,7 +50,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
  */
 public class FullDataPointIdMap
 {
-	private static final Logger LOGGER = LogManager.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	/**
 	 * Should only be enabled when debugging.
 	 * Has the system check if any duplicate Entries were read/written
@@ -61,15 +58,15 @@ public class FullDataPointIdMap
 	 */
 	private static final boolean RUN_SERIALIZATION_DUPLICATE_VALIDATION = false;
 	/** Distant Horizons - Block State Wrapper */
-	private static final String BLOCK_STATE_SEPARATOR_STRING = "_DH-BSW_";
+	public 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 Entry's ID */
+	/** The index should be the same as the BlockBiomeWrapperPair's ID */
-	private final ArrayList<Entry> entryList = new ArrayList<>();
+	private final ArrayList<BlockBiomeWrapperPair> blockBiomePairList = new ArrayList<>();
-	private final ConcurrentHashMap<Entry, Integer> idMap = new ConcurrentHashMap<>();
+	private final ConcurrentHashMap<BlockBiomeWrapperPair, Integer> idMap = new ConcurrentHashMap<>();
 	
 	private int cachedHashCode = 0;
 	
@@ -91,28 +88,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#entryList} */
+	/** @throws IndexOutOfBoundsException if the given ID isn't in the {@link FullDataPointIdMap#blockBiomePairList} */
-	private Entry getEntry(int id) throws IndexOutOfBoundsException
+	private BlockBiomeWrapperPair getEntry(int id) throws IndexOutOfBoundsException
 	{
-		Entry entry;
+		BlockBiomeWrapperPair pair;
 		try
 		{
-			entry = this.entryList.get(id);
+			pair = this.blockBiomePairList.get(id);
 		}
 		catch (IndexOutOfBoundsException e)
 		{
-			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()+"].");
+			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()+"].");
 		}
 		
-		return entry;
+		return pair;
 	}
 	
 	
 	/** @return -1 if the list is empty */
-	public int getMaxValidId() { return this.entryList.size() - 1; }
+	public int getMaxValidId() { return this.blockBiomePairList.size() - 1; }
-	public int size() { return this.entryList.size(); }
+	public int size() { return this.blockBiomePairList.size(); }
 	
-	public boolean isEmpty() { return this.entryList.isEmpty(); }
+	public boolean isEmpty() { return this.blockBiomePairList.isEmpty(); }
 	
 	public long getPos() { return this.pos; }
 	
@@ -126,11 +123,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(Entry.getEntry(biome, blockState)); }
+	public int addIfNotPresentAndGetId(IBiomeWrapper biome, IBlockStateWrapper blockState) { return this.addIfNotPresentAndGetId(BlockBiomeWrapperPair.get(blockState, biome)); }
-	private int addIfNotPresentAndGetId(Entry biomeBlockStateEntry)
+	private int addIfNotPresentAndGetId(BlockBiomeWrapperPair pair)
 	{
 		// try getting the existing ID
-		Integer nullableId = this.idMap.get(biomeBlockStateEntry);
+		Integer nullableId = this.idMap.get(pair);
 		if (nullableId != null)
 		{
 			return nullableId;
@@ -138,7 +135,7 @@ public class FullDataPointIdMap
 		
 		
 		// create the new ID
-		return this.idMap.compute(biomeBlockStateEntry, (Entry newBiomeBlockStateEntry, Integer currentId) -> 
+		return this.idMap.compute(pair, (BlockBiomeWrapperPair newPair, Integer currentId) -> 
 		{
 			if (currentId != null)
 			{
@@ -147,8 +144,8 @@ public class FullDataPointIdMap
 			
 			
 			// Add the new ID
-			currentId = this.entryList.size();
+			currentId = this.blockBiomePairList.size();
-			this.entryList.add(biomeBlockStateEntry);
+			this.blockBiomePairList.add(newPair);
 			
 			// invalidate the cached hash code
 			this.cachedHashCode = 0;
@@ -158,7 +155,7 @@ public class FullDataPointIdMap
 	}
 	
 	/**
-	 * Adds every {@link Entry} from inputMap into this map. <br>
+	 * Adds every {@link BlockBiomeWrapperPair} 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 
@@ -168,19 +165,19 @@ public class FullDataPointIdMap
 	 */
 	public void addAll(FullDataPointIdMap inputMap)
 	{
-		ArrayList<Entry> entriesToMerge = inputMap.entryList;
+		ArrayList<BlockBiomeWrapperPair> pairsToMerge = inputMap.blockBiomePairList;
-		for (int i = 0; i < entriesToMerge.size(); i++)
+		for (int i = 0; i < pairsToMerge.size(); i++)
 		{
-			Entry entity = entriesToMerge.get(i);
+			BlockBiomeWrapperPair pair = pairsToMerge.get(i);
-			this.add(entity);
+			this.add(pair);
 		}
 	}
-	/** allows for adding duplicate {@link Entry} */
+	/** allows for adding duplicate {@link BlockBiomeWrapperPair} */
-	private void add(Entry biomeBlockStateEntry)
+	private void add(BlockBiomeWrapperPair pair)
 	{
-		int id = this.entryList.size();
+		int id = this.blockBiomePairList.size();
-		this.entryList.add(biomeBlockStateEntry);
+		this.blockBiomePairList.add(pair);
-		this.idMap.put(biomeBlockStateEntry, id);
+		this.idMap.put(pair, id);
 		
 		// invalidate the cached hash code
 		this.cachedHashCode = 0;
@@ -197,23 +194,23 @@ public class FullDataPointIdMap
 	 */
 	public int[] mergeAndReturnRemappedEntityIds(FullDataPointIdMap inputMap)
 	{
-		ArrayList<Entry> entriesToMerge = inputMap.entryList;
+		ArrayList<BlockBiomeWrapperPair> entriesToMerge = inputMap.blockBiomePairList;
-		int[] remappedEntryIds = new int[entriesToMerge.size()];
+		int[] remappedPairIds = new int[entriesToMerge.size()];
 		for (int i = 0; i < entriesToMerge.size(); i++)
 		{
-			Entry entity = entriesToMerge.get(i);
+			BlockBiomeWrapperPair entity = entriesToMerge.get(i);
 			int id = this.addIfNotPresentAndGetId(entity);
-			remappedEntryIds[i] = id;
+			remappedPairIds[i] = id;
 		}
 		
-		return remappedEntryIds;
+		return remappedPairIds;
 	}
 	
 	/** 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.entryList.clear();
+		this.blockBiomePairList.clear();
 		this.idMap.clear();
 		this.cachedHashCode = 0;
 	}
@@ -227,27 +224,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.entryList.size());
+		outputStream.writeInt(this.blockBiomePairList.size());
 		
 		// only used when debugging
-		HashMap<String, FullDataPointIdMap.Entry> dataPointEntryBySerialization = new HashMap<>();
+		HashMap<String, BlockBiomeWrapperPair> dataPointEntryBySerialization = new HashMap<>();
 		
-		for (Entry entry : this.entryList)
+		for (BlockBiomeWrapperPair pair : this.blockBiomePairList)
 		{
-			String entryString = entry.serialize();
+			String entryString = pair.serialize();
 			outputStream.writeUTF(entryString);
 			
 			if (RUN_SERIALIZATION_DUPLICATE_VALIDATION)
 			{
 				if (dataPointEntryBySerialization.containsKey(entryString))
 				{
-					LOGGER.error("Duplicate serialized entry found with serial: " + entryString);
+					LOGGER.error("Duplicate serialized pair found with serial: " + entryString);
 				}
-				if (dataPointEntryBySerialization.containsValue(entry))
+				if (dataPointEntryBySerialization.containsValue(pair))
 				{
-					LOGGER.error("Duplicate serialized entry found with value: " + entry.serialize());
+					LOGGER.error("Duplicate serialized pair found with value: " + pair.serialize());
 				}
-				dataPointEntryBySerialization.put(entryString, entry);
+				dataPointEntryBySerialization.put(entryString, pair);
 			}
 		}
 	}
@@ -263,7 +260,7 @@ public class FullDataPointIdMap
 		
 		
 		// only used when debugging
-		HashMap<String, FullDataPointIdMap.Entry> dataPointEntryBySerialization = new HashMap<>();
+		HashMap<String, BlockBiomeWrapperPair> dataPointEntryBySerialization = new HashMap<>();
 		
 		FullDataPointIdMap newMap = new FullDataPointIdMap(pos);
 		for (int i = 0; i < entityCount; i++)
@@ -276,8 +273,8 @@ public class FullDataPointIdMap
 			
 			
 			String entryString = inputStream.readUTF();
-			Entry newEntry = Entry.deserialize(entryString, levelWrapper);
+			BlockBiomeWrapperPair newPair = BlockBiomeWrapperPair.deserialize(entryString, levelWrapper);
-			newMap.entryList.add(newEntry);
+			newMap.blockBiomePairList.add(newPair);
 			
 			if (RUN_SERIALIZATION_DUPLICATE_VALIDATION)
 			{
@@ -285,11 +282,11 @@ public class FullDataPointIdMap
 				{
 					LOGGER.error("Duplicate deserialized entry found with serial: " + entryString);
 				}
-				if (dataPointEntryBySerialization.containsValue(newEntry))
+				if (dataPointEntryBySerialization.containsValue(newPair))
 				{
-					LOGGER.error("Duplicate deserialized entry found with value: " + newEntry.serialize());
+					LOGGER.error("Duplicate deserialized entry found with value: " + newPair.serialize());
 				}
-				dataPointEntryBySerialization.put(entryString, newEntry);
+				dataPointEntryBySerialization.put(entryString, newPair);
 			}
 		}
 		
@@ -335,144 +332,13 @@ public class FullDataPointIdMap
 	private void generateHashCode()
 	{
 		int result = DhSectionPos.hashCode(this.pos);
-		for (int i = 0; i < this.entryList.size(); i++)
+		for (int i = 0; i < this.blockBiomePairList.size(); i++)
 		{
-			result = 31 * result + this.entryList.hashCode();
+			result = 31 * result + this.blockBiomePairList.hashCode();
 		}
 		this.cachedHashCode = result;
 	}
 	
 	
 	
-	//==============//
-	// helper class //
-	//==============//
-	
-	private static final class Entry
-	{
-		private static final IWrapperFactory WRAPPER_FACTORY = SingletonInjector.INSTANCE.get(IWrapperFactory.class);
-		
-		private static final ConcurrentHashMap<Integer, Entry> ENTRY_BY_HASH = new ConcurrentHashMap<>();
-		/** lock is necessary since {@link Int2ReferenceOpenHashMap} isn't concurrent and concurrent threads can cause infinite loops */
-		private static final ReentrantReadWriteLock ENTRY_POOL_LOCK = new ReentrantReadWriteLock();
-		
-		public final IBiomeWrapper biome;
-		public final IBlockStateWrapper blockState;
-		
-		private Integer hashCode = null;
-		private String serialString = null;
-		
-		
-		
-		//=============//
-		// constructor //
-		//=============//
-		
-		public static Entry getEntry(IBiomeWrapper biome, IBlockStateWrapper blockState)
-		{
-			int entryHash = generateHashCode(biome, blockState);
-			
-			// try getting the existing Entry
-			Entry entry = ENTRY_BY_HASH.get(entryHash);
-			if (entry != null)
-			{
-				return entry;
-			}
-			
-			// create the missing entry
-			return ENTRY_BY_HASH.compute(entryHash, (Integer newHash, Entry currentEntry) ->
-			{
-				if (currentEntry != null)
-				{
-					return currentEntry;
-				}
-				
-				return new Entry(biome, blockState);
-			});
-		}
-		private Entry(IBiomeWrapper biome, IBlockStateWrapper blockState)
-		{
-			this.biome = biome;
-			this.blockState = blockState;
-		}
-		
-		
-		
-		//===========//
-		// overrides //
-		//===========//
-		
-		@Override
-		public int hashCode()
-		{
-			// cache the hash code to improve speed
-			if (this.hashCode == null)
-			{
-				this.hashCode = generateHashCode(this);
-			}
-			
-			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,7 +33,6 @@ 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;
@@ -47,9 +46,9 @@ import java.util.Arrays;
  * @see FullDataPointUtil
  * @see FullDataSourceV2
  */
-public class FullDataSourceV1 implements IDataSource<IDhLevel>
+public class FullDataSourceV1
 {
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	public static final byte SECTION_SIZE_OFFSET = DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL;
 	/** measured in dataPoints */
@@ -94,29 +93,14 @@ public class FullDataSourceV1 implements IDataSource<IDhLevel>
 	}
 	
 	
-	
-	
-	//======//
-	// 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); }
 	
-	@Override
+	public long getPos() { return this.pos; }
-	public Long getPos() { return this.pos; }
 	
 	public void resizeDataStructuresForRepopulation(long pos)
 	{
@@ -124,7 +108,6 @@ public class FullDataSourceV1 implements IDataSource<IDhLevel>
 		this.pos = pos;
 	}
 	
-	@Override
 	public byte getDataDetailLevel() { return (byte) (DhSectionPos.getDetailLevel(this.pos) - SECTION_SIZE_OFFSET); }
 	
 	public boolean isEmpty() { return this.isEmpty; }
@@ -197,7 +180,7 @@ public class FullDataSourceV1 implements IDataSource<IDhLevel>
 	{
 		outputStream.writeInt(this.getDataDetailLevel());
 		outputStream.writeInt(WIDTH);
-		outputStream.writeInt(level.getMinY());
+		outputStream.writeInt(level.getLevelWrapper().getMinHeight());
 		outputStream.writeByte(this.worldGenStep.value);
 		
 	}
@@ -206,19 +189,19 @@ public class FullDataSourceV1 implements IDataSource<IDhLevel>
 		int dataDetail = inputStream.readInt();
 		if (dataDetail != dto.dataDetailLevel)
 		{
-			throw new IOException(LodUtil.formatLog("Data level mismatch. Expected: ["+dto.dataDetailLevel+"], found ["+dataDetail+"]."));
+			throw new IOException("Data level mismatch. Expected: ["+dto.dataDetailLevel+"], found ["+dataDetail+"].");
 		}
 		
 		int width = inputStream.readInt();
 		if (width != WIDTH)
 		{
-			throw new IOException(LodUtil.formatLog("Section width mismatch: " + width + " != " + WIDTH + " (Currently only 1 section width is supported)"));
+			throw new IOException("Section width mismatch: [" + width + "] != [" + WIDTH + "] (Currently only 1 section width is supported)");
 		}
 		
 		int minY = inputStream.readInt();
-		if (minY != level.getMinY())
+		if (minY != level.getLevelWrapper().getMinHeight())
 		{
-			LOGGER.warn("Data minY mismatch: " + minY + " != " + level.getMinY() + ". Will ignore data's y level");
+			LOGGER.warn("Data minY mismatch: [" + minY + "] != [" + level.getLevelWrapper().getMinHeight() + "]. Will ignore data's y level");
 		}
 		
 		byte worldGenByte = inputStream.readByte();
@@ -377,15 +360,6 @@ public class FullDataSourceV1 implements IDataSource<IDhLevel>
 	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,25 +23,31 @@ 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.file.AbstractDataSourceHandler;
+import com.seibel.distanthorizons.core.enums.EDhDirection;
-import com.seibel.distanthorizons.core.file.IDataSource;
+import com.seibel.distanthorizons.core.file.fullDatafile.V2.FullDataSourceProviderV2;
-import com.seibel.distanthorizons.core.level.IDhLevel;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.pooling.PhantomArrayListParent;
+import com.seibel.distanthorizons.core.pooling.AbstractPhantomArrayList;
+import com.seibel.distanthorizons.core.pooling.PhantomArrayListCheckout;
 import com.seibel.distanthorizons.core.pooling.PhantomArrayListPool;
+import com.seibel.distanthorizons.core.pos.DhLodPos;
 import com.seibel.distanthorizons.core.pos.DhSectionPos;
+import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos;
+import com.seibel.distanthorizons.core.sql.dto.util.FullDataMinMaxPosUtil;
 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.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;
@@ -53,10 +59,10 @@ import java.util.List;
  * @see FullDataSourceV1
  */
 public class FullDataSourceV2 
-		extends PhantomArrayListParent
+		extends AbstractPhantomArrayList
-		implements IDataSource<IDhLevel>, IDhApiFullDataSource
+		implements IDhApiFullDataSource
 {
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	/** 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;
 	/** 
@@ -71,8 +77,6 @@ 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");
 	
 	
@@ -80,10 +84,6 @@ 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;
@@ -109,9 +109,7 @@ public class FullDataSourceV2
 	
 	/** 
 	 * stored x/z, y <br>
-	 * The y data should be sorted from top to bottom <br>
+	 * The y data should be sorted from top to bottom
-	 * 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;
 	
@@ -132,7 +130,7 @@ public class FullDataSourceV2
 	// constructors //
 	//==============//
 	
-	public static FullDataSourceV2 createFromChunk(IChunkWrapper chunkWrapper) { return LodDataBuilder.createFromChunk(chunkWrapper); }
+	public static FullDataSourceV2 createFromChunk(ILevelWrapper levelWrapper, IChunkWrapper chunkWrapper) { return LodDataBuilder.createFromChunk(levelWrapper, chunkWrapper); }
 	
 	public static FullDataSourceV2 createFromLegacyDataSourceV1(FullDataSourceV1 legacyData)
 	{
@@ -221,7 +219,7 @@ public class FullDataSourceV2
 	private FullDataSourceV2(
 			long pos,
 			FullDataPointIdMap mapping, @Nullable LongArrayList[] data,
-			@Nullable byte[] columnGenerationSteps, @Nullable byte[] columnWorldCompressionMode,
+			byte @Nullable [] columnGenerationSteps, byte @Nullable [] columnWorldCompressionMode,
 			boolean empty)
 	{
 		super(ARRAY_LIST_POOL, 2, 0, WIDTH * WIDTH);
@@ -278,15 +276,98 @@ public class FullDataSourceV2
 	
 	
 	
-	//======//
+	//=========//
-	// data //
+	// getters //
-	//======//
+	//=========//
 	
-	public LongArrayList get(int relX, int relZ) throws IndexOutOfBoundsException { return this.dataPoints[relativePosToIndex(relX, relZ)]; }
+	public LongArrayList getColumnAtRelPos(int relX, int relZ) throws IndexOutOfBoundsException 
+	{ return this.dataPoints[relativePosToIndex(relX, relZ)]; }
 	
-	@Override
+	@Nullable
-	public boolean update(@NotNull FullDataSourceV2 inputDataSource, @Nullable IDhLevel level) { return this.update(inputDataSource); }
+	public LongArrayList tryGetColumnAtRelPos(int relX, int relZ)
-	public boolean update(@NotNull FullDataSourceV2 inputDataSource)
+	{
+		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(DhBlockPos blockPos)
+	{
+		DhLodPos requestedPos = new DhLodPos(LodUtil.BLOCK_DETAIL_LEVEL, blockPos.getX(), blockPos.getZ());
+		
+		// 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
+		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 requestedY = blockPos.getY();
+			int bottomY = FullDataPointUtil.getBottomY(dataPoint) + this.levelMinY;
+			int height = FullDataPointUtil.getHeight(dataPoint);
+			int topY = bottomY + height;
+			
+			// does this datapoint contain the requested Y position? 
+			if (bottomY <= requestedY
+				&& requestedY < topY) // blockPositions start from the bottom of the block, thus "<=" for bottomY, just "<" for topY
+			{
+				return dataPoint;
+			}
+		}
+		
+		return FullDataPointUtil.EMPTY_DATA_POINT;
+	}
+	
+	
+	
+	//==========//
+	// updating //
+	//==========//
+	
+	public boolean updateFromChunk(@NotNull FullDataSourceV2 inputDataSource)
 	{
 		// don't try updating if the input is empty
 		if (inputDataSource.mapping.isEmpty())
@@ -314,7 +395,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) < AbstractDataSourceHandler.TOP_SECTION_DETAIL_LEVEL);
+						&& (DhSectionPos.getDetailLevel(this.pos) < FullDataSourceProviderV2.ROOT_SECTION_DETAIL_LEVEL);
 			}
 			
 			// null check to prevent setting a flag we don't want to save in the DB
@@ -323,7 +404,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) > AbstractDataSourceHandler.MIN_SECTION_DETAIL_LEVEL);
+						&& (DhSectionPos.getDetailLevel(this.pos) > FullDataSourceProviderV2.LEAF_SECTION_DETAIL_LEVEL);
 			}
 		}
 		else if (inputDetailLevel + 1 == thisDetailLevel)
@@ -334,7 +415,7 @@ public class FullDataSourceV2
 			this.applyToParent =
 					dataChanged
 					&& (BoolUtil.falseIfNull(this.applyToParent) || BoolUtil.falseIfNull(inputDataSource.applyToParent))
-					&& (DhSectionPos.getDetailLevel(this.pos) < AbstractDataSourceHandler.TOP_SECTION_DETAIL_LEVEL);
+					&& (DhSectionPos.getDetailLevel(this.pos) < FullDataSourceProviderV2.ROOT_SECTION_DETAIL_LEVEL);
 			
 		}
 		else if (inputDetailLevel - 1 == thisDetailLevel)
@@ -346,7 +427,7 @@ public class FullDataSourceV2
 			this.applyToChildren =
 					dataChanged
 					&& (BoolUtil.falseIfNull(this.applyToChildren) || BoolUtil.falseIfNull(inputDataSource.applyToChildren))
-					&& (DhSectionPos.getDetailLevel(this.pos) > AbstractDataSourceHandler.MIN_SECTION_DETAIL_LEVEL);
+					&& (DhSectionPos.getDetailLevel(this.pos) > FullDataSourceProviderV2.LEAF_SECTION_DETAIL_LEVEL);
 		}
 		else
 		{
@@ -357,8 +438,31 @@ 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();
 		}
@@ -747,7 +851,7 @@ public class FullDataSourceV2
 					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+"].");
+						LOGGER.warn("Skipping corrupt datapoint for pos ["+DhSectionPos.toString(inputDataSource.pos)+"] at relative position ["+x+","+z+"] with data: ID["+lastId+"], Height["+height+"], minY["+minY+"], lastBlockLight["+lastBlockLight+"], lastSkyLight["+lastSkyLight+"].");
 					}
 				}
 				
@@ -769,7 +873,7 @@ public class FullDataSourceV2
 			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+"].");
+				LOGGER.warn("Skipping corrupt datapoint for pos ["+DhSectionPos.toString(inputDataSource.pos)+"] at relative position ["+x+","+z+"] with data: ID["+lastId+"], Height["+height+"], minY["+minY+"], lastBlockLight["+lastBlockLight+"], lastSkyLight["+lastSkyLight+"].");
 			}
 		}
 		
@@ -989,6 +1093,39 @@ 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 //
 	//================//
@@ -996,18 +1133,35 @@ public class FullDataSourceV2
 	/** 
 	 * 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 relativePosToIndex(int relX, int relZ) throws IndexOutOfBoundsException
+	public static int tryGetRelativePosToIndex(int relX, int relZ)
 	{
-		if (relX < 0 || relZ < 0 ||
+		if (relX < 0 || relZ < 0
-			relX > WIDTH || relZ > WIDTH)
+				|| relX >= WIDTH || relZ >= WIDTH)
 		{
-			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 -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)
+		{
+			throw new IndexOutOfBoundsException("Relative data source positions must be between [0] (inclusive) and ["+WIDTH+"] (exclusive) the relative pos: ["+relX+","+relZ+"] is outside those boundaries.");
+		}
+		
+		return index; 
+	}
+	
 	/** 
 	 * Throws an exception if the given
 	 * full data column array is in the wrong order
@@ -1072,18 +1226,10 @@ public class FullDataSourceV2
 	// setters and getters //
 	//=====================//
 	
-	@Override
+	public long getPos() { return this.pos; }
-	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);
@@ -1147,7 +1293,7 @@ public class FullDataSourceV2
 	@Override 
 	public List<DhApiTerrainDataPoint> getApiDataPointColumn(int relX, int relZ) throws IndexOutOfBoundsException
 	{
-		LongArrayList dataColumn = this.get(relX, relZ);
+		LongArrayList dataColumn = this.getColumnAtRelPos(relX, relZ);
 		
 		ArrayList<DhApiTerrainDataPoint> apiList = new ArrayList<>();
 		for (int i = 0; i < dataColumn.size(); i++)
@@ -1163,6 +1309,15 @@ 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

@@ -1,101 +0,0 @@
-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,43 +19,28 @@
 
 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.PhantomArrayListParent;
+import com.seibel.distanthorizons.core.pooling.AbstractPhantomArrayList;
 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 org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
-
-import java.util.concurrent.atomic.AtomicLong;
 
 /**
  * Stores the render data used to generate OpenGL buffers.
  *
  * @see RenderDataPointUtil
  */
-public class ColumnRenderSource
+public class ColumnRenderSource extends AbstractPhantomArrayList
-		extends PhantomArrayListParent
-		implements IDataSource<IDhClientLevel>
 {
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
-	public static final boolean DO_SAFETY_CHECKS = ModInfo.IS_DEV_BUILD;
+	/** measured in data columns */
-	public static final byte SECTION_SIZE_OFFSET = DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL;
+	public static final int WIDTH = 64;
-	/** 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");
 	
@@ -72,8 +57,6 @@ public class ColumnRenderSource
 	
 	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
-	
 	
 	
 	//==============//
@@ -97,9 +80,9 @@ public class ColumnRenderSource
 		
 		this.verticalDataCount = maxVerticalSize;
 		
-		this.renderDataContainer = this.pooledArraysCheckout.getLongArray(0, SECTION_SIZE * SECTION_SIZE * this.verticalDataCount);
+		this.renderDataContainer = this.pooledArraysCheckout.getLongArray(0, WIDTH * WIDTH * this.verticalDataCount);
 		
-		this.debugSourceFlags = new DebugSourceFlag[SECTION_SIZE * SECTION_SIZE];
+		this.debugSourceFlags = new DebugSourceFlag[WIDTH * WIDTH];
 	}
 	
 	
@@ -108,19 +91,19 @@ public class ColumnRenderSource
 	// datapoint manipulation //
 	//========================//
 	
-	public long getDataPoint(int posX, int posZ, int verticalIndex) { return this.renderDataContainer.getLong(posX * SECTION_SIZE * this.verticalDataCount + posZ * this.verticalDataCount + verticalIndex); }
+	public long getDataPoint(int posX, int posZ, int verticalIndex) { return this.renderDataContainer.getLong(posX * WIDTH * this.verticalDataCount + posZ * this.verticalDataCount + verticalIndex); }
 	
 	public ColumnArrayView getVerticalDataPointView(int posX, int posZ)
 	{
-		int offset = posX * SECTION_SIZE * this.verticalDataCount + posZ * this.verticalDataCount;
+		int offset = posX * WIDTH * this.verticalDataCount + posZ * this.verticalDataCount;
 		
 		// don't allow returning views that are outside this render source's bounds
 		if (offset >= this.renderDataContainer.size())
 		{
 			return null;
 		}
-		else if (posX < 0 || posX >= SECTION_SIZE
+		else if (posX < 0 || posX >= WIDTH
-				|| posZ < 0 || posZ >= SECTION_SIZE)
+				|| posZ < 0 || posZ >= WIDTH)
 		{
 			return null;
 		}
@@ -129,74 +112,8 @@ public class ColumnRenderSource
 				offset, this.verticalDataCount);
 	}
 	
-	public ColumnQuadView getFullQuadView() { return this.getQuadViewOverRange(0, 0, SECTION_SIZE, SECTION_SIZE); }
+	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, SECTION_SIZE, this.verticalDataCount, quadX, quadZ, quadXSize, quadZSize); }
+	public ColumnQuadView getQuadViewOverRange(int quadX, int quadZ, int quadXSize, int quadZSize) { return new ColumnQuadView(this.renderDataContainer, WIDTH, 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;
-	}
 	
 	
 	
@@ -205,12 +122,9 @@ public class ColumnRenderSource
 	//=====================//
 	
 	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) - SECTION_SIZE_OFFSET); }
+	public byte getDataDetailLevel() { return (byte) (DhSectionPos.getDetailLevel(this.pos) - DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL); }
 	
 	public boolean isEmpty() { return this.isEmpty; }
 	public void markNotEmpty() { this.isEmpty = false; }
@@ -224,15 +138,15 @@ public class ColumnRenderSource
 		}
 		
 		
-		for (int x = 0; x < SECTION_SIZE; x++)
+		for (int x = 0; x < WIDTH; x++)
 		{
-			for (int z = 0; z < SECTION_SIZE; z++)
+			for (int z = 0; z < WIDTH; z++)
 			{
 				ColumnArrayView columnArrayView = this.getVerticalDataPointView(x,z);
 				for (int i = 0; i < columnArrayView.size; i++)
 				{
 					long dataPoint = columnArrayView.get(i);
-					if (!RenderDataPointUtil.isVoid(dataPoint))
+					if (!RenderDataPointUtil.hasZeroHeight(dataPoint))
 					{
 						return true;
 					}
@@ -256,12 +170,12 @@ public class ColumnRenderSource
 		{
 			for (int z = zStart; z < zStart + zWidth; z++)
 			{
-				this.debugSourceFlags[x * SECTION_SIZE + z] = flag;
+				this.debugSourceFlags[x * WIDTH + z] = flag;
 			}
 		}
 	}
 	
-	public DebugSourceFlag debugGetFlag(int ox, int oz) { return this.debugSourceFlags[ox * SECTION_SIZE + oz]; }
+	public DebugSourceFlag debugGetFlag(int ox, int oz) { return this.debugSourceFlags[ox * WIDTH + 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.AdvancedGraphics#earthCurveRatio earthCurveRatio}
+	 * when {@link Config.Client.Advanced.Graphics.Experimental#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.getAxis())
+			switch (this.direction.axis)
 			{
 				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.getAxis());
+					throw new IllegalArgumentException("Invalid Axis enum: [" + this.direction.axis + "].");
 			}
 		}
 		else
 		{
-			switch (this.direction.getAxis())
+			switch (this.direction.axis)
 			{
 				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.getAxis());
+					throw new IllegalArgumentException("Invalid Axis enum: [" + this.direction.axis + "].");
 			}
 		}
 	}
@@ -169,7 +169,7 @@ public final class BufferQuad
 		short thisParallelCompareStartPos; // edge parallel to the merge direction
 		short otherPerpendicularCompareStartPos;
 		short otherParallelCompareStartPos;
-		switch (this.direction.getAxis())
+		switch (this.direction.axis)
 		{
 			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,38 +23,27 @@ 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.pooling.PhantomArrayListPool;
 import com.seibel.distanthorizons.core.util.ColorUtil;
 import com.seibel.distanthorizons.core.util.LodUtil;
 import com.seibel.distanthorizons.core.util.RenderDataPointUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnArrayView;
-import com.seibel.distanthorizons.core.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 IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
 	
 	/** 
 	 * if the skylight has this value that means
-	 * no data is expected 
+	 * that block position is covered/occluded by an adjacent block/column.
 	 */
-	private static final byte SKYLIGHT_EMPTY = -1;
+	private static final byte SKYLIGHT_COVERED = -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;
-	});
 	
 	
 	
@@ -63,8 +52,8 @@ public class ColumnBox
 	//=========//
 	
 	public static void addBoxQuadsToBuilder(
-			LodQuadBuilder builder, IDhClientLevel clientLevel,
+			LodQuadBuilder builder, PhantomArrayListCheckout phantomArrayCheckout, IDhClientLevel clientLevel,
-			short xSize, short ySize, short zSize,
+			short width, short yHeight,
 			short minX, short minY, short minZ,
 			int color, byte irisBlockMaterialId, byte skyLight, byte blockLight,
 			long topData, long bottomData, ColumnArrayView[] adjData, boolean[] isAdjDataSameDetailLevel)
@@ -73,23 +62,26 @@ public class ColumnBox
 		// variable setup //
 		//================//
 		
-		short maxX = (short) (minX + xSize);
+		short maxX = (short) (minX + width);
-		short maxY = (short) (minY + ySize);
+		short maxY = (short) (minY + yHeight);
-		short maxZ = (short) (minZ + zSize);
+		short maxZ = (short) (minZ + width);
 		byte skyLightTop = skyLight;
 		byte skyLightBot = RenderDataPointUtil.doesDataPointExist(bottomData) ? RenderDataPointUtil.getLightSky(bottomData) : 0;
 		
-		boolean isTransparent = ColorUtil.getAlpha(color) < 255 && LodRenderer.transparencyEnabled;
+		boolean transparencyEnabled = Config.Client.Advanced.Graphics.Quality.transparency.get().transparencyEnabled;
+		boolean fakeOceanFloor = Config.Client.Advanced.Graphics.Quality.transparency.get().fakeTransparencyEnabled;
+		
+		boolean isTransparent = ColorUtil.getAlpha(color) < 255 && transparencyEnabled;
 		boolean overVoid = !RenderDataPointUtil.doesDataPointExist(bottomData);
-		boolean isTopTransparent = RenderDataPointUtil.getAlpha(topData) < 255 && LodRenderer.transparencyEnabled;
+		boolean isTopTransparent = RenderDataPointUtil.getAlpha(topData) < 255 && transparencyEnabled;
-		boolean isBottomTransparent = RenderDataPointUtil.getAlpha(bottomData) < 255 && LodRenderer.transparencyEnabled;
+		boolean isBottomTransparent = RenderDataPointUtil.getAlpha(bottomData) < 255 && 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.getMinY();
+			caveCullingMaxY = Config.Client.Advanced.Graphics.Culling.caveCullingHeight.get() - clientLevel.getLevelWrapper().getMinHeight();
 		}
 		
 		
@@ -103,20 +95,20 @@ public class ColumnBox
 		
 		
 		// fake ocean transparency
-		if (LodRenderer.transparencyEnabled && LodRenderer.fakeOceanFloor)
+		if (transparencyEnabled && fakeOceanFloor)
 		{
 			if (!isTransparent && isTopTransparent && RenderDataPointUtil.doesDataPointExist(topData))
 			{
 				skyLightTop = (byte) MathUtil.clamp(0, 15 - (RenderDataPointUtil.getYMax(topData) - minY), 15);
-				ySize = (short) (RenderDataPointUtil.getYMax(topData) - minY - 1);
+				yHeight = (short) (RenderDataPointUtil.getYMax(topData) - minY - 1);
 			}
 			else if (isTransparent && !isBottomTransparent && RenderDataPointUtil.doesDataPointExist(bottomData))
 			{
-				minY = (short) (minY + ySize - 1);
+				minY = (short) (minY + yHeight - 1);
-				ySize = 1;
+				yHeight = 1;
 			}
 			
-			maxY = (short) (minY + ySize);
+			maxY = (short) (minY + yHeight);
 		}
 		
 		
@@ -125,16 +117,26 @@ public class ColumnBox
 		// add top and bottom faces //
 		//==========================//
 		
-		boolean skipTop = RenderDataPointUtil.doesDataPointExist(topData) && (RenderDataPointUtil.getYMin(topData) == maxY) && !isTopTransparent;
+		// top face
+		{
+			boolean skipTop = RenderDataPointUtil.doesDataPointExist(topData)
+					&& (RenderDataPointUtil.getYMin(topData) == maxY)
+					&& !isTopTransparent;
 			if (!skipTop)
 			{
-			builder.addQuadUp(minX, maxY, minZ, xSize, zSize, ColorUtil.applyShade(color, MC.getShade(EDhDirection.UP)), irisBlockMaterialId, skyLightTop, blockLight);
+				builder.addQuadUp(minX, maxY, minZ, width, width, ColorUtil.applyShade(color, MC.getShade(EDhDirection.UP)), irisBlockMaterialId, skyLightTop, blockLight);
+			}
 		}
 		
-		boolean skipBottom = RenderDataPointUtil.doesDataPointExist(bottomData) && (RenderDataPointUtil.getYMax(bottomData) == minY) && !isBottomTransparent;
+		// bottom face 
+		{
+			boolean skipBottom = RenderDataPointUtil.doesDataPointExist(bottomData)
+					&& (RenderDataPointUtil.getYMax(bottomData) == minY)
+					&& !isBottomTransparent;
 			if (!skipBottom)
 			{
-			builder.addQuadDown(minX, minY, minZ, xSize, zSize, ColorUtil.applyShade(color, MC.getShade(EDhDirection.DOWN)), irisBlockMaterialId, skyLightBot, blockLight);
+				builder.addQuadDown(minX, minY, minZ, width, width, ColorUtil.applyShade(color, MC.getShade(EDhDirection.DOWN)), irisBlockMaterialId, skyLightBot, blockLight);
+			}
 		}
 		
 		
@@ -145,84 +147,119 @@ public class ColumnBox
 		
 		// NORTH face
 		{
-			ColumnArrayView adjCol = adjData[EDhDirection.NORTH.ordinal() - 2]; // TODO can we use something other than ordinal-2?
+			ColumnArrayView adjCol = adjData[EDhDirection.NORTH.compassIndex];
-			boolean adjSameDetailLevel = isAdjDataSameDetailLevel[EDhDirection.NORTH.ordinal() - 2];
+			boolean adjSameDetailLevel = isAdjDataSameDetailLevel[EDhDirection.NORTH.compassIndex];
 			// if the adjacent column is null that generally means the adjacent area hasn't been generated yet
 			if (adjCol == null)
 			{
 				// Add an adjacent face if this is opaque face or transparent over the void.
 				if (!isTransparent || overVoid)
 				{
-					builder.addQuadAdj(EDhDirection.NORTH, minX, minY, minZ, xSize, ySize, color, irisBlockMaterialId, LodUtil.MAX_MC_LIGHT, blockLight);
+					builder.addQuadAdj(
+							EDhDirection.NORTH, 
+							minX, minY, minZ, 
+							width, yHeight, 
+							color, irisBlockMaterialId, LodUtil.MAX_MC_LIGHT, blockLight);
 				}
 			}
 			else
 			{
-				makeAdjVerticalQuad(builder, adjCol, adjSameDetailLevel, caveCullingMaxY, EDhDirection.NORTH, minX, minY, minZ, xSize, ySize,
+				makeAdjVerticalQuad(
+						builder, phantomArrayCheckout, 
+						adjCol, adjSameDetailLevel, caveCullingMaxY, EDhDirection.NORTH, 
+						minX, minY, minZ, width, yHeight,
 						color, irisBlockMaterialId, blockLight);
 			}
 		}
 		
 		// SOUTH face
 		{
-			ColumnArrayView adjCol = adjData[EDhDirection.SOUTH.ordinal() - 2];
+			ColumnArrayView adjCol = adjData[EDhDirection.SOUTH.compassIndex];
-			boolean adjSameDetailLevel = isAdjDataSameDetailLevel[EDhDirection.SOUTH.ordinal() - 2];
+			boolean adjSameDetailLevel = isAdjDataSameDetailLevel[EDhDirection.SOUTH.compassIndex];
 			if (adjCol == null)
 			{
 				if (!isTransparent || overVoid)
 				{
-					builder.addQuadAdj(EDhDirection.SOUTH, minX, minY, maxZ, xSize, ySize, color, irisBlockMaterialId, LodUtil.MAX_MC_LIGHT, blockLight);
+					builder.addQuadAdj(
+							EDhDirection.SOUTH, 
+							minX, minY, maxZ, 
+							width, yHeight, 
+							color, irisBlockMaterialId, LodUtil.MAX_MC_LIGHT, blockLight);
 				}
 			}
 			else
 			{
-				makeAdjVerticalQuad(builder, adjCol, adjSameDetailLevel, caveCullingMaxY, EDhDirection.SOUTH, minX, minY, maxZ, xSize, ySize,
+				makeAdjVerticalQuad(
+						builder, phantomArrayCheckout,
+						adjCol, adjSameDetailLevel, caveCullingMaxY, EDhDirection.SOUTH,
+						minX, minY, maxZ, width, yHeight,
 						color, irisBlockMaterialId, blockLight);
 			}
 		}
 		
 		// WEST face
 		{
-			ColumnArrayView adjCol = adjData[EDhDirection.WEST.ordinal() - 2];
+			ColumnArrayView adjCol = adjData[EDhDirection.WEST.compassIndex];
-			boolean adjSameDetailLevel = isAdjDataSameDetailLevel[EDhDirection.WEST.ordinal() - 2];
+			boolean adjSameDetailLevel = isAdjDataSameDetailLevel[EDhDirection.WEST.compassIndex];
 			if (adjCol == null)
 			{
 				if (!isTransparent || overVoid)
 				{
-					builder.addQuadAdj(EDhDirection.WEST, minX, minY, minZ, zSize, ySize, color, irisBlockMaterialId, LodUtil.MAX_MC_LIGHT, blockLight);
+					builder.addQuadAdj(
+							EDhDirection.WEST, 
+							minX, minY, minZ, 
+							width, yHeight, 
+							color, irisBlockMaterialId, LodUtil.MAX_MC_LIGHT, blockLight);
 				}
 			}
 			else
 			{
-				makeAdjVerticalQuad(builder, adjCol, adjSameDetailLevel, caveCullingMaxY, EDhDirection.WEST, minX, minY, minZ, zSize, ySize,
+				makeAdjVerticalQuad(
+						builder, phantomArrayCheckout,
+						adjCol, adjSameDetailLevel, caveCullingMaxY, EDhDirection.WEST, 
+						minX, minY, minZ, width, yHeight,
 						color, irisBlockMaterialId, blockLight);
 			}
 		}
 		
 		// EAST face
 		{
-			ColumnArrayView adjCol = adjData[EDhDirection.EAST.ordinal() - 2];
+			ColumnArrayView adjCol = adjData[EDhDirection.EAST.compassIndex];
-			boolean adjSameDetailLevel = isAdjDataSameDetailLevel[EDhDirection.EAST.ordinal() - 2];
+			boolean adjSameDetailLevel = isAdjDataSameDetailLevel[EDhDirection.EAST.compassIndex];
 			if (adjCol == null)
 			{
 				if (!isTransparent || overVoid)
 				{
-					builder.addQuadAdj(EDhDirection.EAST, maxX, minY, minZ, zSize, ySize, color, irisBlockMaterialId, LodUtil.MAX_MC_LIGHT, blockLight);
+					builder.addQuadAdj(
+							EDhDirection.EAST, 
+							maxX, minY, minZ, 
+							width, yHeight, 
+							color, irisBlockMaterialId, LodUtil.MAX_MC_LIGHT, blockLight);
 				}
 			}
 			else
 			{
-				makeAdjVerticalQuad(builder, adjCol, adjSameDetailLevel, caveCullingMaxY, EDhDirection.EAST, maxX, minY, minZ, zSize, ySize,
+				makeAdjVerticalQuad(
+						builder, phantomArrayCheckout,
+						adjCol, adjSameDetailLevel, caveCullingMaxY, EDhDirection.EAST, 
+						maxX, minY, minZ, width, yHeight,
 						color, irisBlockMaterialId, blockLight);
 			}
 		}
 	}
 	
 	private static void makeAdjVerticalQuad(
-			LodQuadBuilder builder, @NotNull ColumnArrayView adjColumnView, boolean adjacentIsSameDetailLevel, int caveCullingMaxY, EDhDirection direction, 
+			LodQuadBuilder builder, PhantomArrayListCheckout phantomArrayCheckout,
+			@NotNull ColumnArrayView adjColumnView, boolean adjacentIsSameDetailLevel, int caveCullingMaxY, EDhDirection direction,
 			short x, short yMin, short z, short horizontalWidth, short ySize,
 			int color, byte irisBlockMaterialId, byte blockLight)
 	{
+		// pooled arrays
+		LongArrayList segments = phantomArrayCheckout.getLongArray(0, 0);
+		LongArrayList newSegments = phantomArrayCheckout.getLongArray(1, 0);
+		
+		
+		
 		//==================//
 		// create face with //
 		// no adjacent data //
@@ -230,48 +267,41 @@ public class ColumnBox
 		
 		color = ColorUtil.applyShade(color, MC.getShade(direction));
 		
-		// if there isn't any data adjacent to this LOD,
+		if (adjColumnView.size == 0
-		// just add the full vertical quad
+			|| RenderDataPointUtil.hasZeroHeight(adjColumnView.get(0)))
-		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 //
+		// determine face visibility/light //
-		// based on it's neighbors   //
+		//=================================//
-		//===========================//
 		
-		short yMax = (short) (yMin + ySize); // min is inclusive, max is exclusive
+		boolean transparencyEnabled = Config.Client.Advanced.Graphics.Quality.transparency.get().transparencyEnabled;
-		byte[] skyLightAtInputPos = THREAD_LOCAL_SKY_LIGHT_ARRAY.get();
+		boolean inputTransparent = ColorUtil.getAlpha(color) < 255 && transparencyEnabled;
+		short yMax = (short) (yMin + ySize);
 		
-		try
-		{
-			// 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);
 		
-			// iterate top down
 		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++)
 		{
 			long adjPoint = adjColumnView.get(adjIndex);
 			short adjMinY = RenderDataPointUtil.getYMin(adjPoint);
 			short adjMaxY = RenderDataPointUtil.getYMax(adjPoint);
 			
-				// skip empty adjacent datapoints
+			// skip empty adjacent points
+			// or points below this one
 			if (!RenderDataPointUtil.doesDataPointExist(adjPoint)
-						|| RenderDataPointUtil.isVoid(adjPoint))
+				|| RenderDataPointUtil.hasZeroHeight(adjPoint)
-				{
+				|| yMax <= adjMinY)
-					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;
 			}
@@ -280,123 +310,121 @@ public class ColumnBox
 			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;
+			boolean adjTransparent = !adjOverVoid
+					&& RenderDataPointUtil.getAlpha(adjPoint) < 255
+					&& transparencyEnabled;
 			
+			byte adjSkyLight = RenderDataPointUtil.getLightSky(adjPoint);
+			byte lightToApply;
 			
-				
-				//=================================//
-				// set sky light based on adjacent //
-				//=================================//
-				
-				// set light based on overlapping adjacent
 			if (!adjTransparent)
 			{
-					// adj opaque
+				// Adjacent is 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;
+				lightToApply = adjacentCoversThis ? adjSkyLight : SKYLIGHT_COVERED;
-						skyLightAtInputPos[i] = (byte) Math.min(newSkyLightAtPos, skyLightAtPos);
-					}
 			}
 			else
 			{
-					// adjacent is transparent,
+				// Adjacent is transparent, use below light
-					// use datapoint below adjacent for lighting
+				lightToApply = RenderDataPointUtil.getLightSky(adjBelowPoint);
-					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,
+			// Apply light to the range [adjMinY, adjMaxY)
-				// this is done to handle overhangs
+			applyLightToRange(segments, newSegments, adjMinY, adjMaxY, lightToApply);
-				byte adjSkyLight = RenderDataPointUtil.getLightSky(adjPoint);
+			
-				int adjAboveMinY = RenderDataPointUtil.getYMin(adjAbovePoint);
+			// Fill overhang area [adjMaxY, adjAboveMinY) with adjSkyLight
-				for (int i = adjMaxY; i < adjAboveMinY; i++)
+			short adjAboveMinY = RenderDataPointUtil.getYMin(adjAbovePoint);
+			if (adjMaxY < adjAboveMinY)
 			{
-					byte skyLightAtPos = skyLightAtInputPos[i];
+				applyLightToRange(segments, newSegments, adjMaxY, adjAboveMinY, adjSkyLight);
-					skyLightAtInputPos[i] = (byte) Math.min(adjSkyLight, skyLightAtPos);
 			}
 		}
 		
 		
 		
 		//=======================//
-			// create vertical faces //
+		// Create vertical faces //
+		// from segments         //
 		//=======================//
 		
-			boolean inputTransparent = ColorUtil.getAlpha(color) < 255 && LodRenderer.transparencyEnabled;
+		for (int i = 0; i < segments.size(); i++)
-			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++)
 		{
-				byte skyLight = skyLightAtInputPos[i];
+			long segment = segments.getLong(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
+					YSegmentUtil.getSkyLight(segment), inputTransparent, YSegmentUtil.getEndY(segment), YSegmentUtil.getStartY(segment)
-					);
-					
-					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
 			);
 		}
 	}
-		finally
+	
+	/**
+	 * 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)
 	{
-			// clean up the array before the next thread uses it
+		// clear the pooled array that the new segments will go into
-			// (may be unnecessary since we only work between the yMin-yMax anyway, but is helpful for debugging)
+		newSegments.clear();
-			Arrays.fill(skyLightAtInputPos, yMin, yMax, SKYLIGHT_EMPTY);
+		
+		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,
@@ -405,22 +433,72 @@ 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
+		if (inputTransparent
-				|| (lastSkyLight == LodUtil.MAX_MC_LIGHT))
+			&& (lastSkyLight != LodUtil.MAX_MC_LIGHT))
 		{
+			return;
+		}
+		
 		// don't add negative/empty height faces
 		short height = (short) (quadTopY - quadBottomY);
-				if (height > 0)
+		if (height <= 0)
 		{
-					builder.addQuadAdj(direction, x, (short) quadBottomY, z, horizontalWidth, height, color, irisBlockMaterialId, lastSkyLight, blockLight);
+			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/ColumnRenderBufferBuilder.java

@@ -25,20 +25,17 @@ 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.ConfigBasedLogger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.pooling.PhantomArrayListCheckout;
+import com.seibel.distanthorizons.core.pooling.PhantomArrayListPool;
 import com.seibel.distanthorizons.core.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;
 
@@ -49,9 +46,9 @@ import java.util.concurrent.CompletableFuture;
  */
 public class ColumnRenderBufferBuilder
 {
-	public static final ConfigBasedLogger EVENT_LOGGER = new ConfigBasedLogger(LogManager.getLogger(),
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
-			() -> Config.Common.Logging.logRendererBufferEvent.get());
+	
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	public static final PhantomArrayListPool ARRAY_LIST_POOL = new PhantomArrayListPool("Column Buffer Builder");
 	
 	
 	
@@ -60,14 +57,15 @@ public class ColumnRenderBufferBuilder
 	//==============//
 	
 	/** @link adjData should be null for adjacent sections that cross detail level boundaries */
-	public static CompletableFuture<ColumnRenderBuffer> uploadBuffersAsync(
+	public static CompletableFuture<LodBufferContainer> uploadBuffersAsync(
 			IDhClientLevel clientLevel,
 			long pos,
 			LodQuadBuilder quadBuilder
 		)
 	{
-		ColumnRenderBuffer buffer = new ColumnRenderBuffer(new DhBlockPos(DhSectionPos.getMinCornerBlockX(pos), clientLevel.getMinY(), DhSectionPos.getMinCornerBlockZ(pos)));
+		DhBlockPos minBlockPos = new DhBlockPos(DhSectionPos.getMinCornerBlockX(pos), clientLevel.getLevelWrapper().getMinHeight(), DhSectionPos.getMinCornerBlockZ(pos));
-		CompletableFuture<ColumnRenderBuffer> uploadFuture = buffer.makeAndUploadBuffersAsync(quadBuilder, GLProxy.getInstance().getGpuUploadMethod());
+		LodBufferContainer bufferContainer = new LodBufferContainer(pos, minBlockPos);
+		CompletableFuture<LodBufferContainer> uploadFuture = bufferContainer.makeAndUploadBuffersAsync(quadBuilder);
 		uploadFuture.whenComplete((uploadedBuffer, exception) -> 
 		{
 			// clean up if not uploaded
@@ -109,19 +107,19 @@ 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++)
+			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)))
+							|| RenderDataPointUtil.hasZeroHeight(columnRenderData.get(0)))
 					{
 						continue;
 					}
@@ -154,16 +152,16 @@ public class ColumnRenderBufferBuilder
 					// get adjacent render data columns //
 					//==================================//
 					
-				ColumnArrayView[] adjColumnViews = new ColumnArrayView[EDhDirection.ADJ_DIRECTIONS.length];
+					ColumnArrayView[] adjColumnViews = new ColumnArrayView[EDhDirection.CARDINAL_COMPASS.length];
-				for (EDhDirection lodDirection : EDhDirection.ADJ_DIRECTIONS)
+					for (EDhDirection direction : EDhDirection.CARDINAL_COMPASS)
 					{
 						try
 						{
-						int xAdj = relX + lodDirection.getNormal().x;
+							int xAdj = relX + direction.normal.x;
-						int zAdj = relZ + lodDirection.getNormal().z;
+							int zAdj = relZ + direction.normal.z;
 							boolean isCrossRenderSourceBoundary =
-								(xAdj < 0 || xAdj >= ColumnRenderSource.SECTION_SIZE) ||
+									(xAdj < 0 || xAdj >= ColumnRenderSource.WIDTH) ||
-								(zAdj < 0 || zAdj >= ColumnRenderSource.SECTION_SIZE);
+											(zAdj < 0 || zAdj >= ColumnRenderSource.WIDTH);
 							
 							ColumnRenderSource adjRenderSource;
 							byte adjDetailLevel;
@@ -186,7 +184,7 @@ public class ColumnRenderBufferBuilder
 								// the adjacent position is outside this render source
 								
 								// skip empty sections
-							adjRenderSource = adjRegions[lodDirection.ordinal() - 2];
+								adjRenderSource = adjRegions[direction.compassIndex];
 								if (adjRenderSource == null)
 								{
 									continue;
@@ -200,20 +198,20 @@ public class ColumnRenderBufferBuilder
 									
 									if (xAdj < 0)
 									{
-									xAdj += ColumnRenderSource.SECTION_SIZE;
+										xAdj += ColumnRenderSource.WIDTH;
 									}
-								if (xAdj >= ColumnRenderSource.SECTION_SIZE)
+									if (xAdj >= ColumnRenderSource.WIDTH)
 									{
-									xAdj -= ColumnRenderSource.SECTION_SIZE;
+										xAdj -= ColumnRenderSource.WIDTH;
 									}
 									
 									if (zAdj < 0)
 									{
-									zAdj += ColumnRenderSource.SECTION_SIZE;
+										zAdj += ColumnRenderSource.WIDTH;
 									}
-								if (zAdj >= ColumnRenderSource.SECTION_SIZE)
+									if (zAdj >= ColumnRenderSource.WIDTH)
 									{
-									zAdj -= ColumnRenderSource.SECTION_SIZE;
+										zAdj -= ColumnRenderSource.WIDTH;
 									}
 								}
 							}
@@ -232,11 +230,11 @@ public class ColumnRenderBufferBuilder
 								LodUtil.assertNotReach("Mismatch between adjacent detail level ["+adjDetailLevel+"] and this render source's detail level ["+thisDetailLevel+"]. Detail levels should be adj >= this.");
 							}
 							
-						adjColumnViews[lodDirection.ordinal() - 2] = adjRenderSource.getVerticalDataPointView(xAdj, zAdj);
+							adjColumnViews[direction.compassIndex] = 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);
+							LOGGER.warn("Failed to get adj data for relative pos: [" + thisDetailLevel + ":" + relX + "," + relZ + "] at [" + direction + "], Error: [" + e.getMessage() + "].", e);
 						}
 					} // for adjacent directions
 					
@@ -248,15 +246,14 @@ public class ColumnRenderBufferBuilder
 					
 					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)
+							if (wantedColumnIndex >= 0
+									&& i != wantedColumnIndex)
 							{
 								continue;
 							}
@@ -265,7 +262,8 @@ public class ColumnRenderBufferBuilder
 						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))
+						if (RenderDataPointUtil.hasZeroHeight(data)
+								|| !RenderDataPointUtil.doesDataPointExist(data))
 						{
 							break;
 						}
@@ -273,8 +271,8 @@ public class ColumnRenderBufferBuilder
 						long topDataPoint = (i - 1) >= 0 ? columnRenderData.get(i - 1) : RenderDataPointUtil.EMPTY_DATA;
 						long bottomDataPoint = (i + 1) < columnRenderData.size() ? columnRenderData.get(i + 1) : RenderDataPointUtil.EMPTY_DATA;
 						
-					addLodToBuffer(
+						addRenderDataPointToBuilder(
-							clientLevel,
+								clientLevel, phantomArrayCheckout,
 								data, topDataPoint, bottomDataPoint,
 								adjColumnViews, isSameDetailLevel,
 								thisDetailLevel, relX, relZ,
@@ -283,34 +281,35 @@ public class ColumnRenderBufferBuilder
 					
 				}// for z
 			}// for x
+		}// phantom checkout
 		
-		quadBuilder.finalizeData();
+		quadBuilder.mergeQuads();
 	}
-	private static void addLodToBuffer(
+	private static void addRenderDataPointToBuilder(
-			IDhClientLevel clientLevel,
+			IDhClientLevel clientLevel, PhantomArrayListCheckout phantomArrayCheckout,
-			long data, long topData, long bottomData, 
+			long renderData, long topRenderData, long bottomRenderData, 
 			ColumnArrayView[] adjColumnViews, boolean[] isSameDetailLevel,
 			byte detailLevel, int renderSourceOffsetPosX, int renderSourceOffsetPosZ, 
 			LodQuadBuilder quadBuilder, ColumnRenderSource.DebugSourceFlag debugSource)
 	{
 		long sectionPos = DhSectionPos.encode(detailLevel, renderSourceOffsetPosX, renderSourceOffsetPosZ);
 		
-		short width = (short) BitShiftUtil.powerOfTwo(detailLevel);
+		short blockWidth = (short) DhSectionPos.getDetailLevelWidthInBlocks(detailLevel);
-		short xMin = (short) DhSectionPos.getMinCornerBlockX(sectionPos);
+		short blockMinX = (short) DhSectionPos.getMinCornerBlockX(sectionPos);
-		short yMin = RenderDataPointUtil.getYMin(data);
+		short blockMinY = RenderDataPointUtil.getYMin(renderData);
-		short zMin = (short) DhSectionPos.getMinCornerBlockZ(sectionPos);
+		short blockMinZ = (short) DhSectionPos.getMinCornerBlockZ(sectionPos);
-		short ySize = (short) (RenderDataPointUtil.getYMax(data) - yMin);
+		short blockMaxY = (short) (RenderDataPointUtil.getYMax(renderData) - blockMinY);
 		
-		if (ySize == 0)
+		if (blockMaxY == 0)
 		{
 			return;
 		}
-		else if (ySize < 0)
+		else if (blockMaxY < 0)
 		{
-			throw new IllegalArgumentException("Negative y size for the data! Data: [" + RenderDataPointUtil.toString(data) + "].");
+			throw new IllegalArgumentException("Negative y size for the renderDataPoint! Data: [" + RenderDataPointUtil.toString(renderData) + "].");
 		}
 		
-		byte blockMaterialId = RenderDataPointUtil.getBlockMaterialId(data);
+		byte blockMaterialId = RenderDataPointUtil.getBlockMaterialId(renderData);
 		
 		
 		
@@ -325,11 +324,11 @@ public class ColumnRenderBufferBuilder
 				float brightnessMultiplier = Config.Client.Advanced.Graphics.Quality.brightnessMultiplier.get().floatValue();
 				if (saturationMultiplier == 1.0 && brightnessMultiplier == 1.0)
 				{
-					color = RenderDataPointUtil.getColor(data);
+					color = RenderDataPointUtil.getColor(renderData);
 				}
 				else
 				{
-					float[] ahsv = ColorUtil.argbToAhsv(RenderDataPointUtil.getColor(data));
+					float[] ahsv = ColorUtil.argbToAhsv(RenderDataPointUtil.getColor(renderData));
 					color = ColorUtil.ahsvToArgb(ahsv[0], ahsv[1], ahsv[2] * saturationMultiplier, ahsv[3] * brightnessMultiplier);
 				}
 				break;
@@ -419,14 +418,14 @@ public class ColumnRenderBufferBuilder
 		}
 		
 		ColumnBox.addBoxQuadsToBuilder(
-				quadBuilder, clientLevel,
+				quadBuilder, phantomArrayCheckout, clientLevel,
-				width, ySize, width,
+				blockWidth, blockMaxY,
-				xMin, yMin, zMin,
+				blockMinX, blockMinY, blockMinZ,
 				color,
 				blockMaterialId,
-				RenderDataPointUtil.getLightSky(data),
+				RenderDataPointUtil.getLightSky(renderData),
-				fullBright ? 15 : RenderDataPointUtil.getLightBlock(data),
+				fullBright ? LodUtil.MAX_MC_LIGHT : RenderDataPointUtil.getLightBlock(renderData),
-				topData, bottomData, adjColumnViews, isSameDetailLevel);
+				topRenderData, bottomRenderData, adjColumnViews, isSameDetailLevel);
 	}
 	
 }

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

@@ -19,16 +19,14 @@
 
 package com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding;
 
-import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiRenderParam;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 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;
@@ -40,9 +38,9 @@ import java.util.concurrent.*;
  *
  * @see ColumnRenderBufferBuilder
  */
-public class ColumnRenderBuffer implements AutoCloseable
+public class LodBufferContainer implements AutoCloseable
 {
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	/** number of bytes a single quad takes */
 	public static final int QUADS_BYTE_SIZE = LodUtil.LOD_VERTEX_FORMAT.getByteSize() * 4;
@@ -52,15 +50,16 @@ public class ColumnRenderBuffer 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 blockPos;
+	public final DhBlockPos minCornerBlockPos;
+	public final long pos;
 	
 	public boolean buffersUploaded = false;
 	
-	private GLVertexBuffer[] vbos;
+	public GLVertexBuffer[] vbos;
-	private GLVertexBuffer[] vbosTransparent;
+	public GLVertexBuffer[] vbosTransparent;
 	
-	private CompletableFuture<ColumnRenderBuffer> uploadFuture = null;
+	private CompletableFuture<LodBufferContainer> uploadFuture = null;
 	
 	
 	
@@ -68,9 +67,10 @@ public class ColumnRenderBuffer implements AutoCloseable
 	// constructors //
 	//==============//
 	
-	public ColumnRenderBuffer(DhBlockPos blockPos)
+	public LodBufferContainer(long pos, DhBlockPos minCornerBlockPos)
 	{
-		this.blockPos = blockPos;
+		this.pos = pos;
+		this.minCornerBlockPos = minCornerBlockPos;
 		this.vbos = new GLVertexBuffer[0];
 		this.vbosTransparent = new GLVertexBuffer[0];
 	}
@@ -82,10 +82,10 @@ public class ColumnRenderBuffer implements AutoCloseable
 	//==================//
 	
 	/** Should be run on a DH thread. */
-	public synchronized CompletableFuture<ColumnRenderBuffer> makeAndUploadBuffersAsync(LodQuadBuilder builder, EDhApiGpuUploadMethod gpuUploadMethod)
+	public synchronized CompletableFuture<LodBufferContainer> makeAndUploadBuffersAsync(LodQuadBuilder builder)
 	{
 		// separate variable to prevent race condition when checking null
-		CompletableFuture<ColumnRenderBuffer> future = this.uploadFuture;
+		CompletableFuture<LodBufferContainer> future = this.uploadFuture;
 		if (future != null)
 		{
 			// upload already in process
@@ -117,6 +117,8 @@ public class ColumnRenderBuffer implements AutoCloseable
 					throw new InterruptedException();
 				}
 				
+				EDhApiGpuUploadMethod gpuUploadMethod = GLProxy.getInstance().getGpuUploadMethod();
+				
 				// upload on the render thread
 				uploadBuffersDirect(this.vbos, opaqueBuffers, gpuUploadMethod);
 				uploadBuffersDirect(this.vbosTransparent, transparentBuffers, gpuUploadMethod);
@@ -133,7 +135,7 @@ public class ColumnRenderBuffer implements AutoCloseable
 			}
 			catch (Exception e)
 			{
-				LOGGER.error("Unexpected issue uploading buffer ["+this.blockPos +"], error: ["+e.getMessage()+"].", e);
+				LOGGER.error("Unexpected issue uploading buffer ["+this.minCornerBlockPos +"], error: ["+e.getMessage()+"].", e);
 				
 				this.uploadFuture.completeExceptionally(e);
 				this.uploadFuture = null;
@@ -177,7 +179,9 @@ public class ColumnRenderBuffer implements AutoCloseable
 		}
 		return newVbos;
 	}
-	private static void uploadBuffersDirect(GLVertexBuffer[] vbos, ArrayList<ByteBuffer> byteBuffers, EDhApiGpuUploadMethod method) throws InterruptedException
+	private static void uploadBuffersDirect(
+			GLVertexBuffer[] vbos, ArrayList<ByteBuffer> byteBuffers, 
+			EDhApiGpuUploadMethod uploadMethod) throws InterruptedException
 	{
 		int vboIndex = 0;
 		for (int i = 0; i < byteBuffers.size(); i++)
@@ -191,7 +195,7 @@ public class ColumnRenderBuffer implements AutoCloseable
 			// get or create the VBO
 			if (vbos[vboIndex] == null)
 			{
-				vbos[vboIndex] = new GLVertexBuffer(method.useBufferStorage);
+				vbos[vboIndex] = new GLVertexBuffer(uploadMethod.useBufferStorage);
 			}
 			GLVertexBuffer vbo = vbos[vboIndex];
 			
@@ -202,13 +206,13 @@ public class ColumnRenderBuffer implements AutoCloseable
 			try
 			{
 				vbo.bind();
-				vbo.uploadBuffer(buffer, size / LodUtil.LOD_VERTEX_FORMAT.getByteSize(), method, FULL_SIZED_BUFFER);
+				vbo.uploadBuffer(buffer, size / LodUtil.LOD_VERTEX_FORMAT.getByteSize(), uploadMethod, FULL_SIZED_BUFFER);
 			}
 			catch (Exception e)
 			{
 				vbos[vboIndex] = null;
 				vbo.close();
-				LOGGER.error("Failed to upload buffer: ", e);
+				LOGGER.error("Failed to upload buffer. Error: ["+e.getMessage()+"].", e);
 			}
 			
 			vboIndex++;
@@ -222,69 +226,6 @@ public class ColumnRenderBuffer 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 //
 	//================//
@@ -328,7 +269,7 @@ public class ColumnRenderBuffer implements AutoCloseable
 				
 				if (vertexBuffer.getSize() == 0)
 				{
-					GLProxy.GL_LOGGER.warn("VBO with size 0");
+					GLProxy.LOGGER.warn("VBO with size 0");
 				}
 				statsMap.incBytesStat("TotalUsage", vertexBuffer.getSize());
 			}

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

@@ -20,7 +20,6 @@
 package com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding;
 
 import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
 import java.util.*;
 
 import com.seibel.distanthorizons.api.enums.config.EDhApiGrassSideRendering;
@@ -29,15 +28,12 @@ import com.seibel.distanthorizons.api.enums.rendering.EDhApiDebugRendering;
 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.logging.DhLogger;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.render.glObject.buffer.GLVertexBuffer;
 import com.seibel.distanthorizons.core.util.ColorUtil;
-import com.seibel.distanthorizons.api.enums.config.EDhApiGpuUploadMethod;
-import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import com.seibel.distanthorizons.coreapi.util.MathUtil;
-import org.apache.logging.log4j.Logger;
 import org.lwjgl.system.MemoryUtil;
 
 /**
@@ -47,7 +43,7 @@ import org.lwjgl.system.MemoryUtil;
  */
 public class LodQuadBuilder
 {
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
 	
 	@SuppressWarnings("unchecked")
@@ -142,7 +138,8 @@ public class LodQuadBuilder
 	//===========//
 	
 	public void addQuadAdj(
-			EDhDirection dir, short x, short y, short z,
+			EDhDirection dir, 
+			short x, short y, short z,
 			short widthEastWest, short widthNorthSouthOrUpDown,
 			int color, byte irisBlockMaterialId, byte skyLight, byte blockLight)
 	{
@@ -153,8 +150,8 @@ public class LodQuadBuilder
 		
 		BufferQuad quad = new BufferQuad(x, y, z, widthEastWest, widthNorthSouthOrUpDown, color, irisBlockMaterialId, skyLight, blockLight, dir);
 		ArrayList<BufferQuad> quadList = (this.doTransparency && ColorUtil.getAlpha(color) < 255) ? this.transparentQuads[dir.ordinal()] : this.opaqueQuads[dir.ordinal()];
-		if (!quadList.isEmpty() &&
+		if (!quadList.isEmpty()
-				(
+			&& (
 				quadList.get(quadList.size() - 1).tryMerge(quad, BufferMergeDirectionEnum.EastWest)
 				|| quadList.get(quadList.size() - 1).tryMerge(quad, BufferMergeDirectionEnum.NorthSouthOrUpDown))
 			)
@@ -169,39 +166,23 @@ public class LodQuadBuilder
 	// XZ
 	public void addQuadUp(short minX, short maxY, short minZ, short widthEastWest, short widthNorthSouthOrUpDown, int color, byte irisBlockMaterialId, byte skylight, byte blocklight) // TODO argument names are wrong
 	{
-		BufferQuad quad = new BufferQuad(minX, maxY, minZ, widthEastWest, widthNorthSouthOrUpDown, color, irisBlockMaterialId, skylight, blocklight, EDhDirection.UP);
 		boolean isTransparent = (this.doTransparency && ColorUtil.getAlpha(color) < 255);
-		ArrayList<BufferQuad> quadList = isTransparent ? this.transparentQuads[EDhDirection.UP.ordinal()] : this.opaqueQuads[EDhDirection.UP.ordinal()];
+		ArrayList<BufferQuad> quadList = isTransparent 
-		
+				? this.transparentQuads[EDhDirection.UP.ordinal()] 
-		
+				: this.opaqueQuads[EDhDirection.UP.ordinal()];
-		// attempt to merge this quad with adjacent ones
-		if (!quadList.isEmpty() &&
-				(
-					quadList.get(quadList.size() - 1).tryMerge(quad, BufferMergeDirectionEnum.EastWest)
-					|| quadList.get(quadList.size() - 1).tryMerge(quad, BufferMergeDirectionEnum.NorthSouthOrUpDown))
-			)
-		{
-			this.premergeCount++;
-			return;
-		}
 		
+		BufferQuad quad = new BufferQuad(minX, maxY, minZ, widthEastWest, widthNorthSouthOrUpDown, color, irisBlockMaterialId, skylight, blocklight, EDhDirection.UP);
 		quadList.add(quad);
 	}
 	
 	public void addQuadDown(short x, short y, short z, short width, short wz, int color, byte irisBlockMaterialId, byte skylight, byte blocklight)
 	{
+		ArrayList<BufferQuad> quadArray = (this.doTransparency && ColorUtil.getAlpha(color) < 255)
+				? this.transparentQuads[EDhDirection.DOWN.ordinal()]
+				: this.opaqueQuads[EDhDirection.DOWN.ordinal()];
+		
 		BufferQuad quad = new BufferQuad(x, y, z, width, wz, color, irisBlockMaterialId, skylight, blocklight, EDhDirection.DOWN);
-		ArrayList<BufferQuad> qs = (doTransparency && ColorUtil.getAlpha(color) < 255)
+		quadArray.add(quad);
-				? transparentQuads[EDhDirection.DOWN.ordinal()] : opaqueQuads[EDhDirection.DOWN.ordinal()];
-		if (!qs.isEmpty()
-				&& (qs.get(qs.size() - 1).tryMerge(quad, BufferMergeDirectionEnum.EastWest)
-						|| qs.get(qs.size() - 1).tryMerge(quad, BufferMergeDirectionEnum.NorthSouthOrUpDown))
-			)
-		{
-			premergeCount++;
-			return;
-		}
-		qs.add(quad);
 	}
 	
 	
@@ -210,9 +191,6 @@ public class LodQuadBuilder
 	// data finalizing //
 	//=================//
 	
-	/** runs any final data cleanup, merging, etc. */
-	public void finalizeData() { this.mergeQuads(); }
-	
 	/** Uses Greedy meshing to merge this builder's Quads. */
 	public void mergeQuads()
 	{
@@ -251,7 +229,9 @@ public class LodQuadBuilder
 	private static long mergeQuadsInternal(ArrayList<BufferQuad>[] list, int directionIndex, BufferMergeDirectionEnum mergeDirection)
 	{
 		if (list[directionIndex].size() <= 1)
+		{
 			return 0;
+		}
 		
 		list[directionIndex].sort((objOne, objTwo) -> objOne.compare(objTwo, mergeDirection));
 		
@@ -306,7 +286,7 @@ public class LodQuadBuilder
 				// create a new buffer
 				if (buffer == null || !buffer.hasRemaining())
 				{
-					buffer = MemoryUtil.memAlloc(ColumnRenderBuffer.FULL_SIZED_BUFFER);
+					buffer = MemoryUtil.memAlloc(LodBufferContainer.FULL_SIZED_BUFFER);
 					byteBufferList.add(buffer);
 				}
 				
@@ -330,7 +310,7 @@ public class LodQuadBuilder
 		short widthEastWest = quad.widthEastWest;
 		short widthNorthSouth = quad.widthNorthSouthOrUpDown;
 		byte normalIndex = (byte) quad.direction.ordinal();
-		EDhDirection.Axis axis = quad.direction.getAxis();
+		EDhDirection.Axis axis = quad.direction.axis;
 		for (int i = 0; i < quadBase.length; i++)
 		{
 			short dx, dy, dz;
@@ -378,7 +358,7 @@ public class LodQuadBuilder
 					if (this.grassSideRenderingMode != EDhApiGrassSideRendering.AS_GRASS)
 					{
 						// only change the vertex color if it's on the side or bottom
-						if (quad.direction.getAxis().isHorizontal() || quad.direction == EDhDirection.DOWN)
+						if (quad.direction.axis.isHorizontal() || quad.direction == EDhDirection.DOWN)
 						{
 							if (this.grassSideRenderingMode == EDhApiGrassSideRendering.AS_DIRT
 									// if we want the color to fade, only apply the dirt color to the bottom vertices
@@ -477,7 +457,7 @@ public class LodQuadBuilder
 	}
 	
 	/** Returns how many GpuBuffers will be needed to render opaque quads in this builder. */
-	public int getCurrentNeededOpaqueVertexBufferCount() { return MathUtil.ceilDiv(this.getCurrentOpaqueQuadsCount(), ColumnRenderBuffer.MAX_QUADS_PER_BUFFER); }
+	public int getCurrentNeededOpaqueVertexBufferCount() { return MathUtil.ceilDiv(this.getCurrentOpaqueQuadsCount(), LodBufferContainer.MAX_QUADS_PER_BUFFER); }
 	/** Returns how many GpuBuffers will be needed to render transparent quads in this builder. */
 	public int getCurrentNeededTransparentVertexBufferCount()
 	{
@@ -486,7 +466,7 @@ public class LodQuadBuilder
 			return 0;
 		}
 		
-		return MathUtil.ceilDiv(this.getCurrentTransparentQuadsCount(), ColumnRenderBuffer.MAX_QUADS_PER_BUFFER);
+		return MathUtil.ceilDiv(this.getCurrentTransparentQuadsCount(), LodBufferContainer.MAX_QUADS_PER_BUFFER);
 	}
 	
 }

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

@@ -101,9 +101,7 @@ public final class ColumnArrayView implements IColumnDataView
 	
 	@Override
 	public ColumnArrayView subView(int dataIndexStart, int dataCount)
-	{
+	{ return new ColumnArrayView(data, dataCount * verticalSize, offset + dataIndexStart * verticalSize, verticalSize); }
-		return new ColumnArrayView(data, dataCount * verticalSize, offset + dataIndexStart * verticalSize, verticalSize);
-	}
 	
 	public void fill(long value) { Arrays.fill(data.elements(), offset, offset + size, value); }
 	
@@ -185,21 +183,11 @@ public final class ColumnArrayView implements IColumnDataView
 		{
 			for (int i = 0; i < this.dataCount(); i++)
 			{
-				RenderDataPointUtil.mergeMultiData(source.subView(i, 1), subView(i, 1));
+				RenderDataPointUtil.mergeMultiData(source.subView(i, 1), this.subView(i, 1));
 			}
 		}
 	}
 	
-	public void mergeMultiDataFrom(IColumnDataView source)
-	{
-		if (dataCount() != 1)
-		{
-			throw new IllegalArgumentException("output dataCount must be 1");
-		}
-		
-		RenderDataPointUtil.mergeMultiData(source, this);
-	}
-	
 	
 	
 	//================//
@@ -210,15 +198,15 @@ public final class ColumnArrayView implements IColumnDataView
 	public String toString()
 	{
 		StringBuilder sb = new StringBuilder();
-		sb.append("S:").append(size);
+		sb.append("S:").append(this.size);
-		sb.append(" V:").append(verticalSize);
+		sb.append(" V:").append(this.verticalSize);
-		sb.append(" O:").append(offset);
+		sb.append(" O:").append(this.offset);
 		
 		sb.append(" [");
-		for (int i = 0; i < size; i++)
+		for (int i = 0; i < this.size; i++)
 		{
-			sb.append(RenderDataPointUtil.toString(data.getLong(offset + i)));
+			sb.append(RenderDataPointUtil.toString(this.data.getLong(this.offset + i)));
-			if (i < size - 1)
+			if (i < this.size - 1)
 			{
 				sb.append(",\n");
 			}
@@ -229,11 +217,7 @@ public final class ColumnArrayView implements IColumnDataView
 	}
 	
 	
-	public int getDataHash()
+	public int getDataHash() { return arrayHash(this.data, this.offset, this.size); }
-	{
-		return arrayHash(data, offset, size);
-	}
-	
 	private static int arrayHash(LongArrayList a, int offset, int length)
 	{
 		if (a == null)
@@ -252,4 +236,6 @@ public final class ColumnArrayView implements IColumnDataView
 		return result;
 	}
 	
+	
+	
 }

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

@@ -140,40 +140,4 @@ public class ColumnQuadView implements IColumnDataView
 		}
 	}
 	
-	public void copyTo(ColumnQuadView target)
-	{
-		if (target.xSize != xSize || target.zSize != zSize)
-			throw new IllegalArgumentException("Target view must have same size as this view");
-		
-		for (int x = 0; x < xSize; x++)
-		{
-			target.getRow(x).changeVerticalSizeFrom(getRow(x));
-		}
-	}
-	
-	public void mergeMultiColumnFrom(ColumnQuadView source)
-	{
-		if (source.xSize == xSize && source.zSize == zSize)
-		{
-			source.copyTo(this);
-			return;
-		}
-		if (source.xSize < xSize || source.zSize < zSize)
-			throw new IllegalArgumentException("Source view must have same or larger size as this view");
-		
-		int srcXPerTrgX = source.xSize / xSize;
-		int srcZPerTrgZ = source.zSize / zSize;
-		if (source.xSize % xSize != 0 || source.zSize % zSize != 0)
-			throw new IllegalArgumentException("Source view's size must be a multiple of this view's size");
-		
-		for (int x = 0; x < xSize; x++)
-		{
-			for (int z = 0; z < zSize; z++)
-			{
-				ColumnQuadView srcBlock = source.subView(x * srcXPerTrgX, z * srcZPerTrgZ, srcXPerTrgX, srcZPerTrgZ);
-				get(x, z).mergeMultiDataFrom(srcBlock);
-			}
-		}
-	}
-	
 }

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

@@ -0,0 +1,199 @@
+package com.seibel.distanthorizons.core.dataObjects.transformers;
+
+import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
+import com.seibel.distanthorizons.core.util.FullDataPointUtil;
+import com.seibel.distanthorizons.core.util.LodUtil;
+import it.unimi.dsi.fastutil.longs.LongArrayList;
+import org.jetbrains.annotations.NotNull;
+
+public class FullDataOcclusionCuller
+{
+	/**
+	 * Mutates the given datasource so blocks that aren't visible
+	 * (IE completely surrounded by other opaque blocks)
+	 * are removed from the data column.
+	 * 
+	 * @param dataSource
+	 * @param relX relative X position in the datasource
+	 * @param relZ relative Z position in the datasource
+	 */
+	public static void cullHiddenDatapointsInColumn(
+			FullDataSourceV2 dataSource,
+			int relX, int relZ
+	)
+	{
+		LongArrayList centerColumn = dataSource.getColumnAtRelPos(relX, relZ);
+		LongArrayList posXColumn = dataSource.tryGetColumnAtRelPos(relX + 1, relZ);
+		LongArrayList negXColumn = dataSource.tryGetColumnAtRelPos(relX - 1, relZ);
+		LongArrayList posZColumn = dataSource.tryGetColumnAtRelPos(relX, relZ + 1);
+		LongArrayList negZColumn = dataSource.tryGetColumnAtRelPos(relX, relZ - 1);
+		
+		if (posXColumn == null || posXColumn.size() == 0
+			|| negXColumn == null || negXColumn.size() == 0
+			|| posZColumn == null || posZColumn.size() == 0
+			|| negZColumn == null || negZColumn.size() == 0)
+		{
+			// if any adjacent columns are empty then we can't
+			// cull this column, since at least one side will be open
+			// to air/void
+			return;
+		}
+		
+		
+		int centerIndex = centerColumn.size() - 1;
+		int posXIndex = (posXColumn.size() - 1);
+		int negXIndex = (negXColumn.size() - 1);
+		int posZIndex = (posZColumn.size() - 1);
+		int negZIndex = (negZColumn.size() - 1);
+		
+		for (; centerIndex >= 0; centerIndex--)
+		{
+			long currentPoint = centerColumn.getLong(centerIndex);
+			
+			// Translucent data points are not eligible to be culled.
+			if (isTranslucent(dataSource, currentPoint))
+			{
+				continue;
+			}
+			
+			// the top segment should never be culled.
+			if (centerIndex == 0
+				|| isTranslucent(dataSource, centerColumn.getLong(centerIndex - 1)))
+			{
+				continue;
+			}
+			
+			// the bottom segment can sometimes be culled.
+			// assume it will not be seen from below,
+			// because this would imply the player is in the void.
+			if (centerIndex + 1 < centerColumn.size()
+				&& isTranslucent(dataSource, centerColumn.getLong(centerIndex + 1)))
+			{
+				continue;
+			}
+			
+			// the lowest/bedrock segment should not be culled
+			if (centerIndex + 1 == centerColumn.size())
+			{
+				continue;
+			}
+			
+			
+			posXIndex = checkOcclusion(dataSource, currentPoint, posXColumn, posXIndex);
+			if (posXIndex < 0)
+			{
+				posXIndex = ~posXIndex;
+				continue;
+			}
+			
+			negXIndex = checkOcclusion(dataSource, currentPoint, negXColumn, negXIndex);
+			if (negXIndex < 0)
+			{
+				negXIndex = ~negXIndex;
+				continue;
+			}
+			
+			posZIndex = checkOcclusion(dataSource, currentPoint, posZColumn, posZIndex);
+			if (posZIndex < 0)
+			{
+				posZIndex = ~posZIndex;
+				continue;
+			}
+			
+			negZIndex = checkOcclusion(dataSource, currentPoint, negZColumn, negZIndex);
+			if (negZIndex < 0)
+			{
+				negZIndex = ~negZIndex;
+				continue;
+			}
+			
+			
+			// Current point is fully surrounded. remove it.
+			centerColumn.removeLong(centerIndex);
+			
+			// Make the above data point cover the area that the current point used to occupy.
+			// The element that was at `centerIndex - 1` is still at that position even after removal of centerIndex.
+			long above = centerColumn.getLong(centerIndex - 1);
+			above = FullDataPointUtil.setBottomY(above, FullDataPointUtil.getBottomY(currentPoint));
+			above = FullDataPointUtil.setHeight(above, FullDataPointUtil.getHeight(currentPoint) + FullDataPointUtil.getHeight(above));
+			centerColumn.set(centerIndex - 1, above);
+		}
+	}
+	/**
+	 checks if centerPoint is "covered" by opaque data points in adjacentColumn.
+	 centerPoint counts as covered if, and only if, for all Y levels in its height range,
+	 there exists an opaque data point in adjacentColumn which overlaps with that Y level.
+	 
+	 @param source used to lookup blocks (and their opacities) based on their IDs.
+	 @param centerPoint the point being checked to see if it's fully covered.
+	 @param adjacentColumn the data points which might cover centerPoint.
+	 @param adjacentIndex the starting index in adjacentColumn to start scanning at.
+	 indices greater than adjacentIndex have already been checked and confirmed to
+	 not overlap or only overlap partially with centerPoint's Y range.
+	 
+	 @return if centerPoint is covered, returns the index of the segment which finishes covering it.
+	 the start of the covering may be a smaller index. in this case, the returned index may be used
+	 as the adjacentIndex provided to this method on the next iteration which yields a new centerPoint.
+	 
+	 if centerPoint is NOT covered, returns the bitwise negation of the index of the
+	 segment which did not cover it. this guarantees that the returned value is negative.
+	 the caller should check for negative return values and manually un-negate them to proceed with the loop.
+	 
+	 in other words, this function returns the index of the next adjacent data
+	 point to use in the loop, AND a boolean indicating whether or not the
+	 centerPoint is covered;	both are packed into the same int, and returned.
+	 */
+	private static int checkOcclusion(@NotNull FullDataSourceV2 source, long centerPoint, @NotNull LongArrayList adjacentColumn, int adjacentIndex)
+	{
+		// check if this point is adjacent to an empty column
+		// if so it will always be shown
+		if (adjacentColumn.isEmpty())
+		{
+			return ~adjacentIndex;
+		}
+		else if (adjacentColumn.size() == 1
+				&& adjacentColumn.getLong(0) == FullDataPointUtil.EMPTY_DATA_POINT)
+		{	
+			return ~adjacentIndex;
+		}
+		
+		
+		int bottomOfCenter = FullDataPointUtil.getBottomY(centerPoint);
+		int topOfCenter = bottomOfCenter + FullDataPointUtil.getHeight(centerPoint);
+		for (; adjacentIndex >= 0; adjacentIndex--)
+		{
+			long adjacentPoint = adjacentColumn.getLong(adjacentIndex);
+			int topOfAdjacent = FullDataPointUtil.getBottomY(adjacentPoint) + FullDataPointUtil.getHeight(adjacentPoint);
+			if (topOfAdjacent <= bottomOfCenter)
+			{
+				// the adjacent point is below the center point,
+				// check the next one
+				continue;
+			}
+			else if (isTranslucent(source, adjacentPoint))
+			{
+				// this point is adjacent to a transparent LOD and should be shown
+				return ~adjacentIndex;
+			}
+			else if (topOfAdjacent >= topOfCenter)
+			{
+				// the adjacent point covers the center point
+				return adjacentIndex;
+			}
+		}
+		
+		
+		// the Adjacent column ends before center column does,
+		// this point should be visible
+		return ~adjacentIndex;
+	}
+	private static boolean isTranslucent(FullDataSourceV2 source, long point)
+	{
+		int id = FullDataPointUtil.getId(point);
+		int opacity = source.mapping.getBlockStateWrapper(id).getOpacity();
+		return opacity < LodUtil.BLOCK_FULLY_OPAQUE;
+	}
+	
+	
+	
+}

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

@@ -26,21 +26,22 @@ import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSour
 import com.seibel.distanthorizons.core.dataObjects.render.ColumnRenderSource;
 import com.seibel.distanthorizons.core.dataObjects.render.columnViews.ColumnArrayView;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
-import com.seibel.distanthorizons.core.level.IDhClientLevel;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.pooling.PhantomArrayListCheckout;
 import com.seibel.distanthorizons.core.pooling.PhantomArrayListPool;
 import com.seibel.distanthorizons.core.pos.DhSectionPos;
 import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPosMutable;
+import com.seibel.distanthorizons.core.render.LodQuadTree;
 import com.seibel.distanthorizons.core.util.*;
 import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
 import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import com.seibel.distanthorizons.coreapi.util.BitShiftUtil;
 import it.unimi.dsi.fastutil.longs.LongArrayList;
 import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
-import org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.HashSet;
@@ -50,7 +51,7 @@ import java.util.HashSet;
  */
 public class FullDataToRenderDataTransformer
 {
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	private static final IWrapperFactory WRAPPER_FACTORY = SingletonInjector.INSTANCE.get(IWrapperFactory.class);
 	private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
@@ -66,13 +67,14 @@ public class FullDataToRenderDataTransformer
 	//==============================//
 	
 	@Nullable
-	public static ColumnRenderSource transformFullDataToRenderSource(@Nullable FullDataSourceV2 fullDataSource, @Nullable IDhClientLevel level)
+	public static ColumnRenderSource transformFullDataToRenderSource(
+			@Nullable FullDataSourceV2 fullDataSource, @Nullable IClientLevelWrapper levelWrapper)
 	{
 		if (fullDataSource == null)
 		{
 			return null;
 		}
-		else if (level == null)
+		else if (levelWrapper == null)
 		{
 			// if the client is no longer loaded in the world, render sources cannot be created 
 			return null;
@@ -81,7 +83,7 @@ public class FullDataToRenderDataTransformer
 		
 		try
 		{
-			return transformCompleteFullDataToColumnData(level, fullDataSource);
+			return transformCompleteFullDataToColumnData(levelWrapper, fullDataSource);
 		}
 		catch (InterruptedException e)
 		{
@@ -102,7 +104,8 @@ public class FullDataToRenderDataTransformer
 	 * @throws InterruptedException Can be caused by interrupting the thread upstream.
 	 * Generally thrown if the method is running after the client leaves the current world.
 	 */
-	private static ColumnRenderSource transformCompleteFullDataToColumnData(IDhClientLevel level, FullDataSourceV2 fullDataSource) throws InterruptedException
+	private static ColumnRenderSource transformCompleteFullDataToColumnData(
+			IClientLevelWrapper levelWrapper, FullDataSourceV2 fullDataSource) throws InterruptedException
 	{
  		final long pos = fullDataSource.getPos();
 		final byte dataDetail = fullDataSource.getDataDetailLevel();
@@ -111,7 +114,7 @@ public class FullDataToRenderDataTransformer
 		
 		
 		
-		final ColumnRenderSource columnSource = ColumnRenderSource.createEmpty(pos, vertSize, level.getMinY());
+		final ColumnRenderSource columnSource = ColumnRenderSource.createEmpty(pos, vertSize, levelWrapper.getMinHeight());
 		if (fullDataSource.isEmpty)
 		{
 			return columnSource;
@@ -121,37 +124,36 @@ public class FullDataToRenderDataTransformer
 		int baseX = DhSectionPos.getMinCornerBlockX(pos);
 		int baseZ = DhSectionPos.getMinCornerBlockZ(pos);
 		
-		for (int x = 0; x < DhSectionPos.getWidthCountForLowerDetailedSection(pos, dataDetail); x++)
+		for (int x = 0; x < FullDataSourceV2.WIDTH; x++)
 		{
-			for (int z = 0; z < DhSectionPos.getWidthCountForLowerDetailedSection(pos, dataDetail); z++)
+			for (int z = 0; z < FullDataSourceV2.WIDTH; z++)
 			{
-				throwIfThreadInterrupted();
-				
 				ColumnArrayView columnArrayView = columnSource.getVerticalDataPointView(x, z);
-				LongArrayList dataColumn = fullDataSource.get(x, z);
+				LongArrayList dataColumn = fullDataSource.getColumnAtRelPos(x, z);
 				
 				updateOrReplaceRenderDataViewColumnWithFullDataColumn(
-						level, fullDataSource.mapping, 
+						levelWrapper, fullDataSource, 
 						// bitshift is to account for LODs with a detail level greater than 0 so the block pos is correct
 						baseX + BitShiftUtil.pow(x,dataDetail), baseZ + BitShiftUtil.pow(z,dataDetail), 
 						columnArrayView, dataColumn);
 			}
 		}
 		
-		columnSource.fillDebugFlag(0, 0, ColumnRenderSource.SECTION_SIZE, ColumnRenderSource.SECTION_SIZE, ColumnRenderSource.DebugSourceFlag.FULL);
+		columnSource.fillDebugFlag(0, 0, ColumnRenderSource.WIDTH, ColumnRenderSource.WIDTH, ColumnRenderSource.DebugSourceFlag.FULL);
 		
 		return columnSource;
 	}
 	
 	/** Updates the given {@link ColumnArrayView} to match the incoming Full data {@link LongArrayList} */
 	public static void updateOrReplaceRenderDataViewColumnWithFullDataColumn(
-			IDhClientLevel level, 
+			IClientLevelWrapper levelWrapper,
-			FullDataPointIdMap fullDataMapping, int blockX, int blockZ, 
+			FullDataSourceV2 fullDataSource, int blockX, int blockZ, 
 			ColumnArrayView columnArrayView, 
 			LongArrayList fullDataColumn)
 	{
 		// we can't do anything if the full data is missing or empty
-		if (fullDataColumn == null || fullDataColumn.size() == 0)
+		if (fullDataColumn == null 
+			|| fullDataColumn.size() == 0)
 		{
 			return;
 		}
@@ -160,7 +162,7 @@ public class FullDataToRenderDataTransformer
 		if (fullDataLength <= columnArrayView.verticalSize())
 		{
 			// Directly use the arrayView since it fits.
-			setRenderColumnView(level, fullDataMapping, blockX, blockZ, columnArrayView, fullDataColumn);
+			setRenderColumnView(levelWrapper, fullDataSource, blockX, blockZ, columnArrayView, fullDataColumn);
 		}
 		else
 		{
@@ -171,7 +173,8 @@ public class FullDataToRenderDataTransformer
 			{
 				// expand the ColumnArrayView to fit the new larger max vertical size
 				ColumnArrayView newColumnArrayView = new ColumnArrayView(dataArrayList, fullDataLength, 0, fullDataLength);
-				setRenderColumnView(level, fullDataMapping, blockX, blockZ, newColumnArrayView, fullDataColumn);
+				setRenderColumnView(levelWrapper, fullDataSource, blockX, blockZ, newColumnArrayView, fullDataColumn);
+				
 				columnArrayView.changeVerticalSizeFrom(newColumnArrayView);
 			}
 			finally
@@ -181,7 +184,7 @@ public class FullDataToRenderDataTransformer
 		}
 	}
 	private static void setRenderColumnView(
-			IDhClientLevel level, FullDataPointIdMap fullDataMapping,
+			IClientLevelWrapper levelWrapper, FullDataSourceV2 fullDataSource,
 			int blockX, int blockZ,
 			ColumnArrayView renderColumnData, LongArrayList fullColumnData)
 	{
@@ -192,18 +195,18 @@ public class FullDataToRenderDataTransformer
 		boolean ignoreNonCollidingBlocks = (Config.Client.Advanced.Graphics.Quality.blocksToIgnore.get() == EDhApiBlocksToAvoid.NON_COLLIDING);
 		boolean colorBelowWithAvoidedBlocks = Config.Client.Advanced.Graphics.Quality.tintWithAvoidedBlocks.get();
 		
-		HashSet<IBlockStateWrapper> blockStatesToIgnore = WRAPPER_FACTORY.getRendererIgnoredBlocks(level.getLevelWrapper());
+		HashSet<IBlockStateWrapper> blockStatesToIgnore = WRAPPER_FACTORY.getRendererIgnoredBlocks(levelWrapper);
-		HashSet<IBlockStateWrapper> caveBlockStatesToIgnore = WRAPPER_FACTORY.getRendererIgnoredCaveBlocks(level.getLevelWrapper());
+		HashSet<IBlockStateWrapper> caveBlockStatesToIgnore = WRAPPER_FACTORY.getRendererIgnoredCaveBlocks(levelWrapper);
 		
-		int caveCullingMaxY = Config.Client.Advanced.Graphics.Culling.caveCullingHeight.get() - level.getMinY();
+		int caveCullingMaxY = Config.Client.Advanced.Graphics.Culling.caveCullingHeight.get() - levelWrapper.getMinHeight();
 		boolean caveCullingEnabled = 
 			Config.Client.Advanced.Graphics.Culling.enableCaveCulling.get()
 			&& (
 				// dimensions with a ceiling will be all caves so we don't want cave culling
-				!level.getLevelWrapper().hasCeiling()
+				!levelWrapper.hasCeiling()
 				// the end has a lot of overhangs with 0 lighting above the void, which look broken with
 				// the current cave culling logic (this could probably be improved, but just skipping it works best for now)
-				&& !level.getLevelWrapper().getDimensionType().isTheEnd()
+				&& !levelWrapper.getDimensionType().isTheEnd()
 			);
 		
 		boolean isColumnVoid = true;
@@ -222,6 +225,8 @@ public class FullDataToRenderDataTransformer
 		// convert full data to render data //
 		//==================================//
 		
+		FullDataPointIdMap fullDataMapping = fullDataSource.mapping;
+		
 		DhBlockPosMutable mutableBlockPos = new DhBlockPosMutable(blockX, 0, blockZ);
 		
 		// goes from the top down
@@ -236,7 +241,7 @@ public class FullDataToRenderDataTransformer
 			int blockLight = FullDataPointUtil.getBlockLight(fullData);
 			int skyLight = FullDataPointUtil.getSkyLight(fullData);
 			
-			mutableBlockPos.setY(bottomY + level.getMinY());
+			mutableBlockPos.setY(bottomY + levelWrapper.getMinHeight());
 			
 			IBiomeWrapper biome;
 			IBlockStateWrapper block;
@@ -250,7 +255,7 @@ public class FullDataToRenderDataTransformer
 				if (!brokenPos.contains(fullDataMapping.getPos()))
 				{
 					brokenPos.add(fullDataMapping.getPos());
-					String levelId = level.getLevelWrapper().getDhIdentifier();
+					String levelId = levelWrapper.getDhIdentifier();
 					LOGGER.warn("Unable to get data point with id ["+id+"] " +
 							"(Max possible ID: ["+fullDataMapping.getMaxValidId()+"]) " +
 							"for pos ["+fullDataMapping.getPos()+"] in level ["+levelId+"]. " +
@@ -320,11 +325,14 @@ public class FullDataToRenderDataTransformer
 			//=======================//
 			
 			if (ignoreNonCollidingBlocks
-				&& !block.isSolid() && !block.isLiquid() && block.getOpacity() != LodUtil.BLOCK_FULLY_OPAQUE)
+					&& !block.isSolid()
+					&& !block.isLiquid()
+					&& block.getOpacity() != LodUtil.BLOCK_FULLY_OPAQUE)
 			{
 				if (colorBelowWithAvoidedBlocks)
 				{
-					int tempColor = level.computeBaseColor(mutableBlockPos, biome, block);
+					int tempColor = levelWrapper.getBlockColor(mutableBlockPos, biome, fullDataSource, block);
+					
 					// don't transfer the color when alpha is 0
 					// this prevents issues if grass is transparent
 					if (ColorUtil.getAlpha(tempColor) != 0)
@@ -344,7 +352,7 @@ public class FullDataToRenderDataTransformer
 			if (colorToApplyToNextBlock == -1)
 			{
 				// use this block's color
-				color = level.computeBaseColor(mutableBlockPos, biome, block);
+				color = levelWrapper.getBlockColor(mutableBlockPos, biome, fullDataSource, block);
 			}
 			else
 			{
@@ -362,7 +370,9 @@ public class FullDataToRenderDataTransformer
 			//=============================//
 			
 			// check if they share a top-bottom face and if they have same color
-			if (color == lastColor && bottomY + blockHeight == lastBottom  && renderDataIndex > 0)
+			if (color == lastColor 
+				&& bottomY + blockHeight == lastBottom  
+				&& renderDataIndex > 0)
 			{
 				//replace the previous block with new bottom
 				long columnData = renderColumnData.get(renderDataIndex - 1);
@@ -390,21 +400,4 @@ public class FullDataToRenderDataTransformer
 	
 	
 	
-	//================//
-	// helper methods //
-	//================//
-	
-	/**
-	 * Called in loops that may run for an extended period of time. <br>
-	 * This is necessary to allow canceling these transformers since running
-	 * them after the client has left a given world will throw exceptions.
-	 */
-	private static void throwIfThreadInterrupted() throws InterruptedException
-	{
-		if (Thread.interrupted())
-		{
-			throw new InterruptedException(FullDataToRenderDataTransformer.class.getSimpleName() + " task interrupted.");
-		}
-	}
-	
 }

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

@@ -24,15 +24,13 @@ import java.util.List;
 
 import com.seibel.distanthorizons.api.enums.config.EDhApiWorldCompressionMode;
 import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGenerationStep;
+import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiChunkProcessingEvent;
 import com.seibel.distanthorizons.api.objects.data.DhApiChunk;
 import com.seibel.distanthorizons.api.objects.data.DhApiTerrainDataPoint;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
-import com.seibel.distanthorizons.core.enums.EDhDirection;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos;
-import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPosMutable;
 import com.seibel.distanthorizons.core.pos.DhSectionPos;
 import com.seibel.distanthorizons.core.util.FullDataPointUtil;
 import com.seibel.distanthorizons.core.util.LodUtil;
@@ -43,14 +41,17 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IMutableBlockPosWrapper;
 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.coreapi.DependencyInjection.ApiEventInjector;
 import it.unimi.dsi.fastutil.longs.LongArrayList;
-import org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 import org.jetbrains.annotations.Nullable;
 
 public class LodDataBuilder
 {
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
-	private static final IBlockStateWrapper AIR = SingletonInjector.INSTANCE.get(IWrapperFactory.class).getAirBlockStateWrapper();
+	private static final IWrapperFactory WRAPPER_FACTORY = SingletonInjector.INSTANCE.get(IWrapperFactory.class);
+	private static final IBlockStateWrapper AIR = WRAPPER_FACTORY.getAirBlockStateWrapper();
 	
 	private static boolean getTopErrorLogged = false;
 	
@@ -60,12 +61,13 @@ public class LodDataBuilder
 	// converters //
 	//============//
 	
-	public static FullDataSourceV2 createFromChunk(IChunkWrapper chunkWrapper)
+	public static FullDataSourceV2 createFromChunk(ILevelWrapper levelWrapper, IChunkWrapper chunkWrapper)
 	{
 		// only block lighting is needed here, sky lighting is populated at the data source stage
-		LodUtil.assertTrue(chunkWrapper.isDhBlockLightingCorrect());
+		LodUtil.assertTrue(chunkWrapper.isDhBlockLightingCorrect(), "Provided chunk's DH Block lighting hasn't been baked.");
-		
 		
+		int chunkPosX = chunkWrapper.getChunkPos().getX();
+		int chunkPosZ = chunkWrapper.getChunkPos().getZ();
 		
 		int sectionPosX = getXOrZSectionPosFromChunkPos(chunkWrapper.getChunkPos().getX());
 		int sectionPosZ = getXOrZSectionPosFromChunkPos(chunkWrapper.getChunkPos().getZ());
@@ -80,9 +82,7 @@ public class LodDataBuilder
 		
 		// compute the chunk dataSource offset
 		// this offset is used to determine where in the dataSource this chunk's data should go
-		int chunkOffsetX = chunkWrapper.getChunkPos().getX();
+		
-		if (chunkWrapper.getChunkPos().getX() < 0)
-		{
 		// expected offset positions:
 		// chunkPos -> offset
 		//  5 -> 1
@@ -96,31 +96,17 @@ public class LodDataBuilder
 		// -3 -> 1
 		// -4 -> 0 ---
 		// -5 -> 3
-			chunkOffsetX = ((chunkOffsetX) % FullDataSourceV2.NUMB_OF_CHUNKS_WIDE);
-			if (chunkOffsetX != 0)
-			{
-				chunkOffsetX += FullDataSourceV2.NUMB_OF_CHUNKS_WIDE;
-			}
-		}
-		else
-		{
-			chunkOffsetX %= FullDataSourceV2.NUMB_OF_CHUNKS_WIDE;
-		}
-		chunkOffsetX *= LodUtil.CHUNK_WIDTH;
 		
-		int chunkOffsetZ = chunkWrapper.getChunkPos().getZ();
+		// Fast modulo calculation using bitwise AND since NUMB_OF_CHUNKS_WIDE is a power of 2 (4)
-		if (chunkWrapper.getChunkPos().getZ() < 0)
+		// For any number n: n & (2^k - 1) is equivalent to Math.floorMod(n, 2^k)
-		{
+		// Original: Math.floorMod(x, 4) - Handles negative numbers, gives non-negative result in range [0,3]
-			chunkOffsetZ = ((chunkOffsetZ) % FullDataSourceV2.NUMB_OF_CHUNKS_WIDE);
+		// Bitwise: x & (4-1) - Also gives non-negative result in range [0,3]
-			if (chunkOffsetZ != 0)
+		// Example: -5 & 3 = 3, which equals Math.floorMod(-5, 4) = 3
-			{
+		int chunkOffsetX = chunkWrapper.getChunkPos().getX() & (FullDataSourceV2.NUMB_OF_CHUNKS_WIDE - 1);
-				chunkOffsetZ += FullDataSourceV2.NUMB_OF_CHUNKS_WIDE;
+		int chunkOffsetZ = chunkWrapper.getChunkPos().getZ() & (FullDataSourceV2.NUMB_OF_CHUNKS_WIDE - 1);
-			}
+		
-		}
+		// Convert from chunk coordinates to block coordinates
-		else
+		chunkOffsetX *= LodUtil.CHUNK_WIDTH;
-		{
-			chunkOffsetZ %= FullDataSourceV2.NUMB_OF_CHUNKS_WIDE;
-		}
 		chunkOffsetZ *= LodUtil.CHUNK_WIDTH;
 		
 		
@@ -130,62 +116,60 @@ public class LodDataBuilder
 		//==========================//
 		
 		EDhApiWorldCompressionMode worldCompressionMode = Config.Common.LodBuilding.worldCompression.get();
-		boolean ignoreHiddenBlocks = (worldCompressionMode != EDhApiWorldCompressionMode.MERGE_SAME_BLOCKS);
 		
 		try
 		{
 			IMutableBlockPosWrapper mcBlockPos = chunkWrapper.getMutableBlockPosWrapper();
 			IBlockStateWrapper previousBlockState = null;
 			
+			DhApiChunkProcessingEvent.EventParam mutableChunkProcessedEventParam 
+					= new DhApiChunkProcessingEvent.EventParam(levelWrapper, chunkPosX, chunkPosZ);
+			
 			int minBuildHeight = chunkWrapper.getMinNonEmptyHeight();
+			int exclusiveMaxBuildHeight = chunkWrapper.getExclusiveMaxBuildHeight();
+			int inclusiveMinBuildHeight = chunkWrapper.getInclusiveMinBuildHeight();
+			int dataCapacity = chunkWrapper.getHeight() / 4;
+			
 			for (int relBlockX = 0; relBlockX < LodUtil.CHUNK_WIDTH; relBlockX++)
 			{
 				for (int relBlockZ = 0; relBlockZ < LodUtil.CHUNK_WIDTH; relBlockZ++)
 				{
-					LongArrayList longs =  dataSource.get(
+					// Calculate column position
-							relBlockX + chunkOffsetX,
+					int columnX = relBlockX + chunkOffsetX;
-							relBlockZ + chunkOffsetZ);
+					int columnZ = relBlockZ + chunkOffsetZ;
+					
+					// Get column data
+					LongArrayList longs = dataSource.getColumnAtRelPos(columnX, columnZ);
 					if (longs == null)
 					{
-						longs = new LongArrayList(chunkWrapper.getHeight() / 4);
+						longs = new LongArrayList(dataCapacity);
 					}
 					else
 					{
 						longs.clear();
 					}
 					
-					int lastY = chunkWrapper.getExclusiveMaxBuildHeight();
+					int lastY = exclusiveMaxBuildHeight;
-					IBiomeWrapper biome = chunkWrapper.getBiome(relBlockX, lastY, relBlockZ);
+					IBiomeWrapper currentBiome = chunkWrapper.getBiome(relBlockX, lastY, relBlockZ);
-					IBlockStateWrapper blockState = AIR;
+					IBlockStateWrapper currentBlockState = AIR;
-					int mappedId = dataSource.mapping.addIfNotPresentAndGetId(biome, blockState);
+					int mappedId = dataSource.mapping.addIfNotPresentAndGetId(currentBiome, currentBlockState);
 					
+					// Determine lighting (we are at the height limit. There are no torches here, and sky is not obscured.) // TODO: Per face lighting someday?
+					byte blockLight = LodUtil.MIN_MC_LIGHT;
+					byte skyLight = LodUtil.MAX_MC_LIGHT;
 					
-					byte blockLight;
+					// Get the maximum height from both heightmaps
-					byte skyLight;
-					if (lastY < chunkWrapper.getExclusiveMaxBuildHeight())
-					{
-						// FIXME: The lastY +1 offset is to reproduce the old behavior. Remove this when we get per-face lighting
-						blockLight = (byte) chunkWrapper.getDhBlockLight(relBlockX, lastY + 1, relBlockZ);
-						skyLight = (byte) chunkWrapper.getDhSkyLight(relBlockX, lastY + 1, relBlockZ);
-					}
-					else
-					{
-						//we are at the height limit. There are no torches here, and sky is not obscured.
-						blockLight = LodUtil.MIN_MC_LIGHT;
-						skyLight = LodUtil.MAX_MC_LIGHT;
-					}
-					
-					
-					// determine the starting Y Pos
 					int y = Math.max(
 							// max between both heightmaps to account for solid invisible blocks (glass)
 							// and non-solid opaque blocks (at one point this was stairs, not sure what would fit this now)
 							chunkWrapper.getLightBlockingHeightMapValue(relBlockX, relBlockZ),
 							chunkWrapper.getSolidHeightMapValue(relBlockX, relBlockZ)
 					);
-					// go up until we reach open air or the world limit
+					
+					// Go up until we reach open air or the world limit
 					IBlockStateWrapper topBlockState = previousBlockState = chunkWrapper.getBlockState(relBlockX, y, relBlockZ, mcBlockPos, previousBlockState);
-					while (!topBlockState.isAir() && y < chunkWrapper.getExclusiveMaxBuildHeight())
+					while (!topBlockState.isAir() 
+							&& y < exclusiveMaxBuildHeight)
 					{
 						try
 						{
@@ -198,7 +182,7 @@ public class LodDataBuilder
 						{
 							if (!getTopErrorLogged)
 							{
-								LOGGER.warn("Unexpected issue in LodDataBuilder, future errors won't be logged. Chunk [" + chunkWrapper.getChunkPos() + "] with max height: [" + chunkWrapper.getExclusiveMaxBuildHeight() + "] had issue getting block at pos [" + relBlockX + "," + y + "," + relBlockZ + "] error: " + e.getMessage(), e);
+								LOGGER.warn("Unexpected issue in LodDataBuilder, future errors won't be logged. Chunk [" + chunkWrapper.getChunkPos() + "] with max height: [" + exclusiveMaxBuildHeight + "] had issue getting block at pos [" + relBlockX + "," + y + "," + relBlockZ + "] error: " + e.getMessage(), e);
 								getTopErrorLogged = true;
 							}
 							
@@ -207,7 +191,8 @@ public class LodDataBuilder
 						}
 					}
 					
-					
+					// Process blocks from top to bottom
+					boolean forceSingleBlock = false;
 					for (; y >= minBuildHeight; y--)
 					{
 						IBiomeWrapper newBiome = chunkWrapper.getBiome(relBlockX, y, relBlockZ);
@@ -215,32 +200,59 @@ public class LodDataBuilder
 						byte newBlockLight = (byte) chunkWrapper.getDhBlockLight(relBlockX, y + 1, relBlockZ);
 						byte newSkyLight = (byte) chunkWrapper.getDhSkyLight(relBlockX, y + 1, relBlockZ);
 						
-						// save the biome/block change
+						// Save the biome/block change if different from previous
-						if (!newBiome.equals(biome) || !newBlockState.equals(blockState))
+						if (!newBiome.equals(currentBiome) 
+							|| !newBlockState.equals(currentBlockState) 
+							|| forceSingleBlock)
 						{
-							longs.add(FullDataPointUtil.encode(mappedId, lastY - y, y + 1 - chunkWrapper.getInclusiveMinBuildHeight(), blockLight, skyLight));
+							// if the previous block potentially colors this block
-							biome = newBiome;
+							// make this block a single entry, aka add the next block even if it is the same
-							blockState = newBlockState;
+							// this is done to allow fire, snow, flowers, etc. to properly color the top of columns vs the whole column
+							forceSingleBlock = 
+									!currentBlockState.isAir()
+									&& !currentBlockState.isSolid()
+									&& !currentBlockState.isLiquid()
+									&& currentBlockState.getOpacity() != LodUtil.BLOCK_FULLY_OPAQUE;
 							
-							mappedId = dataSource.mapping.addIfNotPresentAndGetId(biome, blockState);
+							
+							// check for API overrides
+							{
+								mutableChunkProcessedEventParam.updateForPosition(relBlockX, y, relBlockZ, newBlockState, newBiome);
+								ApiEventInjector.INSTANCE.fireAllEvents(DhApiChunkProcessingEvent.class, mutableChunkProcessedEventParam);
+								
+								// did the API user override this block?
+								if (mutableChunkProcessedEventParam.getBlockOverride() != null)
+								{
+									// API users shouldn't be creating their own IBlockStateWrapper objects
+									newBlockState = (IBlockStateWrapper)mutableChunkProcessedEventParam.getBlockOverride();
+								}
+								
+								// did the API user override this biome?
+								if (mutableChunkProcessedEventParam.getBiomeOverride() != null)
+								{
+									// API users shouldn't be creating their own IBlockStateWrapper objects
+									newBiome = (IBiomeWrapper) mutableChunkProcessedEventParam.getBiomeOverride();
+								}
+							}
+							
+							
+							longs.add(FullDataPointUtil.encode(mappedId, lastY - y, y + 1 - inclusiveMinBuildHeight, blockLight, skyLight));
+							currentBiome = newBiome;
+							currentBlockState = newBlockState;
+							
+							mappedId = dataSource.mapping.addIfNotPresentAndGetId(currentBiome, currentBlockState);
 							blockLight = newBlockLight;
 							skyLight = newSkyLight;
 							lastY = y;
 						}
 					}
-					longs.add(FullDataPointUtil.encode(mappedId, lastY - y, y + 1 - chunkWrapper.getInclusiveMinBuildHeight(), blockLight, skyLight));
 					
-					dataSource.setSingleColumn(longs,
+					// Add the final data point
-							relBlockX + chunkOffsetX,
+					longs.add(FullDataPointUtil.encode(mappedId, lastY - y, y + 1 - inclusiveMinBuildHeight, blockLight, skyLight));
-							relBlockZ + chunkOffsetZ,
-							EDhApiWorldGenerationStep.LIGHT,
-							worldCompressionMode);
-				}
-			}
 					
-			if (ignoreHiddenBlocks) 
+					// Set the column in the data source
-			{
+					dataSource.setSingleColumn(longs, columnX, columnZ, EDhApiWorldGenerationStep.LIGHT, worldCompressionMode);
-				cullHiddenBlocks(dataSource, chunkOffsetX, chunkOffsetZ);
+				}
 			}
 		}
 		catch (DataCorruptedException e)
@@ -253,145 +265,6 @@ public class LodDataBuilder
 		return dataSource;
 	}
 	
-	private static void cullHiddenBlocks(FullDataSourceV2 dataSource, int chunkOffsetX, int chunkOffsetZ)
-	{
-		for (int relZ = 1; relZ < LodUtil.CHUNK_WIDTH - 1; relZ++)
-		{
-			for (int relX = 1; relX < LodUtil.CHUNK_WIDTH - 1; relX++)
-			{
-				LongArrayList
-						centerColumn = dataSource.get(relX + chunkOffsetX, relZ + chunkOffsetZ),
-						posXColumn = dataSource.get(relX + chunkOffsetX + 1, relZ + chunkOffsetZ),
-						negXColumn = dataSource.get(relX + chunkOffsetX - 1, relZ + chunkOffsetZ),
-						posZColumn = dataSource.get(relX + chunkOffsetX, relZ + chunkOffsetZ + 1),
-						negZColumn = dataSource.get(relX + chunkOffsetX, relZ + chunkOffsetZ - 1);
-				int
-						centerIndex = centerColumn.size() - 1,
-						posXIndex = posXColumn.size() - 1,
-						negXIndex = negXColumn.size() - 1,
-						posZIndex = posZColumn.size() - 1,
-						negZIndex = negZColumn.size() - 1;
-				for (; centerIndex >= 0; centerIndex--)
-				{
-					long currentPoint = centerColumn.getLong(centerIndex);
-					
-					// translucent data points are not eligible to be culled.
-					if (isTranslucent(dataSource, currentPoint))
-					{
-						continue;
-					}
-					
-					// the top segment should never be culled.
-					if (centerIndex == 0 
-						|| isTranslucent(dataSource, centerColumn.getLong(centerIndex - 1))
-						)
-					{
-						continue;
-					}
-					
-					// the bottom segment can sometimes be culled.
-					// assume it will not be seen from below,
-					// because this would imply the player is in the void.
-					if (centerIndex + 1 < centerColumn.size() 
-						&& isTranslucent(dataSource, centerColumn.getLong(centerIndex + 1))
-						)
-					{
-						continue;
-					}
-					
-					posXIndex = checkOcclusion(dataSource, currentPoint, posXColumn, posXIndex);
-					if (posXIndex < 0)
-					{
-						posXIndex = ~posXIndex;
-						continue;
-					}
-					
-					negXIndex = checkOcclusion(dataSource, currentPoint, negXColumn, negXIndex);
-					if (negXIndex < 0)
-					{
-						negXIndex = ~negXIndex;
-						continue;
-					}
-					
-					posZIndex = checkOcclusion(dataSource, currentPoint, posZColumn, posZIndex);
-					if (posZIndex < 0)
-					{
-						posZIndex = ~posZIndex;
-						continue;
-					}
-					
-					negZIndex = checkOcclusion(dataSource, currentPoint, negZColumn, negZIndex);
-					if (negZIndex < 0)
-					{
-						negZIndex = ~negZIndex;
-						continue;
-					}
-					
-					// current point is fully surrounded. remove it.
-					centerColumn.removeLong(centerIndex);
-					// make the above data point cover the area that the current point used to occupy.
-					long above = centerColumn.getLong(centerIndex - 1);
-					above = FullDataPointUtil.setBottomY(above, FullDataPointUtil.getBottomY(currentPoint));
-					above = FullDataPointUtil.setHeight(above, FullDataPointUtil.getHeight(currentPoint) + FullDataPointUtil.getHeight(above));
-					centerColumn.set(centerIndex - 1, above);
-				}
-			}
-		}
-	}
-
-	/**
-	checks if centerPoint is "covered" by opaque data points in adjacentColumn.
-	centerPoint counts as covered if, and only if, for all Y levels in its height range,
-	there exists an opaque data point in adjacentColumn which overlaps with that Y level.
-
-	@param source used to lookup blocks (and their opacities) based on their IDs.
-	@param centerPoint the point being checked to see if it's fully covered.
-	@param adjacentColumn the data points which might cover centerPoint.
-	@param adjacentIndex the starting index in adjacentColumn to start scanning at.
-	indices greater than adjacentIndex have already been checked and confirmed to
-	not overlap or only overlap partially with centerPoint's Y range.
-
-	@return if centerPoint is covered, returns the index of the segment which finishes covering it.
-	the start of the covering may be a smaller index. in this case, the returned index may be used
-	as the adjacentIndex provided to this method on the next iteration which yields a new centerPoint.
-
-	if centerPoint is NOT covered, returns the bitwise negation of the index of the
-	segment which did not cover it. this guarantees that the returned value is negative.
-	the caller should check for negative return values and manually un-negate them to proceed with the loop.
-
-	in other words, this function returns the index of the next adjacent data 
-	point to use in the loop, AND a boolean indicating whether or not the 
-	centerPoint is covered;	both are packed into the same int, and returned.
-	*/
-	private static int checkOcclusion(FullDataSourceV2 source, long centerPoint, LongArrayList adjacentColumn, int adjacentIndex)
-	{
-		int bottomOfCenter = FullDataPointUtil.getBottomY(centerPoint);
-		int topOfCenter = bottomOfCenter + FullDataPointUtil.getHeight(centerPoint);
-		for (; adjacentIndex >= 0; adjacentIndex--)
-		{
-			long adjacentPoint = adjacentColumn.getLong(adjacentIndex);
-			int topOfAdjacent = FullDataPointUtil.getBottomY(adjacentPoint) + FullDataPointUtil.getHeight(adjacentPoint);
-			if (topOfAdjacent <= bottomOfCenter)
-			{
-				continue;
-			}
-			else if (isTranslucent(source, adjacentPoint))
-			{
-				return ~adjacentIndex;
-			}
-			else if (topOfAdjacent >= topOfCenter)
-			{
-				return adjacentIndex;
-			}
-		}
-		
-		throw new LodUtil.AssertFailureException("Adjacent column ends before center column does.");
-	}
-
-	private static boolean isTranslucent(FullDataSourceV2 source, long point) {
-		return source.mapping.getBlockStateWrapper(FullDataPointUtil.getId(point)).getOpacity() < LodUtil.BLOCK_FULLY_OPAQUE;
-	}
-
 	
 	
 	/** @throws ClassCastException if an API user returns the wrong object type(s) */
@@ -402,9 +275,13 @@ public class LodDataBuilder
 		int sectionPosZ = getXOrZSectionPosFromChunkPos(apiChunk.chunkPosZ);
 		long pos = DhSectionPos.encode(DhSectionPos.SECTION_BLOCK_DETAIL_LEVEL, sectionPosX, sectionPosZ);
 		
-		// chunk relative block position in the data source
+		// Fast modulo calculation using bitwise AND since NUMB_OF_CHUNKS_WIDE is a power of 2 (4)
-		int relSourceBlockX = Math.floorMod(apiChunk.chunkPosX, 4) * LodUtil.CHUNK_WIDTH;
+		// For any number n: n & (2^k - 1) is equivalent to Math.floorMod(n, 2^k)
-		int relSourceBlockZ = Math.floorMod(apiChunk.chunkPosZ, 4) * LodUtil.CHUNK_WIDTH;
+		// Original: Math.floorMod(x, 4) - Handles negative numbers, gives non-negative result in range [0,3]
+		// Bitwise: x & (4-1) - Also gives non-negative result in range [0,3]
+		// Example: -5 & 3 = 3, which equals Math.floorMod(-5, 4) = 3
+		int relSourceBlockX = (apiChunk.chunkPosX & (FullDataSourceV2.NUMB_OF_CHUNKS_WIDE - 1)) * LodUtil.CHUNK_WIDTH;
+		int relSourceBlockZ = (apiChunk.chunkPosZ & (FullDataSourceV2.NUMB_OF_CHUNKS_WIDE - 1)) * LodUtil.CHUNK_WIDTH;
 		
 		FullDataSourceV2 dataSource = FullDataSourceV2.createEmpty(pos);
 		for (int relBlockZ = 0; relBlockZ < LodUtil.CHUNK_WIDTH; relBlockZ++)
@@ -546,11 +423,11 @@ public class LodDataBuilder
 	
 	
 	
-	//================//
+	//==================//
-	// helper methods //
+	// internal helpers //
-	//================//
+	//==================//
 	
-	public static int getXOrZSectionPosFromChunkPos(int chunkXOrZPos)
+	private static int getXOrZSectionPosFromChunkPos(int chunkXOrZPos)
 	{
 		// get the section position
 		int sectionPos = chunkXOrZPos;
@@ -559,4 +436,6 @@ public class LodDataBuilder
 		return sectionPos;
 	}
 	
+	
+	
 }

core/src/main/java/com/seibel/distanthorizons/core/dependencyInjection/ModAccessorInjector.java

@@ -23,7 +23,7 @@ import com.seibel.distanthorizons.coreapi.DependencyInjection.DependencyInjector
 import com.seibel.distanthorizons.coreapi.interfaces.dependencyInjection.IBindable;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IModAccessor;
-import org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 
 import java.lang.invoke.MethodHandles;
 
@@ -40,7 +40,7 @@ import java.lang.invoke.MethodHandles;
  */
 public class ModAccessorInjector extends DependencyInjector<IModAccessor>
 {
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger(MethodHandles.lookup().lookupClass().getSimpleName());
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	public static final ModAccessorInjector INSTANCE = new ModAccessorInjector(IModAccessor.class);
 	

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

@@ -19,496 +19,165 @@
 
 package com.seibel.distanthorizons.core.enums;
 
-import java.util.Arrays;
-import java.util.Locale;
-import java.util.Map;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
 import com.seibel.distanthorizons.core.util.math.Vec3i;
 
 /**
- * An (almost) exact copy of Minecraft's
- * Direction enum. <Br><Br>
- *
  * Up <Br>
  * Down <Br>
  * North <Br>
  * South <Br>
  * East <Br>
  * West <Br>
- *
- * @author James Seibel
- * @version 2021-11-13
  */
 public enum EDhDirection
 {
 	/** negative Y */
-	DOWN(0, 1, -1, "down", EDhDirection.AxisDirection.NEGATIVE, EDhDirection.Axis.Y, new Vec3i(0, -1, 0)),
+	DOWN("down", EDhDirection.AxisDirection.NEGATIVE, EDhDirection.Axis.Y, new Vec3i(0, -1, 0), -1),
 	/** positive Y */
-	UP(1, 0, -1, "up", EDhDirection.AxisDirection.POSITIVE, EDhDirection.Axis.Y, new Vec3i(0, 1, 0)),
+	UP("up", EDhDirection.AxisDirection.POSITIVE, EDhDirection.Axis.Y, new Vec3i(0, 1, 0), -1),
 	/** negative Z */
-	NORTH(2, 3, 2, "north", EDhDirection.AxisDirection.NEGATIVE, EDhDirection.Axis.Z, new Vec3i(0, 0, -1)),
+	NORTH("north", EDhDirection.AxisDirection.NEGATIVE, EDhDirection.Axis.Z, new Vec3i(0, 0, -1), 0),
 	/** positive Z */
-	SOUTH(3, 2, 0, "south", EDhDirection.AxisDirection.POSITIVE, EDhDirection.Axis.Z, new Vec3i(0, 0, 1)),
+	SOUTH("south", EDhDirection.AxisDirection.POSITIVE, EDhDirection.Axis.Z, new Vec3i(0, 0, 1), 1),
 	/** negative X */
-	WEST(4, 5, 1, "west", EDhDirection.AxisDirection.NEGATIVE, EDhDirection.Axis.X, new Vec3i(-1, 0, 0)),
+	WEST("west", EDhDirection.AxisDirection.NEGATIVE, EDhDirection.Axis.X, new Vec3i(-1, 0, 0), 2),
 	/** positive X */
-	EAST(5, 4, 3, "east", EDhDirection.AxisDirection.POSITIVE, EDhDirection.Axis.X, new Vec3i(1, 0, 0));
+	EAST("east", EDhDirection.AxisDirection.POSITIVE, EDhDirection.Axis.X, new Vec3i(1, 0, 0), 3);
 	
-	/**
+	
-	 * Up, Down, West, East, North, South <br>
+	/** Up, Down, West, East, North, South */
-	 * Similar to {@link EDhDirection#OPPOSITE_DIRECTIONS}, just with a different order
+	public static final EDhDirection[] ALL = new EDhDirection[] {
-	 */
-	public static final EDhDirection[] CARDINAL_DIRECTIONS = new EDhDirection[]{
 			EDhDirection.UP,
 			EDhDirection.DOWN,
 			EDhDirection.WEST,
 			EDhDirection.EAST,
 			EDhDirection.NORTH,
-			EDhDirection.SOUTH};
+			EDhDirection.SOUTH
-	
-	/**
-	 * Up, Down, South, North, East, West <br>
-	 * Similar to {@link EDhDirection#CARDINAL_DIRECTIONS}, just with a different order
-	 */
-	public static final EDhDirection[] OPPOSITE_DIRECTIONS = new EDhDirection[]{
-			EDhDirection.UP,
-			EDhDirection.DOWN,
-			EDhDirection.SOUTH,
-			EDhDirection.NORTH,
-			EDhDirection.EAST,
-			EDhDirection.WEST};
-	
-	/** North, South, East, West */ // TODO rename to state this is just X/Z or flat directions
-	public static final EDhDirection[] ADJ_DIRECTIONS = new EDhDirection[]{
-			EDhDirection.EAST,
-			EDhDirection.WEST,
-			EDhDirection.SOUTH,
-			EDhDirection.NORTH};
-
-//	private final int data3d;
-//	private final int oppositeIndex;
-//	private final int data2d;
-	
-	private final String name;
-	private final EDhDirection.Axis axis;
-	private final EDhDirection.AxisDirection axisDirection;
-	private final Vec3i normal;
-	private static final EDhDirection[] VALUES = values();
-	
-	private static final Map<String, EDhDirection> BY_NAME = Arrays.stream(VALUES).collect(Collectors.toMap(EDhDirection::getName, (p_199787_0_) ->
-	{
-		return p_199787_0_;
-	}));
-
-//	private static final LodDirection[] BY_3D_DATA = Arrays.stream(VALUES).sorted(Comparator.comparingInt((p_199790_0_) ->
-//	{
-//		return p_199790_0_.data3d;
-//	})).toArray((p_199788_0_) ->
-//	{
-//		return new LodDirection[p_199788_0_];
-//	});
-//	
-//	private static final LodDirection[] BY_2D_DATA = Arrays.stream(VALUES).filter((p_199786_0_) ->
-//	{
-//		return p_199786_0_.getAxis().isHorizontal();
-//	}).sorted(Comparator.comparingInt((p_199789_0_) ->
-//	{
-//		return p_199789_0_.data2d;
-//	})).toArray((p_199791_0_) ->
-//	{
-//		return new LodDirection[p_199791_0_];
-//	});
-
-//	private static final Long2ObjectMap<LodDirection> BY_NORMAL = Arrays.stream(VALUES).collect(Collectors.toMap((p_218385_0_) ->
-//	{
-//		return (new BlockPos(p_218385_0_.getNormal())).asLong();
-//	}, (p_218384_0_) ->
-//	{
-//		return p_218384_0_;
-//	}, (p_218386_0_, p_218386_1_) ->
-//	{
-//		throw new IllegalArgumentException("Duplicate keys");
-//	}, Long2ObjectOpenHashMap::new));
-	
-	
-	
-	EDhDirection(int p_i46016_3_, int p_i46016_4_, int p_i46016_5_, String p_i46016_6_, EDhDirection.AxisDirection p_i46016_7_, EDhDirection.Axis p_i46016_8_, Vec3i p_i46016_9_)
-	{
-//		this.data3d = p_i46016_3_;
-//		this.data2d = p_i46016_5_;
-//		this.oppositeIndex = p_i46016_4_;
-		this.name = p_i46016_6_;
-		this.axis = p_i46016_8_;
-		this.axisDirection = p_i46016_7_;
-		this.normal = p_i46016_9_;
-	}
-
-
-
-
-//	public static LodDirection[] orderedByNearest(Entity p_196054_0_)
-//	{
-//		float f = p_196054_0_.getViewXRot(1.0F) * ((float) Math.PI / 180F);
-//		float f1 = -p_196054_0_.getViewYRot(1.0F) * ((float) Math.PI / 180F);
-//		float f2 = MathHelper.sin(f);
-//		float f3 = MathHelper.cos(f);
-//		float f4 = MathHelper.sin(f1);
-//		float f5 = MathHelper.cos(f1);
-//		boolean flag = f4 > 0.0F;
-//		boolean flag1 = f2 < 0.0F;
-//		boolean flag2 = f5 > 0.0F;
-//		float f6 = flag ? f4 : -f4;
-//		float f7 = flag1 ? -f2 : f2;
-//		float f8 = flag2 ? f5 : -f5;
-//		float f9 = f6 * f3;
-//		float f10 = f8 * f3;
-//		LodDirection lodDirection = flag ? EAST : WEST;
-//		LodDirection direction1 = flag1 ? UP : DOWN;
-//		LodDirection direction2 = flag2 ? SOUTH : NORTH;
-//		if (f6 > f8)
-//		{
-//			if (f7 > f9)
-//			{
-//				return makeDirectionArray(direction1, lodDirection, direction2);
-//			}
-//			else
-//			{
-//				return f10 > f7 ? makeDirectionArray(lodDirection, direction2, direction1) : makeDirectionArray(lodDirection, direction1, direction2);
-//			}
-//		}
-//		else if (f7 > f10)
-//		{
-//			return makeDirectionArray(direction1, direction2, lodDirection);
-//		}
-//		else
-//		{
-//			return f9 > f7 ? makeDirectionArray(direction2, lodDirection, direction1) : makeDirectionArray(direction2, direction1, lodDirection);
-//		}
-//	}
-
-//	private static LodDirection[] makeDirectionArray(LodDirection p_196053_0_, LodDirection p_196053_1_, LodDirection p_196053_2_)
-//	{
-//		return new LodDirection[] { p_196053_0_, p_196053_1_, p_196053_2_, p_196053_2_.getOpposite(), p_196053_1_.getOpposite(), p_196053_0_.getOpposite() };
-//	}
-
-//	public static LodDirection rotate(Mat4f p_229385_0_, LodDirection p_229385_1_)
-//	{
-//		Vec3i Vec3i = p_229385_1_.getNormal();
-//		Vector4f vector4f = new Vector4f(Vec3i.getX(), Vec3i.getY(), Vec3i.getZ(), 0.0F);
-//		vector4f.transform(p_229385_0_);
-//		return getNearest(vector4f.x(), vector4f.y(), vector4f.z());
-//	}
-
-//	public Quaternion getRotation()
-//	{
-//		Quaternion quaternion = Vector3f.XP.rotationDegrees(90.0F);
-//		switch (this)
-//		{
-//		case DOWN:
-//			return Vector3f.XP.rotationDegrees(180.0F);
-//		case UP:
-//			return Quaternion.ONE.copy();
-//		case NORTH:
-//			quaternion.mul(Vector3f.ZP.rotationDegrees(180.0F));
-//			return quaternion;
-//		case SOUTH:
-//			return quaternion;
-//		case WEST:
-//			quaternion.mul(Vector3f.ZP.rotationDegrees(90.0F));
-//			return quaternion;
-//		case EAST:
-//		default:
-//			quaternion.mul(Vector3f.ZP.rotationDegrees(-90.0F));
-//			return quaternion;
-//		}
-//	}
-
-//	public int get3DDataValue()
-//	{
-//		return this.data3d;
-//	}
-//	
-//	public int get2DDataValue()
-//	{
-//		return this.data2d;
-//	}
-	
-	public EDhDirection.AxisDirection getAxisDirection()
-	{
-		return this.axisDirection;
-	}
-
-//	public LodDirection getOpposite()
-//	{
-//		return from3DDataValue(this.oppositeIndex);
-//	}
-	
-	public EDhDirection getClockWise()
-	{
-		switch (this)
-		{
-			case NORTH:
-				return EAST;
-			case SOUTH:
-				return WEST;
-			case WEST:
-				return NORTH;
-			case EAST:
-				return SOUTH;
-			default:
-				throw new IllegalStateException("Unable to get Y-rotated facing of " + this);
-		}
-	}
-	
-	public EDhDirection getCounterClockWise()
-	{
-		switch (this)
-		{
-			case NORTH:
-				return WEST;
-			case SOUTH:
-				return EAST;
-			case WEST:
-				return SOUTH;
-			case EAST:
-				return NORTH;
-			default:
-				throw new IllegalStateException("Unable to get CCW facing of " + this);
-		}
-	}
-	
-	public String getName()
-	{
-		return this.name;
-	}
-	
-	public EDhDirection.Axis getAxis()
-	{
-		return this.axis;
-	}
-	
-	public static EDhDirection byName(String name)
-	{
-		return name == null ? null : BY_NAME.get(name.toLowerCase(Locale.ROOT));
-	}
-
-//	public static LodDirection from3DDataValue(int p_82600_0_)
-//	{
-//		return BY_3D_DATA[MathHelper.abs(p_82600_0_ % BY_3D_DATA.length)];
-//	}
-//	
-//	public static LodDirection from2DDataValue(int p_176731_0_)
-//	{
-//		return BY_2D_DATA[MathHelper.abs(p_176731_0_ % BY_2D_DATA.length)];
-//	}
-
-//	@Nullable
-//	public static LodDirection fromNormal(int p_218383_0_, int p_218383_1_, int p_218383_2_)
-//	{
-//		return BY_NORMAL.get(BlockPos.asLong(p_218383_0_, p_218383_1_, p_218383_2_));
-//	}
-
-//	public static LodDirection fromYRot(double p_176733_0_)
-//	{
-//		return from2DDataValue(MathHelper.floor(p_176733_0_ / 90.0D + 0.5D) & 3);
-//	}
-	
-	public static EDhDirection fromAxisAndDirection(EDhDirection.Axis p_211699_0_, EDhDirection.AxisDirection p_211699_1_)
-	{
-		switch (p_211699_0_)
-		{
-			case X:
-				return p_211699_1_ == EDhDirection.AxisDirection.POSITIVE ? EAST : WEST;
-			case Y:
-				return p_211699_1_ == EDhDirection.AxisDirection.POSITIVE ? UP : DOWN;
-			case Z:
-			default:
-				return p_211699_1_ == EDhDirection.AxisDirection.POSITIVE ? SOUTH : NORTH;
-		}
-	}
-
-//	public float toYRot()
-//	{
-//		return (this.data2d & 3) * 90;
-//	}
-
-//	public static LodDirection getRandom(Random p_239631_0_)
-//	{
-//		return Util.getRandom(VALUES, p_239631_0_);
-//	}
-
-//	public static LodDirection getNearest(double p_210769_0_, double p_210769_2_, double p_210769_4_)
-//	{
-//		return getNearest((float) p_210769_0_, (float) p_210769_2_, (float) p_210769_4_);
-//	}
-
-//	public static LodDirection getNearest(float p_176737_0_, float p_176737_1_, float p_176737_2_)
-//	{
-//		LodDirection lodDirection = NORTH;
-//		float f = Float.MIN_VALUE;
-//		
-//		for (LodDirection direction1 : VALUES)
-//		{
-//			float f1 = p_176737_0_ * direction1.normal.x + p_176737_1_ * direction1.normal.y + p_176737_2_ * direction1.normal.z;
-//			if (f1 > f)
-//			{
-//				f = f1;
-//				lodDirection = direction1;
-//			}
-//		}
-//		
-//		return lodDirection;
-//	}
-	
-	public static EDhDirection get(EDhDirection.AxisDirection p_181076_0_, EDhDirection.Axis p_181076_1_)
-	{
-		for (EDhDirection lodDirection : VALUES)
-		{
-			if (lodDirection.getAxisDirection() == p_181076_0_ && lodDirection.getAxis() == p_181076_1_)
-			{
-				return lodDirection;
-			}
-		}
-		
-		throw new IllegalArgumentException("No such direction: " + p_181076_0_ + " " + p_181076_1_);
-	}
-	
-	public Vec3i getNormal()
-	{
-		return this.normal;
-	}
-
-//	public boolean isFacingAngle(float p_243532_1_)
-//	{
-//		float f = p_243532_1_ * ((float) Math.PI / 180F);
-//		float f1 = -MathHelper.sin(f);
-//		float f2 = MathHelper.cos(f);
-//		return this.normal.getX() * f1 + this.normal.getZ() * f2 > 0.0F;
-//	}
-	
-	public enum Axis implements Predicate<EDhDirection>
-	{
-		X("x")
-				{
-					@Override
-					public int choose(int x, int y, int z)
-					{
-						return x;
-					}
-					
-					@Override
-					public double choose(double x, double y, double z)
-					{
-						return x;
-					}
-				},
-		Y("y")
-				{
-					@Override
-					public int choose(int x, int y, int z)
-					{
-						return y;
-					}
-					
-					@Override
-					public double choose(double x, double y, double z)
-					{
-						return y;
-					}
-				},
-		Z("z")
-				{
-					@Override
-					public int choose(int x, int y, int z)
-					{
-						return z;
-					}
-					
-					@Override
-					public double choose(double x, double y, double z)
-					{
-						return z;
-					}
 	};
 	
-		private static final EDhDirection.Axis[] VALUES = values();
+	/** North, South, East, West */
+	public static final EDhDirection[] CARDINAL_COMPASS = new EDhDirection[] {
+			EDhDirection.EAST,
+			EDhDirection.WEST,
+			EDhDirection.SOUTH,
+			EDhDirection.NORTH
+	};
 	
-		private static final Map<String, EDhDirection.Axis> BY_NAME = Arrays.stream(VALUES).collect(Collectors.toMap(EDhDirection.Axis::getName, (p_199785_0_) ->
-		{
-			return p_199785_0_;
-		}));
-		private final String name;
 	
-		Axis(String name)
+	
+	public final String name;
+	public final EDhDirection.Axis axis;
+	public final EDhDirection.AxisDirection axisDirection;
+	public final Vec3i normal;
+	/** -1 if not a {@link EDhDirection#CARDINAL_COMPASS} direction */
+	public final int compassIndex;
+	
+	
+	
+	//=============//
+	// constructor //
+	//=============//
+		
+	EDhDirection(String name, EDhDirection.AxisDirection axisDirection, EDhDirection.Axis axis, Vec3i normal, int compassIndex)
 	{
 		this.name = name;
+		this.axis = axis;
+		this.axisDirection = axisDirection;
+		this.normal = normal;
+		this.compassIndex = compassIndex;
 	}
 	
-		public static EDhDirection.Axis byName(String name)
+	
+	
+	//=========//
+	// methods //
+	//=========//
+	
+	public EDhDirection opposite()
 	{ 
-			return BY_NAME.get(name.toLowerCase(Locale.ROOT));
+		switch(this)
+		{
+			case UP:
+				return EDhDirection.DOWN;
+			case DOWN:
+				return EDhDirection.UP;
+				
+			case NORTH:
+				return EDhDirection.SOUTH;
+			case SOUTH:
+				return EDhDirection.NORTH;
+				
+			case EAST:
+				return EDhDirection.WEST;
+			case WEST:
+				return EDhDirection.EAST;
+				
+			default:
+				throw new IllegalArgumentException();
+		}
 	}
 	
-		public String getName()
-		{
-			return this.name;
-		}
-		
-		public boolean isVertical()
-		{
-			return this == Y;
-		}
-		
-		public boolean isHorizontal()
-		{
-			return this == X || this == Z;
-		}
 	
 	@Override
-		public String toString()
+	public String toString() { return this.name; }
-		{
-			return this.name;
-		}
 	
-//		public static LodDirection.Axis getRandom(Random p_239634_0_)
+	
-//		{
+	
-//			return Util.getRandom(VALUES, p_239634_0_);
+	//================//
-//		}
+	// helper classes //
+	//================//
+	
+	/**
+	 * X <br>
+	 * Y <br>
+	 * Z <br>
+	 */
+	public enum Axis
+	{
+		X("x"),
+		Y("y"),
+		Z("z");
+		
+		public final String name;
+		
+		
+		//=============//
+		// constructor //
+		//=============//
+		
+		Axis(String name) { this.name = name; }
+		
+		
+		
+		//=========//
+		// methods //
+		//=========//
+		
+		public boolean isVertical() { return this == Y; }
+		public boolean isHorizontal() { return this == X || this == Z; }
 		
 		@Override
-		public boolean test(EDhDirection p_test_1_)
+		public String toString() { return this.name; }
-		{
+		
-			return p_test_1_ != null && p_test_1_.getAxis() == this;
-		}
-
-//		public LodDirection.Plane getPlane()
-//		{
-//			switch (this)
-//			{
-//			case X:
-//			case Z:
-//				return LodDirection.Plane.HORIZONTAL;
-//			case Y:
-//				return LodDirection.Plane.VERTICAL;
-//			default:
-//				throw new Error("Someone's been tampering with the universe!");
-//			}
-//		}
-		
-		public abstract int choose(int p_196052_1_, int p_196052_2_, int p_196052_3_);
-		
-		public abstract double choose(double p_196051_1_, double p_196051_3_, double p_196051_5_);
 	}
 	
+	/**
+	 * POSITIVE <br>
+	 * NEGATIVE <br>
+	 */
 	public enum AxisDirection
 	{
 		POSITIVE(1, "Towards positive"),
 		NEGATIVE(-1, "Towards negative");
 		
-		private final int step;
+		public final int step;
-		private final String name;
+		public final String name;
+		
+		
+		
+		//=============//
+		// constructor //
+		//=============//
 		
 		AxisDirection(int newStep, String newName)
 		{
@@ -516,77 +185,20 @@ public enum EDhDirection
 			this.name = newName;
 		}
 		
-		public int getStep()
-		{
-			return this.step;
-		}
 		
-		@Override
+		
-		public String toString()
+		//=========//
-		{
+		// methods //
-			return this.name;
+		//=========//
-		}
 		
 		public EDhDirection.AxisDirection opposite() 
-		{
+		{ return (this == POSITIVE) ? NEGATIVE : POSITIVE; }
-			return this == POSITIVE ? NEGATIVE : POSITIVE;
-		}
-	}
-
-//	public static enum Plane implements Iterable<LodDirection>, Predicate<LodDirection>
-//	{
-//		HORIZONTAL(new LodDirection[] { LodDirection.NORTH, LodDirection.EAST, LodDirection.SOUTH, LodDirection.WEST }, new LodDirection.Axis[] { LodDirection.Axis.X, LodDirection.Axis.Z }),
-//		VERTICAL(new LodDirection[] { LodDirection.UP, LodDirection.DOWN }, new LodDirection.Axis[] { LodDirection.Axis.Y });
-//		
-//		private final LodDirection[] faces;
-//		private final LodDirection.Axis[] axis;
-//		
-//		private Plane(LodDirection[] p_i49393_3_, LodDirection.Axis[] p_i49393_4_)
-//		{
-//			this.faces = p_i49393_3_;
-//			this.axis = p_i49393_4_;
-//		}
-//		
-//		public LodDirection getRandomDirection(Random p_179518_1_)
-//		{
-//			return Util.getRandom(this.faces, p_179518_1_);
-//		}
-//		
-//		public LodDirection.Axis getRandomAxis(Random p_244803_1_)
-//		{
-//			return Util.getRandom(this.axis, p_244803_1_);
-//		}
-//		
-//		@Override
-//		public boolean test(@Nullable LodDirection p_test_1_)
-//		{
-//			return p_test_1_ != null && p_test_1_.getAxis().getPlane() == this;
-//		}
-//		
-//		@Override
-//		public Iterator<LodDirection> iterator()
-//		{
-//			return Iterators.forArray(this.faces);
-//		}
-//		
-//		public Stream<LodDirection> stream()
-//		{
-//			return Arrays.stream(this.faces);
-//		}
-//	}
-	
-	
-	
-	
-	public String getSerializedName()
-	{
-		return this.name;
-	}
 		
 		@Override
-	public String toString()
+		public String toString() { return this.name; }
-	{
+		
-		return this.name;
+		
+		
 	}
 	
 }

core/src/main/java/com/seibel/distanthorizons/core/file/AbstractDataSourceHandler.java

@@ -1,369 +0,0 @@
-package com.seibel.distanthorizons.core.file;
-
-import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
-import com.seibel.distanthorizons.core.file.structure.ISaveStructure;
-import com.seibel.distanthorizons.core.level.IDhLevel;
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.pos.DhSectionPos;
-import com.seibel.distanthorizons.core.sql.repo.AbstractDhRepo;
-import com.seibel.distanthorizons.core.sql.dto.IBaseDTO;
-import com.seibel.distanthorizons.core.util.LodUtil;
-import com.seibel.distanthorizons.core.util.objects.DataCorruptedException;
-import com.seibel.distanthorizons.core.util.threading.PositionalLockProvider;
-import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
-import org.apache.logging.log4j.Logger;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.locks.ReentrantLock;
-
-// TODO is there a reason this is separate from FullDataSourceProviderV2?
-//  We shouldn't need multiple data source handlers
-public abstract class AbstractDataSourceHandler
-		<TDataSource extends IDataSource<TDhLevel>, 
-				TDTO extends IBaseDTO<Long>,
-				TRepo extends AbstractDhRepo<Long, TDTO>,
-				TDhLevel extends IDhLevel>
-		implements AutoCloseable
-{
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
-	private static final Set<String> CORRUPT_DATA_ERRORS_LOGGED = Collections.newSetFromMap(new ConcurrentHashMap<>());
-	
-	
-	/**
-	 * The highest numerical detail level possible. 
-	 * Used when determining which positions to update. 
-	 * 
-	 * @see AbstractDataSourceHandler#MIN_SECTION_DETAIL_LEVEL
-	 */
-	public static final byte TOP_SECTION_DETAIL_LEVEL = DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL + LodUtil.REGION_DETAIL_LEVEL;
-	/** 
-	 * The lowest numerical detail level possible. 
-	 *
-	 * @see AbstractDataSourceHandler#TOP_SECTION_DETAIL_LEVEL
-	 */
-	public static final byte MIN_SECTION_DETAIL_LEVEL = DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL;
-	
-	
-	protected final PositionalLockProvider updateLockProvider = new PositionalLockProvider();
-	/** 
-	 * generally just used for debugging,
-	 * keeps track of which positions are currently locked.
-	 */
-	public final Set<Long> lockedPosSet = ConcurrentHashMap.newKeySet();
-	public final ConcurrentHashMap<Long, AtomicInteger> queuedUpdateCountsByPos = new ConcurrentHashMap<>();
-	
-	
-	protected final ReentrantLock closeLock = new ReentrantLock();
-	protected volatile boolean isShutdown = false;
-	
-	protected final TDhLevel level;
-	protected final File saveDir;
-	
-	public final TRepo repo;
-	
-	public final ArrayList<IDataSourceUpdateFunc<TDataSource>> dateSourceUpdateListeners = new ArrayList<>();
-	
-	
-	
-	//=============//
-	// constructor //
-	//=============//
-	
-	public AbstractDataSourceHandler(TDhLevel level, ISaveStructure saveStructure) { this(level, saveStructure, null); }
-	public AbstractDataSourceHandler(TDhLevel level, ISaveStructure saveStructure, @Nullable File saveDirOverride)
-	{
-		this.level = level;
-		this.saveDir = (saveDirOverride == null) ? saveStructure.getSaveFolder(level.getLevelWrapper()) : saveDirOverride;
-		this.repo = this.createRepo();
-	}
-	
-	
-	
-	
-	//==================//
-	// abstract methods //
-	//==================//
-	
-	/** When this is called the parent folders should be created */
-	protected abstract TRepo createRepo();
-	
-	protected abstract TDataSource createDataSourceFromDto(TDTO dto) throws InterruptedException, IOException, DataCorruptedException;
-	protected abstract TDTO createDtoFromDataSource(TDataSource dataSource);
-	
-	protected abstract TDataSource makeEmptyDataSource(long pos);
-	
-	
-	
-	//==============//
-	// data reading //
-	//==============//
-	
-	/**
-	 * Returns the {@link TDataSource} for the given section position. <Br>
-	 * The returned data source may be null if repo is in the process of shutting down. <Br> <Br>
-	 *
-	 * This call is concurrent. I.e. it supports being called by multiple threads at the same time.
-	 */
-	public CompletableFuture<TDataSource> getAsync(long pos)
-	{
-		AbstractExecutorService executor = ThreadPoolUtil.getFileHandlerExecutor();
-		if (executor == null || executor.isTerminated())
-		{
-			return CompletableFuture.completedFuture(null);
-		}
-		
-		
-		try
-		{
-			return CompletableFuture.supplyAsync(() -> this.get(pos), executor);
-		}
-		catch (RejectedExecutionException ignore) 
-		{
-			// the thread pool was probably shut down because it's size is being changed, just wait a sec and it should be back
-			return CompletableFuture.completedFuture(null);
-		}
-	}
-	/**
-	 * Should only be used in internal file handler methods where we are already running on a file handler thread.
-	 * Can return null if the repo is in the process of being shut down
-	 * @see AbstractDataSourceHandler#getAsync(long)
-	 */
-	@Nullable
-	public TDataSource get(long pos)
-	{
-		TDataSource dataSource = null;
-		try(TDTO dto = this.repo.getByKey(pos))
-		{
-			if (dto != null)
-			{
-				try
-				{
-					// load from database
-					dataSource = this.createDataSourceFromDto(dto);
-				}
-				catch (DataCorruptedException e)
-				{
-					// there's a rare issue where the exception doesn't
-					// have a message, which can cause problems
-					String message = (e.getMessage() == null) ? e.getMessage() : "No Error message for exception ["+e.getClass().getSimpleName()+"]";
-					
-					// Only log each message type once.
-					// This is done to prevent logging "No compression mode with the value [2]" 10,000 times 
-					// if the user is migrating from a nightly build and used ZStd.
-					if (CORRUPT_DATA_ERRORS_LOGGED.add(message))
-					{
-						LOGGER.warn("Corrupted data found at pos [" + DhSectionPos.toString(pos) + "]. Data at position will be deleted so it can be re-generated to prevent issues. Future errors with this same message won't be logged. Error: [" + message + "].", e);
-					}
-					
-					this.repo.deleteWithKey(pos);
-				}
-			}
-			else
-			{
-				dataSource = this.makeEmptyDataSource(pos);
-			}
-		}
-		catch (InterruptedException ignore) { }
-		catch (IOException e)
-		{
-			LOGGER.warn("File read Error for pos ["+ DhSectionPos.toString(pos)+"], error: "+e.getMessage(), e);
-		}
-		
-		return dataSource;
-	}
-	
-	
-	
-	//===============//
-	// data updating //
-	//===============//
-	
-	/** 
-	 * Can be used if the same thread is already handling IO and/or LOD generation.
-	 * Otherwise the async version {@link AbstractDataSourceHandler#updateDataSourceAsync(FullDataSourceV2)} may be a better choice.
-	 */
-	public void updateDataSource(@NotNull FullDataSourceV2 inputDataSource)
-	{ this.updateDataSourceAtPos(inputDataSource.getPos(), inputDataSource, true); }
-	
-	/**
-	 * Can be used if you don't want to lock the current thread
-	 * Otherwise the sync version {@link AbstractDataSourceHandler#updateDataSource(FullDataSourceV2)} may be a better choice.
-	 */
-	public CompletableFuture<Void> updateDataSourceAsync(@NotNull FullDataSourceV2 inputDataSource)
-	{
-		AbstractExecutorService executor = ThreadPoolUtil.getChunkToLodBuilderExecutor();
-		if (executor == null || executor.isTerminated())
-		{
-			return CompletableFuture.completedFuture(null);
-		}
-		
-		
-		try
-		{
-			this.markUpdateStart(inputDataSource.getPos());
-			return CompletableFuture.runAsync(() ->
-			{
-				try
-				{
-					this.updateDataSourceAtPos(inputDataSource.getPos(), inputDataSource, true);
-				}
-				catch (Exception e)
-				{
-					LOGGER.error("Unexpected error in async data source update at pos: ["+DhSectionPos.toString(inputDataSource.getPos())+"], error: ["+e.getMessage()+"].", e);
-				}
-				finally
-				{
-					this.markUpdateEnd(inputDataSource.getPos());
-				}
-			}, executor);
-		}
-		catch (RejectedExecutionException ignore)
-		{
-			// can happen if the executor was shutdown while this task was queued
-			this.markUpdateEnd(inputDataSource.getPos());
-			return CompletableFuture.completedFuture(null);
-		}
-	}
-	
-	/** 
-	 * After this method returns the inputData will be written to file.
-	 *
-	 * @param updatePos the position to update
-	 */
-	protected void updateDataSourceAtPos(long updatePos, @NotNull FullDataSourceV2 inputData, boolean lockOnUpdatePos)
-	{
-		boolean methodLocked = false;
-		// a lock is necessary to prevent two threads from writing to the same position at once,
-		// if that happens only the second update will apply and the LOD will end up with hole(s)
-		ReentrantLock updateLock = this.updateLockProvider.getLock(updatePos);
-		
-		try
-		{
-			if (lockOnUpdatePos)
-			{
-				methodLocked = true;
-				updateLock.lock();
-				this.lockedPosSet.add(updatePos);
-			}
-			
-			
-			// get or create the data source
-			try (TDataSource recipientDataSource = this.get(updatePos))
-			{
-				if (recipientDataSource != null)
-				{
-					boolean dataModified = recipientDataSource.update(inputData, this.level);
-					if (dataModified)
-					{
-						// save the updated data to the database
-						try (TDTO dto = this.createDtoFromDataSource(recipientDataSource))
-						{
-							this.repo.save(dto);
-						}
-						
-						
-						for (IDataSourceUpdateFunc<TDataSource> listener : this.dateSourceUpdateListeners)
-						{
-							if (listener != null)
-							{
-								listener.OnDataSourceUpdated(recipientDataSource);
-							}
-						}
-					}
-				}
-			}
-		}
-		catch (Exception e)
-		{
-			LOGGER.error("Error updating pos ["+DhSectionPos.toString(updatePos)+"], error: "+e.getMessage(), e);
-		}
-		finally
-		{
-			if (methodLocked)
-			{
-				updateLock.unlock();
-				this.lockedPosSet.remove(updatePos);
-			}
-		}
-	}
-	
-	
-	
-	//================//
-	// helper methods //
-	//================//
-	
-	/** used for debugging to track which positions are queued for updating */
-	private void markUpdateStart(long dataSourcePos)
-	{
-		this.queuedUpdateCountsByPos.compute(dataSourcePos, (pos, atomicCount) ->
-		{
-			if (atomicCount == null)
-			{
-				atomicCount = new AtomicInteger(0);
-			}
-			atomicCount.incrementAndGet();
-			return atomicCount;
-		});
-	}
-	/** used for debugging to track which positions are queued for updating */
-	private void markUpdateEnd(long dataSourcePos)
-	{
-		this.queuedUpdateCountsByPos.compute(dataSourcePos, (pos, atomicCount) ->
-		{
-			if (atomicCount != null && atomicCount.decrementAndGet() <= 0)
-			{
-				atomicCount = null;
-			}
-			return atomicCount;
-		});
-	}
-	
-	
-	
-	//=========//
-	// cleanup //
-	//=========//
-	
-	@Override
-	public void close()
-	{
-		try
-		{
-			this.closeLock.lock();
-			this.isShutdown = true;
-			
-			// wait a moment so any queued saves can finish queuing, 
-			// otherwise we might not see everything that needs saving and attempt to use a closed repo
-			Thread.sleep(200);
-			
-			LOGGER.info("Closing [" + this.getClass().getSimpleName() + "] for level: [" + this.level + "].");
-			
-			this.repo.close();
-		}
-		catch (InterruptedException ignore) { }
-		finally
-		{
-			this.closeLock.unlock();
-		}
-	}
-	
-	
-	
-	//================//
-	// helper classes //
-	//================//
-	
-	@FunctionalInterface
-	public interface IDataSourceUpdateFunc<TDataSource>
-	{
-		void OnDataSourceUpdated(TDataSource updatedFullDataSource);
-	}
-	
-}

core/src/main/java/com/seibel/distanthorizons/core/file/IDataSource.java

@@ -1,36 +0,0 @@
-package com.seibel.distanthorizons.core.file;
-
-import com.seibel.distanthorizons.api.enums.EDhApiDetailLevel;
-import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
-import com.seibel.distanthorizons.core.level.IDhLevel;
-import com.seibel.distanthorizons.core.sql.dto.IBaseDTO;
-
-/**
- * Base for all data sources. <br><br>
- * 
- * AutoCloseable Can be implemented to allow for disposing of pooled data sources. <br><br>
- * 
- * @param <TDhLevel> there are times when we need specifically a client level vs a more generic level
- */
-public interface IDataSource<TDhLevel extends IDhLevel> extends IBaseDTO<Long>, AutoCloseable
-{
-	Long getPos();
-	
-	/** @return true if the data was changed */
-	boolean update(FullDataSourceV2 chunkData, TDhLevel level);
-	
-	
-	
-	//===========//
-	// meta data //
-	//===========//
-	
-	/** 
-	 * Returns the detail level of the data contained by this data source. 
-	 * IE: 0 for block, 1 for 2x2 blocks, etc.
-	 * 
-	 * @see EDhApiDetailLevel
-	 */
-	byte getDataDetailLevel();
-	
-}

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

@@ -1,19 +1,16 @@
 package com.seibel.distanthorizons.core.file.fullDatafile;
 
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
-import com.google.common.cache.RemovalCause;
-import com.google.common.cache.RemovalNotification;
 import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.pos.DhSectionPos;
 import com.seibel.distanthorizons.core.util.KeyedLockContainer;
 import com.seibel.distanthorizons.core.util.ThreadUtil;
-import org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 import org.jetbrains.annotations.NotNull;
 
 import java.lang.ref.WeakReference;
 import java.util.Collections;
+import java.util.Enumeration;
 import java.util.Set;
 import java.util.concurrent.*;
 import java.util.concurrent.locks.ReentrantLock;
@@ -24,7 +21,7 @@ import java.util.concurrent.locks.ReentrantLock;
  */
 public class DelayedFullDataSourceSaveCache implements AutoCloseable
 {
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	/** 
 	 * a cache won't automatically clean itself unless we trigger it's clean method
@@ -38,7 +35,7 @@ public class DelayedFullDataSourceSaveCache implements AutoCloseable
 	
 	
 	
-	private final Cache<Long, FullDataSourceV2> dataSourceByPosition;
+	private final ConcurrentHashMap<Long, DataSourceSavedTimePair> dataSourceByPosition = new ConcurrentHashMap<Long, DataSourceSavedTimePair>();
 	
 	/* don't let two threads load the same position at the same time */
 	protected final KeyedLockContainer<Long> saveLockContainer = new KeyedLockContainer<>();
@@ -60,16 +57,15 @@ public class DelayedFullDataSourceSaveCache implements AutoCloseable
 	public DelayedFullDataSourceSaveCache(@NotNull ISaveDataSourceFunc onSaveTimeoutAsyncFunc, int saveDelayInMs)
 	{
 		this.onSaveTimeoutAsyncFunc = onSaveTimeoutAsyncFunc;
+		
+		// we can't clean items faster than the cleanup timer fires
+		if (saveDelayInMs < CLEANUP_CHECK_TIME_IN_MS)
+		{
+			LOGGER.warn("The save delay ["+saveDelayInMs+"] shouldn't be less than the cleanup check timer interval ["+CLEANUP_CHECK_TIME_IN_MS+"].");
+		}
 		this.saveDelayInMs = saveDelayInMs;
 		
 		
-		this.dataSourceByPosition =
-			CacheBuilder.newBuilder()
-				.expireAfterAccess(this.saveDelayInMs, TimeUnit.MILLISECONDS)
-				.expireAfterWrite(this.saveDelayInMs, TimeUnit.MILLISECONDS)
-				.removalListener(this::handleDataSourceRemoval)
-				.<Long, FullDataSourceV2>build();
-		
 		SAVE_CACHE_SET.add(new WeakReference<>(this));
 	}
 	
@@ -83,62 +79,62 @@ public class DelayedFullDataSourceSaveCache implements AutoCloseable
 	 * Writing into memory is done synchronously so inputDataSource can 
 	 * be closed after this method finishes.
 	 */
-	public void writeDataSourceToMemoryAndQueueSave(FullDataSourceV2 inputDataSource)
+	public void writeDataSourceToMemoryAndQueueSave(@NotNull FullDataSourceV2 inputDataSource)
 	{
 		long inputPos = inputDataSource.getPos();
 		
-		ReentrantLock lock = this.saveLockContainer.getLockForPos(inputPos);
+		ReentrantLock lockForPos = this.saveLockContainer.getLockForPos(inputPos);
 		try
 		{
-			lock.lock();
+			lockForPos.lock();
 			
-			FullDataSourceV2 memoryDataSource = this.dataSourceByPosition.getIfPresent(inputPos);
+			FullDataSourceV2 memoryDataSource;
-			if (memoryDataSource == null)
+			
+			DataSourceSavedTimePair pair = this.dataSourceByPosition.getOrDefault(inputPos, null);
+			if (pair == null)
 			{
+				// no data currently in the memory cache for this position
 				memoryDataSource = FullDataSourceV2.createEmpty(inputPos);
+				pair = new DataSourceSavedTimePair(memoryDataSource);
+				this.dataSourceByPosition.put(inputPos, pair);
 			}
-			memoryDataSource.update(inputDataSource);
+			else
-			this.dataSourceByPosition.put(inputPos, memoryDataSource);
+			{
+				memoryDataSource = pair.dataSource;
+			}
+			
+			// write the new data into memory
+			memoryDataSource.updateFromChunk(inputDataSource);
+			// keep track of when the last time we saved something was
+			pair.updateLastWrittenTimestamp();
 		}
 		finally
 		{
-			lock.unlock();
+			lockForPos.unlock();
 		}
 	}
 	
-	public void handleDataSourceRemoval(RemovalNotification<Long, FullDataSourceV2> removalNotification)
+	/** when this method is called the datasource should no longer be in the memory cache */
+	public void handleDataSourceRemoval(@NotNull FullDataSourceV2 removedDataSource)
 	{
-		RemovalCause cause = removalNotification.getCause();
+		this.onSaveTimeoutAsyncFunc.saveAsync(removedDataSource)
-		if (cause == RemovalCause.EXPIRED
-			|| cause == RemovalCause.COLLECTED
-			|| cause == RemovalCause.EXPLICIT
-			|| cause == RemovalCause.SIZE)
-		{
-			// close the data source after it has expired from the cache
-			FullDataSourceV2 dataSource = removalNotification.getValue();
-			if (dataSource != null)
-			{
-				this.onSaveTimeoutAsyncFunc.saveAsync(dataSource)
 			.handle((voidObj, throwable) ->
 			{
 				try
 				{
-							dataSource.close();
+					// if this close method is fired multiple times
+					// monoliths can appear due to concurrent writing to the
+					// backend arrays
+					removedDataSource.close();
 				}
 				catch (Exception e)
 				{
-							LOGGER.error("Unable to close datasource ["+ DhSectionPos.toString(dataSource.getPos()) +"], removal cause: ["+cause+"], error: ["+e.getMessage()+"].", e);
+					LOGGER.error("Unable to close datasource ["+ DhSectionPos.toString(removedDataSource.getPos()) +"], error: ["+e.getMessage()+"].", e);
 				}
 				
 				return null;
 			});
 	}
-			else
-			{
-				LOGGER.error("Unable to close null cached data source.");
-			}
-		}
-	}
 	
 	
 	
@@ -146,26 +142,36 @@ public class DelayedFullDataSourceSaveCache implements AutoCloseable
 	// List methods //
 	//==============//
 	
-	public int getUnsavedCount() { return (int)this.dataSourceByPosition.size(); }
+	public int getUnsavedCount() { return this.dataSourceByPosition.size(); }
 	
+	public void flush() { this.cleanUp(true); }
 	/** Removes everything from the memory cache and fires the {@link DelayedFullDataSourceSaveCache#onSaveTimeoutAsyncFunc} for each. */
-	public void flush()
+	public void cleanUp(boolean flushAll)
 	{
-		Set<Long> keySet = this.dataSourceByPosition.asMap().keySet();
+		Enumeration<Long> keyIterator = this.dataSourceByPosition.keys();
-		for (Long pos : keySet)
+		while (keyIterator.hasMoreElements())
 		{
-			ReentrantLock lock = this.saveLockContainer.getLockForPos(pos);
+			Long pos = keyIterator.nextElement();
+			ReentrantLock posLock = this.saveLockContainer.getLockForPos(pos);
 			try
 			{
-				lock.lock();
+				posLock.lock();
 				
-				this.dataSourceByPosition.invalidate(pos);
+				DataSourceSavedTimePair savedPair = this.dataSourceByPosition.getOrDefault(pos, null);
+				if (savedPair != null)
+				{
+					if (flushAll
+						|| savedPair.dataSourceHasTimedOut(this.saveDelayInMs))
+					{
+						this.dataSourceByPosition.remove(pos);
+						this.handleDataSourceRemoval(savedPair.dataSource);
+					}
+				}
 			}
 			finally
 			{
-				lock.unlock();
+				posLock.unlock();
 			}
-			
 		}
 	}
 	
@@ -197,7 +203,7 @@ public class DelayedFullDataSourceSaveCache implements AutoCloseable
 					}
 					else
 					{
-						cache.dataSourceByPosition.cleanUp();
+						cache.cleanUp(false);
 					}
 				});
 			}
@@ -240,4 +246,36 @@ public class DelayedFullDataSourceSaveCache implements AutoCloseable
 		CompletableFuture<Void> saveAsync(FullDataSourceV2 inputDataSource);
 	}
 	
+	/** 
+	 * used to keep track of when data sources
+	 * were written to so we can flush them once
+	 * enough time has passed.
+	 */
+	private static class DataSourceSavedTimePair
+	{
+		@NotNull
+		public final FullDataSourceV2 dataSource;
+		/** the last unix millisecond time this data source was written to */
+		public long lastWrittenDateTimeMs;
+		
+		
+		public DataSourceSavedTimePair(@NotNull FullDataSourceV2 dataSource)
+		{
+			this.dataSource = dataSource;
+			this.lastWrittenDateTimeMs = System.currentTimeMillis();
+		}
+		
+		
+		public void updateLastWrittenTimestamp()
+		{ this.lastWrittenDateTimeMs = System.currentTimeMillis(); }
+		
+		public boolean dataSourceHasTimedOut(long msTillTimeout)
+		{
+			long currentTime = System.currentTimeMillis();
+			long timeSinceUpdate = currentTime - this.lastWrittenDateTimeMs;
+			return (timeSinceUpdate > msTillTimeout);
+		}
+	}
+	
+	
 }

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

@@ -1,813 +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.file.fullDatafile;
-
-import com.seibel.distanthorizons.api.enums.config.EDhApiDataCompressionMode;
-import com.seibel.distanthorizons.core.api.internal.ClientApi;
-import com.seibel.distanthorizons.core.config.Config;
-import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV1;
-import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
-import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
-import com.seibel.distanthorizons.core.file.structure.ISaveStructure;
-import com.seibel.distanthorizons.core.file.AbstractDataSourceHandler;
-import com.seibel.distanthorizons.core.generation.tasks.WorldGenResult;
-import com.seibel.distanthorizons.core.level.IDhLevel;
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.logging.f3.F3Screen;
-import com.seibel.distanthorizons.core.pos.DhSectionPos;
-import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos;
-import com.seibel.distanthorizons.core.render.renderer.DebugRenderer;
-import com.seibel.distanthorizons.core.render.renderer.IDebugRenderable;
-import com.seibel.distanthorizons.core.sql.dto.FullDataSourceV2DTO;
-import com.seibel.distanthorizons.core.sql.repo.AbstractDhRepo;
-import com.seibel.distanthorizons.core.sql.repo.FullDataSourceV2Repo;
-import com.seibel.distanthorizons.core.util.ThreadUtil;
-import com.seibel.distanthorizons.core.util.objects.DataCorruptedException;
-import com.seibel.distanthorizons.core.util.threading.PriorityTaskPicker;
-import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
-import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
-import it.unimi.dsi.fastutil.longs.LongArrayList;
-import org.apache.logging.log4j.Logger;
-import org.jetbrains.annotations.Nullable;
-
-import java.awt.*;
-import java.io.File;
-import java.io.IOException;
-import java.sql.SQLException;
-import java.text.NumberFormat;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.locks.ReentrantLock;
-
-/**
- * Handles reading/writing {@link FullDataSourceV2} 
- * to and from the database.
- */
-public class FullDataSourceProviderV2 
-		extends AbstractDataSourceHandler<FullDataSourceV2, FullDataSourceV2DTO, FullDataSourceV2Repo, IDhLevel> 
-		implements IDebugRenderable
-{
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
-	private static final IMinecraftClientWrapper MC_CLIENT = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
-	
-	protected static final int NUMBER_OF_PARENT_UPDATE_TASKS_PER_THREAD = 5;
-	/** how many parent update tasks can be in the queue at once */
-	protected static int getMaxUpdateTaskCount() { return NUMBER_OF_PARENT_UPDATE_TASKS_PER_THREAD* Config.Common.MultiThreading.numberOfThreads.get(); } 
-	
-	/** indicates how long the update queue thread should wait between queuing ticks */
-	protected static final int UPDATE_QUEUE_THREAD_DELAY_IN_MS = 250;
-	
-	/** how many data sources should be pulled down for migration at once */
-	private static final int MIGRATION_BATCH_COUNT = NUMBER_OF_PARENT_UPDATE_TASKS_PER_THREAD;
-	/** 
-	 * 5 minutes <br>
-	 * This should be much longer than any update should take. This is just
-	 * to make sure the thread doesn't get stuck.
-	 */
-	private static final int MIGRATION_MAX_UPDATE_TIMEOUT_IN_MS = 5 * 60 * 1_000;
-	
-	
-	
-	/**
-	 * Interrupting the migration thread pool doesn't work well and may corrupt the database
-	 * vs gracefully shutting down the thread ourselves. 
-	 */
-	protected final AtomicBoolean migrationThreadRunning = new AtomicBoolean(true);
-	protected final FullDataSourceProviderV1<IDhLevel> legacyFileHandler;
-	
-	protected boolean migrationStartMessageQueued = false;
-	
-	protected long legacyDeletionCount = -1;
-	protected long migrationCount = -1;
-	protected boolean migrationStoppedWithError = false;
-	
-	/** 
-	 * Tracks which positions are currently being updated
-	 * to prevent duplicate concurrent updates.
-	 */
-	public final Set<Long> updatingPosSet = ConcurrentHashMap.newKeySet();
-	
-	// TODO only run thread if modifications happened recently
-	/** 
-	 * This isn't in {@link AbstractDataSourceHandler} since we only want to update
-	 * the newest version of the full data, so if we have providers for either
-	 * render data or old full data, we don't want to update them. <br><br>
-	 * 
-	 * Will be null on the dedicated server since updates don't need to be propagated,
-	 * only the highest detail level is needed.
-	 */
-	@Nullable
-	private final ThreadPoolExecutor updateQueueProcessor;
-	
-	
-	
-	//=============//
-	// constructor //
-	//=============//
-	
-	public FullDataSourceProviderV2(IDhLevel level, ISaveStructure saveStructure) { this(level, saveStructure, null); }
-	public FullDataSourceProviderV2(IDhLevel level, ISaveStructure saveStructure, @Nullable File saveDirOverride) 
-	{
-		super(level, saveStructure, saveDirOverride);
-		this.legacyFileHandler = new FullDataSourceProviderV1<>(level, saveStructure, saveDirOverride);
-		
-		DebugRenderer.register(this, Config.Client.Advanced.Debugging.DebugWireframe.showFullDataUpdateStatus);
-		
-		String levelId = level.getLevelWrapper().getDhIdentifier();
-		
-		// start migrating any legacy data sources present in the background
-		ThreadPoolExecutor executor = ThreadPoolUtil.getFullDataMigrationExecutor();
-		if (executor != null)
-		{
-			executor.execute(this::convertLegacyDataSources);
-		}
-		else
-		{
-			// shouldn't happen, but just in case
-			LOGGER.error("Unable to start migration for level: ["+levelId+"] due to missing executor.");
-		}
-		
-		// update propagation doesn't need to be run on the server since only the highest detail level is needed
-		this.updateQueueProcessor = ThreadUtil.makeSingleThreadPool("Parent Update Queue [" + levelId + "]");
-		this.updateQueueProcessor.execute(this::runUpdateQueue);
-	}
-	
-	
-	
-	//====================//
-	// Abstract overrides //
-	//====================//
-	
-	@Override
-	protected FullDataSourceV2Repo createRepo()
-	{
-		try
-		{
-			return new FullDataSourceV2Repo(AbstractDhRepo.DEFAULT_DATABASE_TYPE, new File(this.saveDir.getPath() + File.separator + ISaveStructure.DATABASE_NAME));
-		}
-		catch (SQLException e)
-		{
-			// should only happen if there is an issue with the database (it's locked or the folder path is missing) 
-			// or the database update failed
-			throw new RuntimeException(e);
-		}
-	}
-	
-	@Override 
-	protected FullDataSourceV2DTO createDtoFromDataSource(FullDataSourceV2 dataSource)
-	{
-		try
-		{
-			// when creating new data use the compressor currently selected in the config
-			EDhApiDataCompressionMode compressionModeEnum = Config.Common.LodBuilding.dataCompression.get();
-			return FullDataSourceV2DTO.CreateFromDataSource(dataSource, compressionModeEnum);
-		}
-		catch (IOException e)
-		{
-			LOGGER.warn("Unable to create DTO, error: "+e.getMessage(), e);
-			return null;
-		}
-	}
-	
-	@Override
-	protected FullDataSourceV2 createDataSourceFromDto(FullDataSourceV2DTO dto) throws InterruptedException, IOException, DataCorruptedException
-	{ return dto.createDataSource(this.level.getLevelWrapper()); }
-	
-	@Override
-	protected FullDataSourceV2 makeEmptyDataSource(long pos) 
-	{ return FullDataSourceV2.createEmpty(pos); }
-	
-	
-	
-	//================//
-	// parent updates //
-	//================//
-	
-	private void runUpdateQueue()
-	{
-		while (!Thread.interrupted())
-		{
-			try
-			{
-				Thread.sleep(UPDATE_QUEUE_THREAD_DELAY_IN_MS);
-				
-				PriorityTaskPicker.Executor executor = ThreadPoolUtil.getUpdatePropagatorExecutor();
-				if (executor == null || executor.isTerminated())
-				{
-					continue;
-				}
-				
-				// TODO it might be worth skipping this logic if no parent updates happened
-				
-				// update positions closest to the player (if not on a server)
-				// to make world gen appear faster
-				DhBlockPos targetBlockPos = DhBlockPos.ZERO;
-				if (MC_CLIENT != null && MC_CLIENT.playerExists())
-				{
-					targetBlockPos = MC_CLIENT.getPlayerBlockPos(); 
-				}
-				
-				this.runParentUpdates(executor, targetBlockPos);
-				
-				if (Config.Common.LodBuilding.Experimental.upsampleLowerDetailLodsToFillHoles.get())
-				{
-					this.runChildUpdates(executor, targetBlockPos);
-				}
-				
-			}
-			catch (InterruptedException ignored)
-			{
-				Thread.currentThread().interrupt();
-			}
-			catch (Exception e)
-			{
-				LOGGER.error("Unexpected error in the parent update queue thread. Error: " + e.getMessage(), e);
-			}
-		}
-		
-		LOGGER.info("Update thread ["+Thread.currentThread().getName()+"] terminated.");
-	}
-	/** will always apply updates */
-	private void runParentUpdates(PriorityTaskPicker.Executor executor, DhBlockPos targetBlockPos)
-	{
-		int maxUpdateTaskCount = getMaxUpdateTaskCount();
-		
-		// queue parent updates
-		if (executor.getQueueSize() < maxUpdateTaskCount
-			&& this.updatingPosSet.size() < maxUpdateTaskCount)
-		{
-			// get the positions that need to be applied to their parents
-			LongArrayList parentUpdatePosList = this.repo.getPositionsToUpdate(targetBlockPos.getX(), targetBlockPos.getZ(), maxUpdateTaskCount);
-			
-			// combine updates together based on their parent
-			HashMap<Long, HashSet<Long>> updatePosByParentPos = new HashMap<>();
-			for (Long pos : parentUpdatePosList)
-			{
-				updatePosByParentPos.compute(DhSectionPos.getParentPos(pos), (parentPos, updatePosSet) ->
-				{
-					if (updatePosSet == null)
-					{
-						updatePosSet = new HashSet<>();
-					}
-					updatePosSet.add(pos);
-					return updatePosSet;
-				});
-			}
-			
-			// queue the updates
-			for (Long parentUpdatePos : updatePosByParentPos.keySet())
-			{
-				// stop if there are already a bunch of updates queued
-				if (this.updatingPosSet.size() > maxUpdateTaskCount
-					|| executor.getQueueSize() > maxUpdateTaskCount
-					|| !this.updatingPosSet.add(parentUpdatePos))
-				{
-					break;
-				}
-				
-				try
-				{
-					executor.execute(() ->
-					{
-						ReentrantLock parentWriteLock = this.updateLockProvider.getLock(parentUpdatePos);
-						boolean parentLocked = false;
-						try
-						{
-							//LOGGER.info("updating parent: "+parentUpdatePos);
-							
-							// Locking the parent before the children should prevent deadlocks.
-							// TryLock is used instead of lock so this thread can handle a different update.
-							if (parentWriteLock.tryLock())
-							{
-								parentLocked = true;
-								this.lockedPosSet.add(parentUpdatePos);
-								
-								try (FullDataSourceV2 parentDataSource = this.get(parentUpdatePos))
-								{
-									// will return null if the file handler is shutting down
-									if (parentDataSource != null)
-									{
-										// apply each child pos to the parent
-										for (Long childPos : updatePosByParentPos.get(parentUpdatePos))
-										{
-											ReentrantLock childReadLock = this.updateLockProvider.getLock(childPos);
-											try
-											{
-												childReadLock.lock();
-												this.lockedPosSet.add(childPos);
-												
-												try (FullDataSourceV2 childDataSource = this.get(childPos))
-												{
-													// can return null when the file handler is being shut down
-													if (childDataSource != null)
-													{
-														parentDataSource.update(childDataSource);
-													}
-												}
-											}
-											catch (Exception e)
-											{
-												LOGGER.error("Unexpected in parent update propagation for parent pos: ["+DhSectionPos.toString(parentUpdatePos)+"], child pos: [" + DhSectionPos.toString(parentUpdatePos) + "], Error: [" + e.getMessage() + "].", e);
-											}
-											finally
-											{
-												childReadLock.unlock();
-												this.lockedPosSet.remove(childPos);
-											}
-										}
-										
-										
-										if (DhSectionPos.getDetailLevel(parentUpdatePos) < TOP_SECTION_DETAIL_LEVEL)
-										{
-											parentDataSource.applyToParent = true;
-										}
-										
-										this.updateDataSourceAtPos(parentUpdatePos, parentDataSource, false);
-										for (Long childPos : updatePosByParentPos.get(parentUpdatePos))
-										{
-											this.repo.setApplyToParent(childPos, false);
-										}
-									}
-								}
-							}
-						}
-						finally
-						{
-							if (parentLocked)
-							{
-								parentWriteLock.unlock();
-								this.lockedPosSet.remove(parentUpdatePos);
-							}
-							
-							this.updatingPosSet.remove(parentUpdatePos);
-						}
-					});
-				}
-				catch (RejectedExecutionException ignore)
-				{ /* the executor was shut down, it should be back up shortly and able to accept new jobs */ }
-				catch (Exception e)
-				{
-					this.updatingPosSet.remove(parentUpdatePos);
-					throw e;
-				}
-			}
-		}
-	}
-	/** stops if it finds any LOD data */
-	private void runChildUpdates(PriorityTaskPicker.Executor executor, DhBlockPos targetBlockPos)
-	{
-		int maxUpdateTaskCount = getMaxUpdateTaskCount();
-		
-		// queue child updates
-		if (executor.getQueueSize() < maxUpdateTaskCount
-			&& this.updatingPosSet.size() < maxUpdateTaskCount)
-		{
-			// get the positions that need to be applied to their children
-			LongArrayList childUpdatePosList = this.repo.getChildPositionsToUpdate(targetBlockPos.getX(), targetBlockPos.getZ(), maxUpdateTaskCount);
-			
-			// queue the updates
-			for (long parentUpdatePos : childUpdatePosList)
-			{
-				// stop if there are already a bunch of updates queued
- 				if (this.updatingPosSet.size() > maxUpdateTaskCount
-					    || executor.getQueueSize() > maxUpdateTaskCount)
-				{
-					break;
-				}
-				
-				// skip already updating positions
-				if (!this.updatingPosSet.add(parentUpdatePos))
-				{
-					continue;
-				}
-				
-				try
-				{
-					executor.execute(() ->
-					{
-						ReentrantLock parentReadLock = this.updateLockProvider.getLock(parentUpdatePos);
-						boolean parentLocked = false;
-						try
-						{
-							//LOGGER.info("updating parent: "+parentUpdatePos);
-							
-							// Locking the parent before the children should prevent deadlocks.
-							// TryLock is used instead of lock so this thread can handle a different update.
-							if (parentReadLock.tryLock())
-							{
-								parentLocked = true;
-								this.lockedPosSet.add(parentUpdatePos);
-								
-								try (FullDataSourceV2 parentDataSource = this.get(parentUpdatePos))
-								{
-									// will return null if the file handler is shutting down
-									if (parentDataSource != null)
-									{
-										// apply parent to each child
-										for (int i = 0; i < 4; i++)
-										{
-											long childPos = DhSectionPos.getChildByIndex(parentUpdatePos, i);
-											
-											ReentrantLock childWriteLock = this.updateLockProvider.getLock(childPos);
-											try
-											{
-												childWriteLock.lock();
-												this.lockedPosSet.add(childPos);
-												
-												try (FullDataSourceV2 childDataSource = this.get(childPos))
-												{
-													// will return null if the file handler is shutting down
-													if (childDataSource != null)
-													{
-														childDataSource.update(parentDataSource);
-														
-														// don't propagate child updates past the bottom of the tree
-														if (DhSectionPos.getDetailLevel(childPos) != DhSectionPos.SECTION_BLOCK_DETAIL_LEVEL)
-														{
-															childDataSource.applyToChildren = true;
-														}
-														
-														this.updateDataSourceAtPos(childPos, childDataSource, false);
-													}
-												}
-											}
-											catch (Exception e)
-											{
-												LOGGER.error("Unexpected in child update propagation for parent pos: ["+DhSectionPos.toString(parentUpdatePos)+"], child pos: [" + DhSectionPos.toString(parentUpdatePos) + "], Error: [" + e.getMessage() + "].", e);
-											}
-											finally
-											{
-												childWriteLock.unlock();
-												this.lockedPosSet.remove(childPos);
-											}
-										}
-										
-										this.repo.setApplyToChild(parentUpdatePos, false);
-									}
-								}
-							}
-						}
-						finally
-						{
-							if (parentLocked)
-							{
-								parentReadLock.unlock();
-								this.lockedPosSet.remove(parentUpdatePos);
-							}
-							
-							this.updatingPosSet.remove(parentUpdatePos);
-						}
-					});
-				}
-				catch (RejectedExecutionException ignore)
-				{ /* the executor was shut down, it should be back up shortly and able to accept new jobs */ }
-				catch (Exception e)
-				{
-					this.updatingPosSet.remove(parentUpdatePos);
-					throw e;
-				}
-			}
-		}
-	}
-	
-	
-	
-	//=======================//
-	// data source migration //
-	//=======================//
-	
-	private void convertLegacyDataSources()
-	{
-		try
-		{
-			String levelId = this.level.getLevelWrapper().getDhIdentifier();
-			LOGGER.info("Attempting to migrate data sources for: [" + levelId + "]-[" + this.saveDir + "]...");
-			this.migrationThreadRunning.set(true);
-			
-			
-			
-			//============================//
-			// delete unused data sources //
-			//============================//
-			
-			// this could be done all at once via SQL, 
-			// but doing it in chunks prevents locking the database for long periods of time 
-			long unusedCount = 0;
-			long totalDeleteCount = this.legacyFileHandler.repo.getUnusedDataSourceCount();
-			if (totalDeleteCount != 0)
-			{
-				// this should only be shown once per session but should be shown during 
-				// either when the deletion or migration phases start
-				this.showMigrationStartMessage();
-				
-				
-				LOGGER.info("deleting [" + levelId + "] - [" + totalDeleteCount + "] unused data sources...");
-				this.legacyDeletionCount = totalDeleteCount;
-				
-				ArrayList<String> unusedDataPosList = this.legacyFileHandler.repo.getUnusedDataSourcePositionStringList(50);
-				while (unusedDataPosList.size() != 0)
-				{
-					unusedCount += unusedDataPosList.size();
-					this.legacyDeletionCount -= unusedDataPosList.size();
-					
-					
-					long startTime = System.currentTimeMillis();
-					
-					// delete batch and get next batch 
-					this.legacyFileHandler.repo.deleteUnusedLegacyData(unusedDataPosList);
-					unusedDataPosList = this.legacyFileHandler.repo.getUnusedDataSourcePositionStringList(50);
-					
-					long endStart = System.currentTimeMillis();
-					long deleteTime = endStart - startTime;
-					LOGGER.info("Deleting [" + levelId + "] - [" + unusedCount + "/" + totalDeleteCount + "] in [" + deleteTime + "]ms ...");
-					
-					
-					// a slight delay is added to prevent accidentally locking the database when deleting a lot of rows
-					// (that shouldn't be the case since we're using WAL journaling, but just in case)
-					try
-					{
-						// use the delete time so we don't make powerful computers wait super long
-						// and weak computers wait no time at all
-						Thread.sleep(deleteTime / 2);
-					}
-					catch (InterruptedException ignore)
-					{
-					}
-				}
-				LOGGER.info("Done deleting [" + levelId + "] - [" + totalDeleteCount + "] unused data sources.");
-				
-			}
-			
-			
-			
-			//===========//
-			// migration //
-			//===========//
-			
-			long totalMigrationCount = this.legacyFileHandler.getDataSourceMigrationCount();
-			this.migrationCount = totalMigrationCount;
-			LOGGER.info("Found [" + totalMigrationCount + "] data sources that need migration.");
-			
-			ArrayList<FullDataSourceV1> legacyDataSourceList = this.legacyFileHandler.getDataSourcesToMigrate(MIGRATION_BATCH_COUNT);
-			if (!legacyDataSourceList.isEmpty())
-			{
-				this.showMigrationStartMessage();
-				
-				try
-				{
-					// keep going until every data source has been migrated
-					int progressCount = 0;
-					while (!legacyDataSourceList.isEmpty() && this.migrationThreadRunning.get())
-					{
-						NumberFormat numFormat = F3Screen.NUMBER_FORMAT;
-						LOGGER.info("Migrating [" + levelId + "] - [" + numFormat.format(progressCount) + "/" + numFormat.format(totalMigrationCount) + "]...");
-						
-						ArrayList<CompletableFuture<Void>> updateFutureList = new ArrayList<>();
-						for (int i = 0; i < legacyDataSourceList.size() && this.migrationThreadRunning.get(); i++)
-						{
-							FullDataSourceV1 legacyDataSource = legacyDataSourceList.get(i);
-							
-							try
-							{
-								// convert the legacy data source to the new format,
-								// this is a relatively cheap operation
-								FullDataSourceV2 newDataSource = FullDataSourceV2.createFromLegacyDataSourceV1(legacyDataSource);
-								newDataSource.applyToParent = true;
-								
-								// the actual update process can be moderately expensive due to having to update
-								// the render data along with the full data, so running it async on the update threads gains us a good bit of speed
-								CompletableFuture<Void> future = this.updateDataSourceAsync(newDataSource);
-								updateFutureList.add(future);
-								future.thenRun(() ->
-								{
-									// after the update finishes the legacy data source can be safely deleted
-									this.legacyFileHandler.repo.deleteWithKey(legacyDataSource.getPos());
-									newDataSource.close();
-								});
-							}
-							catch (Exception e)
-							{
-								Long migrationPos = legacyDataSource.getPos();
-								LOGGER.warn("Unexpected issue migrating data source at pos [" + DhSectionPos.toString(migrationPos) + "]. Error: " + e.getMessage(), e);
-								this.legacyFileHandler.markMigrationFailed(migrationPos);
-							}
-						}
-						
-						
-						try
-						{
-							// wait for each thread to finish updating
-							CompletableFuture<Void> combinedFutures = CompletableFuture.allOf(updateFutureList.toArray(new CompletableFuture[0]));
-							combinedFutures.get(MIGRATION_MAX_UPDATE_TIMEOUT_IN_MS, TimeUnit.MILLISECONDS);
-						}
-						catch (InterruptedException | TimeoutException e)
-						{
-							LOGGER.warn("Migration update timed out after [" + MIGRATION_MAX_UPDATE_TIMEOUT_IN_MS + "] milliseconds. Migration will re-try the same positions again in a moment.", e);
-						}
-						catch (ExecutionException e)
-						{
-							LOGGER.warn("Migration update failed. Migration will re-try the same positions again. Error:" + e.getMessage(), e);
-						}
-						
-						legacyDataSourceList = this.legacyFileHandler.getDataSourcesToMigrate(MIGRATION_BATCH_COUNT);
-						
-						progressCount += legacyDataSourceList.size();
-						this.migrationCount -= legacyDataSourceList.size();
-					}
-				}
-				catch (Exception e)
-				{
-					LOGGER.info("migration stopped due to error for: [" + levelId + "]-[" + this.saveDir + "], error: [" + e.getMessage() + "].", e);
-					this.showMigrationEndMessage(false);
-					this.migrationStoppedWithError = true;
-				}
-				finally
-				{
-					if (this.migrationThreadRunning.get())
-					{
-						LOGGER.info("migration complete for: [" + levelId + "]-[" + this.saveDir + "].");
-						this.showMigrationEndMessage(true);
-						this.migrationCount = 0;
-					}
-					else
-					{
-						LOGGER.info("migration stopped for: [" + levelId + "]-[" + this.saveDir + "].");
-						this.showMigrationEndMessage(false);
-						this.migrationStoppedWithError = true;
-					}
-				}
-			}
-			else
-			{
-				LOGGER.info("No migration necessary.");
-			}
-		}
-		finally
-		{
-			this.migrationThreadRunning.set(false);
-		}
-	}
-	
-	public long getLegacyDeletionCount() { return this.legacyDeletionCount; }
-	public long getTotalMigrationCount() { return this.migrationCount; }
-	public boolean getMigrationStoppedWithError() { return this.migrationStoppedWithError; }
-	
-	
-	private void showMigrationStartMessage()
-	{
-		if (this.migrationStartMessageQueued)
-		{
-			return;
-		}
-		this.migrationStartMessageQueued = true;
-		
-		String levelId = this.level.getLevelWrapper().getDhIdentifier();
-		ClientApi.INSTANCE.showChatMessageNextFrame(
-				"Old Distant Horizons data is being migrated for ["+levelId+"]. \n" +
-				"While migrating LODs may load slowly \n" +
-				"and DH world gen will be disabled. \n" +
-				"You can see migration progress in the F3 menu."
-			);
-	}
-	
-	private void showMigrationEndMessage(boolean success)
-	{
-		String levelId = this.level.getLevelWrapper().getDhIdentifier();
-		
-		if (success)
-		{
-			ClientApi.INSTANCE.showChatMessageNextFrame("Distant Horizons data migration for ["+levelId+"] completed.");
-		}
-		else
-		{
-			ClientApi.INSTANCE.showChatMessageNextFrame(
-					"Distant Horizons data migration for ["+levelId+"] stopped. \n" +
-					"Some data may not have been migrated."
-				);
-		}
-	}
-	
-	
-	
-	//=======================//
-	// retrieval (world gen) //
-	//=======================//
-	
-	/**
-	 * Returns true if this provider can generate or retrieve
-	 * {@link FullDataSourceV2}'s that aren't currently in the database.
-	 */
-	public boolean canRetrieveMissingDataSources() 
-	{ 
-		// the base handler just handles basic reading/writing
-		// to the database and as such can't retrieve anything else.
-		return false; 
-	}
-	
-	/**
-	 * Returns false if this provider isn't accepting new requests,
-	 * this can be due to having a full queue or some other
-	 * limiting factor. <br><br>
-	 * 
-	 * Note: when overriding make sure to add: <br>
-	 * <code>
-	 * if (!super.canQueueRetrieval()) <br>
-	 * { <br>
-	 *      return false; <br>
-	 * } <br>
-	 * </code>
-	 * to the beginning of your override.
-	 * Otherwise, parent retrieval limits will be ignored.
-	 */
-	public boolean canQueueRetrieval()
-	{
-		// Retrieval shouldn't happen while an unknown number of
-		// legacy data sources are present.
-		// If retrieval was allowed we might run into concurrency issues.
-		return !this.migrationThreadRunning.get();
-	}
-	
-	/** 
-	 * @return null if this provider can't generate any positions and
-	 * an empty array if all positions were generated 
-	 */
-	@Nullable
-	public LongArrayList getPositionsToRetrieve(Long pos) { return null; }
-		
-	/** @return true if the position was queued, false if not */
-	@Nullable
-	public CompletableFuture<WorldGenResult> queuePositionForRetrieval(Long genPos) { return null; }
-	
-	/** does nothing if the given position isn't present in the queue */
-	public void removeRetrievalRequestIf(DhSectionPos.ICancelablePrimitiveLongConsumer removeIf) { }
-	
-	public void clearRetrievalQueue() { }
-	
-	/** Can be used to display how many total retrieval requests might be available. */
-	public void setTotalRetrievalPositionCount(int newCount) { }
-	/** Can be used to display how many total chunk retrieval requests should be available. */
-	public void setEstimatedRemainingRetrievalChunkCount(int newCount) { }
-	
-	public boolean fileExists(long pos) { return this.repo.getDataSizeInBytes(pos) > 0; }
-	
-	
-	
-	//========================//
-	// multiplayer networking //
-	//========================//
-	
-	@Nullable
-	public Long getTimestampForPos(long pos)
-	{ return this.repo.getTimestampForPos(pos); }
-	
-	
-	
-	//===========//
-	// overrides //
-	//===========//
-	
-	@Override
-	public void debugRender(DebugRenderer renderer)
-	{
-		this.lockedPosSet
-				.forEach((pos) -> { renderer.renderBox(new DebugRenderer.Box(pos, -32f, 74f, 0.15f, Color.PINK)); });
-		
-		this.queuedUpdateCountsByPos
-				.forEach((pos, updateCountRef) -> { renderer.renderBox(new DebugRenderer.Box(pos, -32f, 80f + (updateCountRef.get() * 16f), 0.20f, Color.WHITE)); });
-		this.updatingPosSet
-				.forEach((pos) -> { renderer.renderBox(new DebugRenderer.Box(pos, -32f, 80f, 0.20f, Color.MAGENTA)); });
-	}
-	
-	@Override 
-	public void close()
-	{
-		super.close();
-		if (this.updateQueueProcessor != null)
-		{
-			this.updateQueueProcessor.shutdownNow();
-		}
-		
-		this.legacyFileHandler.close();
-		
-		this.migrationThreadRunning.set(false);
-	}
-	
-}

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

@@ -23,12 +23,15 @@ import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGeneratio
 import com.seibel.distanthorizons.core.api.internal.SharedApi;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
+import com.seibel.distanthorizons.core.file.fullDatafile.V2.FullDataSourceProviderV2;
+import com.seibel.distanthorizons.core.file.fullDatafile.V2.FullDataUpdatePropagatorV2;
 import com.seibel.distanthorizons.core.file.structure.ISaveStructure;
 import com.seibel.distanthorizons.core.generation.DhLightingEngine;
 import com.seibel.distanthorizons.core.generation.IFullDataSourceRetrievalQueue;
 import com.seibel.distanthorizons.core.generation.tasks.IWorldGenTaskTracker;
 import com.seibel.distanthorizons.core.generation.tasks.WorldGenResult;
 import com.seibel.distanthorizons.core.level.IDhLevel;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.pooling.PhantomArrayListCheckout;
 import com.seibel.distanthorizons.core.pooling.PhantomArrayListPool;
@@ -40,7 +43,6 @@ import com.seibel.distanthorizons.core.util.threading.PriorityTaskPicker;
 import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
 import it.unimi.dsi.fastutil.bytes.ByteArrayList;
 import it.unimi.dsi.fastutil.longs.LongArrayList;
-import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -54,7 +56,7 @@ import java.util.stream.IntStream;
 
 public class GeneratedFullDataSourceProvider extends FullDataSourceProviderV2 implements IDebugRenderable
 {
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();;
 	
 	/** 
 	 * Having this number too high causes the system to become overwhelmed by
@@ -79,7 +81,16 @@ public class GeneratedFullDataSourceProvider extends FullDataSourceProviderV2 im
 	//=============//
 	
 	public GeneratedFullDataSourceProvider(IDhLevel level, ISaveStructure saveStructure) { super(level, saveStructure); }
-	public GeneratedFullDataSourceProvider(IDhLevel level, ISaveStructure saveStructure, @Nullable File saveDirOverride) { super(level, saveStructure, saveDirOverride); }
+	public GeneratedFullDataSourceProvider(IDhLevel level, ISaveStructure saveStructure, @Nullable File saveDirOverride) 
+	{
+		super(level, saveStructure, saveDirOverride);
+		
+		this.addDataSourceUpdateListener((@NotNull FullDataSourceV2 updatedData) ->
+		{
+			this.onWorldGenTaskComplete(WorldGenResult.CreateSuccess(updatedData.getPos()), null);
+		});
+		
+	}
 	
 	
 	
@@ -176,7 +187,7 @@ public class GeneratedFullDataSourceProvider extends FullDataSourceProviderV2 im
 	{
 		boolean oldQueueExists = this.worldGenQueueRef.compareAndSet(null, newWorldGenQueue);
 		LodUtil.assertTrue(oldQueueExists, "previous world gen queue is still here!");
-		LOGGER.info("Set world gen queue for level [" + this.level.getLevelWrapper().getDhIdentifier() + "].");
+		LOGGER.info("Set world gen queue for level [" + this.levelId + "].");
 	}
 	
 	@Override
@@ -210,8 +221,18 @@ public class GeneratedFullDataSourceProvider extends FullDataSourceProviderV2 im
 		}
 		
 		
-		PriorityTaskPicker.Executor fileExecutor = ThreadPoolUtil.getFileHandlerExecutor();
+		PriorityTaskPicker.Executor renderLoadExecutor = ThreadPoolUtil.getRenderLoadingExecutor();
-		if (fileExecutor == null || fileExecutor.getQueueSize() >= getMaxUpdateTaskCount() / 2)
+		if (renderLoadExecutor == null 
+			|| renderLoadExecutor.getQueueSize() >= FullDataUpdatePropagatorV2.getMaxPropagateTaskCount() / 2)
+		{
+			// don't queue additional world gen requests if the render loader handler is overwhelmed,
+			// otherwise LODs may not load in properly
+			return false;
+		}
+		
+		PriorityTaskPicker.Executor fileHandlerExecutor = ThreadPoolUtil.getFileHandlerExecutor();
+		if (fileHandlerExecutor == null 
+			|| fileHandlerExecutor.getQueueSize() >= FullDataUpdatePropagatorV2.getMaxPropagateTaskCount() / 2)
 		{
 			// don't queue additional world gen requests if the file handler is overwhelmed,
 			// otherwise LODs may not load in properly
@@ -244,6 +265,7 @@ public class GeneratedFullDataSourceProvider extends FullDataSourceProviderV2 im
 			return false;
 		}
 		
+		
 		int availableTaskSlots = maxWorldGenQueueCount - worldGenQueue.getWaitingTaskCount();
 		if (availableTaskSlots <= 0)
 		{
@@ -282,17 +304,6 @@ public class GeneratedFullDataSourceProvider extends FullDataSourceProviderV2 im
 		return worldGenFuture;
 	}
 	
-	@Override
-	protected void updateDataSourceAtPos(long updatePos, @NotNull FullDataSourceV2 inputData, boolean lockOnUpdatePos)
-	{
-		super.updateDataSourceAtPos(updatePos, inputData, lockOnUpdatePos);
-		
-		//if (SharedApi.getEnvironment() != EWorldEnvironment.CLIENT_ONLY)
-		//	LOGGER.info("updated ["+DhSectionPos.toString(updatePos)+"]");
-		
-		this.onWorldGenTaskComplete(WorldGenResult.CreateSuccess(updatePos), null);
-	}
-	
 	@Override
 	public void removeRetrievalRequestIf(DhSectionPos.ICancelablePrimitiveLongConsumer removeIf)
 	{

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

@@ -0,0 +1,7 @@
+package com.seibel.distanthorizons.core.file.fullDatafile;
+
+@FunctionalInterface
+public interface IDataSourceUpdateListenerFunc<TDataSource>
+{
+	void OnDataSourceUpdated(TDataSource updatedFullDataSource);
+}

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

@@ -27,7 +27,7 @@ import com.seibel.distanthorizons.core.level.IDhLevel;
 import com.seibel.distanthorizons.core.level.WorldGenModule;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.multiplayer.client.SyncOnLoadRequestQueue;
-import org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
@@ -41,7 +41,7 @@ import java.util.concurrent.TimeUnit;
  */
 public class RemoteFullDataSourceProvider extends GeneratedFullDataSourceProvider
 {
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	@Nullable
 	private final SyncOnLoadRequestQueue syncOnLoadRequestQueue;

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

@@ -1,4 +1,4 @@
-package com.seibel.distanthorizons.core.file.fullDatafile;
+package com.seibel.distanthorizons.core.file.fullDatafile.V1;
 
 import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV1;
 import com.seibel.distanthorizons.core.file.structure.ISaveStructure;
@@ -9,9 +9,10 @@ import com.seibel.distanthorizons.core.sql.dto.FullDataSourceV1DTO;
 import com.seibel.distanthorizons.core.sql.repo.AbstractDhRepo;
 import com.seibel.distanthorizons.core.sql.repo.FullDataSourceV1Repo;
 import com.seibel.distanthorizons.core.util.objects.DataCorruptedException;
+import com.seibel.distanthorizons.core.util.objects.dataStreams.DhDataInputStream;
 import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
 import it.unimi.dsi.fastutil.longs.LongArrayList;
-import org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 import org.jetbrains.annotations.Nullable;
 
 import java.io.File;
@@ -21,13 +22,12 @@ import java.util.ArrayList;
 import java.util.concurrent.AbstractExecutorService;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.RejectedExecutionException;
-import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.locks.ReentrantLock;
 
 public class FullDataSourceProviderV1<TDhLevel extends IDhLevel>
 		implements AutoCloseable
 {
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	protected final ReentrantLock closeLock = new ReentrantLock();
 	protected volatile boolean isShutdown = false;
@@ -43,10 +43,10 @@ public class FullDataSourceProviderV1<TDhLevel extends IDhLevel>
 	// constructor //
 	//=============//
 	
-	public FullDataSourceProviderV1(TDhLevel level, ISaveStructure saveStructure, @Nullable File saveDirOverride)
+	public FullDataSourceProviderV1(TDhLevel level, File saveDir)
 	{
 		this.level = level;
-		this.saveDir = (saveDirOverride == null) ? saveStructure.getSaveFolder(level.getLevelWrapper()) : saveDirOverride;
+		this.saveDir = saveDir;
 		if (!this.saveDir.exists() && !this.saveDir.mkdirs())
 		{
 			LOGGER.warn("Unable to create full data folder, file saving may fail.");
@@ -79,7 +79,10 @@ public class FullDataSourceProviderV1<TDhLevel extends IDhLevel>
 	protected FullDataSourceV1 createDataSourceFromDto(FullDataSourceV1DTO dto) throws InterruptedException, IOException, DataCorruptedException
 	{
 		FullDataSourceV1 dataSource = FullDataSourceV1.createEmpty(dto.pos);
-		dataSource.populateFromStream(dto, dto.getInputStream(), this.level);
+		try (DhDataInputStream inputStream = dto.getInputStream())
+		{
+			dataSource.populateFromStream(dto, inputStream, this.level);
+		}
 		return dataSource;
 	}
 	

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

@@ -0,0 +1,346 @@
+package com.seibel.distanthorizons.core.file.fullDatafile.V2;
+
+import com.seibel.distanthorizons.core.api.internal.ClientApi;
+import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV1;
+import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
+import com.seibel.distanthorizons.core.file.fullDatafile.V1.FullDataSourceProviderV1;
+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.logging.f3.F3Screen;
+import com.seibel.distanthorizons.core.pos.DhSectionPos;
+import com.seibel.distanthorizons.core.render.renderer.DebugRenderer;
+import com.seibel.distanthorizons.core.render.renderer.IDebugRenderable;
+import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
+
+import java.io.File;
+import java.text.NumberFormat;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class DataMigratorV1 implements IDebugRenderable, AutoCloseable
+{
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	
+	/** how many data sources should be pulled down for migration at once */
+	private static final int MIGRATION_BATCH_COUNT = FullDataUpdatePropagatorV2.NUMBER_OF_PARENT_UPDATE_TASKS_PER_THREAD;
+	/**
+	 * 5 minutes <br>
+	 * This should be much longer than any update should take. This is just
+	 * to make sure the thread doesn't get stuck.
+	 */
+	private static final int MIGRATION_MAX_UPDATE_TIMEOUT_IN_MS = 5 * 60 * 1_000;
+	
+	
+	
+	private final FullDataUpdaterV2 dataUpdater;
+	
+	
+	private boolean migrationStartMessageQueued = false;
+	
+	private long legacyDeletionCount = -1;
+	private long migrationCount = -1;
+	private boolean migrationStoppedWithError = false;
+	
+	/**
+	 * Interrupting the migration thread pool doesn't work well and may corrupt the database
+	 * vs gracefully shutting down the thread ourselves. 
+	 */
+	public final AtomicBoolean migrationThreadRunning = new AtomicBoolean(true);
+	private final FullDataSourceProviderV1<IDhLevel> v1DataSourceProvider;
+	
+	private final String levelId;
+	private final File saveDir;
+	
+	
+	
+	//=============//
+	// constructor //
+	//=============//
+	
+	public DataMigratorV1(
+			FullDataUpdaterV2 dataUpdater,
+			IDhLevel level, String levelId, File saveDir)
+	{
+		this.dataUpdater = dataUpdater;
+		this.saveDir = saveDir;
+		this.v1DataSourceProvider = new FullDataSourceProviderV1<>(level, saveDir);
+		
+		this.levelId = levelId;
+		
+		
+		// start migrating any legacy data sources present in the background
+		ThreadPoolExecutor executor = ThreadPoolUtil.getFullDataMigrationExecutor();
+		if (executor != null)
+		{
+			executor.execute(this::convertLegacyDataSources);
+		}
+		else
+		{
+			// shouldn't happen, but just in case
+			LOGGER.error("Unable to start migration for level: ["+this.levelId+"] due to missing executor.");
+		}
+		
+	}
+	
+	
+	//=======================//
+	// data source migration //
+	//=======================//
+	
+	private void convertLegacyDataSources()
+	{
+		try
+		{
+			LOGGER.debug("Attempting to migrate data sources for: [" + this.levelId + "]-[" + this.saveDir + "]...");
+			this.migrationThreadRunning.set(true);
+			
+			
+			
+			//============================//
+			// delete unused data sources //
+			//============================//
+			
+			// this could be done all at once via SQL, 
+			// but doing it in chunks prevents locking the database for long periods of time 
+			long unusedCount = 0;
+			long totalDeleteCount = this.v1DataSourceProvider.repo.getUnusedDataSourceCount();
+			if (totalDeleteCount != 0)
+			{
+				// this should only be shown once per session but should be shown during 
+				// either when the deletion or migration phases start
+				this.showMigrationStartMessage();
+				
+				
+				LOGGER.info("deleting [" + this.levelId + "] - [" + totalDeleteCount + "] unused data sources...");
+				this.legacyDeletionCount = totalDeleteCount;
+				
+				ArrayList<String> unusedDataPosList = this.v1DataSourceProvider.repo.getUnusedDataSourcePositionStringList(50);
+				while (unusedDataPosList.size() != 0)
+				{
+					unusedCount += unusedDataPosList.size();
+					this.legacyDeletionCount -= unusedDataPosList.size();
+					
+					
+					long startTime = System.currentTimeMillis();
+					
+					// delete batch and get next batch 
+					this.v1DataSourceProvider.repo.deleteUnusedLegacyData(unusedDataPosList);
+					unusedDataPosList = this.v1DataSourceProvider.repo.getUnusedDataSourcePositionStringList(50);
+					
+					long endStart = System.currentTimeMillis();
+					long deleteTime = endStart - startTime;
+					LOGGER.info("Deleting [" + this.levelId + "] - [" + unusedCount + "/" + totalDeleteCount + "] in [" + deleteTime + "]ms ...");
+					
+					
+					// a slight delay is added to prevent accidentally locking the database when deleting a lot of rows
+					// (that shouldn't be the case since we're using WAL journaling, but just in case)
+					try
+					{
+						// use the delete time so we don't make powerful computers wait super long
+						// and weak computers wait no time at all
+						Thread.sleep(deleteTime / 2);
+					}
+					catch (InterruptedException ignore)
+					{
+					}
+				}
+				LOGGER.info("Done deleting [" + this.levelId + "] - [" + totalDeleteCount + "] unused data sources.");
+				
+			}
+			
+			
+			
+			//===========//
+			// migration //
+			//===========//
+			
+			long totalMigrationCount = this.v1DataSourceProvider.getDataSourceMigrationCount();
+			this.migrationCount = totalMigrationCount;
+			LOGGER.debug("Found [" + totalMigrationCount + "] data sources that need migration.");
+			
+			ArrayList<FullDataSourceV1> legacyDataSourceList = this.v1DataSourceProvider.getDataSourcesToMigrate(MIGRATION_BATCH_COUNT);
+			if (!legacyDataSourceList.isEmpty())
+			{
+				this.showMigrationStartMessage();
+				
+				try
+				{
+					// keep going until every data source has been migrated
+					int progressCount = 0;
+					while (!legacyDataSourceList.isEmpty() && this.migrationThreadRunning.get())
+					{
+						NumberFormat numFormat = F3Screen.NUMBER_FORMAT;
+						LOGGER.info("Migrating [" + this.levelId + "] - [" + numFormat.format(progressCount) + "/" + numFormat.format(totalMigrationCount) + "]...");
+						
+						ArrayList<CompletableFuture<Void>> updateFutureList = new ArrayList<>();
+						for (int i = 0; i < legacyDataSourceList.size() && this.migrationThreadRunning.get(); i++)
+						{
+							FullDataSourceV1 legacyDataSource = legacyDataSourceList.get(i);
+							
+							try
+							{
+								// convert the legacy data source to the new format,
+								// this is a relatively cheap operation
+								FullDataSourceV2 newDataSource = FullDataSourceV2.createFromLegacyDataSourceV1(legacyDataSource);
+								newDataSource.applyToParent = true;
+								
+								// the actual update process can be moderately expensive due to having to update
+								// the render data along with the full data, so running it async on the update threads gains us a good bit of speed
+								CompletableFuture<Void> future = this.dataUpdater.updateDataSourceAsync(newDataSource);
+								updateFutureList.add(future);
+								future.thenRun(() ->
+								{
+									// after the update finishes the legacy data source can be safely deleted
+									this.v1DataSourceProvider.repo.deleteWithKey(legacyDataSource.getPos());
+									newDataSource.close();
+								});
+							}
+							catch (Exception e)
+							{
+								long migrationPos = legacyDataSource.getPos();
+								LOGGER.warn("Unexpected issue migrating data source at pos [" + DhSectionPos.toString(migrationPos) + "]. Error: " + e.getMessage(), e);
+								this.v1DataSourceProvider.markMigrationFailed(migrationPos);
+							}
+						}
+						
+						
+						try
+						{
+							// wait for each thread to finish updating
+							CompletableFuture<Void> combinedFutures = CompletableFuture.allOf(updateFutureList.toArray(new CompletableFuture[0]));
+							combinedFutures.get(MIGRATION_MAX_UPDATE_TIMEOUT_IN_MS, TimeUnit.MILLISECONDS);
+						}
+						catch (InterruptedException | TimeoutException e)
+						{
+							LOGGER.warn("Migration update timed out after [" + MIGRATION_MAX_UPDATE_TIMEOUT_IN_MS + "] milliseconds. Migration will re-try the same positions again in a moment.", e);
+						}
+						catch (ExecutionException e)
+						{
+							LOGGER.warn("Migration update failed. Migration will re-try the same positions again. Error:" + e.getMessage(), e);
+						}
+						
+						legacyDataSourceList = this.v1DataSourceProvider.getDataSourcesToMigrate(MIGRATION_BATCH_COUNT);
+						
+						progressCount += legacyDataSourceList.size();
+						this.migrationCount -= legacyDataSourceList.size();
+					}
+				}
+				catch (Exception e)
+				{
+					LOGGER.info("migration stopped due to error for: [" + this.levelId + "]-[" + this.saveDir + "], error: [" + e.getMessage() + "].", e);
+					this.showMigrationEndMessage(false);
+					this.migrationStoppedWithError = true;
+				}
+				finally
+				{
+					if (this.migrationThreadRunning.get())
+					{
+						LOGGER.info("migration complete for: [" + this.levelId + "]-[" + this.saveDir + "].");
+						this.showMigrationEndMessage(true);
+						this.migrationCount = 0;
+					}
+					else
+					{
+						LOGGER.info("migration stopped for: [" + this.levelId + "]-[" + this.saveDir + "].");
+						this.showMigrationEndMessage(false);
+						this.migrationStoppedWithError = true;
+					}
+				}
+			}
+			else
+			{
+				LOGGER.info("No migration necessary.");
+			}
+		}
+		finally
+		{
+			this.migrationThreadRunning.set(false);
+		}
+	}
+	
+	
+	private void showMigrationStartMessage()
+	{
+		if (this.migrationStartMessageQueued)
+		{
+			return;
+		}
+		this.migrationStartMessageQueued = true;
+		
+		ClientApi.INSTANCE.showChatMessageNextFrame(
+				"Old Distant Horizons data is being migrated for ["+this.levelId+"]. \n" +
+				"While migrating LODs may load slowly \n" +
+				"and DH world gen will be disabled. \n" +
+				"You can see migration progress in the F3 menu."
+		);
+	}
+	
+	private void showMigrationEndMessage(boolean success)
+	{
+		if (success)
+		{
+			ClientApi.INSTANCE.showChatMessageNextFrame("Distant Horizons data migration for ["+this.levelId+"] completed.");
+		}
+		else
+		{
+			ClientApi.INSTANCE.showChatMessageNextFrame(
+					"Distant Horizons data migration for ["+this.levelId+"] stopped. \n" +
+					"Some data may not have been migrated."
+			);
+		}
+	}
+	
+	
+	
+	//===========//
+	// debugging //
+	//===========//
+	
+	public void addDebugMenuStringsToList(List<String> messageList)
+	{
+		// migration
+		boolean migrationErrored = this.migrationStoppedWithError;
+		if (!migrationErrored)
+		{
+			long legacyDeletionCount = this.legacyDeletionCount;
+			if (legacyDeletionCount > 0)
+			{
+				messageList.add("  Migrating - Deleting #: " + F3Screen.NUMBER_FORMAT.format(legacyDeletionCount));
+			}
+			
+			long migrationCount = this.migrationCount;
+			if (migrationCount > 0)
+			{
+				messageList.add("  Migrating - Conversion #: " + F3Screen.NUMBER_FORMAT.format(migrationCount));
+			}
+		}
+		else
+		{
+			messageList.add("  Migration Failed");
+		}
+	}
+	
+	
+	
+	//===========//
+	// overrides //
+	//===========//
+	
+	@Override
+	public void debugRender(DebugRenderer renderer)
+	{
+		// nothing currently needed
+	}
+	
+	@Override
+	public void close()
+	{
+		//LOGGER.info("Closing [" + this.getClass().getSimpleName() + "] for level: [" + this.levelId + "].");
+	}
+	
+	
+	
+}

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

@@ -0,0 +1,452 @@
+/*
+ *    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.file.fullDatafile.V2;
+
+import com.seibel.distanthorizons.api.enums.config.EDhApiDataCompressionMode;
+import com.seibel.distanthorizons.core.config.Config;
+import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
+import com.seibel.distanthorizons.core.enums.EDhDirection;
+import com.seibel.distanthorizons.core.file.fullDatafile.IDataSourceUpdateListenerFunc;
+import com.seibel.distanthorizons.core.file.structure.ISaveStructure;
+import com.seibel.distanthorizons.core.generation.tasks.WorldGenResult;
+import com.seibel.distanthorizons.core.level.IDhLevel;
+import com.seibel.distanthorizons.core.logging.DhLogger;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.pos.DhSectionPos;
+import com.seibel.distanthorizons.core.render.renderer.DebugRenderer;
+import com.seibel.distanthorizons.core.render.renderer.IDebugRenderable;
+import com.seibel.distanthorizons.core.sql.dto.FullDataSourceV2DTO;
+import com.seibel.distanthorizons.core.sql.repo.AbstractDhRepo;
+import com.seibel.distanthorizons.core.sql.repo.FullDataSourceV2Repo;
+import com.seibel.distanthorizons.core.util.LodUtil;
+import com.seibel.distanthorizons.core.util.objects.DataCorruptedException;
+import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
+import it.unimi.dsi.fastutil.longs.LongArrayList;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.File;
+import java.io.IOException;
+import java.sql.SQLException;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.ReentrantLock;
+
+/**
+ * Handles reading/writing {@link FullDataSourceV2} 
+ * to and from the database.
+ */
+public class FullDataSourceProviderV2 implements IDebugRenderable, AutoCloseable
+{
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+
+	private static final Set<String> CORRUPT_DATA_ERRORS_LOGGED = Collections.newSetFromMap(new ConcurrentHashMap<>());
+	
+	/**
+	 * The highest numerical detail level possible. 
+	 * Used when determining which positions to update. 
+	 *
+	 * @see FullDataSourceProviderV2#LEAF_SECTION_DETAIL_LEVEL
+	 */
+	public static final byte ROOT_SECTION_DETAIL_LEVEL
+			= DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL
+			+ LodUtil.REGION_DETAIL_LEVEL;
+	/**
+	 * The lowest numerical detail level possible. 
+	 *
+	 * @see FullDataSourceProviderV2#ROOT_SECTION_DETAIL_LEVEL
+	 */
+	public static final byte LEAF_SECTION_DETAIL_LEVEL = DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL;
+	
+	
+	public final FullDataSourceV2Repo repo;
+	
+	
+	protected final AtomicBoolean isShutdownRef = new AtomicBoolean(false);
+	protected final File saveDir;
+	protected final IDhLevel level;
+	protected final String levelId;
+	
+	
+	private final FullDataUpdaterV2 dataUpdater;
+	private final FullDataUpdatePropagatorV2 updatePropagator;
+	private final DataMigratorV1 dataMigratorV1;
+	
+	
+	
+	//=============//
+	// constructor //
+	//=============//
+	
+	public FullDataSourceProviderV2(IDhLevel level, ISaveStructure saveStructure) { this(level, saveStructure, null); }
+	public FullDataSourceProviderV2(IDhLevel level, ISaveStructure saveStructure, @Nullable File saveDirOverride) 
+	{
+		this.saveDir = (saveDirOverride == null) ? saveStructure.getSaveFolder(level.getLevelWrapper()) : saveDirOverride;
+		this.repo = this.createRepo();
+		this.level = level;
+		
+		this.levelId = this.level.getLevelWrapper().getDhIdentifier();
+		
+		this.dataUpdater = new FullDataUpdaterV2(this, this.levelId);
+		this.updatePropagator = new FullDataUpdatePropagatorV2(this, this.dataUpdater, this.levelId);
+		this.dataMigratorV1 = new DataMigratorV1(this.dataUpdater, this.level, this.levelId, this.saveDir);
+		
+		DebugRenderer.register(this, Config.Client.Advanced.Debugging.DebugWireframe.showFullDataUpdateStatus);
+		
+	}
+	private FullDataSourceV2Repo createRepo()
+	{
+		try
+		{
+			return new FullDataSourceV2Repo(AbstractDhRepo.DEFAULT_DATABASE_TYPE, new File(this.saveDir.getPath() + File.separator + ISaveStructure.DATABASE_NAME));
+		}
+		catch (SQLException e)
+		{
+			// should only happen if there is an issue with the database (it's locked or the folder path is missing) 
+			// or the database update failed
+			throw new RuntimeException(e);
+		}
+	}
+	
+	
+	
+	//=================//
+	// event listeners //
+	//=================//
+	
+	public void addDataSourceUpdateListener(IDataSourceUpdateListenerFunc<FullDataSourceV2> listener)
+	{
+		synchronized (this.dataUpdater)
+		{
+			this.dataUpdater.dateSourceUpdateListeners.add(listener);
+		}
+	}
+	public void removeDataSourceUpdateListener(IDataSourceUpdateListenerFunc<FullDataSourceV2> listener)
+	{
+		synchronized (this.dataUpdater)
+		{
+			this.dataUpdater.dateSourceUpdateListeners.add(listener);
+		}
+	}
+	
+	
+	
+	//================//
+	// DTO converters //
+	//================//
+	
+	protected FullDataSourceV2 createDataSourceFromDto(FullDataSourceV2DTO dto) throws InterruptedException, IOException, DataCorruptedException
+	{ return dto.createDataSource(this.level.getLevelWrapper(), null); }
+	protected FullDataSourceV2 createAdjDataSourceFromDto(FullDataSourceV2DTO dto, EDhDirection direction) throws InterruptedException, IOException, DataCorruptedException
+	{ return dto.createDataSource(this.level.getLevelWrapper(), direction); }
+	
+	
+	
+	//=========================//
+	// basic DataSource getter //
+	//=========================//
+	
+	/**
+	 * Returns the {@link FullDataSourceV2} for the given section position. <Br>
+	 * The returned data source may be null if repo is in the process of shutting down. <Br> <Br>
+	 *
+	 * This call is concurrent. I.e. it supports being called by multiple threads at the same time.
+	 */
+	public CompletableFuture<FullDataSourceV2> getAsync(long pos)
+	{
+		if (this.isShutdownRef.get())
+		{
+			return CompletableFuture.completedFuture(null);
+		}
+		
+		AbstractExecutorService executor = ThreadPoolUtil.getFileHandlerExecutor();
+		if (executor == null || executor.isTerminated())
+		{
+			return CompletableFuture.completedFuture(null);
+		}
+		
+		
+		try
+		{
+			return CompletableFuture.supplyAsync(() -> this.get(pos), executor);
+		}
+		catch (RejectedExecutionException ignore)
+		{
+			// the thread pool was probably shut down because it's size is being changed, just wait a sec and it should be back
+			return CompletableFuture.completedFuture(null);
+		}
+	}
+	/**
+	 * Should only be used in internal file handler methods where we are already running on a file handler thread.
+	 * Can return null if the repo is in the process of being shut down
+	 * @see FullDataSourceProviderV2#getAsync(long)
+	 */
+	@Nullable
+	public FullDataSourceV2 get(long pos)
+	{
+		if (this.isShutdownRef.get())
+		{
+			return null;
+		}
+		
+		try(FullDataSourceV2DTO dto = this.repo.getByKey(pos))
+		{
+			if (dto == null)
+			{
+				return FullDataSourceV2.createEmpty(pos);
+			}
+			
+			try
+			{
+				FullDataSourceV2 dataSource = this.createDataSourceFromDto(dto);
+				
+				// automatically create and save adjacent data if missing
+				if (dto.dataFormatVersion == FullDataSourceV2DTO.DATA_FORMAT.V1_NO_ADJACENT_DATA)
+				{
+					EDhApiDataCompressionMode compressionMode = Config.Common.LodBuilding.dataCompression.get();
+					try(FullDataSourceV2DTO updatedDto = FullDataSourceV2DTO.CreateFromDataSource(dataSource, compressionMode))
+					{
+						this.repo.save(updatedDto);
+					}
+				}
+				
+				return dataSource; 
+			}
+			catch (DataCorruptedException e)
+			{
+				this.tryLogCorruptedDataError(DhSectionPos.toString(pos), e);
+				this.repo.deleteWithKey(pos);
+			}
+		}
+		catch (InterruptedException ignore) { }
+		catch (IOException e)
+		{
+			LOGGER.warn("File read Error for pos ["+DhSectionPos.toString(pos)+"], error: "+e.getMessage(), e);
+		}
+		
+		// an error occurred
+		return null;
+	}
+	
+	protected void tryLogCorruptedDataError(String whereClause, Exception e)
+	{
+		// there's a rare issue where the exception doesn't
+		// have a message, which can cause problems
+		String message = (e.getMessage() == null) ? e.getMessage() : "No Error message for exception ["+e.getClass().getSimpleName()+"]";
+		
+		// Only log each message type once.
+		// This is done to prevent logging "No compression mode with the value [2]" 10,000 times 
+		// if the user is migrating from a nightly build and used ZStd.
+		if (CORRUPT_DATA_ERRORS_LOGGED.add(message))
+		{
+			LOGGER.warn("Corrupted data found at [" + whereClause + "]. Data at will be deleted so it can be re-generated to prevent issues. Future errors with this same message won't be logged. Error: [" + message + "].", e);
+		}
+	}
+	
+	
+	
+	//=================//
+	// partial getters //
+	//=================//
+	
+	/** 
+	 * Only returns the data row/column for the given compass-cardinal
+	 * direction. <br>
+	 * This is generally used for generating LOD render data
+	 * where we only need the adjacent data, not the full thing.
+	 */
+	public FullDataSourceV2 getAdjForDirection(long pos, EDhDirection direction)
+	{
+		if (this.isShutdownRef.get())
+		{
+			return null;
+		}
+		
+		try(FullDataSourceV2DTO dto = this.repo.getAdjByPosAndDirection(pos, direction))
+		{
+			if (dto == null)
+			{
+				return FullDataSourceV2.createEmpty(pos);
+			}
+			
+			// migrate to the V2 format first if needed
+			if (dto.dataFormatVersion == FullDataSourceV2DTO.DATA_FORMAT.V1_NO_ADJACENT_DATA)
+			{
+				// get automatically converts from V1 to V2
+				FullDataSourceV2 migratedDataSource = this.get(pos);
+				if (migratedDataSource != null)
+				{
+					migratedDataSource.clearAllNonAdjData(direction);
+				}
+				
+				return migratedDataSource;
+			}
+			
+			try
+			{
+				// load from database
+				return this.createAdjDataSourceFromDto(dto, direction);
+			}
+			catch (DataCorruptedException e)
+			{
+				this.tryLogCorruptedDataError(DhSectionPos.toString(pos), e);
+				this.repo.deleteWithKey(pos);
+			}
+		}
+		catch (InterruptedException ignore) { }
+		catch (IOException e)
+		{
+			LOGGER.warn("File read Error for pos ["+DhSectionPos.toString(pos)+"], error: "+e.getMessage(), e);
+		}
+		
+		// an error occurred
+		return null;
+	}
+	
+	
+	
+	//=======================//
+	// retrieval (world gen) //
+	//=======================//
+	
+	/**
+	 * Returns true if this provider can generate or retrieve
+	 * {@link FullDataSourceV2}'s that aren't currently in the database.
+	 */
+	public boolean canRetrieveMissingDataSources() 
+	{ 
+		// the base handler just handles basic reading/writing
+		// to the database and as such can't retrieve anything else.
+		return false; 
+	}
+	
+	/**
+	 * Returns false if this provider isn't accepting new requests,
+	 * this can be due to having a full queue or some other
+	 * limiting factor. <br><br>
+	 * 
+	 * Note: when overriding make sure to add: <br>
+	 * <code>
+	 * if (!super.canQueueRetrieval()) <br>
+	 * { <br>
+	 *      return false; <br>
+	 * } <br>
+	 * </code>
+	 * to the beginning of your override.
+	 * Otherwise, parent retrieval limits will be ignored.
+	 */
+	public boolean canQueueRetrieval()
+	{
+		// Retrieval shouldn't happen while an unknown number of
+		// legacy data sources are present.
+		// If retrieval was allowed we might run into concurrency issues.
+		return !this.dataMigratorV1.migrationThreadRunning.get();
+	}
+	
+	/** 
+	 * @return null if this provider can't generate any positions and
+	 * an empty array if all positions were generated 
+	 */
+	@Nullable
+	public LongArrayList getPositionsToRetrieve(Long pos) { return null; }
+		
+	/** @return true if the position was queued, false if not */
+	@Nullable
+	public CompletableFuture<WorldGenResult> queuePositionForRetrieval(Long genPos) { return null; }
+	
+	/** does nothing if the given position isn't present in the queue */
+	public void removeRetrievalRequestIf(DhSectionPos.ICancelablePrimitiveLongConsumer removeIf) { }
+	
+	public void clearRetrievalQueue() { }
+	
+	/** Can be used to display how many total retrieval requests might be available. */
+	public void setTotalRetrievalPositionCount(int newCount) { }
+	/** Can be used to display how many total chunk retrieval requests should be available. */
+	public void setEstimatedRemainingRetrievalChunkCount(int newCount) { }
+	
+	
+	
+	//=============//
+	// data update //
+	//=============//
+	
+	public CompletableFuture<Void> updateDataSourceAsync(@NotNull FullDataSourceV2 inputData)
+	{ return this.dataUpdater.updateDataSourceAsync(inputData); }
+	
+	
+	
+	//========================//
+	// multiplayer networking //
+	//========================//
+	
+	@Nullable
+	public Long getTimestampForPos(long pos)
+	{
+		if (this.isShutdownRef.get())
+		{
+			return null;
+		}
+		
+		return this.repo.getTimestampForPos(pos); 
+	}
+	
+	
+	
+	//===========//
+	// debugging //
+	//===========//
+	
+	public void addDebugMenuStringsToList(List<String> messageList)
+	{
+		this.dataMigratorV1.addDebugMenuStringsToList(messageList);
+	}
+	
+	
+	
+	//===========//
+	// overrides //
+	//===========//
+	
+	@Override
+	public void debugRender(DebugRenderer renderer)
+	{
+		this.dataUpdater.debugRender(renderer);
+		this.updatePropagator.debugRender(renderer);
+		this.dataMigratorV1.debugRender(renderer);
+	}
+	
+	@Override 
+	public void close()
+	{
+		LOGGER.debug("Closing [" + this.getClass().getSimpleName() + "] for level: [" + this.levelId + "].");
+		
+		this.isShutdownRef.set(true);
+		
+		this.dataUpdater.close();
+		this.updatePropagator.close();
+		this.dataMigratorV1.close();
+		
+		this.repo.close();
+	}
+	
+	
+	
+}

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

@@ -0,0 +1,399 @@
+package com.seibel.distanthorizons.core.file.fullDatafile.V2;
+
+import com.seibel.distanthorizons.core.config.Config;
+import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
+import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
+import com.seibel.distanthorizons.core.logging.DhLogger;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.pos.DhSectionPos;
+import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos;
+import com.seibel.distanthorizons.core.render.renderer.DebugRenderer;
+import com.seibel.distanthorizons.core.render.renderer.IDebugRenderable;
+import com.seibel.distanthorizons.core.util.ThreadUtil;
+import com.seibel.distanthorizons.core.util.threading.PriorityTaskPicker;
+import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
+import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
+import it.unimi.dsi.fastutil.longs.LongArrayList;
+import org.jetbrains.annotations.Nullable;
+
+import java.awt.*;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.RejectedExecutionException;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.ReentrantLock;
+
+public class FullDataUpdatePropagatorV2 implements IDebugRenderable, AutoCloseable
+{
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	
+	private static final IMinecraftClientWrapper MC_CLIENT = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
+	
+	/** indicates how long the update queue thread should wait between queuing ticks */
+	protected static final int PROPAGATE_QUEUE_THREAD_DELAY_IN_MS = 250;
+	
+	public static final int NUMBER_OF_PARENT_UPDATE_TASKS_PER_THREAD = 5;
+	
+	/** how many parent update tasks can be in the queue at once */
+	public static int getMaxPropagateTaskCount() 
+	{ return NUMBER_OF_PARENT_UPDATE_TASKS_PER_THREAD * Config.Common.MultiThreading.numberOfThreads.get(); }
+	
+	
+	
+	/**
+	 * Tracks which positions are currently being updated
+	 * to prevent duplicate concurrent updates.
+	 */
+	private final Set<Long> updatingPosSet = ConcurrentHashMap.newKeySet();
+	
+	// TODO only run thread if modifications happened recently
+	/**
+	 * Will be null on the dedicated server since updates don't need to be propagated,
+	 * only the highest detail level is needed.
+	 */
+	@Nullable
+	public final ThreadPoolExecutor updateQueueProcessor;
+	
+	private final AtomicBoolean isShutdownRef = new AtomicBoolean(false);
+	private final String levelId;
+	
+	
+	private final FullDataSourceProviderV2 provider;
+	private final FullDataUpdaterV2 dataUpdater;
+	
+	
+	
+	//=============//
+	// constructor //
+	//=============//
+	
+	public FullDataUpdatePropagatorV2(FullDataSourceProviderV2 provider, FullDataUpdaterV2 dataUpdater, String levelId)
+	{
+		this.provider = provider;
+		this.dataUpdater = dataUpdater;
+		this.levelId = levelId;
+		
+		// update propagation doesn't need to be run on the server since only the highest detail level is needed
+		this.updateQueueProcessor = ThreadUtil.makeSingleThreadPool("Update Propagate Queue [" + this.levelId + "]");
+		this.updateQueueProcessor.execute(this::runUpdateQueue);
+	}
+	
+	
+	//================//
+	// parent updates //
+	//================//
+	
+	private void runUpdateQueue()
+	{
+		while (!Thread.interrupted())
+		{
+			try
+			{
+				Thread.sleep(PROPAGATE_QUEUE_THREAD_DELAY_IN_MS);
+				
+				PriorityTaskPicker.Executor executor = ThreadPoolUtil.getUpdatePropagatorExecutor();
+				if (executor == null || executor.isTerminated())
+				{
+					continue;
+				}
+				
+				// TODO it might be worth skipping this logic if no parent updates happened
+				
+				// update positions closest to the player (if not on a server)
+				// to make world gen appear faster
+				DhBlockPos targetBlockPos = DhBlockPos.ZERO;
+				if (MC_CLIENT != null 
+					&& MC_CLIENT.playerExists())
+				{
+					targetBlockPos = MC_CLIENT.getPlayerBlockPos();
+				}
+				
+				this.runParentUpdates(executor, targetBlockPos);
+				
+				if (Config.Common.LodBuilding.Experimental.upsampleLowerDetailLodsToFillHoles.get())
+				{
+					this.runChildUpdates(executor, targetBlockPos);
+				}
+				
+			}
+			catch (InterruptedException ignored)
+			{
+				Thread.currentThread().interrupt();
+			}
+			catch (Exception e)
+			{
+				LOGGER.error("Unexpected error in the parent update queue thread. Error: " + e.getMessage(), e);
+			}
+		}
+	}
+	/** will always apply updates */
+	private void runParentUpdates(PriorityTaskPicker.Executor executor, DhBlockPos targetBlockPos)
+	{
+		int maxUpdateTaskCount = getMaxPropagateTaskCount();
+		
+		// queue parent updates
+		if (executor.getQueueSize() < maxUpdateTaskCount
+			&& this.updatingPosSet.size() < maxUpdateTaskCount)
+		{
+			// get the positions that need to be applied to their parents
+			LongArrayList parentUpdatePosList = this.provider.repo.getPositionsToUpdate(targetBlockPos.getX(), targetBlockPos.getZ(), maxUpdateTaskCount);
+			
+			// combine updates together based on their parent
+			HashMap<Long, HashSet<Long>> updatePosByParentPos = new HashMap<>();
+			for (Long pos : parentUpdatePosList)
+			{
+				updatePosByParentPos.compute(DhSectionPos.getParentPos(pos), (parentPos, updatePosSet) ->
+				{
+					if (updatePosSet == null)
+					{
+						updatePosSet = new HashSet<>();
+					}
+					updatePosSet.add(pos);
+					return updatePosSet;
+				});
+			}
+			
+			// queue the updates
+			for (Long parentUpdatePos : updatePosByParentPos.keySet())
+			{
+				// stop if there are already a bunch of updates queued
+				if (this.updatingPosSet.size() > maxUpdateTaskCount
+					|| executor.getQueueSize() > maxUpdateTaskCount
+					|| !this.updatingPosSet.add(parentUpdatePos))
+				{
+					break;
+				}
+				
+				try
+				{
+					executor.execute(() ->
+					{
+						ReentrantLock parentWriteLock = this.dataUpdater.updateLockProvider.getLock(parentUpdatePos);
+						boolean parentLocked = false;
+						try
+						{
+							//LOGGER.info("updating parent: "+parentUpdatePos);
+							
+							// Locking the parent before the children should prevent deadlocks.
+							// TryLock is used instead of lock so this thread can handle a different update.
+							if (parentWriteLock.tryLock())
+							{
+								parentLocked = true;
+								this.dataUpdater.lockedPosSet.add(parentUpdatePos);
+								
+								try (FullDataSourceV2 parentDataSource = this.provider.get(parentUpdatePos))
+								{
+									// will return null if the file handler is shutting down
+									if (parentDataSource != null)
+									{
+										// apply each child pos to the parent
+										for (Long childPos : updatePosByParentPos.get(parentUpdatePos))
+										{
+											ReentrantLock childReadLock = this.dataUpdater.updateLockProvider.getLock(childPos);
+											try
+											{
+												childReadLock.lock();
+												this.dataUpdater.lockedPosSet.add(childPos);
+												
+												try (FullDataSourceV2 childDataSource = this.provider.get(childPos))
+												{
+													// can return null when the file handler is being shut down
+													if (childDataSource != null)
+													{
+														parentDataSource.updateFromChunk(childDataSource);
+													}
+												}
+											}
+											catch (Exception e)
+											{
+												LOGGER.error("Unexpected in parent update propagation for parent pos: ["+DhSectionPos.toString(parentUpdatePos)+"], child pos: [" + DhSectionPos.toString(parentUpdatePos) + "], Error: [" + e.getMessage() + "].", e);
+											}
+											finally
+											{
+												childReadLock.unlock();
+												this.dataUpdater.lockedPosSet.remove(childPos);
+											}
+										}
+										
+										
+										if (DhSectionPos.getDetailLevel(parentUpdatePos) < FullDataSourceProviderV2.ROOT_SECTION_DETAIL_LEVEL)
+										{
+											parentDataSource.applyToParent = true;
+										}
+										
+										this.dataUpdater.updateDataSource(parentDataSource, false);
+										for (Long childPos : updatePosByParentPos.get(parentUpdatePos))
+										{
+											this.provider.repo.setApplyToParent(childPos, false);
+										}
+									}
+								}
+							}
+						}
+						finally
+						{
+							if (parentLocked)
+							{
+								parentWriteLock.unlock();
+								this.dataUpdater.lockedPosSet.remove(parentUpdatePos);
+							}
+							
+							this.updatingPosSet.remove(parentUpdatePos);
+						}
+					});
+				}
+				catch (RejectedExecutionException ignore)
+				{ /* the executor was shut down, it should be back up shortly and able to accept new jobs */ }
+				catch (Exception e)
+				{
+					this.updatingPosSet.remove(parentUpdatePos);
+					throw e;
+				}
+			}
+		}
+	}
+	/** stops if it finds any LOD data */
+	private void runChildUpdates(PriorityTaskPicker.Executor executor, DhBlockPos targetBlockPos)
+	{
+		int maxUpdateTaskCount = getMaxPropagateTaskCount();
+		
+		// queue child updates
+		if (executor.getQueueSize() < maxUpdateTaskCount
+			&& this.updatingPosSet.size() < maxUpdateTaskCount)
+		{
+			// get the positions that need to be applied to their children
+			LongArrayList childUpdatePosList = this.provider.repo.getChildPositionsToUpdate(targetBlockPos.getX(), targetBlockPos.getZ(), maxUpdateTaskCount);
+			
+			// queue the updates
+			for (long parentUpdatePos : childUpdatePosList)
+			{
+				// stop if there are already a bunch of updates queued
+				if (this.updatingPosSet.size() > maxUpdateTaskCount
+					|| executor.getQueueSize() > maxUpdateTaskCount)
+				{
+					break;
+				}
+				
+				// skip already updating positions
+				if (!this.updatingPosSet.add(parentUpdatePos))
+				{
+					continue;
+				}
+				
+				try
+				{
+					executor.execute(() ->
+					{
+						ReentrantLock parentReadLock = this.dataUpdater.updateLockProvider.getLock(parentUpdatePos);
+						boolean parentLocked = false;
+						try
+						{
+							//LOGGER.info("updating parent: "+parentUpdatePos);
+							
+							// Locking the parent before the children should prevent deadlocks.
+							// TryLock is used instead of lock so this thread can handle a different update.
+							if (parentReadLock.tryLock())
+							{
+								parentLocked = true;
+								this.dataUpdater.lockedPosSet.add(parentUpdatePos);
+								
+								try (FullDataSourceV2 parentDataSource = this.provider.get(parentUpdatePos))
+								{
+									// will return null if the file handler is shutting down
+									if (parentDataSource != null)
+									{
+										// apply parent to each child
+										for (int i = 0; i < 4; i++)
+										{
+											long childPos = DhSectionPos.getChildByIndex(parentUpdatePos, i);
+											
+											ReentrantLock childWriteLock = this.dataUpdater.updateLockProvider.getLock(childPos);
+											try
+											{
+												childWriteLock.lock();
+												this.dataUpdater.lockedPosSet.add(childPos);
+												
+												try (FullDataSourceV2 childDataSource = this.provider.get(childPos))
+												{
+													// will return null if the file handler is shutting down
+													if (childDataSource != null)
+													{
+														childDataSource.updateFromChunk(parentDataSource);
+														
+														// don't propagate child updates past the bottom of the tree
+														if (DhSectionPos.getDetailLevel(childPos) != DhSectionPos.SECTION_BLOCK_DETAIL_LEVEL)
+														{
+															childDataSource.applyToChildren = true;
+														}
+														
+														this.dataUpdater.updateDataSource(childDataSource, false);
+													}
+												}
+											}
+											catch (Exception e)
+											{
+												LOGGER.error("Unexpected in child update propagation for parent pos: ["+DhSectionPos.toString(parentUpdatePos)+"], child pos: [" + DhSectionPos.toString(parentUpdatePos) + "], Error: [" + e.getMessage() + "].", e);
+											}
+											finally
+											{
+												childWriteLock.unlock();
+												this.dataUpdater.lockedPosSet.remove(childPos);
+											}
+										}
+										
+										this.provider.repo.setApplyToChild(parentUpdatePos, false);
+									}
+								}
+							}
+						}
+						finally
+						{
+							if (parentLocked)
+							{
+								parentReadLock.unlock();
+								this.dataUpdater.lockedPosSet.remove(parentUpdatePos);
+							}
+							
+							this.updatingPosSet.remove(parentUpdatePos);
+						}
+					});
+				}
+				catch (RejectedExecutionException ignore)
+				{ /* the executor was shut down, it should be back up shortly and able to accept new jobs */ }
+				catch (Exception e)
+				{
+					this.updatingPosSet.remove(parentUpdatePos);
+					throw e;
+				}
+			}
+		}
+	}
+	
+	
+	
+	//===========//
+	// overrides //
+	//===========//
+	
+	@Override
+	public void debugRender(DebugRenderer renderer)
+	{
+		this.updatingPosSet
+				.forEach((pos) -> { renderer.renderBox(new DebugRenderer.Box(pos, -32f, 80f, 0.20f, Color.MAGENTA)); });
+	}
+	
+	@Override
+	public void close()
+	{
+		if (this.updateQueueProcessor != null)
+		{
+			this.updateQueueProcessor.shutdownNow();
+		}
+	}
+	
+	
+	
+}

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

@@ -0,0 +1,249 @@
+package com.seibel.distanthorizons.core.file.fullDatafile.V2;
+
+import com.seibel.distanthorizons.api.enums.config.EDhApiDataCompressionMode;
+import com.seibel.distanthorizons.core.config.Config;
+import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
+import com.seibel.distanthorizons.core.file.fullDatafile.IDataSourceUpdateListenerFunc;
+import com.seibel.distanthorizons.core.logging.DhLogger;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.pos.DhSectionPos;
+import com.seibel.distanthorizons.core.render.renderer.DebugRenderer;
+import com.seibel.distanthorizons.core.render.renderer.IDebugRenderable;
+import com.seibel.distanthorizons.core.sql.dto.FullDataSourceV2DTO;
+import com.seibel.distanthorizons.core.util.threading.PositionalLockProvider;
+import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
+import org.jetbrains.annotations.NotNull;
+
+import java.awt.*;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Set;
+import java.util.concurrent.*;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.ReentrantLock;
+
+public class FullDataUpdaterV2 implements IDebugRenderable, AutoCloseable
+{
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	
+	protected final PositionalLockProvider updateLockProvider = new PositionalLockProvider();
+	/**
+	 * generally just used for debugging,
+	 * keeps track of which positions are currently locked.
+	 */
+	public final Set<Long> lockedPosSet = ConcurrentHashMap.newKeySet();
+	private final ConcurrentHashMap<Long, AtomicInteger> queuedUpdateCountsByPos = new ConcurrentHashMap<>();
+	
+	public final ArrayList<IDataSourceUpdateListenerFunc<FullDataSourceV2>> dateSourceUpdateListeners = new ArrayList<>();
+	
+	private final String levelId;
+	private final AtomicBoolean isShutdownRef = new AtomicBoolean(false);
+	
+	private final FullDataSourceProviderV2 provider;
+	
+	
+	
+	//=============//
+	// constructor //
+	//=============//
+	
+	public FullDataUpdaterV2(FullDataSourceProviderV2 provider, String levelId)
+	{
+		this.provider = provider;
+		this.levelId = levelId;
+		
+	}
+	
+	
+	
+	//===============//
+	// data updating //
+	//===============//
+	
+	/**
+	 * Can be used if you don't want to lock the current thread
+	 * Otherwise the sync version {@link FullDataUpdaterV2#updateDataSource(FullDataSourceV2, boolean)} may be a better choice.
+	 */
+	public CompletableFuture<Void> updateDataSourceAsync(@NotNull FullDataSourceV2 inputDataSource)
+	{
+		if (this.isShutdownRef.get())
+		{
+			return CompletableFuture.completedFuture(null);
+		}
+		
+		AbstractExecutorService executor = ThreadPoolUtil.getChunkToLodBuilderExecutor();
+		if (executor == null || executor.isTerminated())
+		{
+			return CompletableFuture.completedFuture(null);
+		}
+		
+		
+		try
+		{
+			this.markUpdateStart(inputDataSource.getPos());
+			return CompletableFuture.runAsync(() ->
+			{
+				try
+				{
+					this.updateDataSource(inputDataSource, true);
+				}
+				catch (Exception e)
+				{
+					LOGGER.error("Unexpected error in async data source update at pos: ["+ DhSectionPos.toString(inputDataSource.getPos())+"], error: ["+e.getMessage()+"].", e);
+				}
+				finally
+				{
+					this.markUpdateEnd(inputDataSource.getPos());
+				}
+			}, executor);
+		}
+		catch (RejectedExecutionException ignore)
+		{
+			// can happen if the executor was shutdown while this task was queued
+			this.markUpdateEnd(inputDataSource.getPos());
+			return CompletableFuture.completedFuture(null);
+		}
+	}
+	
+	/** After this method returns the inputData will be written to file. */
+	public void updateDataSource(@NotNull FullDataSourceV2 inputData, boolean lockOnUpdatePos)
+	{
+		if (this.isShutdownRef.get())
+		{
+			return;
+		}
+		
+		
+		long updatePos = inputData.getPos();
+		
+		boolean methodLocked = false;
+		// a lock is necessary to prevent two threads from writing to the same position at once,
+		// if that happens only the second update will apply and the LOD will end up with hole(s)
+		ReentrantLock updateLock = this.updateLockProvider.getLock(updatePos);
+		
+		try
+		{
+			if (lockOnUpdatePos)
+			{
+				methodLocked = true;
+				updateLock.lock();
+				this.lockedPosSet.add(updatePos);
+			}
+			
+			
+			// get or create the data source
+			try (FullDataSourceV2 recipientDataSource = this.provider.get(updatePos))
+			{
+				if (recipientDataSource != null)
+				{
+					boolean dataModified = recipientDataSource.updateFromChunk(inputData);
+					if (dataModified)
+					{
+						// save the updated data to the database
+						try (FullDataSourceV2DTO dto = this.createDtoFromDataSource(recipientDataSource))
+						{
+							if (dto != null)
+							{
+								this.provider.repo.save(dto);
+							}
+						}
+						
+						
+						for (IDataSourceUpdateListenerFunc<FullDataSourceV2> listener : this.dateSourceUpdateListeners)
+						{
+							if (listener != null)
+							{
+								listener.OnDataSourceUpdated(recipientDataSource);
+							}
+						}
+					}
+				}
+			}
+		}
+		catch (Exception e)
+		{
+			LOGGER.error("Error updating pos ["+DhSectionPos.toString(updatePos)+"], error: "+e.getMessage(), e);
+		}
+		finally
+		{
+			if (methodLocked)
+			{
+				updateLock.unlock();
+				this.lockedPosSet.remove(updatePos);
+			}
+		}
+	}
+	
+	private FullDataSourceV2DTO createDtoFromDataSource(FullDataSourceV2 dataSource)
+	{
+		try
+		{
+			// when creating new data use the compressor currently selected in the config
+			EDhApiDataCompressionMode compressionModeEnum = Config.Common.LodBuilding.dataCompression.get();
+			return FullDataSourceV2DTO.CreateFromDataSource(dataSource, compressionModeEnum);
+		}
+		catch (IOException e)
+		{
+			LOGGER.warn("Unable to create DTO, error: ["+e.getMessage() + "].", e);
+			return null;
+		}
+	}
+	
+	
+	
+	
+	//==================//
+	// debugger methods //
+	//==================//
+	
+	/** used for debugging to track which positions are queued for updating */
+	private void markUpdateStart(long dataSourcePos)
+	{
+		this.queuedUpdateCountsByPos.compute(dataSourcePos, (pos, atomicCount) ->
+		{
+			if (atomicCount == null)
+			{
+				atomicCount = new AtomicInteger(0);
+			}
+			atomicCount.incrementAndGet();
+			return atomicCount;
+		});
+	}
+	/** used for debugging to track which positions are queued for updating */
+	private void markUpdateEnd(long dataSourcePos)
+	{
+		this.queuedUpdateCountsByPos.compute(dataSourcePos, (pos, atomicCount) ->
+		{
+			if (atomicCount != null && atomicCount.decrementAndGet() <= 0)
+			{
+				atomicCount = null;
+			}
+			return atomicCount;
+		});
+	}
+	
+	
+	
+	//===========//
+	// overrides //
+	//===========//
+	
+	@Override
+	public void debugRender(DebugRenderer renderer)
+	{
+		this.lockedPosSet
+				.forEach((pos) -> { renderer.renderBox(new DebugRenderer.Box(pos, -32f, 74f, 0.15f, Color.PINK)); });
+		
+		this.queuedUpdateCountsByPos
+				.forEach((pos, updateCountRef) -> { renderer.renderBox(new DebugRenderer.Box(pos, -32f, 80f + (updateCountRef.get() * 16f), 0.20f, Color.WHITE)); });
+	}
+	
+	@Override
+	public void close()
+	{
+		this.isShutdownRef.set(true);
+	}
+	
+	
+}

core/src/main/java/com/seibel/distanthorizons/core/file/structure/ClientOnlySaveStructure.java

@@ -32,7 +32,7 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSha
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
 import com.seibel.distanthorizons.coreapi.DependencyInjection.OverrideInjector;
 import com.seibel.distanthorizons.coreapi.util.StringUtil;
-import org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 
 import java.io.File;
 import java.util.*;
@@ -47,7 +47,7 @@ public class ClientOnlySaveStructure implements ISaveStructure
 	public static final String REPLAY_SERVER_FOLDER_NAME = "REPLAY";
 	public static final String INVALID_FILE_CHARACTERS_REGEX = "[\\\\/:*?\"<>|]";
 	
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	private static final IMinecraftClientWrapper MC_CLIENT = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
 	private static final IMinecraftSharedWrapper MC_SHARED = SingletonInjector.INSTANCE.get(IMinecraftSharedWrapper.class);
@@ -81,13 +81,20 @@ public class ClientOnlySaveStructure implements ISaveStructure
 			{
 				IServerKeyedClientLevel keyedClientLevel = (IServerKeyedClientLevel) newLevelWrapper;
 				LOGGER.info("Loading level [" + newLevelWrapper.getDhIdentifier() + "] with key: [" + keyedClientLevel.getServerLevelKey() + "].");
+				
+				String serverKey = keyedClientLevel.getServerKey();
+				if (serverKey.isEmpty())
+				{
+					serverKey = getServerFolderName();
+				}
+				
 				// This world was identified by the server directly, so we can know for sure which folder to use.				
-				saveFolder = getSaveFolderByLevelId(keyedClientLevel.getServerLevelKey());
+				saveFolder = getSaveFolderByLevelId(serverKey, keyedClientLevel.getServerLevelKey());
 			}
 			else
 			{
 				// get the default folder
-				saveFolder = getSaveFolderByLevelId(levelWrapper.getDhIdentifier());
+				saveFolder = getSaveFolderByLevelId(getServerFolderName(), levelWrapper.getDhIdentifier());
 			}
 			
 			// Allow API users to override the save folder
@@ -116,7 +123,7 @@ public class ClientOnlySaveStructure implements ISaveStructure
 			return this.getSaveFolder(levelWrapper);
 		}
 		
-		return getSaveFolderByLevelId(levelWrapper.getDimensionType().getName());
+		return getSaveFolderByLevelId(getServerFolderName(), levelWrapper.getDimensionType().getName());
 	}
 	
 	
@@ -173,11 +180,11 @@ public class ClientOnlySaveStructure implements ISaveStructure
 	}
 	
 	
-	private static File getSaveFolderByLevelId(String dimensionName)
+	private static File getSaveFolderByLevelId(String folderName, String dimensionName)
 	{
 		String path = MC_SHARED.getInstallationDirectory().getPath() + File.separatorChar
 				+ SERVER_DATA_FOLDER_NAME + File.separatorChar
-				+ getServerFolderName() + File.separatorChar
+				+ folderName + File.separatorChar
 				+ dimensionName.replaceAll(":", "@@");
 		
 		return new File(path);