Move max generation distance check functionality to render distance config

Deprecate DhApiColorDepthTextureCreatedEvent since it is less obvious when it fires

.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/interfaces/data/IDhApiTerrainDataCache.java

@@ -9,12 +9,15 @@ package com.seibel.distanthorizons.api.interfaces.data;
  * @version 2024-7-14
  * @since API 3.0.0
  */
-public interface IDhApiTerrainDataCache
+public interface IDhApiTerrainDataCache // TODO should this be AutoClosable?
 {
 	/**
 	 * Removes any data that's currently stored in this cache.
 	 * This cane be done to free up memory or invalidate 
 	 * the cache so fresh data can be pulled in.
+	 * <br><br>
+	 * This should be called before de-referencing this object
+	 * so DH can handle any necessary cleanup for internal objects.
 	 */
 	void clear();
 	

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

@@ -31,21 +31,21 @@ public final class ModInfo
 	public static final String DEDICATED_SERVER_INITIAL_PATH = "dedicated_server_initial";
 	
 	/** Incremented every time any packets are added, changed or removed, with a few exceptions. */
-	public static final int PROTOCOL_VERSION = 10;
+	public static final int PROTOCOL_VERSION = 11;
 	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.0-b";
+	public static final String VERSION = "2.3.3-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;
 	/** This version should be updated whenever new methods are added to the DH API */
-	public static final int API_MINOR_VERSION = 0;
+	public static final int API_MINOR_VERSION = 1;
 	/** This version should be updated whenever non-breaking fixes are added to the DH API */
 	public static final int API_PATCH_VERSION = 0;
 	

core/build.gradle

@@ -60,4 +60,4 @@ shadowJar {
     def librariesLocation = "DistantHorizons.libraries"
 //    relocate "it.unimi.dsi.fastutil", "${librariesLocation}.unimi.dsi.fastutil"
     mergeServiceFiles()
-}
+}

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

@@ -197,10 +197,10 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 		ILevelWrapper coreLevelWrapper = (ILevelWrapper) levelWrapper;
 		
 		
-		if (!(apiDataCache instanceof DhApiTerrainDataCache))
+		// the data cache can be null, but must be our own implementation
+		if (apiDataCache != null
+			&& !(apiDataCache instanceof DhApiTerrainDataCache))
 		{
-			// custom level wrappers aren't supported,
-			// the API user must get a level wrapper from our code somewhere
 			return DhApiResult.createFail("Unsupported [" + IDhApiTerrainDataCache.class.getSimpleName() + "] implementation, only the core class [" + DhApiTerrainDataCache.class.getSimpleName() + "] is a valid parameter.");
 		}
 		DhApiTerrainDataCache dataCache = (DhApiTerrainDataCache) apiDataCache;
@@ -226,10 +226,9 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 		// get the data source //
 		//=====================//
 		
+		FullDataSourceV2 dataSource = null;
 		try
 		{
-			FullDataSourceV2 dataSource = null;
-			
 			// try using the cached data if possible
 			if (dataCache != null)
 			{
@@ -244,7 +243,12 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 				{
 					return DhApiResult.createFail("Unable to find/generate any data at the " + DhSectionPos.class.getSimpleName() + " [" + DhSectionPos.toString(sectionPos) + "].");
 				}
-				dataCache.add(sectionPos, dataSource);
+				
+				// save to the cache if present
+				if (dataCache != null)
+				{
+					dataCache.add(sectionPos, dataSource);
+				}
 			}
 			
 			
@@ -316,6 +320,14 @@ public class DhApiTerrainDataRepo implements IDhApiTerrainDataRepo
 			LOGGER.error("Unexpected exception in getTerrainDataColumnArray. Error: [" + e.getMessage() + "]", e);
 			return DhApiResult.createFail("Unexpected exception: [" + e.getMessage() + "].");
 		}
+		finally
+		{
+			if (dataCache == null
+				&& dataSource != null)
+			{
+				dataSource.close();
+			}
+		}
 	}
 	
 	

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

@@ -99,6 +99,11 @@ public class SharedApi
 	
 	public static void setDhWorld(AbstractDhWorld newWorld)
 	{
+		AbstractDhWorld oldWorld = currentWorld;
+		if (oldWorld != null)
+		{
+			oldWorld.close();
+		}
 		currentWorld = newWorld;
 		
 		// starting and stopping the DataRenderTransformer is necessary to prevent attempting to

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

@@ -171,9 +171,11 @@ public class Config
 				public static class Quality
 				{
 					public static ConfigEntry<Integer> lodChunkRenderDistanceRadius = new ConfigEntry.Builder<Integer>()
+							.setChatCommandName("generation.maxRequestDistance")
 							.setMinDefaultMax(32, 256, 4096)
 							.comment("" +
 									"The radius of the mod's render distance. (measured in chunks)\n" +
+									"On server defines the distance allowed to generate around the player; note that real-time updates and synd on load limits are defined separately. \n" +
 									"")
 							.setPerformance(EConfigEntryPerformance.HIGH)
 							.build();
@@ -1015,9 +1017,23 @@ public class Config
 				public static class OpenGl
 				{
 					public static ConfigEntry<Boolean> overrideVanillaGLLogger = new ConfigEntry.Builder<Boolean>()
-							.set(ModInfo.IS_DEV_BUILD)
+							.set(true)
 							.comment(""
-									+ "Requires a reboot to change. \n"
+									+ "Defines how OpenGL errors are handled. \n "
+									+ "Requires rebooting Minecraft to change. \n"
+									+ "Will catch OpenGL errors thrown by other mods. \n"
+									+ "")
+							.build();
+					
+					public static ConfigEntry<Boolean> onlyLogGlErrorsOnce = new ConfigEntry.Builder<Boolean>()
+							.set(true)
+							.comment(""
+									+ "If true each Open GL error will only be logged once. \n"
+									+ "Enabling this may cause some error logs to be missed. \n"
+									+ "Does nothing if overrideVanillaGLLogger is set to false. \n"
+									+ " \n"
+									+ "Generally this can be kept as 'true' to prevent log spam. \n"
+									+ "However, Please set this to 'false' if a developer needs your log to debug a GL issue. \n"
 									+ "")
 							.build();
 					
@@ -1281,7 +1297,7 @@ public class Config
 			
 			public static ConfigEntry<Integer> generationProgressDisplayIntervalInSeconds = new ConfigEntry.Builder<Integer>()
 					.setChatCommandName("generation.logInterval")
-					.setMinDefaultMax(1, 5, 60 * 60 * 4) // max = 4 hours
+					.setMinDefaultMax(1, 2, 60 * 60 * 4) // max = 4 hours
 					.comment(""
 							+ "How often should the distant generator progress be displayed? \n"
 							+ "")
@@ -1606,15 +1622,6 @@ public class Config
 						+ "")
 				.build();
 		
-		public static ConfigEntry<Integer> maxGenerationRequestDistance = new ConfigEntry.Builder<Integer>()
-				.setChatCommandName("generation.maxRequestDistance")
-				.setMinDefaultMax(256, 4096, 4096)
-				.comment("" +
-						"Defines the distance allowed to generate around the player." +
-						"")
-				.setPerformance(EConfigEntryPerformance.HIGH)
-				.build();
-		
 		public static ConfigEntry<Integer> generationBoundsX = new ConfigEntry.Builder<Integer>()
 				.setChatCommandName("generation.bounds.x")
 				.setAppearance(EConfigEntryAppearance.ONLY_IN_FILE)
@@ -1699,6 +1706,15 @@ public class Config
 						+ "Value of 0 disables the limit."
 						+ "")
 				.build();
+		public static ConfigEntry<Boolean> enableAdaptiveTransferSpeed = new ConfigEntry.Builder<Boolean>()
+				.set(true)
+				.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();
 		

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

@@ -29,14 +29,12 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrappe
 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 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>
@@ -47,7 +45,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
  *  since it stringifies every block and biome name, which is quite bulky.
  *  It might be worth while to have a biome and block ID that then both get mapped
  *  to the data point ID to reduce file size.
- *  And/or it would be good to dynamically remove IDs that aren't currently in use.  
+ *  And/or it would be good to dynamically remove IDs that aren't currently in use.
  * 
  * @author Leetom
  */
@@ -352,14 +350,14 @@ public class FullDataPointIdMap
 	{
 		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();
+		/** two levels are present so we don't need to use a key object */
+		private static final ConcurrentHashMap<IBiomeWrapper, ConcurrentHashMap<IBlockStateWrapper, Entry>> ENTRY_BY_BLOCKSTATE_BY_BIOMEWRAPPER = new ConcurrentHashMap<>();
 		
 		public final IBiomeWrapper biome;
 		public final IBlockStateWrapper blockState;
 		
-		private Integer hashCode = null;
+		private int hashCode = 0;
+		private boolean hashGenerated = false;
 		private String serialString = null;
 		
 		
@@ -370,25 +368,21 @@ public class FullDataPointIdMap
 		
 		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)
+			// check for existing entry
+			ConcurrentHashMap<IBlockStateWrapper, Entry> entryByBlockState = ENTRY_BY_BLOCKSTATE_BY_BIOMEWRAPPER.get(biome);
+			if (entryByBlockState != null)
 			{
-				return entry;
+				Entry entry = entryByBlockState.get(blockState);
+				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);
-			});
+			// Lazily create the inner map and new Entry
+			return ENTRY_BY_BLOCKSTATE_BY_BIOMEWRAPPER
+					.computeIfAbsent(biome, newBiome -> new ConcurrentHashMap<>())
+					.computeIfAbsent(blockState, newBlockState -> new Entry(biome, blockState));
 		}
 		private Entry(IBiomeWrapper biome, IBlockStateWrapper blockState)
 		{
@@ -402,13 +396,18 @@ public class FullDataPointIdMap
 		// 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.hashCode == null)
+			if (!this.hashGenerated)
 			{
 				this.hashCode = generateHashCode(this);
+				this.hashGenerated = true;
 			}
 			
 			return this.hashCode;
@@ -430,10 +429,14 @@ public class FullDataPointIdMap
 		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())

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

@@ -65,8 +65,6 @@ public class LodDataBuilder
 		// only block lighting is needed here, sky lighting is populated at the data source stage
 		LodUtil.assertTrue(chunkWrapper.isDhBlockLightingCorrect());
 		
-		
-		
 		int sectionPosX = getXOrZSectionPosFromChunkPos(chunkWrapper.getChunkPos().getX());
 		int sectionPosZ = getXOrZSectionPosFromChunkPos(chunkWrapper.getChunkPos().getZ());
 		long pos = DhSectionPos.encode(DhSectionPos.SECTION_BLOCK_DETAIL_LEVEL, sectionPosX, sectionPosZ);
@@ -80,47 +78,31 @@ 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
-			//  4 -> 0 ---
-			//  3 -> 3
-			//  2 -> 2
-			//  1 -> 1
-			//  0 -> 0 ===
-			// -1 -> 3
-			// -2 -> 2
-			// -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();
-		if (chunkWrapper.getChunkPos().getZ() < 0)
-		{
-			chunkOffsetZ = ((chunkOffsetZ) % FullDataSourceV2.NUMB_OF_CHUNKS_WIDE);
-			if (chunkOffsetZ != 0)
-			{
-				chunkOffsetZ += FullDataSourceV2.NUMB_OF_CHUNKS_WIDE;
-			}
-		}
-		else
-		{
-			chunkOffsetZ %= FullDataSourceV2.NUMB_OF_CHUNKS_WIDE;
-		}
+		// expected offset positions:
+		// chunkPos -> offset
+		//  5 -> 1
+		//  4 -> 0 ---
+		//  3 -> 3
+		//  2 -> 2
+		//  1 -> 1
+		//  0 -> 0 ===
+		// -1 -> 3
+		// -2 -> 2
+		// -3 -> 1
+		// -4 -> 0 ---
+		// -5 -> 3
+		
+		// Fast modulo calculation using bitwise AND since NUMB_OF_CHUNKS_WIDE is a power of 2 (4)
+		// 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]
+		// 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 chunkOffsetX = chunkWrapper.getChunkPos().getX() & (FullDataSourceV2.NUMB_OF_CHUNKS_WIDE - 1);
+		int chunkOffsetZ = chunkWrapper.getChunkPos().getZ() & (FullDataSourceV2.NUMB_OF_CHUNKS_WIDE - 1);
+		
+		// Convert from chunk coordinates to block coordinates
+		chunkOffsetX *= LodUtil.CHUNK_WIDTH;
 		chunkOffsetZ *= LodUtil.CHUNK_WIDTH;
 		
 		
@@ -138,54 +120,49 @@ public class LodDataBuilder
 			IBlockStateWrapper previousBlockState = null;
 			
 			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(
-							relBlockX + chunkOffsetX,
-							relBlockZ + chunkOffsetZ);
+					// Calculate column position
+					int columnX = relBlockX + chunkOffsetX;
+					int columnZ = relBlockZ + chunkOffsetZ;
+					
+					// Get column data
+					LongArrayList longs = dataSource.get(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);
 					IBlockStateWrapper blockState = AIR;
 					int mappedId = dataSource.mapping.addIfNotPresentAndGetId(biome, blockState);
 					
+					// 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;
-					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
+					// Get the maximum height from both heightmaps
 					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 +175,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 +184,7 @@ public class LodDataBuilder
 						}
 					}
 					
-					
+					// Process blocks from top to bottom
 					for (; y >= minBuildHeight; y--)
 					{
 						IBiomeWrapper newBiome = chunkWrapper.getBiome(relBlockX, y, relBlockZ);
@@ -215,10 +192,10 @@ 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))
 						{
-							longs.add(FullDataPointUtil.encode(mappedId, lastY - y, y + 1 - chunkWrapper.getInclusiveMinBuildHeight(), blockLight, skyLight));
+							longs.add(FullDataPointUtil.encode(mappedId, lastY - y, y + 1 - inclusiveMinBuildHeight, blockLight, skyLight));
 							biome = newBiome;
 							blockState = newBlockState;
 							
@@ -228,17 +205,16 @@ public class LodDataBuilder
 							lastY = y;
 						}
 					}
-					longs.add(FullDataPointUtil.encode(mappedId, lastY - y, y + 1 - chunkWrapper.getInclusiveMinBuildHeight(), blockLight, skyLight));
 					
-					dataSource.setSingleColumn(longs,
-							relBlockX + chunkOffsetX,
-							relBlockZ + chunkOffsetZ,
-							EDhApiWorldGenerationStep.LIGHT,
-							worldCompressionMode);
+					// Add the final data point
+					longs.add(FullDataPointUtil.encode(mappedId, lastY - y, y + 1 - inclusiveMinBuildHeight, blockLight, skyLight));
+					
+					// Set the column in the data source
+					dataSource.setSingleColumn(longs, columnX, columnZ, EDhApiWorldGenerationStep.LIGHT, worldCompressionMode);
 				}
 			}
 			
-			if (ignoreHiddenBlocks) 
+			if (ignoreHiddenBlocks)
 			{
 				cullHiddenBlocks(dataSource, chunkOffsetX, chunkOffsetZ);
 			}
@@ -275,16 +251,16 @@ public class LodDataBuilder
 				{
 					long currentPoint = centerColumn.getLong(centerIndex);
 					
-					// translucent data points are not eligible to be culled.
+					// 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))
-						)
+					if (centerIndex == 0
+							|| isTranslucent(dataSource, centerColumn.getLong(centerIndex - 1))
+					)
 					{
 						continue;
 					}
@@ -292,9 +268,9 @@ public class LodDataBuilder
 					// 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))
-						)
+					if (centerIndex + 1 < centerColumn.size()
+							&& isTranslucent(dataSource, centerColumn.getLong(centerIndex + 1))
+					)
 					{
 						continue;
 					}
@@ -327,9 +303,11 @@ public class LodDataBuilder
 						continue;
 					}
 					
-					// current point is fully surrounded. remove it.
+					// 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.
+					
+					// 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));
@@ -338,31 +316,31 @@ public class LodDataBuilder
 			}
 		}
 	}
-
+	
 	/**
-	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.
-	*/
+	 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);
@@ -387,12 +365,12 @@ public class LodDataBuilder
 		
 		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) */
 	public static FullDataSourceV2 createFromApiChunkData(DhApiChunk apiChunk, boolean runAdditionalValidation) throws ClassCastException, DataCorruptedException, IllegalArgumentException
@@ -402,9 +380,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
-		int relSourceBlockX = Math.floorMod(apiChunk.chunkPosX, 4) * LodUtil.CHUNK_WIDTH;
-		int relSourceBlockZ = Math.floorMod(apiChunk.chunkPosZ, 4) * LodUtil.CHUNK_WIDTH;
+		// Fast modulo calculation using bitwise AND since NUMB_OF_CHUNKS_WIDE is a power of 2 (4)
+		// 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]
+		// 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++)
@@ -423,8 +405,8 @@ public class LodDataBuilder
 				// TODO add the ability for API users to define a different compression mode
 				//  or add a "unkown" compression mode
 				dataSource.setSingleColumn(
-						packedDataPoints, 
-						relBlockX + relSourceBlockX, relBlockZ + relSourceBlockZ, 
+						packedDataPoints,
+						relBlockX + relSourceBlockX, relBlockZ + relSourceBlockZ,
 						EDhApiWorldGenerationStep.LIGHT, EDhApiWorldCompressionMode.MERGE_SAME_BLOCKS);
 				dataSource.isEmpty = false;
 			}
@@ -440,7 +422,7 @@ public class LodDataBuilder
 	
 	/** @see FullDataPointUtil */
 	public static LongArrayList convertApiDataPointListToPackedLongArray(
-			@Nullable List<DhApiTerrainDataPoint> columnDataPoints, FullDataSourceV2 dataSource, 
+			@Nullable List<DhApiTerrainDataPoint> columnDataPoints, FullDataSourceV2 dataSource,
 			int bottomYBlockPos) throws DataCorruptedException
 	{
 		// this null check does 2 nice things at the same time:
@@ -533,13 +515,13 @@ public class LodDataBuilder
 			}
 			// is there a gap between the last datapoint?
 			if (topYPos != lastBottomYPos
-				&& lastBottomYPos != Integer.MIN_VALUE)
+					&& lastBottomYPos != Integer.MIN_VALUE)
 			{
 				throw new IllegalArgumentException("DhApiTerrainDataPoint ["+i+"] has a gap between it and index ["+(i-1)+"]. Empty spaces should be filled by air, otherwise DH's downsampling won't calculate lighting correctly.");
 			}
 			
 			
-			lastBottomYPos = bottomYPos; 
+			lastBottomYPos = bottomYPos;
 		}
 		
 	}

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

@@ -328,7 +328,8 @@ public class DhLightingEngine
 					continue;
 				}
 				
-				if (relNeighbourBlockPos.getY() < neighbourChunk.getMinNonEmptyHeight() || relNeighbourBlockPos.getY() > neighbourChunk.getExclusiveMaxBuildHeight())
+				if (relNeighbourBlockPos.getY() < neighbourChunk.getMinNonEmptyHeight()
+					|| relNeighbourBlockPos.getY() >= neighbourChunk.getExclusiveMaxBuildHeight())
 				{
 					// the light pos is outside the chunk's min/max height,
 					// this can happen if given a chunk that hasn't finished generating

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

@@ -113,8 +113,8 @@ public class RemoteWorldRetrievalQueue extends AbstractFullDataNetworkRequestQue
 		if (this.networkState.sessionConfig.getGenerationBoundsRadius() > 0)
 		{
 			if (DhSectionPos.getChebyshevSignedBlockDistance(sectionPos, new DhBlockPos2D(
-					(int) (this.networkState.sessionConfig.getGenerationBoundsX() / this.level.levelWrapper.getDimensionType().getCoordinateScale()),
-					(int) (this.networkState.sessionConfig.getGenerationBoundsZ() / this.level.levelWrapper.getDimensionType().getCoordinateScale())
+					this.networkState.sessionConfig.getGenerationBoundsX(),
+					this.networkState.sessionConfig.getGenerationBoundsZ()
 			)) > this.networkState.sessionConfig.getGenerationBoundsRadius())
 			{
 				return false;

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

@@ -143,18 +143,17 @@ public abstract class AbstractDhServerLevel extends AbstractDhLevel implements I
 			
 			if (message.clientTimestamp == null)
 			{
-				if (distanceFromPlayer > Config.Server.maxGenerationRequestDistance.get())
+				if (distanceFromPlayer > Config.Client.Advanced.Graphics.Quality.lodChunkRenderDistanceRadius.get())
 				{
-					message.sendResponse(new RequestOutOfRangeException("Distance too large: " + distanceFromPlayer + " > " + Config.Server.maxGenerationRequestDistance.get()));
+					message.sendResponse(new RequestOutOfRangeException("Distance too large: " + distanceFromPlayer + " > " + Config.Client.Advanced.Graphics.Quality.lodChunkRenderDistanceRadius.get()));
 					return;
 				}
 				
 				if (Config.Server.generationBoundsRadius.get() > 0)
 				{
-					double coordinateScale = this.serverLevelWrapper.getDimensionType().getCoordinateScale();
 					if (DhSectionPos.getChebyshevSignedBlockDistance(message.sectionPos, new DhBlockPos2D(
-							(int) (Config.Server.generationBoundsX.get() / coordinateScale),
-							(int) (Config.Server.generationBoundsZ.get() / coordinateScale)
+							serverPlayerState.sessionConfig.getGenerationBoundsX(),
+							serverPlayerState.sessionConfig.getGenerationBoundsZ()
 					)) > Config.Server.generationBoundsRadius.get())
 					{
 						message.sendResponse(new RequestOutOfRangeException("Section out of allowed bounds"));

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

@@ -258,7 +258,11 @@ public class ClientLevelModule implements Closeable, AbstractDataSourceHandler.I
 	
 	public void clearRenderCache()
 	{
-		this.clientLevel.getClientLevelWrapper().clearBlockColorCache();
+		IClientLevelWrapper clientLevelWrapper = this.clientLevel.getClientLevelWrapper();
+		if (clientLevelWrapper != null)
+		{
+			clientLevelWrapper.clearBlockColorCache();
+		}
 		
 		ClientRenderState ClientRenderState = this.ClientRenderStateRef.get();
 		if (ClientRenderState != null && ClientRenderState.quadtree != null)

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

@@ -29,6 +29,7 @@ import com.seibel.distanthorizons.core.file.fullDatafile.FullDataSourceProviderV
 import com.seibel.distanthorizons.core.file.fullDatafile.RemoteFullDataSourceProvider;
 import com.seibel.distanthorizons.core.file.structure.ISaveStructure;
 import com.seibel.distanthorizons.core.generation.RemoteWorldRetrievalQueue;
+import com.seibel.distanthorizons.core.logging.ConfigBasedLogger;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.multiplayer.client.ClientNetworkState;
 import com.seibel.distanthorizons.core.multiplayer.client.SyncOnLoadRequestQueue;
@@ -47,6 +48,7 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IProfilerWrap
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.Nullable;
 
@@ -63,6 +65,9 @@ import java.util.concurrent.TimeUnit;
 public class DhClientLevel extends AbstractDhLevel implements IDhClientLevel
 {
 	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	protected static final ConfigBasedLogger NETWORK_LOGGER = new ConfigBasedLogger(LogManager.getLogger(),
+			() -> Config.Common.Logging.logNetworkEvent.get());
+	
 	private static final IMinecraftClientWrapper MC_CLIENT = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
 	
 	public final ClientLevelModule clientside;
@@ -159,7 +164,9 @@ public class DhClientLevel extends AbstractDhLevel implements IDhClientLevel
 			
 			try (FullDataSourceV2DTO dataSourceDto = this.networkState.fullDataPayloadReceiver.decodeDataSourceAndReleaseBuffer(message.payload))
 			{
-				if (!message.isSameLevelAs(this.levelWrapper))
+				boolean isSameLevel = message.isSameLevelAs(this.levelWrapper);
+				NETWORK_LOGGER.debug("Buffer {} isSameLevel: {}", message.payload.dtoBufferId, isSameLevel);
+				if (!isSameLevel)
 				{
 					return;
 				}

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

@@ -35,6 +35,7 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftCli
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper;
+import org.jetbrains.annotations.Nullable;
 
 import java.awt.*;
 import java.util.List;
@@ -107,6 +108,7 @@ public class DhClientServerLevel extends AbstractDhServerLevel implements IDhCli
 		}
 	}
 	
+	@Nullable
 	@Override
 	public IClientLevelWrapper getClientLevelWrapper() { return MC_CLIENT.getWrappedClientLevel(); }
 	

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

@@ -25,6 +25,7 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrappe
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IProfilerWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
+import org.jetbrains.annotations.Nullable;
 
 public interface IDhClientLevel extends IDhLevel
 {
@@ -35,6 +36,7 @@ public interface IDhClientLevel extends IDhLevel
 	
 	int computeBaseColor(DhBlockPos pos, IBiomeWrapper biome, IBlockStateWrapper block);
 	
+	@Nullable
 	IClientLevelWrapper getClientLevelWrapper();
 	
 	/**

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

@@ -290,7 +290,7 @@ public class WorldGenModule implements Closeable
 			remainingChunkCount += this.worldGenerationQueue.getQueuedChunkCount();
 			String remainingChunkCountStr = F3Screen.NUMBER_FORMAT.format(remainingChunkCount);
 			
-			String message = "DH Gen/Import: " + remainingChunkCountStr + " chunks left.";
+			String message = "DH is loading chunks. " + remainingChunkCountStr + " left.";
 			
 			// show a message about how to disable progress logging if requested
 			int msToShowDisableInstructions = Config.Common.WorldGenerator.generationProgressDisableMessageDisplayTimeInSeconds.get() * 1_000;

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

@@ -0,0 +1,71 @@
+package com.seibel.distanthorizons.core.multiplayer.client;
+
+import com.seibel.distanthorizons.core.network.messages.fullData.FullDataSplitMessage;
+
+import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.BooleanSupplier;
+import java.util.function.IntConsumer;
+import java.util.function.IntSupplier;
+
+public class ClientCongestionControl
+{
+	private static final double ADDITIVE_INCREASE = 50000;
+	private static final long INTERVAL_MS = 1000;
+	
+	private final Runnable rateUpdateHandler;
+	
+	private final AtomicLong bytesReceived = new AtomicLong(0);
+	
+	private double desiredRate;
+	private long lastAdjustTime;
+	
+	
+	public ClientCongestionControl(
+			Runnable rateUpdateHandler
+	)
+	{
+		this.rateUpdateHandler = rateUpdateHandler;
+		this.reset();
+	}
+	
+	public void reset()
+	{
+		this.desiredRate = ADDITIVE_INCREASE;
+		this.lastAdjustTime = System.currentTimeMillis();
+		this.bytesReceived.set(0);
+	}
+	
+	
+	public void onPayloadReceived(FullDataSplitMessage message)
+	{
+		long now = System.currentTimeMillis();
+		if (now - this.lastAdjustTime >= INTERVAL_MS)
+		{
+			this.adjustRate(now);
+		}
+		
+		this.bytesReceived.addAndGet(message.buffer.readableBytes());
+	}
+	
+	private void adjustRate(long now)
+	{
+		double throughput = this.bytesReceived.getAndSet(0);
+		if (throughput >= this.desiredRate)
+		{
+			this.desiredRate += ADDITIVE_INCREASE;
+		}
+		else
+		{
+			this.desiredRate = Math.max(throughput - ADDITIVE_INCREASE / 2, 1000);
+		}
+		
+		this.lastAdjustTime = now;
+		this.rateUpdateHandler.run();
+	}
+	
+	public int getDesiredRate()
+	{
+		return (int) (this.desiredRate / 1000);
+	}
+	
+}

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

@@ -1,6 +1,7 @@
 package com.seibel.distanthorizons.core.multiplayer.client;
 
 import com.seibel.distanthorizons.core.config.Config;
+import com.seibel.distanthorizons.core.config.listeners.ConfigChangeListener;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.logging.ConfigBasedLogger;
 import com.seibel.distanthorizons.core.multiplayer.config.SessionConfig;
@@ -56,6 +57,23 @@ public class ClientNetworkState implements Closeable
 	private long serverTimeOffset = 0;
 	public long getServerTimeOffset() { return this.serverTimeOffset; }
 	
+	private final ClientCongestionControl congestionControl = new ClientCongestionControl(
+			() -> {
+				if (Config.Server.enableAdaptiveTransferSpeed.get())
+				{
+					this.sendConfigMessage(false);
+				}
+			}
+	);
+	private final ConfigChangeListener<Boolean> adaptiveTransferSpeedListener = new ConfigChangeListener<>(Config.Server.enableAdaptiveTransferSpeed, isEnabled -> {
+		if (isEnabled)
+		{
+			this.congestionControl.reset();
+		}
+		
+		this.sendConfigMessage();
+	});
+	
 	
 	
 	//=============//
@@ -116,6 +134,7 @@ public class ClientNetworkState implements Closeable
 			});
 			
 			this.networkSession.registerHandler(FullDataSplitMessage.class, this.fullDataPayloadReceiver::receiveChunk);
+			this.networkSession.registerHandler(FullDataSplitMessage.class, this.congestionControl::onPayloadReceived);
 		}
 	}
 	
@@ -127,10 +146,22 @@ public class ClientNetworkState implements Closeable
 	
 	
 	
-	public void sendConfigMessage()
+	public void sendConfigMessage() { this.sendConfigMessage(true); }
+	public void sendConfigMessage(boolean blocking)
 	{
-		this.configReceived = false;
-		this.getSession().sendMessage(new SessionConfigMessage(new SessionConfig()));
+		SessionConfig sessionConfig = new SessionConfig();
+		
+		if (Config.Server.enableAdaptiveTransferSpeed.get())
+		{
+			sessionConfig.constrainValue(Config.Server.maxDataTransferSpeed, this.congestionControl.getDesiredRate());
+		}
+		
+		if (blocking)
+		{
+			this.configReceived = false;
+		}
+		
+		this.getSession().sendMessage(new SessionConfigMessage(sessionConfig));
 	}
 	
 	
@@ -166,6 +197,7 @@ public class ClientNetworkState implements Closeable
 	public void close()
 	{
 		this.fullDataPayloadReceiver.close();
+		this.adaptiveTransferSpeedListener.close();
 		this.configAnyChangeListener.close();
 		this.networkSession.close();
 	}

core/src/main/java/com/seibel/distanthorizons/core/multiplayer/config/SessionConfig.java

@@ -18,7 +18,7 @@ public class SessionConfig implements INetworkObject
 	private static final LinkedHashMap<String, Entry> CONFIG_ENTRIES = new LinkedHashMap<>();
 	
 	
-	private final LinkedHashMap<String, Object> values = new LinkedHashMap<>();
+	private final HashMap<String, Object> values = new HashMap<>();
 	public SessionConfig constrainingConfig;
 	
 	
@@ -32,10 +32,10 @@ public class SessionConfig implements INetworkObject
 		// Note: config values are transmitted in the insertion order
 		
 		registerConfigEntry(Config.Common.WorldGenerator.enableDistantGeneration, Boolean::logicalAnd);
-		registerConfigEntry(Config.Server.maxGenerationRequestDistance, Math::min);
-		registerConfigEntry(Config.Server.generationBoundsX, (x, y) -> x);
-		registerConfigEntry(Config.Server.generationBoundsZ, (x, y) -> x);
-		registerConfigEntry(Config.Server.generationBoundsRadius, (x, y) -> x);
+		registerConfigEntry(Config.Client.Advanced.Graphics.Quality.lodChunkRenderDistanceRadius, Math::min);
+		registerConfigEntry(Config.Server.generationBoundsX, (x, y) -> y);
+		registerConfigEntry(Config.Server.generationBoundsZ, (x, y) -> y);
+		registerConfigEntry(Config.Server.generationBoundsRadius, (x, y) -> y);
 		registerConfigEntry(Config.Server.generationRequestRateLimit, Math::min);
 		
 		registerConfigEntry(Config.Server.enableRealTimeUpdates, Boolean::logicalAnd);
@@ -67,7 +67,7 @@ public class SessionConfig implements INetworkObject
 	//===============//
 	
 	public boolean isDistantGenerationEnabled() { return this.getValue(Config.Common.WorldGenerator.enableDistantGeneration); }
-	public int getMaxGenerationRequestDistance() { return this.getValue(Config.Server.maxGenerationRequestDistance); }
+	public int getMaxGenerationRequestDistance() { return this.getValue(Config.Client.Advanced.Graphics.Quality.lodChunkRenderDistanceRadius); }
 	public Integer getGenerationBoundsX() { return this.getValue(Config.Server.generationBoundsX); }
 	public Integer getGenerationBoundsZ() { return this.getValue(Config.Server.generationBoundsZ); }
 	public Integer getGenerationBoundsRadius() { return this.getValue(Config.Server.generationBoundsRadius); }
@@ -119,10 +119,17 @@ public class SessionConfig implements INetworkObject
 		}
 		
 		return (this.constrainingConfig != null
-				? (T) entry.valueConstrainer.apply(value, this.constrainingConfig.getValue(name))
+				? (T) entry.valueConstrainer.apply(this.constrainingConfig.getValue(name), value)
 				: value);
 	}
 	
+	public <T> void constrainValue(ConfigEntry<T> configEntry, T value) { this.constrainValue(configEntry.getChatCommandName(), value); }
+	private void constrainValue(String name, Object value)
+	{
+		Entry entry = CONFIG_ENTRIES.get(name);
+		this.values.put(name, entry.valueConstrainer.apply(this.getValue(name), value));
+	}
+	
 	private Map<String, ?> getValues()
 	{
 		return CONFIG_ENTRIES.keySet().stream().collect(Collectors.toMap(

core/src/main/java/com/seibel/distanthorizons/core/multiplayer/fullData/FullDataPayloadReceiver.java

@@ -34,8 +34,6 @@ public class FullDataPayloadReceiver implements AutoCloseable
 			})
 			.build().asMap();
 	
-	
-	
 	@Override
 	public void close()
 	{
@@ -69,19 +67,21 @@ public class FullDataPayloadReceiver implements AutoCloseable
 		});
 	}
 	
-	public FullDataSourceV2DTO decodeDataSourceAndReleaseBuffer(FullDataPayload msg)
+	public FullDataSourceV2DTO decodeDataSourceAndReleaseBuffer(FullDataPayload payload)
 	{
-		CompositeByteBuf compositeByteBuffer = this.buffersById.get(msg.dtoBufferId);
+		CompositeByteBuf compositeByteBuffer = this.buffersById.get(payload.dtoBufferId);
 		LodUtil.assertTrue(compositeByteBuffer != null);
 		
 		try
 		{
-			return INetworkObject.decodeToInstance(FullDataSourceV2DTO.CreateEmptyDataSourceForDecoding(), compositeByteBuffer);
+			FullDataSourceV2DTO dataSourceDto = INetworkObject.decodeToInstance(FullDataSourceV2DTO.CreateEmptyDataSourceForDecoding(), compositeByteBuffer);
+			LOGGER.debug("Buffer {} DTO: {}", payload.dtoBufferId, dataSourceDto);
+			return dataSourceDto;
 		}
 		finally
 		{
 			// Releasing the buffer is handled by cache
-			this.buffersById.remove(msg.dtoBufferId);
+			this.buffersById.remove(payload.dtoBufferId);
 		}
 	}
 	

core/src/main/java/com/seibel/distanthorizons/core/multiplayer/fullData/FullDataPayloadSender.java

@@ -13,7 +13,7 @@ import java.util.function.*;
 
 public class FullDataPayloadSender implements AutoCloseable
 {
-	private static final int TICK_RATE = 4;
+	private static final int TICK_RATE = 20;
 	
 	/** 1 Mebibyte minus 576 bytes for other info */
 	public static final int FULL_DATA_SPLIT_SIZE_IN_BYTES = 1_048_000;

core/src/main/java/com/seibel/distanthorizons/core/multiplayer/server/FullDataSourceRequestHandler.java

@@ -59,45 +59,61 @@ public class FullDataSourceRequestHandler
 		}
 		
 		
-		// the client timestamp will be null if we want to retrieve the LOD regardless of when it was last updated
-		long clientTimestamp = (message.clientTimestamp != null) ? message.clientTimestamp : -1;
-		// the server timestamp will be null if no LOD data exists for this position
-		Long serverTimestamp = this.fullDataSourceProvider().getTimestampForPos(message.sectionPos);
-		if (serverTimestamp == null
-			|| serverTimestamp <= clientTimestamp)
+		
+		AbstractExecutorService fileHandlerExecutor = ThreadPoolUtil.getFileHandlerExecutor();
+		if (fileHandlerExecutor == null)
 		{
-			// either no data exists to sync, or the client is already up to date
-			rateLimiterSet.syncOnLoginRateLimiter.release();
-			message.sendResponse(new FullDataSourceResponseMessage(null));
+			// shouldn't normally happen, but just in case
+			LOGGER.warn("Unable to send FullDataSourceResponseMessage - getFileHandlerExecutor() is null");
 			return;
 		}
 		
-		
-		AbstractExecutorService executor = ThreadPoolUtil.getNetworkCompressionExecutor();
-		if (executor == null)
+		AbstractExecutorService networkCompressionExecutor = ThreadPoolUtil.getNetworkCompressionExecutor();
+		if (networkCompressionExecutor == null)
 		{
 			// shouldn't normally happen, but just in case
 			LOGGER.warn("Unable to send FullDataSourceResponseMessage - getNetworkCompressionExecutor() is null");
 			return;
 		}
 		
-		this.fullDataSourceProvider().getAsync(message.sectionPos).thenAcceptAsync(fullDataSource ->
-		{
-			try (FullDataPayload payload = new FullDataPayload(fullDataSource, this.getAllBeamsForPos(message.sectionPos)))
-			{
-				fullDataSource.close();
-				
-				serverPlayerState.fullDataPayloadSender.sendInChunks(payload, () ->
-				{
-					message.sendResponse(new FullDataSourceResponseMessage(payload));
-					rateLimiterSet.syncOnLoginRateLimiter.release();
+		CompletableFuture.completedFuture(null)
+				.thenComposeAsync(v -> {
+					// the client timestamp will be null if we want to retrieve the LOD regardless of when it was last updated
+					long clientTimestamp = (message.clientTimestamp != null) ? message.clientTimestamp : -1;
+					// the server timestamp will be null if no LOD data exists for this position
+					Long serverTimestamp = this.fullDataSourceProvider().getTimestampForPos(message.sectionPos);
+					if (serverTimestamp == null
+							|| serverTimestamp <= clientTimestamp)
+					{
+						// either no data exists to sync, or the client is already up to date
+						rateLimiterSet.syncOnLoginRateLimiter.release();
+						message.sendResponse(new FullDataSourceResponseMessage(null));
+						return null;
+					}
+					
+					return this.fullDataSourceProvider().getAsync(message.sectionPos);
+				}, fileHandlerExecutor)
+				.thenAcceptAsync(fullDataSource -> {
+					if (fullDataSource == null)
+					{
+						return;
+					}
+					
+					try (FullDataPayload payload = new FullDataPayload(fullDataSource, this.getAllBeamsForPos(message.sectionPos)))
+					{
+						fullDataSource.close();
+						
+						serverPlayerState.fullDataPayloadSender.sendInChunks(payload, () ->
+						{
+							message.sendResponse(new FullDataSourceResponseMessage(payload));
+							rateLimiterSet.syncOnLoginRateLimiter.release();
+						});
+					}
+				}, networkCompressionExecutor)
+				.exceptionally(e -> {
+					LOGGER.error("Unexpected issue getting request for pos [" + DhSectionPos.toString(message.sectionPos) + "], error: [" + e.getMessage() + "].", e);
+					return null;
 				});
-			}
-			catch (Exception e)
-			{
-				LOGGER.error("Unexpected issue getting request for pos ["+DhSectionPos.toString(message.sectionPos)+"], error: ["+e.getMessage()+"].", e);
-			}
-		}, executor);
 	}
 	
 	public void queueWorldGenForRequestMessage(ServerPlayerState serverPlayerState, FullDataSourceRequestMessage message, ServerPlayerState.RateLimiterSet rateLimiterSet)

core/src/main/java/com/seibel/distanthorizons/core/multiplayer/server/ServerPlayerState.java

@@ -24,7 +24,7 @@ public class ServerPlayerState implements Closeable
 {
 	private final ConfigChangeListener<String> levelKeyPrefixChangeListener
 			= new ConfigChangeListener<>(Config.Server.levelKeyPrefix, this::onLevelKeyPrefixConfigChanged);
-	private final SessionConfig.AnyChangeListener configAnyChangeListener = new SessionConfig.AnyChangeListener(this::onSessionConfigChanged);
+	private final SessionConfig.AnyChangeListener configAnyChangeListener = new SessionConfig.AnyChangeListener(this::sendConfigMessage);
 	
 	
 	private String lastLevelKey = "";
@@ -56,8 +56,9 @@ public class ServerPlayerState implements Closeable
 		this.networkSession.registerHandler(SessionConfigMessage.class, (sessionConfigMessage) ->
 		{
 			this.sessionConfig.constrainingConfig = sessionConfigMessage.config;
+			
 			this.sendLevelKey();
-			this.networkSession.sendMessage(new SessionConfigMessage(this.sessionConfig));
+			this.sendConfigMessage();
 		});
 		
 		this.networkSession.registerHandler(CloseInternalEvent.class, event -> {
@@ -93,7 +94,14 @@ public class ServerPlayerState implements Closeable
 		}
 	}
 	
-	private void onSessionConfigChanged() { this.networkSession.sendMessage(new SessionConfigMessage(this.sessionConfig)); }
+	private void sendConfigMessage()
+	{
+		double coordinateScale = this.getServerPlayer().getLevel().getDimensionType().getCoordinateScale();
+		this.sessionConfig.constrainValue(Config.Server.generationBoundsX, (int) (Config.Server.generationBoundsX.get() / coordinateScale));
+		this.sessionConfig.constrainValue(Config.Server.generationBoundsZ, (int) (Config.Server.generationBoundsZ.get() / coordinateScale));
+		
+		this.networkSession.sendMessage(new SessionConfigMessage(this.sessionConfig));
+	}
 	
 	
 	

core/src/main/java/com/seibel/distanthorizons/core/render/LodQuadTree.java

@@ -399,9 +399,11 @@ public class LodQuadTree extends QuadTree<LodRenderSection> implements IDebugRen
 			// prepare this section for rendering
 			if (!renderSection.gpuUploadInProgress()
 				&& renderSection.renderBuffer == null
+				// TODO this is commented out since some users reported LODs refusing to
+				//  load at their expected higher-detail levels
 				// this check is specifically for N-sized world generators where the higher quality
 				// data source may not exist yet, this is done to prevent holes while waiting for said generator
-				&& renderSection.getFullDataSourceExists()
+				//&& renderSection.getFullDataSourceExists()
 				)
 			{
 				nodesNeedingLoading.add(renderSection);

core/src/main/java/com/seibel/distanthorizons/core/render/LodRenderSection.java

@@ -510,10 +510,13 @@ public class LodRenderSection implements IDebugRenderable, AutoCloseable
 			{
 				// TODO memoization is needed for multiplayer, otherwise
 				//  new retrieval requests won't be submitted.
-				//  TODO why is that the case? Shouldn't the missing positions be un-changing?
+				// TODO why is that the case? Shouldn't the missing positions be un-changing?
+				// TODO setting this value to low can cause world gen to slow down significantly
+				//  due to a race condition where the world gen thinks it is finished, but the results
+				//  haven't been saved to file yet, causing the gen to fire again
 				this.missingGenerationPosFunc = Suppliers.memoizeWithExpiration(
 						() -> this.fullDataSourceProvider.getPositionsToRetrieve(this.pos),
-						15, TimeUnit.SECONDS);
+						10, TimeUnit.MINUTES);
 			}
 			
 			LongArrayList missingGenerationPos = this.getMissingGenerationPos();

core/src/main/java/com/seibel/distanthorizons/core/render/RenderBufferHandler.java

@@ -359,6 +359,7 @@ public class RenderBufferHandler implements AutoCloseable
 		// debug wireframe setup //
 		//=======================//
 		
+		// TODO move this logic into LodRenderer so all the GL states can be handled there
 		boolean renderWireframe = Config.Client.Advanced.Debugging.renderWireframe.get();
 		if (renderWireframe)
 		{

core/src/main/java/com/seibel/distanthorizons/core/render/glObject/GLProxy.java

@@ -25,10 +25,10 @@ import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.logging.ConfigBasedLogger;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.util.objects.GLMessage;
-import com.seibel.distanthorizons.core.util.objects.GLMessageOutputStream;
+import com.seibel.distanthorizons.core.util.objects.GLMessages.*;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.distanthorizons.coreapi.ModInfo;
+import com.seibel.distanthorizons.coreapi.util.StringUtil;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.lwjgl.glfw.GLFW;
@@ -38,31 +38,28 @@ import org.lwjgl.opengl.GLCapabilities;
 import org.lwjgl.opengl.GLUtil;
 
 import java.io.PrintStream;
-import java.lang.invoke.MethodHandles;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
 /**
  * A singleton that holds references to different openGL contexts
  * and GPU capabilities.
- *
- * <p>
- * Helpful OpenGL resources:
- * <p>
- * https://www.seas.upenn.edu/~pcozzi/OpenGLInsights/OpenGLInsights-AsynchronousBufferTransfers.pdf <br>
- * https://learnopengl.com/Advanced-OpenGL/Advanced-Data <br>
- * https://www.slideshare.net/CassEveritt/approaching-zero-driver-overhead <br><br>
- *
- * https://gamedev.stackexchange.com/questions/91995/edit-vbo-data-or-create-a-new-one <br>
- * https://stackoverflow.com/questions/63509735/massive-performance-loss-with-glmapbuffer <br><br>
  */
 public class GLProxy
 {
 	private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
 	
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger(MethodHandles.lookup().lookupClass().getSimpleName());
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	public static final ConfigBasedLogger GL_LOGGER = new ConfigBasedLogger(LogManager.getLogger(GLProxy.class),
 			() -> Config.Common.Logging.logRendererGLEvent.get());
 	
+	public static final Set<String> LOGGED_GL_MESSAGES = Collections.newSetFromMap(new ConcurrentHashMap<String, Boolean>());
+	
+	
+	
 	private static GLProxy instance = null;
 	
 	
@@ -79,7 +76,29 @@ public class GLProxy
 	
 	private final EDhApiGpuUploadMethod preferredUploadMethod;
 	
-	public final GLMessage.Builder vanillaDebugMessageBuilder = GLMessage.Builder.DEFAULT_MESSAGE_BUILDER;
+	public final GLMessageBuilder vanillaDebugMessageBuilder = 
+		new GLMessageBuilder(
+			(type) ->
+			{
+				if (type == EGLMessageType.POP_GROUP)
+					return false;
+				else if (type == EGLMessageType.PUSH_GROUP)
+					return false;
+				else if (type == EGLMessageType.MARKER)
+					return false;
+				else
+					return true;
+			},
+			(severity) ->
+			{
+				// notifications can generally be ignored (if they are logged at all)
+				if (severity == EGLMessageSeverity.NOTIFICATION)
+					return false;
+				else
+					return true;
+			},
+			null
+	);
 	
 	
 	
@@ -258,6 +277,7 @@ public class GLProxy
 	// logging //
 	//=========//
 	
+	/** this method is called on the render thread at the point of the GL Error */
 	private static void logMessage(GLMessage msg)
 	{
 		EDhApiGLErrorHandlingMode errorHandlingMode = Config.Client.Advanced.Debugging.OpenGl.glErrorHandlingMode.get();
@@ -268,44 +288,56 @@ public class GLProxy
 		
 		
 		
-		if (msg.type == GLMessage.EType.ERROR || msg.type == GLMessage.EType.UNDEFINED_BEHAVIOR)
+		boolean onlyLogOnce = Config.Client.Advanced.Debugging.OpenGl.onlyLogGlErrorsOnce.get();
+		String errorMessage = "GL ERROR [" + msg.id + "] from [" + msg.source + "]: [" + msg.message + "]"+(onlyLogOnce ? " this message will only be logged once" : "")+".";
+		if (onlyLogOnce
+			&& !LOGGED_GL_MESSAGES.add(errorMessage))
+		{
+			// this message has already been logged
+			return;
+		}
+		
+		
+		// create an exception so we get a stacktrace of where the message was triggered from
+		RuntimeException exception = new RuntimeException(errorMessage);
+		
+		if (msg.type == EGLMessageType.ERROR || msg.type == EGLMessageType.UNDEFINED_BEHAVIOR)
 		{
 			// critical error
 			
-			GL_LOGGER.error("GL ERROR " + msg.id + " from " + msg.source + ": " + msg.message);
+			GL_LOGGER.error(exception.getMessage(), exception);
 			
 			if (errorHandlingMode == EDhApiGLErrorHandlingMode.LOG_THROW)
 			{
-				throw new RuntimeException("GL ERROR: " + msg);
+				// will probably crash the game,
+				// good for quickly checking if there's a problem while preventing log spam
+				throw exception;
 			}
-			
 		}
 		else
 		{
 			// non-critical log
 			
-			GLMessage.ESeverity severity = msg.severity;
-			RuntimeException ex = new RuntimeException("GL MESSAGE: " + msg);
-			
+			EGLMessageSeverity severity = msg.severity;
 			if (severity == null)
 			{
 				// just in case the message was malformed
-				severity = GLMessage.ESeverity.LOW;
+				severity = EGLMessageSeverity.LOW;
 			}
 			
 			switch (severity)
 			{
 				case HIGH:
-					GL_LOGGER.error("{}", ex);
+					GL_LOGGER.error(exception.getMessage(), exception);
 					break;
 				case MEDIUM:
-					GL_LOGGER.warn("{}", ex);
+					GL_LOGGER.warn(exception.getMessage(), exception);
 					break;
 				case LOW:
-					GL_LOGGER.info("{}", ex);
+					GL_LOGGER.info(exception.getMessage(), exception);
 					break;
 				case NOTIFICATION:
-					GL_LOGGER.debug("{}", ex);
+					GL_LOGGER.debug(exception.getMessage(), exception);
 					break;
 			}
 		}

core/src/main/java/com/seibel/distanthorizons/core/render/glObject/GLState.java

@@ -35,7 +35,7 @@ public class GLState
 	public int vao;
 	public int vbo;
 	public int ebo;
-	public int[] fbo;
+	public int fbo;
 	public int texture2D;
 	/** IE: GL_TEXTURE0, GL_TEXTURE1, etc. */
 	public int activeTextureNumber;
@@ -57,10 +57,10 @@ public class GLState
 	public boolean depth;
 	public boolean writeToDepthBuffer;
 	public int depthFunc;
-	//public boolean stencil;
-	//public int stencilFunc;
-	//public int stencilRef;
-	//public int stencilMask;
+	public boolean stencil;
+	public int stencilFunc;
+	public int stencilRef;
+	public int stencilMask;
 	public int[] view;
 	public boolean cull;
 	public int cullMode;
@@ -68,12 +68,7 @@ public class GLState
 	
 	
 	
-	public GLState() 
-	{
-		this.fbo = new int[FBO_MAX];
-		
-		this.saveState();
-	}
+	public GLState() { this.saveState(); }
 	
 	public void saveState()
 	{
@@ -82,7 +77,7 @@ public class GLState
 		this.vbo = GL32.glGetInteger(GL32.GL_ARRAY_BUFFER_BINDING);
 		this.ebo = GL32.glGetInteger(GL32.GL_ELEMENT_ARRAY_BUFFER_BINDING);
 		
-		GL32.glGetIntegerv(GL32.GL_FRAMEBUFFER_BINDING, this.fbo);
+		this.fbo = GL32.glGetInteger(GL32.GL_FRAMEBUFFER_BINDING);
 		
 		this.texture2D = GL32.glGetInteger(GL32.GL_TEXTURE_BINDING_2D);
 		this.activeTextureNumber = GL32.glGetInteger(GL32.GL_ACTIVE_TEXTURE);
@@ -101,9 +96,19 @@ public class GLState
 		
 		GLMC.glActiveTexture(this.activeTextureNumber);
 		
-		this.frameBufferTexture0 = GL32.glGetFramebufferAttachmentParameteri(GL32.GL_FRAMEBUFFER, GL32.GL_COLOR_ATTACHMENT0, GL32.GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME);
-		this.frameBufferTexture1 = GL32.glGetFramebufferAttachmentParameteri(GL32.GL_FRAMEBUFFER, GL32.GL_COLOR_ATTACHMENT1, GL32.GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME);
-		this.frameBufferDepthTexture = GL32.glGetFramebufferAttachmentParameteri(GL32.GL_FRAMEBUFFER, GL32.GL_DEPTH_ATTACHMENT, GL32.GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME);
+		if (this.fbo != 0)
+		{
+			this.frameBufferTexture0 = GL32.glGetFramebufferAttachmentParameteri(GL32.GL_FRAMEBUFFER, GL32.GL_COLOR_ATTACHMENT0, GL32.GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME);
+			this.frameBufferTexture1 = GL32.glGetFramebufferAttachmentParameteri(GL32.GL_FRAMEBUFFER, GL32.GL_COLOR_ATTACHMENT1, GL32.GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME);
+			this.frameBufferDepthTexture = GL32.glGetFramebufferAttachmentParameteri(GL32.GL_FRAMEBUFFER, GL32.GL_DEPTH_ATTACHMENT, GL32.GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME);
+		}
+		else
+		{
+			// attempting to get values from the default framebuffer can throw errors on Linux
+			this.frameBufferTexture0 = 0;
+			this.frameBufferTexture1 = 0;
+			this.frameBufferDepthTexture = 0;
+		}
 		
 		this.blend = GL32.glIsEnabled(GL32.GL_BLEND);
 		this.scissor = GL32.glIsEnabled(GL32.GL_SCISSOR_TEST);
@@ -116,10 +121,10 @@ public class GLState
 		this.depth = GL32.glIsEnabled(GL32.GL_DEPTH_TEST);
 		this.writeToDepthBuffer = GL32.glGetInteger(GL32.GL_DEPTH_WRITEMASK) == GL32.GL_TRUE;
 		this.depthFunc = GL32.glGetInteger(GL32.GL_DEPTH_FUNC);
-		//this.stencil = GL32.glIsEnabled(GL32.GL_STENCIL_TEST);
-		//this.stencilFunc = GL32.glGetInteger(GL32.GL_STENCIL_FUNC);
-		//this.stencilRef = GL32.glGetInteger(GL32.GL_STENCIL_REF);
-		//this.stencilMask = GL32.glGetInteger(GL32.GL_STENCIL_VALUE_MASK);
+		this.stencil = GL32.glIsEnabled(GL32.GL_STENCIL_TEST);
+		this.stencilFunc = GL32.glGetInteger(GL32.GL_STENCIL_FUNC);
+		this.stencilRef = GL32.glGetInteger(GL32.GL_STENCIL_REF);
+		this.stencilMask = GL32.glGetInteger(GL32.GL_STENCIL_VALUE_MASK);
 		this.view = new int[4];
 		GL32.glGetIntegerv(GL32.GL_VIEWPORT, this.view);
 		this.cull = GL32.glIsEnabled(GL32.GL_CULL_FACE);
@@ -131,38 +136,33 @@ public class GLState
 	public String toString()
 	{
 		return "GLState{" +
-				"program=" + this.program + ", vao=" + this.vao + ", vbo=" + this.vbo + ", ebo=" + this.ebo + ", fbo=" + this.fbo[0] +
+				"program=" + this.program + ", vao=" + this.vao + ", vbo=" + this.vbo + ", ebo=" + this.ebo + ", fbo=" + this.fbo +
 				", text=" + GLEnums.getString(this.texture2D) + "@" + this.activeTextureNumber + ", text0=" + GLEnums.getString(this.texture0) +
 				", FB text0=" + this.frameBufferTexture0 +
 				", FB text1=" + this.frameBufferTexture1 +
 				", FB depth=" + this.frameBufferDepthTexture +
 				", blend=" + this.blend + ", scissor=" + this.scissor + ", blendMode=" + GLEnums.getString(this.blendSrcColor) + "," + GLEnums.getString(this.blendDstColor) +
 				", depth=" + this.depth +
-				//", depthFunc=" + GLEnums.getString(this.depthFunc) + ", stencil=" + this.stencil + ", stencilFunc=" +
-				//GLEnums.getString(this.stencilFunc) + ", stencilRef=" + this.stencilRef + ", stencilMask=" + this.stencilMask +
+				", depthFunc=" + GLEnums.getString(this.depthFunc) + ", stencil=" + this.stencil +
+				", stencilFunc=" + GLEnums.getString(this.stencilFunc) + ", stencilRef=" + this.stencilRef + ", stencilMask=" + this.stencilMask +
 				", view={x:" + this.view[0] + ", y:" + this.view[1] +
-				", w:" + this.view[2] + ", h:" + this.view[3] + "}" + ", cull=" + this.cull + ", cullMode="
-				+ GLEnums.getString(this.cullMode) + ", polyMode=" + GLEnums.getString(this.polyMode) +
+				", w:" + this.view[2] + ", h:" + this.view[3] + "}" + ", cull=" + this.cull +
+				", cullMode=" + GLEnums.getString(this.cullMode) + ", polyMode=" + GLEnums.getString(this.polyMode) +
 				'}';
 	}
 	
-	public void RestoreFrameBuffer()
-	{
-		// explicitly unbinding the frame buffer is necessary to prevent GL_CLEAR calls from hitting the wrong buffer
-		GLMC.glBindFramebuffer(GL32.GL_FRAMEBUFFER, 0);
-		
-		for (int i = 0; i < FBO_MAX; i++)
-		{
-			int buffer = this.fbo[i];
-			if (i > 0 && buffer == 0) break;
-			
-			GLMC.glBindFramebuffer(GL32.GL_FRAMEBUFFER, GL32.glIsFramebuffer(buffer) ? buffer : 0);
-		}
-	}
-	
 	public void restore()
 	{
-		this.RestoreFrameBuffer();
+		// explicitly unbinding the frame buffer is necessary to prevent GL_CLEAR calls from hitting the wrong buffer
+		GLMC.glBindFramebuffer(GL32.GL_FRAMEBUFFER, 0);
+		boolean frameBufferSet = false;
+		
+		if (this.fbo != 0 && GL32.glIsFramebuffer(this.fbo))
+		{
+			GLMC.glBindFramebuffer(GL32.GL_FRAMEBUFFER, this.fbo);
+			frameBufferSet = true;
+		}
+		
 		
 		if (this.blend)
 		{
@@ -197,9 +197,13 @@ public class GLState
 		GLMC.glActiveTexture(this.activeTextureNumber);
 		GLMC.glBindTexture(GL32.glIsTexture(this.texture2D) ? this.texture2D : 0);
 		
-		GL32.glFramebufferTexture2D(GL32.GL_FRAMEBUFFER, GL32.GL_COLOR_ATTACHMENT0, GL32.GL_TEXTURE_2D, this.frameBufferTexture0, 0);
-		GL32.glFramebufferTexture2D(GL32.GL_FRAMEBUFFER, GL32.GL_COLOR_ATTACHMENT1, GL32.GL_TEXTURE_2D, this.frameBufferTexture1, 0);
-		GL32.glFramebufferTexture2D(GL32.GL_FRAMEBUFFER, GL32.GL_DEPTH_ATTACHMENT, GL32.GL_TEXTURE_2D, this.frameBufferDepthTexture, 0);
+		// attempting to set textures on the default frame buffer (ID 0) will throw errors
+		if (frameBufferSet)
+		{
+			GL32.glFramebufferTexture2D(GL32.GL_FRAMEBUFFER, GL32.GL_COLOR_ATTACHMENT0, GL32.GL_TEXTURE_2D, this.frameBufferTexture0, 0);
+			GL32.glFramebufferTexture2D(GL32.GL_FRAMEBUFFER, GL32.GL_COLOR_ATTACHMENT1, GL32.GL_TEXTURE_2D, this.frameBufferTexture1, 0);
+			GL32.glFramebufferTexture2D(GL32.GL_FRAMEBUFFER, GL32.GL_DEPTH_ATTACHMENT, GL32.GL_TEXTURE_2D, this.frameBufferDepthTexture, 0);
+		}
 		
 		GL32.glBindVertexArray(GL32.glIsVertexArray(this.vao) ? this.vao : 0);
 		GL32.glBindBuffer(GL32.GL_ARRAY_BUFFER, GL32.glIsBuffer(this.vbo) ? this.vbo : 0);
@@ -229,15 +233,15 @@ public class GLState
 		}
 		GLMC.glDepthFunc(this.depthFunc);
 		
-		//if (this.stencil)
-		//{
-		//	GL32.glEnable(GL32.GL_STENCIL_TEST);
-		//}
-		//else
-		//{
-		//	GL32.glDisable(GL32.GL_STENCIL_TEST);
-		//}
-		//GL32.glStencilFunc(this.stencilFunc, this.stencilRef, this.stencilMask);
+		if (this.stencil)
+		{
+			GL32.glEnable(GL32.GL_STENCIL_TEST);
+		}
+		else
+		{
+			GL32.glDisable(GL32.GL_STENCIL_TEST);
+		}
+		GL32.glStencilFunc(this.stencilFunc, this.stencilRef, this.stencilMask);
 		
 		GL32.glViewport(this.view[0], this.view[1], this.view[2], this.view[3]);
 		if (this.cull)

core/src/main/java/com/seibel/distanthorizons/core/render/glObject/buffer/GLBuffer.java

@@ -223,7 +223,7 @@ public class GLBuffer implements AutoCloseable
 		this.destroyAsync();
 		this.create(true);
 		this.bind();
-		GL44.glBufferStorage(this.getBufferBindingTarget(), bb, bufferStorageHint);
+		GL44.glBufferStorage(this.getBufferBindingTarget(), bb, 0);
 		this.size = bbSize;
 	}
 	/** Requires the buffer to be bound */

core/src/main/java/com/seibel/distanthorizons/core/render/glObject/shader/Shader.java

@@ -32,15 +32,18 @@ import org.lwjgl.opengl.GL32;
 /**
  * This object holds a OpenGL reference to a shader
  * and allows for reading in and compiling a shader file.
- *
- * @author James Seibel
- * @version 11-8-2021
  */
 public class Shader
 {
 	/** OpenGL shader ID */
 	public final int id;
 	
+	
+	
+	//==============//
+	// constructors //
+	//==============//
+	
 	/**
 	 * Creates a shader with specified type.
 	 *
@@ -51,51 +54,67 @@ public class Shader
 	 */
 	public Shader(int type, String path, boolean absoluteFilePath)
 	{
-		GLProxy.GL_LOGGER.info("Loading shader at " + path);
+		GLProxy.GL_LOGGER.info("Loading shader at [" + path + "]");
 		// Create an empty shader object
-		id = GL32.glCreateShader(type);
-		StringBuilder source = loadFile(path, absoluteFilePath, new StringBuilder());
-		GL32.glShaderSource(id, source);
+		this.id = GL32.glCreateShader(type);
+		if (this.id == 0)
+		{
+			throw new IllegalArgumentException("Failed to create shader with type ["+type+"].");
+		}
 		
-		GL32.glCompileShader(id);
+		StringBuilder source = loadFile(path, absoluteFilePath, new StringBuilder());
+		GL32.glShaderSource(this.id, source);
+		
+		GL32.glCompileShader(this.id);
 		// check if the shader compiled
-		int status = GL32.glGetShaderi(id, GL32.GL_COMPILE_STATUS);
+		int status = GL32.glGetShaderi(this.id, GL32.GL_COMPILE_STATUS);
 		if (status != GL32.GL_TRUE)
 		{
-			String message = "Shader compiler error. Details: " + GL32.glGetShaderInfoLog(id);
-			free(); // important!
+			String message = "Shader compiler error. Details: ["+GL32.glGetShaderInfoLog(this.id)+"].";
+			this.free(); // important!
 			throw new RuntimeException(message);
 		}
-		GLProxy.GL_LOGGER.info("Shader at " + path + " loaded sucessfully.");
+		GLProxy.GL_LOGGER.info("Shader at " + path + " loaded successfully.");
 	}
 	
 	public Shader(int type, String sourceString)
 	{
-		GLProxy.GL_LOGGER.info("Loading shader with type: {}", type);
-		GLProxy.GL_LOGGER.debug("Source:\n{}", sourceString);
-		// Create an empty shader object
-		id = GL32.glCreateShader(type);
-		GL32.glShaderSource(id, sourceString);
+		GLProxy.GL_LOGGER.info("Loading shader with type: ["+type+"]");
+		GLProxy.GL_LOGGER.debug("Source: \n["+sourceString+"]");
+		if (sourceString == null || sourceString.isEmpty())
+		{
+			throw new IllegalArgumentException("No shader source given.");
+		}
 		
-		GL32.glCompileShader(id);
+		// Create an empty shader object
+		this.id = GL32.glCreateShader(type);
+		if (this.id == 0)
+		{
+			throw new IllegalArgumentException("Failed to create shader with type ["+type+"] and Source: \n["+sourceString+"].");
+		}
+		
+		GL32.glShaderSource(this.id, sourceString);
+		GL32.glCompileShader(this.id);
 		// check if the shader compiled
-		int status = GL32.glGetShaderi(id, GL32.GL_COMPILE_STATUS);
+		int status = GL32.glGetShaderi(this.id, GL32.GL_COMPILE_STATUS);
 		if (status != GL32.GL_TRUE)
 		{
 			
-			String message = "Shader compiler error. Details: " + GL32.glGetShaderInfoLog(id);
-			message += "\nSource:\n" + sourceString;
-			free(); // important!
+			String message = "Shader compiler error. Details: [" + GL32.glGetShaderInfoLog(this.id) + "]\n";
+			message += "Source: \n[" + sourceString + "]";
+			this.free(); // important!
 			throw new RuntimeException(message);
 		}
 		GLProxy.GL_LOGGER.info("Shader loaded sucessfully.");
 	}
 	
-	// REMEMBER to always free the resource!
-	public void free()
-	{
-		GL32.glDeleteShader(id);
-	}
+	
+	
+	//=========//
+	// helpers //
+	//=========//
+	
+	public void free() { GL32.glDeleteShader(this.id); }
 	
 	public static StringBuilder loadFile(String path, boolean absoluteFilePath, StringBuilder stringBuilder)
 	{

core/src/main/java/com/seibel/distanthorizons/core/render/glObject/texture/DHDepthTexture.java

@@ -1,5 +1,7 @@
 package com.seibel.distanthorizons.core.render.glObject.texture;
 
+import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
+import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftGLWrapper;
 import org.lwjgl.opengl.GL11C;
 import org.lwjgl.opengl.GL13C;
 import org.lwjgl.opengl.GL43C;
@@ -8,12 +10,15 @@ import java.nio.ByteBuffer;
 
 public class DHDepthTexture
 {
+	private static final IMinecraftGLWrapper GLMC = SingletonInjector.INSTANCE.get(IMinecraftGLWrapper.class);
+	
+	
 	private int id;
 	public DHDepthTexture(int width, int height, EDhDepthBufferFormat format)
 	{
 		this.id = GL43C.glGenTextures();
 		
-		resize(width, height, format);
+		this.resize(width, height, format);
 		
 		GL43C.glTexParameteri(GL11C.GL_TEXTURE_2D, GL11C.GL_TEXTURE_MIN_FILTER, GL11C.GL_NEAREST);
 		GL43C.glTexParameteri(GL11C.GL_TEXTURE_2D, GL11C.GL_TEXTURE_MAG_FILTER, GL11C.GL_NEAREST);
@@ -24,27 +29,31 @@ public class DHDepthTexture
 	}
 	
 	// For internal use by Iris for copying data. Do not use this in DH.
-	public DHDepthTexture(int id) {
-		this.id = id;
-	}
+	public DHDepthTexture(int id) { this.id = id; }
 	
 	public void resize(int width, int height, EDhDepthBufferFormat format)
 	{
-		GL43C.glBindTexture(GL43C.GL_TEXTURE_2D, getTextureId());
+		GL43C.glBindTexture(GL43C.GL_TEXTURE_2D, this.getTextureId());
 		GL43C.glTexImage2D(GL11C.GL_TEXTURE_2D, 0, format.getGlInternalFormat(), width, height, 0,
 				format.getGlType(), format.getGlFormat(), (ByteBuffer) null);
 	}
 	
 	public int getTextureId()
 	{
-		if (id == -1) throw new IllegalStateException("Depth texture does not exist!");
-		return id;
+		if (this.id == -1)
+		{
+			throw new IllegalStateException("Depth texture does not exist!");
+		}
+		
+		return this.id;
 	}
 	
 	public void destroy()
 	{
-		GL43C.glDeleteTextures(getTextureId());
+		GLMC.glDeleteTextures(this.getTextureId());
 		this.id = -1;
 	}
 	
+	
+	
 }

core/src/main/java/com/seibel/distanthorizons/core/render/glObject/texture/DhColorTexture.java

@@ -1,5 +1,7 @@
 package com.seibel.distanthorizons.core.render.glObject.texture;
 
+import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
+import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftGLWrapper;
 import org.joml.Vector2i;
 import org.lwjgl.opengl.GL11C;
 import org.lwjgl.opengl.GL13C;
@@ -9,6 +11,9 @@ import java.nio.ByteBuffer;
 
 public class DhColorTexture
 {
+	private static final IMinecraftGLWrapper GLMC = SingletonInjector.INSTANCE.get(IMinecraftGLWrapper.class);
+	
+	
 	private final EDhInternalTextureFormat internalFormat;
 	private final EDhPixelFormat format;
 	private final EDhPixelType type;
@@ -100,7 +105,7 @@ public class DhColorTexture
 		this.throwIfInvalid();
 		this.isValid = false;
 		
-		GL43C.glDeleteTextures(this.id);
+		GLMC.glDeleteTextures(this.id);
 	}
 	
 	/** @throws IllegalStateException if the texture isn't valid */

core/src/main/java/com/seibel/distanthorizons/core/render/renderer/FadeRenderer.java

@@ -86,22 +86,31 @@ public class FadeRenderer
 			this.fadeFramebuffer = -1;
 		}
 		
-		if (this.fadeTexture != -1)
-		{
-			GLMC.glDeleteTextures(this.fadeTexture);
-			this.fadeTexture = -1;
-		}
-		
 		this.fadeFramebuffer = GL32.glGenFramebuffers();
 		GLMC.glBindFramebuffer(GL32.GL_FRAMEBUFFER, this.fadeFramebuffer);
 		
-		this.fadeTexture = GL32.glGenTextures();
-		GLMC.glBindTexture(this.fadeTexture);
-		GL32.glTexImage2D(GL32.GL_TEXTURE_2D, 0, GL32.GL_RGBA16, width, height, 0, GL32.GL_RGBA, GL32.GL_UNSIGNED_SHORT_4_4_4_4, (ByteBuffer) null);
-		GL32.glTexParameteri(GL32.GL_TEXTURE_2D, GL32.GL_TEXTURE_MIN_FILTER, GL32.GL_LINEAR);
-		GL32.glTexParameteri(GL32.GL_TEXTURE_2D, GL32.GL_TEXTURE_MAG_FILTER, GL32.GL_LINEAR);
-		GL32.glFramebufferTexture2D(GL32.GL_FRAMEBUFFER, GL32.GL_COLOR_ATTACHMENT0, GL32.GL_TEXTURE_2D, this.fadeTexture, 0);
 		
+		// Applying the fade texture is only needed if MC is drawing to their own frame buffer,
+		// otherwise we can directly render to their texture
+		if (MC_RENDER.mcRendersToFrameBuffer())
+		{
+			if (this.fadeTexture != -1)
+			{
+				GLMC.glDeleteTextures(this.fadeTexture);
+				this.fadeTexture = -1;
+			}
+			
+			this.fadeTexture = GL32.glGenTextures();
+			GLMC.glBindTexture(this.fadeTexture);
+			GL32.glTexImage2D(GL32.GL_TEXTURE_2D, 0, GL32.GL_RGBA16, width, height, 0, GL32.GL_RGBA, GL32.GL_UNSIGNED_SHORT_4_4_4_4, (ByteBuffer) null);
+			GL32.glTexParameteri(GL32.GL_TEXTURE_2D, GL32.GL_TEXTURE_MIN_FILTER, GL32.GL_LINEAR);
+			GL32.glTexParameteri(GL32.GL_TEXTURE_2D, GL32.GL_TEXTURE_MAG_FILTER, GL32.GL_LINEAR);
+			GL32.glFramebufferTexture2D(GL32.GL_FRAMEBUFFER, GL32.GL_COLOR_ATTACHMENT0, GL32.GL_TEXTURE_2D, this.fadeTexture, 0);
+		}
+		else
+		{
+			GL32.glFramebufferTexture2D(GL32.GL_FRAMEBUFFER, GL32.GL_COLOR_ATTACHMENT0, GL32.GL_TEXTURE_2D, MC_RENDER.getColorTextureId(), 0);
+		}
 	}
 	
 	
@@ -146,8 +155,13 @@ public class FadeRenderer
 			
 			profiler.popPush("Fade Apply");
 			
-			FadeApplyShader.INSTANCE.fadeTexture = this.fadeTexture;
-			FadeApplyShader.INSTANCE.render(partialTicks);
+			// Applying the fade texture is only needed if MC is drawing to their own frame buffer,
+			// otherwise we can directly render to their texture
+			if (MC_RENDER.mcRendersToFrameBuffer())
+			{
+				FadeApplyShader.INSTANCE.fadeTexture = this.fadeTexture;
+				FadeApplyShader.INSTANCE.render(partialTicks);
+			}
 			
 			profiler.pop(); 
 		}

core/src/main/java/com/seibel/distanthorizons/core/render/renderer/LodRenderer.java

@@ -23,6 +23,7 @@ import com.seibel.distanthorizons.api.interfaces.override.rendering.IDhApiFrameb
 import com.seibel.distanthorizons.api.interfaces.override.rendering.IDhApiShaderProgram;
 import com.seibel.distanthorizons.api.methods.events.abstractEvents.*;
 import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiRenderParam;
+import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiTextureCreatedParam;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.dataObjects.render.bufferBuilding.ColumnRenderBuffer;
 import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector;
@@ -557,34 +558,24 @@ public class LodRenderer
 		activeFrameBuffer.bind();
 		
 		
-		boolean clearTextures = !ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeTextureClearEvent.class, renderEventParam);
-		if (clearTextures)
-		{
-			if (this.usingMcFrameBuffer && framebufferOverride == null)
-			{
-				// Due to using MC/Optifine's framebuffer we need to re-bind the depth texture,
-				// otherwise we'll be writing to MC/Optifine's depth texture which causes rendering issues
-				activeFrameBuffer.addDepthAttachment(this.depthTexture.getTextureId(), EDhDepthBufferFormat.DEPTH32F.isCombinedStencil());
-				
-				
-				// don't clear the color texture, that removes the sky 
-				GL32.glClear(GL32.GL_DEPTH_BUFFER_BIT);
-			}
-			else if (firstPass)
-			{
-				GL32.glClear(GL32.GL_COLOR_BUFFER_BIT | GL32.GL_DEPTH_BUFFER_BIT);
-			}
-		}
-		
 		// by default draw everything as triangles
 		GL32.glPolygonMode(GL32.GL_FRONT_AND_BACK, GL32.GL_FILL);
 		GLMC.enableFaceCulling();
 		
+		GLMC.glBlendFunc(GL32.GL_SRC_ALPHA, GL32.GL_ONE_MINUS_SRC_ALPHA);
+		GLMC.glBlendFuncSeparate(GL32.GL_SRC_ALPHA, GL32.GL_ONE_MINUS_SRC_ALPHA, GL32.GL_ONE, GL32.GL_ZERO);
+		
+		GL32.glDisable(GL32.GL_SCISSOR_TEST);
+		
 		// Enable depth test and depth mask
 		GLMC.enableDepthTest();
 		GLMC.glDepthFunc(GL32.GL_LESS);
 		GLMC.enableDepthMask();
 		
+		// This is required for MC versions 1.21.5+
+		// due to MC updating the lightmap by changing the viewport size
+		GL32.glViewport(0, 0, this.cachedWidth, this.cachedHeight);
+		
 		/*---------Bind required objects--------*/
 		// Setup LodRenderProgram and the LightmapTexture if it has not yet been done
 		// also binds LightmapTexture, VAO, and ShaderProgram
@@ -605,6 +596,33 @@ public class LodRenderer
 		}
 		
 		this.lodRenderProgram.fillUniformData(renderEventParam);
+		
+		
+		// needs to be fired after all the textures have been created/bound
+		boolean clearTextures = !ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeTextureClearEvent.class, renderEventParam);
+		if (clearTextures)
+		{
+			GL32.glClearDepth(1.0);
+			
+			float[] clearColorValues = new float[4];
+			GL32.glGetFloatv(GL32.GL_COLOR_CLEAR_VALUE, clearColorValues);
+			GL32.glClearColor(clearColorValues[0], clearColorValues[1], clearColorValues[2], 1.0f);
+			
+			if (this.usingMcFrameBuffer && framebufferOverride == null)
+			{
+				// Due to using MC/Optifine's framebuffer we need to re-bind the depth texture,
+				// otherwise we'll be writing to MC/Optifine's depth texture which causes rendering issues
+				activeFrameBuffer.addDepthAttachment(this.depthTexture.getTextureId(), EDhDepthBufferFormat.DEPTH32F.isCombinedStencil());
+				
+				
+				// don't clear the color texture, that removes the sky 
+				GL32.glClear(GL32.GL_DEPTH_BUFFER_BIT);
+			}
+			else if (firstPass)
+			{
+				GL32.glClear(GL32.GL_COLOR_BUFFER_BIT | GL32.GL_DEPTH_BUFFER_BIT);
+			}
+		}
 	}
 	
 	/** Setup all render objects - MUST be called on the render thread */
@@ -656,7 +674,7 @@ public class LodRenderer
 			if(this.framebuffer.getStatus() != GL32.GL_FRAMEBUFFER_COMPLETE)
 			{
 				// This generally means something wasn't bound, IE missing either the color or depth texture
-				SPAM_LOGGER.warn("FrameBuffer ["+this.framebuffer.getId()+"] isn't complete.");
+				EVENT_LOGGER.warn("FrameBuffer ["+this.framebuffer.getId()+"] isn't complete.");
 			}
 			
 			
@@ -675,12 +693,15 @@ public class LodRenderer
 		this.cachedWidth = MC_RENDER.getTargetFrameBufferViewportWidth();
 		this.cachedHeight = MC_RENDER.getTargetFrameBufferViewportHeight();
 		
+		DhApiTextureCreatedParam textureCreatedParam = new DhApiTextureCreatedParam(
+				oldWidth, oldHeight,
+				this.cachedWidth, this.cachedHeight
+		);
 		
-		ApiEventInjector.INSTANCE.fireAllEvents(DhApiColorDepthTextureCreatedEvent.class, 
-				new DhApiColorDepthTextureCreatedEvent.EventParam(
-						oldWidth, oldHeight,
-						this.cachedWidth, this.cachedHeight
-				));
+		
+		
+		ApiEventInjector.INSTANCE.fireAllEvents(DhApiColorDepthTextureCreatedEvent.class, new DhApiColorDepthTextureCreatedEvent.EventParam(textureCreatedParam));
+		ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeColorDepthTextureCreatedEvent.class, textureCreatedParam);
 				
 		
 		// also update the override if present
@@ -712,26 +733,10 @@ public class LodRenderer
 		{
 			this.nullableColorTexture = null;
 		}
-	}
-	
-	
-	
-	private Color getFogColor(float partialTicks)
-	{
-		Color fogColor;
 		
-		if (Config.Client.Advanced.Graphics.Fog.colorMode.get() == EDhApiFogColorMode.USE_SKY_COLOR)
-		{
-			fogColor = MC_RENDER.getSkyColor();
-		}
-		else
-		{
-			fogColor = MC_RENDER.getFogColor(partialTicks);
-		}
 		
-		return fogColor;
+		ApiEventInjector.INSTANCE.fireAllEvents(DhApiAfterColorDepthTextureCreatedEvent.class, textureCreatedParam);
 	}
-	private Color getSpecialFogColor(float partialTicks) { return MC_RENDER.getSpecialFogColor(partialTicks); }
 	
 	
 	
@@ -748,7 +753,10 @@ public class LodRenderer
 	public static int getActiveColorTextureId() { return activeColorTextureId; }
 	
 	private void setActiveDepthTextureId(int depthTextureId) { activeDepthTextureId = depthTextureId; }
-	/** Returns -1 if no texture has been bound yet */
+	/**
+	 * FIXME it's possible for this to return an invalid texture ID if the renderer is being re-built at the same time 
+	 * Returns -1 if no texture has been bound yet 
+	 */
 	public static int getActiveDepthTextureId() { return activeDepthTextureId; }
 	
 	

core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/DhApplyShader.java

@@ -75,6 +75,18 @@ public class DhApplyShader extends AbstractShaderRenderer
 	
 	@Override
 	protected void onRender()
+	{
+		if (MC_RENDER.mcRendersToFrameBuffer())
+		{
+			this.renderToFrameBuffer();
+		}
+		else
+		{
+			this.renderToMcTexture();
+		}
+	}
+	// TODO merge duplicate code between these to render methods
+	private void renderToFrameBuffer()
 	{
 		int targetFrameBuffer = MC_RENDER.getTargetFrameBuffer();
 		if (targetFrameBuffer == -1)
@@ -87,9 +99,15 @@ public class DhApplyShader extends AbstractShaderRenderer
 		
 		GLMC.disableDepthTest();
 		
-		GLMC.enableBlend();
-		GL32.glBlendEquation(GL32.GL_FUNC_ADD);
-		GLMC.glBlendFunc(GL32.GL_ONE, GL32.GL_ONE_MINUS_SRC_ALPHA);
+		// blending isn't needed, we're manually merging the MC and DH textures
+		// Note: this prevents the sun/moon and stars from rendering through transparent LODs,
+		// however this also fixes transparent LODs from glowing when rendered against the sky during the day
+		GLMC.disableBlend();
+		
+		// old blending logic in case it's ever needed:
+		//GLMC.enableBlend();
+		//GL32.glBlendEquation(GL32.GL_FUNC_ADD);
+		//GLMC.glBlendFunc(GL32.GL_ONE, GL32.GL_ONE_MINUS_SRC_ALPHA);
 		
 		GLMC.glActiveTexture(GL32.GL_TEXTURE0);
 		GLMC.glBindTexture(LodRenderer.getActiveColorTextureId());
@@ -110,5 +128,66 @@ public class DhApplyShader extends AbstractShaderRenderer
 		GLMC.glBindFramebuffer(GL32.GL_FRAMEBUFFER, targetFrameBuffer);
 		
 	}
+	private void renderToMcTexture()
+	{
+		int targetColorTextureId = MC_RENDER.getColorTextureId();
+		if (targetColorTextureId == -1)
+		{
+			return;
+		}
+		
+		int dhFrameBufferId = LodRenderer.getActiveFramebufferId();
+		if (dhFrameBufferId == -1)
+		{
+			return;
+		}
+		
+		int mcFrameBufferId = MC_RENDER.getTargetFrameBuffer();
+		if (mcFrameBufferId == -1)
+		{
+			return;
+		}
+		
+		
+		
+		GLState state = new GLState();
+		
+		GLMC.disableDepthTest();
+		
+		// blending isn't needed, we're just directly merging the MC and DH textures
+		// Note: this prevents the sun/moon and stars from rendering through transparent LODs,
+		// however this also fixes
+		GLMC.disableBlend();
+		
+		// old blending logic in case it's ever needed:
+		//GLMC.enableBlend();
+		//GL32.glBlendEquation(GL32.GL_FUNC_ADD);
+		//GLMC.glBlendFunc(GL32.GL_ONE, GL32.GL_ONE_MINUS_SRC_ALPHA);
+		
+		GLMC.glActiveTexture(GL32.GL_TEXTURE0);
+		GLMC.glBindTexture(LodRenderer.getActiveColorTextureId());
+		GL32.glUniform1i(this.gDhColorTextureUniform, 0);
+		
+		GLMC.glActiveTexture(GL32.GL_TEXTURE1);
+		GLMC.glBindTexture(LodRenderer.getActiveDepthTextureId());
+		GL32.glUniform1i(this.gDepthMapUniform, 1);
+		
+		
+		
+		GL32.glFramebufferTexture(GL32.GL_DRAW_FRAMEBUFFER, GL32.GL_COLOR_ATTACHMENT0, targetColorTextureId, 0);
+		
+		// Copy to MC's texture via MC's framebuffer
+		GLMC.glBindFramebuffer(GL32.GL_FRAMEBUFFER, dhFrameBufferId);
+		
+		ScreenQuad.INSTANCE.render();
+		
+		
+		// restore everything, except at this point the MC framebuffer should now be used instead
+		state.restore();
+		GLMC.glBindFramebuffer(GL32.GL_FRAMEBUFFER, mcFrameBufferId);
+		
+	}
+	
+	
 	
 }

core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/FadeApplyShader.java

@@ -20,6 +20,7 @@
 package com.seibel.distanthorizons.core.render.renderer.shaders;
 
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
+import com.seibel.distanthorizons.core.render.glObject.GLState;
 import com.seibel.distanthorizons.core.render.glObject.shader.ShaderProgram;
 import com.seibel.distanthorizons.core.render.renderer.FadeRenderer;
 import com.seibel.distanthorizons.core.render.renderer.LodRenderer;
@@ -104,6 +105,12 @@ public class FadeApplyShader extends AbstractShaderRenderer
 	@Override
 	protected void onRender()
 	{
+		if (!MC_RENDER.mcRendersToFrameBuffer())
+		{
+			throw new IllegalStateException("If Minecraft is directly rendering to a texture the apply shader isn't needed, just draw the fade directly to the MC color texture.");
+		}
+		
+		
 		GLMC.disableBlend();
 		
 		// Depth testing must be disabled otherwise this application shader won't apply anything.
@@ -119,6 +126,9 @@ public class FadeApplyShader extends AbstractShaderRenderer
 		ScreenQuad.INSTANCE.render();
 		
 		GLMC.enableDepthTest();
+		
 	}
 	
+	
+	
 }

core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/FadeShader.java

@@ -165,6 +165,7 @@ public class FadeShader extends AbstractShaderRenderer
 		GL32.glUniform1i(this.uMcDepthTexture, 0);
 		
 		GLMC.glActiveTexture(GL32.GL_TEXTURE1);
+		// FIXME it's possible for this to return an invalid texture ID if the renderer is being re-built at the same time
 		GLMC.glBindTexture(LodRenderer.getActiveDepthTextureId());
 		GL32.glUniform1i(this.uDhDepthTexture, 1);
 		

core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/FogApplyShader.java

@@ -84,6 +84,7 @@ public class FogApplyShader extends AbstractShaderRenderer
 		GLMC.glActiveTexture(GL32.GL_TEXTURE1);
 		GLMC.glBindTexture(LodRenderer.getActiveDepthTextureId());
 		GL32.glUniform1i(this.depthTextureUniform, 1);
+		
 	}
 	
 	

core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/FogShader.java

@@ -28,9 +28,11 @@ import com.seibel.distanthorizons.core.render.glObject.shader.ShaderProgram;
 import com.seibel.distanthorizons.core.render.renderer.LodRenderer;
 import com.seibel.distanthorizons.core.render.renderer.ScreenQuad;
 import com.seibel.distanthorizons.core.util.LodUtil;
+import com.seibel.distanthorizons.core.wrapperInterfaces.IVersionConstants;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.distanthorizons.core.util.math.Mat4f;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftGLWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
 import org.lwjgl.opengl.GL32;
 
 import java.awt.*;
@@ -41,11 +43,14 @@ public class FogShader extends AbstractShaderRenderer
 	
 	private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
 	private static final IMinecraftGLWrapper GLMC = SingletonInjector.INSTANCE.get(IMinecraftGLWrapper.class);
+	private static final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
+	
 	
 	
 	public int frameBuffer;
 	
-	private Mat4f inverseMvmProjMatrix;
+	private Mat4f inverseMvmProjMatrix; 
+	
 	
 	
 	//==========//
@@ -253,7 +258,15 @@ public class FogShader extends AbstractShaderRenderer
 		
 		// this is necessary for MC 1.16 (IE Legacy OpenGL)
 		// otherwise the framebuffer isn't cleared correctly and the fog smears across the screen
-		GL32.glClear(GL32.GL_COLOR_BUFFER_BIT | GL32.GL_DEPTH_BUFFER_BIT);
+		if (MC_RENDER.runningLegacyOpenGL())
+		{
+			// in another part of the DH code we set the fog color to opaque, here it needs to be transparent
+			float[] clearColorValues = new float[4];
+			GL32.glGetFloatv(GL32.GL_COLOR_CLEAR_VALUE, clearColorValues);
+			GL32.glClearColor(clearColorValues[0], clearColorValues[1], clearColorValues[2], 0.0f);
+			
+			GL32.glClear(GL32.GL_COLOR_BUFFER_BIT | GL32.GL_DEPTH_BUFFER_BIT);
+		}
 		
 		
 		ScreenQuad.INSTANCE.render();

core/src/main/java/com/seibel/distanthorizons/core/render/renderer/shaders/SSAOApplyShader.java

@@ -134,9 +134,6 @@ public class SSAOApplyShader extends AbstractShaderRenderer
 		// it should be automatically restored after rendering is complete.
 		GLMC.disableDepthTest();
 		
-		GLMC.glActiveTexture(GL32.GL_TEXTURE0);
-		GLMC.glBindTexture(0);
-		
 		// apply the rendered SSAO to the LODs 
 		GLMC.glBindFramebuffer(GL32.GL_READ_FRAMEBUFFER, SSAOShader.INSTANCE.frameBuffer);
 		GLMC.glBindFramebuffer(GL32.GL_DRAW_FRAMEBUFFER, LodRenderer.getActiveFramebufferId());

core/src/main/java/com/seibel/distanthorizons/core/sql/dto/FullDataSourceV2DTO.java

@@ -454,7 +454,7 @@ public class FullDataSourceV2DTO
 	{
 		return MoreObjects.toStringHelper(this)
 				.add("levelMinY", this.levelMinY)
-				.add("pos", this.pos)
+				.add("pos", DhSectionPos.toString(this.pos))
 				.add("dataChecksum", this.dataChecksum)
 				.add("compressedDataByteArray length", this.compressedDataByteArray.size())
 				.add("compressedColumnGenStepByteArray length", this.compressedColumnGenStepByteArray.size())

core/src/main/java/com/seibel/distanthorizons/core/sql/repo/AbstractDhRepo.java

@@ -25,6 +25,7 @@ import com.seibel.distanthorizons.core.sql.DbConnectionClosedException;
 import com.seibel.distanthorizons.core.sql.dto.IBaseDTO;
 import com.seibel.distanthorizons.core.sql.repo.phantoms.AutoClosableTrackingWrapper;
 import com.seibel.distanthorizons.core.util.KeyedLockContainer;
+import com.seibel.distanthorizons.coreapi.ModInfo;
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.Nullable;
 
@@ -501,7 +502,12 @@ public abstract class AbstractDhRepo<TKey, TDTO extends IBaseDTO<TKey>> implemen
 					}
 					else
 					{
-						LOGGER.warn("Attempting to close already closed database connection: [" + connectionString + "]");
+						// these warnings can be ignored in release builds, as long as the connection is closed it doesn't really matter
+						// TODO fix duplicate closes
+						if (ModInfo.IS_DEV_BUILD)
+						{
+							LOGGER.warn("Attempting to close already closed database connection: [" + connectionString + "]");
+						}
 					}
 				}
 			}
@@ -562,7 +568,12 @@ public abstract class AbstractDhRepo<TKey, TDTO extends IBaseDTO<TKey>> implemen
 					}
 					else
 					{
-						LOGGER.warn("Attempting to close already closed database connection: [" + this.connectionString + "]");
+						// these warnings can be ignored in release builds, as long as the connection is closed it doesn't really matter
+						// TODO fix duplicate closes
+						if (ModInfo.IS_DEV_BUILD)
+						{
+							LOGGER.warn("Attempting to close already closed database connection: [" + this.connectionString + "]");
+						}
 					}
 				}
 				ACTIVE_CONNECTION_STRINGS_BY_REPO.remove(this);

core/src/main/java/com/seibel/distanthorizons/core/util/RenderDataPointUtil.java

@@ -73,7 +73,10 @@ public class RenderDataPointUtil
 	
 	
 	public final static int EMPTY_DATA = 0;
-	public final static int MAX_WORLD_Y_SIZE = 4096;
+
+	// the maximum valid Y value is the maximum min y + world height.
+	// min y is [-2032, 2031], height is < 4064.
+	public final static int MAX_WORLD_Y_SIZE = 2031 + 4064;
 	
 	public final static int ALPHA_DOWNSIZE_SHIFT = 4;
 	

core/src/main/java/com/seibel/distanthorizons/core/util/objects/GLMessage.java

@@ -1,430 +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.util.objects;
-
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.coreapi.ModInfo;
-import org.apache.logging.log4j.Logger;
-
-import java.lang.invoke.MethodHandles;
-import java.util.HashMap;
-import java.util.function.Function;
-
-/**
- * Handles parsing and creating string messages from OpenGL messages.
- *
- * @author Leetom
- * @version 2022-10-1
- */
-public final class GLMessage
-{
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger(MethodHandles.lookup().lookupClass().getSimpleName());
-	
-	static final String HEADER = "[LWJGL] OpenGL debug message";
-	public final EType type;
-	public final ESeverity severity;
-	public final ESource source;
-	public final String id;
-	public final String message;
-	
-	/** This is needed since gl callback will not have the correct class loader set, which causes issues. */
-	static void initLoadClass()
-	{
-		Builder dummy = new Builder();
-		dummy.add(GLMessage.HEADER);
-		dummy.add("ID");
-		dummy.add(":");
-		dummy.add("dummyId");
-		dummy.add("Source");
-		dummy.add(":");
-		dummy.add(ESource.API.name);
-		dummy.add("Type");
-		dummy.add(":");
-		dummy.add(EType.OTHER.name);
-		dummy.add("Severity");
-		dummy.add(":");
-		dummy.add(ESeverity.LOW.name);
-		dummy.add("Message");
-		dummy.add(":");
-		dummy.add("dummyMessage");
-	}
-	
-	static
-	{
-		initLoadClass();
-	}
-	
-	
-	
-	GLMessage(EType type, ESeverity severity, ESource source, String id, String message)
-	{
-		this.type = type;
-		this.source = source;
-		this.severity = severity;
-		this.id = id;
-		this.message = message;
-	}
-	
-	@Override
-	public String toString() { return "[level:" + severity + ", type:" + type + ", source:" + source + ", id:" + id + ", msg:{" + message + "}]"; }
-	
-	
-	
-	//==============//
-	// helper enums //
-	//==============//
-	
-	public enum EType
-	{
-		ERROR,
-		DEPRECATED_BEHAVIOR,
-		UNDEFINED_BEHAVIOR,
-		PORTABILITY,
-		PERFORMANCE,
-		MARKER,
-		PUSH_GROUP,
-		POP_GROUP,
-		OTHER;
-		
-		
-		private static final HashMap<String, EType> ENUM_BY_NAME = new HashMap<>();
-		
-		private final String name;
-		
-		
-		static
-		{
-			for (EType type : EType.values())
-			{
-				ENUM_BY_NAME.put(type.name, type);
-			}
-		}
-		
-		EType() { name = super.toString().toUpperCase(); }
-		
-		
-		@Override
-		public final String toString() { return name; }
-		
-		public static EType get(String name) { return ENUM_BY_NAME.get(name.toUpperCase()); }
-		
-	}
-	
-	public enum ESource
-	{
-		API,
-		WINDOW_SYSTEM,
-		SHADER_COMPILER,
-		THIRD_PARTY,
-		APPLICATION,
-		OTHER;
-		
-		
-		private static final HashMap<String, ESource> ENUM_BY_NAME = new HashMap<>();
-		
-		public final String name;
-		
-		
-		static
-		{
-			for (ESource source : ESource.values())
-			{
-				ENUM_BY_NAME.put(source.name, source);
-			}
-		}
-		
-		ESource() { name = super.toString().toUpperCase(); }
-		
-		
-		@Override
-		public final String toString() { return name; }
-		
-		public static ESource get(String name) { return ENUM_BY_NAME.get(name.toUpperCase()); }
-		
-	}
-	
-	public enum ESeverity
-	{
-		HIGH,
-		MEDIUM,
-		LOW,
-		NOTIFICATION;
-		
-		
-		public final String name;
-		
-		static final HashMap<String, ESeverity> ENUM_BY_NAME = new HashMap<>();
-		
-		
-		static
-		{
-			for (ESeverity severity : ESeverity.values())
-			{
-				ENUM_BY_NAME.put(severity.name, severity);
-			}
-		}
-		
-		ESeverity() { name = super.toString().toUpperCase(); }
-		
-		
-		@Override
-		public final String toString() { return name; }
-		
-		public static ESeverity get(String name) { return ENUM_BY_NAME.get(name.toUpperCase()); }
-		
-	}
-	
-	
-	
-	//================//
-	// helper classes //
-	//================//
-	
-	/**
-	 * Expected message format: <br>
-	 * <code>
-	 * [LWJGL] OpenGL debug message      <br>
-	 * ID: 0x20071                       <br>
-	 * Source: API                       <br>
-	 * Type: OTHER                       <br>
-	 * Severity: NOTIFICATION            <br>
-	 * Message: Buffer detailed info: Buffer object 1014084 (bound to ...
-	 * </code>
-	 */
-	public static class Builder
-	{
-		/** how many stages are present in the message parser */
-		private static final int FINAL_PARSER_STAGE_INDEX = 15;
-		
-		public static final Builder DEFAULT_MESSAGE_BUILDER =
-			new Builder(
-					(type) -> 
-					{ // type filter
-						if (type == GLMessage.EType.POP_GROUP)
-							return false;
-						if (type == GLMessage.EType.PUSH_GROUP)
-							return false;
-						if (type == GLMessage.EType.MARKER)
-							return false;
-						// if (type == GLMessage.Type.PERFORMANCE) return false;
-						return true;
-					},
-					(severity) -> 
-					{ // severity filter
-						if (severity == GLMessage.ESeverity.NOTIFICATION)
-							return false;
-						return true;
-					},
-					null
-			);
-		
-		
-		private final StringBuilder inProgressMessageBuilder = new StringBuilder();
-		
-		private EType type;
-		private ESeverity severity;
-		private ESource source;
-		
-		/** if the function returns false the message will be allowed */
-		private final Function<EType, Boolean> typeFilter;
-		/** if the function returns false the message will be allowed */
-		private final Function<ESeverity, Boolean> severityFilter;
-		/** if the function returns false the message will be allowed */
-		private final Function<ESource, Boolean> sourceFilter;
-		
-		private String id;
-		private String message;
-		/** how far into the message parser this builder is */
-		private int parserStage = 0;
-		
-		
-		
-		static
-		{
-			initLoadClass();
-		}
-		
-		public Builder() { this(null, null, null); }
-		
-		public Builder(
-				Function<EType, Boolean> typeFilter,
-				Function<ESeverity, Boolean> severityFilter,
-				Function<ESource, Boolean> sourceFilter)
-		{
-			this.typeFilter = typeFilter;
-			this.severityFilter = severityFilter;
-			this.sourceFilter = sourceFilter;
-		}
-		
-		
-		
-		/**
-		 * Adds the given string to the message builder. <br> <br>
-		 *
-		 * Will log a warning if the string given wasn't expected
-		 * for the next stage of the OpenGL message format.<br> <br>
-		 *
-		 * @return null if the message isn't complete
-		 */
-		public GLMessage add(String str)
-		{
-			// TODO fix implementation for MC 1.20.2 and newer
-			//  please see the incomplete GLMessageTest for an example as to how the message formats differ
-			if (true)
-				return null;
-			
-			str = str.trim();
-			if (str.isEmpty())
-				return null;
-			
-			boolean parseSuccess = runNextParserStage(str);
-			if (parseSuccess && parserStage > FINAL_PARSER_STAGE_INDEX)
-			{
-				this.parserStage = 0;
-				GLMessage msg = new GLMessage(this.type, this.severity, this.source, this.id, this.message);
-				if (doesMessagePassFilters(msg))
-				{
-					return msg;
-				}
-			}
-			else if (!parseSuccess)
-			{
-				LOGGER.warn("Failed to parse GLMessage line '{}' at stage {}", str, parserStage);
-			}
-			
-			// the message isn't finished yet
-			return null;
-			
-			// TODO implement a method that works for both MC 1.20.2+ and 1.20.1-
-			//if (str.equals(HEADER) && inProgressMessageBuilder.length() != 0)
-			//{
-			//	boolean parseSuccess = runNextParserStage(str);
-			//	if (parseSuccess && parserStage > FINAL_PARSER_STAGE_INDEX)
-			//	{
-			//		this.parserStage = 0;
-			//		GLMessage msg = new GLMessage(this.type, this.severity, this.source, this.id, this.message);
-			//		if (doesMessagePassFilters(msg))
-			//		{
-			//			return msg;
-			//		}
-			//		else
-			//		{
-			//			inProgressMessageBuilder.setLength(0);
-			//			return null;
-			//		}
-			//	}
-			//	else
-			//	{
-			//		if (!parseSuccess)
-			//		{
-			//			LOGGER.warn("Failed to parse GLMessage line '{}' at stage {}", str, parserStage);
-			//			inProgressMessageBuilder.setLength(0);
-			//		}
-			//		
-			//		return null;
-			//	}
-			//}
-			//else
-			//{
-			//	inProgressMessageBuilder.append(str);
-			//	return null;
-			//}
-		}
-		
-		private boolean doesMessagePassFilters(GLMessage msg)
-		{
-			if (this.sourceFilter != null && !this.sourceFilter.apply(msg.source))
-				return false;
-			else if (this.typeFilter != null && !this.typeFilter.apply(msg.type))
-				return false;
-			else if (this.severityFilter != null && !this.severityFilter.apply(msg.severity))
-				return false;
-			else
-				return true;
-		}
-		
-		/** @return true if the given string was expected next for the OpenGL message format */
-		private boolean runNextParserStage(String str)
-		{
-			switch (this.parserStage)
-			{
-				case 0:
-					return checkAndIncStage(str, GLMessage.HEADER);
-				case 1:
-					return checkAndIncStage(str, "ID");
-				case 2:
-					return checkAndIncStage(str, ":");
-				case 3:
-					this.id = str;
-					this.parserStage++;
-					return true;
-				case 4:
-					return checkAndIncStage(str, "Source");
-				case 5:
-					return checkAndIncStage(str, ":");
-				case 6:
-					this.source = ESource.get(str);
-					this.parserStage++;
-					return true;
-				case 7:
-					return checkAndIncStage(str, "Type");
-				case 8:
-					return checkAndIncStage(str, ":");
-				case 9:
-					this.type = EType.get(str);
-					this.parserStage++;
-					return true;
-				case 10:
-					return checkAndIncStage(str, "Severity");
-				case 11:
-					return checkAndIncStage(str, ":");
-				case 12:
-					this.severity = ESeverity.get(str);
-					this.parserStage++;
-					return true;
-				case 13:
-					return checkAndIncStage(str, "Message");
-				case 14:
-					return checkAndIncStage(str, ":");
-				case 15:
-					this.message = str;
-					this.parserStage++;
-					return true;
-				default:
-					return false;
-			}
-		}
-		
-		/**
-		 * Returns true and increments the parserStage
-		 * if the given and expected strings are the same.
-		 */
-		private boolean checkAndIncStage(String givenString, String expectedString)
-		{
-			boolean equal = givenString.equals(expectedString);
-			//boolean equal = givenString.contains(expectedString);
-			if (equal)
-				this.parserStage++;
-			return equal;
-		}
-		
-	} // builder class
-	
-}

core/src/main/java/com/seibel/distanthorizons/core/util/objects/GLMessages/EGLMessageSeverity.java

@@ -0,0 +1,54 @@
+/*
+ *    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.util.objects.GLMessages;
+
+import java.util.HashMap;
+
+public enum EGLMessageSeverity
+{
+	HIGH,
+	MEDIUM,
+	LOW,
+	NOTIFICATION;
+	
+	
+	public final String name;
+	
+	static final HashMap<String, EGLMessageSeverity> ENUM_BY_NAME = new HashMap<>();
+	
+	
+	static
+	{
+		for (EGLMessageSeverity severity : EGLMessageSeverity.values())
+		{
+			ENUM_BY_NAME.put(severity.name, severity);
+		}
+	}
+	
+	EGLMessageSeverity() { this.name = super.toString().toUpperCase(); }
+	
+	
+	@Override
+	public final String toString() { return this.name; }
+	
+	public static EGLMessageSeverity get(String name) { return ENUM_BY_NAME.get(name.toUpperCase()); }
+	
+}
+	

core/src/main/java/com/seibel/distanthorizons/core/util/objects/GLMessages/EGLMessageSource.java

@@ -0,0 +1,55 @@
+/*
+ *    This file is part of the Distant Horizons mod
+ *    licensed under the GNU LGPL v3 License.
+ *
+ *    Copyright (C) 2020 James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU Lesser General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.distanthorizons.core.util.objects.GLMessages;
+
+import java.util.HashMap;
+
+public enum EGLMessageSource
+{
+	API,
+	WINDOW_SYSTEM,
+	SHADER_COMPILER,
+	THIRD_PARTY,
+	APPLICATION,
+	OTHER;
+	
+	
+	private static final HashMap<String, EGLMessageSource> ENUM_BY_NAME = new HashMap<>();
+	
+	public final String name;
+	
+	
+	static
+	{
+		for (EGLMessageSource source : EGLMessageSource.values())
+		{
+			ENUM_BY_NAME.put(source.name, source);
+		}
+	}
+	
+	EGLMessageSource() { this.name = super.toString().toUpperCase(); }
+	
+	
+	@Override
+	public final String toString() { return this.name; }
+	
+	public static EGLMessageSource get(String name) { return ENUM_BY_NAME.get(name.toUpperCase()); }
+	
+}

core/src/main/java/com/seibel/distanthorizons/core/util/objects/GLMessages/EGLMessageType.java

@@ -0,0 +1,58 @@
+/*
+ *    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.util.objects.GLMessages;
+
+import java.util.HashMap;
+
+public enum EGLMessageType
+{
+	ERROR,
+	DEPRECATED_BEHAVIOR,
+	UNDEFINED_BEHAVIOR,
+	PORTABILITY,
+	PERFORMANCE,
+	MARKER,
+	PUSH_GROUP,
+	POP_GROUP,
+	OTHER;
+	
+	
+	private static final HashMap<String, EGLMessageType> ENUM_BY_NAME = new HashMap<>();
+	
+	public final String name;
+	
+	
+	static
+	{
+		for (EGLMessageType type : EGLMessageType.values())
+		{
+			ENUM_BY_NAME.put(type.name, type);
+		}
+	}
+	
+	EGLMessageType() { this.name = super.toString().toUpperCase(); }
+	
+	
+	@Override
+	public final String toString() { return this.name; }
+	
+	public static EGLMessageType get(String name) { return ENUM_BY_NAME.get(name.toUpperCase()); }
+	
+}

core/src/main/java/com/seibel/distanthorizons/core/util/objects/GLMessages/GLMessage.java

@@ -0,0 +1,56 @@
+/*
+ *    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.util.objects.GLMessages;
+
+public final class GLMessage
+{
+	static final String HEADER = "[LWJGL] OpenGL debug message";
+	public final EGLMessageType type;
+	public final EGLMessageSeverity severity;
+	public final EGLMessageSource source;
+	public final String id;
+	public final String message;
+	
+	
+	
+	GLMessage(EGLMessageType type, EGLMessageSeverity severity, EGLMessageSource source, String id, String message)
+	{
+		this.type = type;
+		this.source = source;
+		this.severity = severity;
+		this.id = id;
+		this.message = message;
+	}
+	
+	
+	
+	@Override
+	public String toString() 
+	{ 
+		return "level: [" + this.severity + "], " +
+				"type: [" + this.type + "], " +
+				"source: [" + this.source + "], " +
+				"id: [" + this.id + "], " +
+				"msg: [" + this.message + "]"; 
+	}
+	
+	
+	
+}

core/src/main/java/com/seibel/distanthorizons/core/util/objects/GLMessages/GLMessageBuilder.java

@@ -0,0 +1,319 @@
+/*
+ *    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.util.objects.GLMessages;
+
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import org.apache.logging.log4j.Logger;
+
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+/** Expected message formats can be found in GLMessageTest. */
+public class GLMessageBuilder
+{
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	
+	/** how many stages are present in the message parser */
+	private static final int FINAL_LEGACY_PARSER_STAGE_INDEX = 15;
+	private static final int FINAL_NEW_PARSER_STAGE_INDEX = 5;
+	
+	
+	
+	private EGLMessageType type;
+	private EGLMessageSeverity severity;
+	private EGLMessageSource source;
+	
+	/** if the function returns false the message will be allowed */
+	private final Function<EGLMessageType, Boolean> typeFilter;
+	/** if the function returns false the message will be allowed */
+	private final Function<EGLMessageSeverity, Boolean> severityFilter;
+	/** if the function returns false the message will be allowed */
+	private final Function<EGLMessageSource, Boolean> sourceFilter;
+	
+	private String id;
+	private String message;
+	/** how far into the message parser this builder is */
+	private int parserStage = 0;
+	
+	private boolean legacyMessage = true;
+	
+	
+	
+	//==============//
+	// constructors //
+	//==============//
+	
+	public GLMessageBuilder() { this(null, null, null); }
+	
+	public GLMessageBuilder(
+			Function<EGLMessageType, Boolean> typeFilter,
+			Function<EGLMessageSeverity, Boolean> severityFilter,
+			Function<EGLMessageSource, Boolean> sourceFilter)
+	{
+		this.typeFilter = typeFilter;
+		this.severityFilter = severityFilter;
+		this.sourceFilter = sourceFilter;
+	}
+	
+	
+	
+	//=================//
+	// message parsing //
+	//=================//
+	
+	/**
+	 * Adds the given string to the message builder. <br> <br>
+	 *
+	 * Will log a warning if the string given wasn't expected
+	 * for the next stage of the OpenGL message format.<br> <br>
+	 *
+	 * @return null if the message isn't complete
+	 */
+	public GLMessage add(String str)
+	{
+		str = str.trim();
+		if (str.isEmpty())
+		{
+			return null;
+		}
+		
+		boolean messageFinished = false;
+		boolean parseSuccess = this.runNextParserStage(str);
+		
+		
+		if (this.legacyMessage
+				&& this.parserStage > FINAL_LEGACY_PARSER_STAGE_INDEX)
+		{
+			messageFinished = true;
+		}
+		else if (!this.legacyMessage
+				&& this.parserStage > FINAL_NEW_PARSER_STAGE_INDEX)
+		{
+			messageFinished = true;
+		}
+		
+		
+		if (parseSuccess && messageFinished)
+		{
+			this.parserStage = 0;
+			GLMessage msg = new GLMessage(this.type, this.severity, this.source, this.id, this.message);
+			if (this.doesMessagePassFilters(msg))
+			{
+				return msg;
+			}
+		}
+		else if (!parseSuccess && messageFinished)
+		{
+			LOGGER.warn("Failed to parse GLMessage line [" + str + "] at stage [" + this.parserStage + "]");
+		}
+		
+		// the message isn't finished yet
+		return null;
+	}
+	
+	private boolean doesMessagePassFilters(GLMessage msg)
+	{
+		if (this.sourceFilter != null && !this.sourceFilter.apply(msg.source))
+			return false;
+		else if (this.typeFilter != null && !this.typeFilter.apply(msg.type))
+			return false;
+		else if (this.severityFilter != null && !this.severityFilter.apply(msg.severity))
+			return false;
+		else
+			return true;
+	}
+	
+	/** @return true if the given string was expected next for the OpenGL message format */
+	private boolean runNextParserStage(String str)
+	{
+		if (this.parserStage == 0)
+		{
+			return this.checkExactAndIncStage(str, GLMessage.HEADER);
+		}
+		else if (this.parserStage == 1)
+		{
+			// legacy message only contains "ID" (not the colon)
+			this.legacyMessage = !str.contains("ID: ");
+		}
+		
+		
+		if (this.legacyMessage)
+		{
+			return this.runNextLegacyParserStage(str);
+		}
+		else
+		{
+			return this.runNextNewParserStage(str);
+		}
+	}
+	/** MC 1.20.2 and older */
+	private boolean runNextLegacyParserStage(String str)
+	{
+		switch (this.parserStage)
+		{
+			case 0:
+				throw new IllegalStateException("Parser should be past stage ["+this.parserStage+"], next stage is [1].");
+			case 1:
+				return this.checkExactAndIncStage(str, "ID");
+			case 2:
+				return this.checkExactAndIncStage(str, ":");
+			case 3:
+				this.id = str;
+				this.parserStage++;
+				return true;
+			case 4:
+				return this.checkExactAndIncStage(str, "Source");
+			case 5:
+				return this.checkExactAndIncStage(str, ":");
+			case 6:
+				this.source = EGLMessageSource.get(str);
+				this.parserStage++;
+				return true;
+			case 7:
+				return this.checkExactAndIncStage(str, "Type");
+			case 8:
+				return this.checkExactAndIncStage(str, ":");
+			case 9:
+				this.type = EGLMessageType.get(str);
+				this.parserStage++;
+				return true;
+			case 10:
+				return this.checkExactAndIncStage(str, "Severity");
+			case 11:
+				return this.checkExactAndIncStage(str, ":");
+			case 12:
+				this.severity = EGLMessageSeverity.get(str);
+				this.parserStage++;
+				return true;
+			case 13:
+				return this.checkExactAndIncStage(str, "Message");
+			case 14:
+				return this.checkExactAndIncStage(str, ":");
+			case 15:
+				this.message = str;
+				this.parserStage++;
+				return true;
+			default:
+				return false;
+		}
+	}
+	/** after MC 1.20.2 */
+	private boolean runNextNewParserStage(String str)
+	{
+		switch (this.parserStage)
+		{
+			case 0:
+				throw new IllegalStateException("Parser should be past stage [" + this.parserStage + "], next stage is [1].");
+			case 1:
+				String idPrefix = "ID: ";
+				return this.checkPrefixAndRun(str, idPrefix,
+						(line) ->
+						{
+							this.id = trySubstring(str, idPrefix.length());
+							this.parserStage++;
+						});
+			case 2:
+				String sourcePrefix = "Source: ";
+				return this.checkPrefixAndRun(str, sourcePrefix,
+						(line) ->
+						{
+							String sourceString = trySubstring(str, sourcePrefix.length());
+							this.source = EGLMessageSource.get(sourceString);
+							this.parserStage++;
+						});
+			case 3:
+				String typePrefix = "Type: ";
+				return this.checkPrefixAndRun(str, typePrefix,
+						(line) ->
+						{
+							String sourceString = trySubstring(str, typePrefix.length());
+							this.type = EGLMessageType.get(sourceString);
+							this.parserStage++;
+						});
+			case 4:
+				String severityPrefix = "Severity: ";
+				return this.checkPrefixAndRun(str, severityPrefix,
+						(line) ->
+						{
+							String sourceString = trySubstring(str, severityPrefix.length());
+							this.severity = EGLMessageSeverity.get(sourceString);
+							this.parserStage++;
+						});
+			case 5:
+				String messagePrefix = "Message: ";
+				return this.checkPrefixAndRun(str, messagePrefix,
+						(line) ->
+						{
+							this.message = trySubstring(str, messagePrefix.length());
+							this.parserStage++;
+						});
+			default:
+				return false;
+		}
+	}
+	
+	
+	
+	//================//
+	// helper methods //
+	//================//
+	
+	/**
+	 * Returns true and increments the parserStage
+	 * if the message and expected strings are the same.
+	 */
+	private boolean checkExactAndIncStage(String message, String expectedString)
+	{
+		boolean equal = message.equals(expectedString);
+		if (equal)
+		{
+			this.parserStage++;
+		}
+		return equal;
+	}
+	
+	/**
+	 * Returns true and increments the parserStage
+	 * if the message starts with the given prefix.
+	 */
+	private boolean checkPrefixAndRun(String message, String expectedPrefix, Consumer<String> successConsumer)
+	{
+		boolean equal = message.startsWith(expectedPrefix);
+		if (equal)
+		{
+			successConsumer.accept(message);
+		}
+		return equal;
+	}
+	/** returns "" if the string isn't long enough */
+	private static String trySubstring(String string, int beginIndex)
+	{
+		if (beginIndex > string.length())
+		{
+			// prevent index-out-of-bounds errors
+			// if the message isn't what we expected
+			return "";
+		}
+		
+		return string.substring(beginIndex);
+	}
+	
+	
+}

core/src/main/java/com/seibel/distanthorizons/core/util/objects/GLMessages/GLMessageOutputStream.java

@@ -17,7 +17,7 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.distanthorizons.core.util.objects;
+package com.seibel.distanthorizons.core.util.objects.GLMessages;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -27,12 +27,12 @@ import java.util.function.Consumer;
 public final class GLMessageOutputStream extends OutputStream
 {
 	final Consumer<GLMessage> func;
-	final GLMessage.Builder builder;
+	final GLMessageBuilder builder;
 	
 	
 	private final ByteArrayOutputStream buffer = new ByteArrayOutputStream();
 	
-	public GLMessageOutputStream(Consumer<GLMessage> func, GLMessage.Builder builder)
+	public GLMessageOutputStream(Consumer<GLMessage> func, GLMessageBuilder builder)
 	{
 		this.func = func;
 		this.builder = builder;
@@ -41,24 +41,30 @@ public final class GLMessageOutputStream extends OutputStream
 	@Override
 	public void write(int b)
 	{
-		buffer.write(b);
-		if (b == '\n') flush();
+		this.buffer.write(b);
+		if (b == '\n')
+		{
+			this.flush();
+		}
 	}
 	
 	@Override
 	public void flush()
 	{
-		String str = buffer.toString();
-		GLMessage msg = builder.add(str);
-		if (msg != null) func.accept(msg);
-		buffer.reset();
+		String str = this.buffer.toString();
+		GLMessage msg = this.builder.add(str);
+		if (msg != null)
+		{
+			this.func.accept(msg);
+		}
+		this.buffer.reset();
 	}
 	
 	@Override
 	public void close() throws IOException
 	{
-		flush();
-		buffer.close();
+		this.flush();
+		this.buffer.close();
 	}
 	
 }

core/src/main/java/com/seibel/distanthorizons/core/util/threading/RateLimitedThreadPoolExecutor.java

@@ -78,9 +78,11 @@ public class RateLimitedThreadPoolExecutor extends ThreadPoolExecutor
 			long runTime = System.nanoTime() - this.runStartTime.get();
 			Thread.sleep(TimeUnit.NANOSECONDS.toMillis((long) (runTime / this.runTimeRatioConfig.get() - runTime)));
 		}
-		catch (InterruptedException e)
+		catch (InterruptedException ignore)
 		{
-			throw new RuntimeException(e);
+			// if this thread is interrupted that means the
+			// thread pool is being shut down,
+			// we don't need to log that.
 		}
 	}
 	

core/src/main/java/com/seibel/distanthorizons/core/util/threading/ThreadPoolUtil.java

@@ -89,7 +89,14 @@ public class ThreadPoolUtil
 	
 	public static void setupThreadPools()
 	{
-		// thread pools
+		//==================//
+		// main thread pool //
+		//==================//
+		
+		if (taskPicker != null)
+		{
+			taskPicker.shutdown();
+		}
 		taskPicker = new PriorityTaskPicker();
 		
 		networkCompressionThreadPool = taskPicker.createExecutor();
@@ -98,8 +105,22 @@ public class ThreadPoolUtil
 		updatePropagatorThreadPool = taskPicker.createExecutor();
 		worldGenThreadPool = taskPicker.createExecutor();
 		
-		// single thread pools
+		
+		
+		//=========================//
+		// standalone thread pools //
+		//=========================//
+		
+		if (beaconCullingThreadPool != null)
+		{
+			beaconCullingThreadPool.shutdown();
+		}
 		beaconCullingThreadPool = ThreadUtil.makeSingleThreadPool(BEACON_CULLING_THREAD_NAME);
+		
+		if (fullDataMigrationThreadPool != null)
+		{
+			fullDataMigrationThreadPool.shutdown();
+		}
 		fullDataMigrationThreadPool = ThreadUtil.makeSingleThreadPool(FULL_DATA_MIGRATION_THREAD_NAME);
 		
 	}

core/src/main/java/com/seibel/distanthorizons/core/world/DhClientWorld.java

@@ -39,8 +39,8 @@ public class DhClientWorld extends AbstractDhWorld implements IDhClientWorld
 	public final ClientOnlySaveStructure saveStructure;
 	public final ClientNetworkState networkState = new ClientNetworkState();
 	
-	public ExecutorService dhTickerThread = ThreadUtil.makeSingleThreadPool("Client World Ticker Thread");
-	public EventLoop eventLoop = new EventLoop(this.dhTickerThread, this::_clientTick);
+	public final ExecutorService dhTickerThread = ThreadUtil.makeSingleThreadPool("Client World Ticker Thread");
+	public final EventLoop eventLoop = new EventLoop(this.dhTickerThread, this::_clientTick);
 	
 	
 	
@@ -128,6 +128,8 @@ public class DhClientWorld extends AbstractDhWorld implements IDhClientWorld
 	{
 		this.networkState.close();
 		
+		this.dhTickerThread.shutdownNow();
+		
 		
 		for (DhClientLevel dhClientLevel : this.levels.values())
 		{

core/src/main/java/com/seibel/distanthorizons/core/world/DhServerWorld.java

@@ -37,6 +37,7 @@ public class DhServerWorld extends AbstractDhServerWorld<DhServerLevel>
 	}
 	
 	
+	
 	//================//
 	// level handling //
 	//================//

core/src/main/java/com/seibel/distanthorizons/core/world/IDhWorld.java

@@ -23,9 +23,11 @@ import com.seibel.distanthorizons.core.level.IDhLevel;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
 import org.jetbrains.annotations.NotNull;
 
+import java.io.Closeable;
 import java.util.concurrent.CompletableFuture;
 
-public interface IDhWorld
+// TODO why is this exist alongside AbstractDhWorld?
+public interface IDhWorld extends Closeable
 {
 	
 	IDhLevel getOrLoadLevel(@NotNull ILevelWrapper levelWrapper);

core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/block/IBlockStateWrapper.java

@@ -49,6 +49,11 @@ public interface IBlockStateWrapper extends IDhApiBlockStateWrapper
 	boolean isBeaconBlock();
 	/** IE a glass block that can affect the beacon beam color */
 	boolean isBeaconTintBlock();
+	/** 
+	 * Returns true for any blocks that allow beacon beams to go through.
+	 * IE: glass, stairs, bedrock, chests, end portal frames, carpet, cake 
+	 */
+	boolean allowsBeaconBeamPassage();
 	/** 
 	 * The blocks used by a beacon's base
 	 * IE Iron, diamond, gold, etc. 

core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/chunk/IChunkWrapper.java

@@ -381,8 +381,9 @@ public interface IChunkWrapper extends IBindable
 		for (int y = beaconRelPos.getY() +1; y <= maxY; y++)
 		{
 			IBlockStateWrapper block = centerChunk.getBlockState(beaconRelPos.getX(), y, beaconRelPos.getZ());
-			if (!block.isAir() && block.getOpacity() == LodUtil.BLOCK_FULLY_OPAQUE)
+			if (!block.allowsBeaconBeamPassage())
 			{
+				// beam is blocked by this block
 				return null;
 			}
 			

core/src/main/java/com/seibel/distanthorizons/core/wrapperInterfaces/minecraft/IMinecraftRenderWrapper.java

@@ -60,6 +60,9 @@ public interface IMinecraftRenderWrapper extends IBindable
 	int getScreenWidth();
 	int getScreenHeight();
 	
+	boolean mcRendersToFrameBuffer();
+	boolean runningLegacyOpenGL();
+	
 	/** @return -1 if no valid framebuffer is available yet */
 	int getTargetFrameBuffer(); // Note: Iris is now hooking onto this for DH + Iris compat, try not to change (unless we wanna deal with some annoyances)
 								//          Iris commit: https://github.com/IrisShaders/Iris/commit/a76a240527e93780bbcba57c09bef377419d47a7#diff-7b9ded0c79bbcdb130010373387756a28ee8d3640d522c0a5b7acd0abbfc20aeR16

core/src/main/resources/assets/distanthorizons/lang/en_us.json

@@ -477,7 +477,11 @@
   "distanthorizons.config.client.advanced.debugging.openGl.overrideVanillaGLLogger":
     "Override Vanilla GL Logger",
   "distanthorizons.config.client.advanced.debugging.openGl.overrideVanillaGLLogger.@tooltip":
-    "Defines how OpenGL errors are handled. \n Requires rebooting Minecraft to apply. \nMay incorrectly catch OpenGL errors thrown by other mods.",
+    "Defines how OpenGL errors are handled. \nRequires rebooting Minecraft to change. \nWill catch OpenGL errors thrown by other mods.",
+  "distanthorizons.config.client.advanced.debugging.openGl.onlyLogGlErrorsOnce":
+    "Only Log GL Errors Once",
+  "distanthorizons.config.client.advanced.debugging.openGl.onlyLogGlErrorsOnce.@tooltip":
+    "If true each Open GL error will only be logged once. \nTEnabling this may cause some error logs to be missed. \nDoes nothing if overrideVanillaGLLogger is set to false. \n\nGenerally this can be kept as 'true' to prevent log spam. \nHowever, Please set this to 'false' if a developer needs your log to debug a GL issue. \n",
   "distanthorizons.config.client.advanced.debugging.openGl.glErrorHandlingMode":
     "OpenGL Error Handling Mode",
   "distanthorizons.config.client.advanced.debugging.openGl.glErrorHandlingMode.@tooltip":
@@ -742,6 +746,10 @@
     "Maximum Data Transfer Speed, KB/s",
   "distanthorizons.config.server.maxDataTransferSpeed.@tooltip":
     "Maximum speed for uploading LODs to the clients, in KB/s.\nValue of 0 disables the limit.",
+  "distanthorizons.config.server.enableAdaptiveTransferSpeed":
+    "Enable Adaptive Transfer Speed",
+  "distanthorizons.config.server.enableAdaptiveTransferSpeed.@tooltip":
+    "Enables adaptive transfer speed based on client performance.\nIf true, DH will automatically adjust transfer rate to minimize connection lag.\nIf false, transfer speed will remain fixed.",
 
 
   "distanthorizons.config.server.experimental":

core/src/main/resources/shaders/apply.frag

@@ -8,17 +8,26 @@ uniform sampler2D gDhColorTexture;
 uniform sampler2D gDhDepthTexture;
 
 
-
+/** 
+ * LOD application shader
+ *
+ * This merges the rendered LODs into Minecraft's texture/FBO   
+ */
 void main()
 {
     fragColor = vec4(0.0);
     
-    float fragmentDepth = texture(gDhDepthTexture, TexCoord).r;
-
     // a fragment depth of "1" means the fragment wasn't drawn to,
     // only update fragments that were drawn to
-    if (fragmentDepth != 1) 
+    float fragmentDepth = texture(gDhDepthTexture, TexCoord).r;
+    if (fragmentDepth != 1)
     {
         fragColor = texture(gDhColorTexture, TexCoord);
     }
+    else
+    {
+        // use the original MC texture if no LODs were drawn to this fragment
+        discard;
+    }
 }
+

core/src/main/resources/shaders/fog/apply.frag

@@ -8,16 +8,19 @@ uniform sampler2D uColorTexture;
 uniform sampler2D uDepthTexture;
 
 
-
+/** 
+ * Fog application shader
+ *
+ * This merges the rendered fog onto DH's rendered LODs
+ */
 void main()
 {
-    fragColor = vec4(1.0);
-    
-    float fragmentDepth = textureLod(uDepthTexture, TexCoord, 0).r;
+    fragColor = vec4(0.0);
 
     // a fragment depth of "1" means the fragment wasn't drawn to,
     // only update fragments that were drawn to
-    if (fragmentDepth != 1) 
+    float fragmentDepth = textureLod(uDepthTexture, TexCoord, 0).r;
+    if (fragmentDepth != 1)
     {
         fragColor = texture(uColorTexture, TexCoord);
     }

core/src/test/java/tests/DhRepoSqliteTest.java

@@ -23,6 +23,7 @@ import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.pos.DhChunkPos;
 import com.seibel.distanthorizons.core.sql.DatabaseUpdater;
 import com.seibel.distanthorizons.core.sql.repo.AbstractDhRepo;
+import com.seibel.distanthorizons.core.sql.repo.phantoms.AutoClosableTrackingWrapper;
 import org.apache.logging.log4j.Logger;
 import org.junit.Assert;
 import org.junit.BeforeClass;
@@ -218,6 +219,12 @@ public class DhRepoSqliteTest
 	@Test
 	public void testRepoLeakDetection()
 	{
+		if (!AutoClosableTrackingWrapper.TRACK_WRAPPERS)
+		{
+			System.out.println("Skipping repo leak detection unit test. Leak tracking is disabled.");
+			return;
+		}
+		
 		TestPrimaryKeyRepo primaryKeyRepo = null;
 		try
 		{
@@ -298,7 +305,8 @@ public class DhRepoSqliteTest
 					}
 				}
 				
-				//Assert.assertNotEquals(0, primaryKeyRepo.openClosables.size()); // TODO fails when built for release due to tracking being disabled
+				// TODO fails when built for release due to tracking being disabled
+				Assert.assertNotEquals(0, primaryKeyRepo.openClosables.size());
 				primaryKeyRepo.openClosables.clear();
 				
 				
@@ -318,7 +326,7 @@ public class DhRepoSqliteTest
 					}
 				}
 				
-				//Assert.assertNotEquals(0, primaryKeyRepo.openClosables.size());
+				Assert.assertNotEquals(0, primaryKeyRepo.openClosables.size());
 			}
 		}
 		catch (SQLException e)

core/src/test/java/tests/GLMessageTest.java

@@ -19,7 +19,7 @@
 
 package tests;
 
-import com.seibel.distanthorizons.core.util.objects.GLMessage;
+import com.seibel.distanthorizons.core.util.objects.GLMessages.*;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -28,66 +28,88 @@ import java.util.ArrayList;
 public class GLMessageTest
 {
 	public static final String MESSAGE_ID = "0x20071";
-	public static final GLMessage.ESource MESSAGE_SOURCE = GLMessage.ESource.API;
-	public static final GLMessage.EType MESSAGE_TYPE = GLMessage.EType.OTHER;
-	public static final GLMessage.ESeverity MESSAGE_SEVERITY = GLMessage.ESeverity.NOTIFICATION;
+	public static final EGLMessageSource MESSAGE_SOURCE = EGLMessageSource.API;
+	public static final EGLMessageType MESSAGE_TYPE = EGLMessageType.OTHER;
+	public static final EGLMessageSeverity MESSAGE_SEVERITY = EGLMessageSeverity.NOTIFICATION;
 	public static final String MESSAGE = "Buffer detailed info: Buffer object 1014084 (bound to GL_ARRAY_BUFFER_ARB, usage hint is GL_STATIC_DRAW) will use VIDEO memory as\" \"the source for buffer object operations.";
 	
 	
 	/** This is how debug messages were sent prior to Minecraft 1.20.2 */
-	private static final String[] PRE_1_20_2_MESSAGE_ARRAY = 
+	private static final String[] OLD_MESSAGE_ARRAY = 
 			{
 				 "[LWJGL] OpenGL debug message"
-				,"ID", ":", "0x20071"
-				,"Source", ":", "API"
-				,"Type", ":", "OTHER"
-				,"Severity", ":", "NOTIFICATION"
-				,"Message", ":", "Buffer detailed info: Buffer object 1014084 (bound to GL_ARRAY_BUFFER_ARB, usage hint is GL_STATIC_DRAW) will use VIDEO memory as\" \"the source for buffer object operations."
+				,"ID", ":", MESSAGE_ID
+				,"Source", ":", MESSAGE_SOURCE.name
+				,"Type", ":", MESSAGE_TYPE.name
+				,"Severity", ":", MESSAGE_SEVERITY.name
+				,"Message", ":", MESSAGE
 				
 				// optional addition to force the builder into noticing the message ended, shouldn't be necessary	
 				//,"[LWJGL] OpenGL debug message"
 			};
 	
 	/** This is how debug messages were sent after (and including) Minecraft 1.20.2 */
-	private static final String[] POST_1_20_2_MESSAGE_ARRAY = 
+	private static final String[] NEW_MESSAGE_ARRAY = 
 			{
 				 "[LWJGL] OpenGL debug message"
-				,"ID: 0x20071"
-				,"Source: API"
-				,"Type: OTHER"
-				,"Severity: NOTIFICATION"
-				,"Message: Buffer detailed info: Buffer object 1014084 (bound to GL_ARRAY_BUFFER_ARB, usage hint is GL_STATIC_DRAW) will use VIDEO memory as\" \"the source for buffer object operations."
-					
+				,"ID: " + MESSAGE_ID
+				,"Source: " + MESSAGE_SOURCE.name
+				,"Type: " + MESSAGE_TYPE.name
+				,"Severity: " + MESSAGE_SEVERITY.name
+				,"Message: " + MESSAGE
+				
 				// optional addition to force the builder into noticing the message ended, shouldn't be necessary	
 				//,"[LWJGL] OpenGL debug message"
 			};
 	
+	public final GLMessageBuilder messageBuilder = new GLMessageBuilder(null, null, null);
 	
 	
+	
+	//=======//
+	// tests //
+	//=======//
+	
 	@Test
 	public void preMc1_20_2()
 	{
 		ArrayList<GLMessage> messageList = new ArrayList<>();
-		for (String str : PRE_1_20_2_MESSAGE_ARRAY)
+		for (String str : OLD_MESSAGE_ARRAY)
 		{
-			GLMessage message = GLMessage.Builder.DEFAULT_MESSAGE_BUILDER.add(str);
+			GLMessage message = this.messageBuilder.add(str);
 			if (message != null)
 			{
 				messageList.add(message);
 			}
 		}
 		
-		//Assert.assertEquals("Incorrect message parse count.", 1, messageList.size());
-		//testMessage(messageList.get(0));
+		Assert.assertEquals("Incorrect message parse count.", 1, messageList.size());
+		messageMatchesExpected(messageList.get(0));
 	}
 	
 	@Test
 	public void mc1_20_2()
 	{
-		// TODO
+		ArrayList<GLMessage> messageList = new ArrayList<>();
+		for (String str : NEW_MESSAGE_ARRAY)
+		{
+			GLMessage message = this.messageBuilder.add(str);
+			if (message != null)
+			{
+				messageList.add(message);
+			}
+		}
+		
+		Assert.assertEquals("Incorrect message parse count.", 1, messageList.size());
+		messageMatchesExpected(messageList.get(0));
 	}
 	
 	
+	
+	//================//
+	// helper methods //
+	//================//
+	
 	private static void messageMatchesExpected(GLMessage testMessage)
 	{
 		Assert.assertEquals(MESSAGE_ID, testMessage.id);
@@ -97,4 +119,6 @@ public class GLMessageTest
 		Assert.assertEquals(MESSAGE, testMessage.message);
 	}
 	
+	
+	
 }