up version number 2.4.4 -> 2.4.5

This reverts commit 50bdb73a52.

.editorconfig

@@ -4,14 +4,13 @@
 
 [*]
 charset = utf-8
-end_of_line = crlf
 indent_size = 4
 indent_style = space
 insert_final_newline = false
 max_line_length = 1000
 tab_width = 4
 trim_trailing_whitespace = false
-ij_continuation_indent_size = 8
+ij_continuation_indent_size = 4
 ij_formatter_off_tag = @formatter:off
 ij_formatter_on_tag = @formatter:on
 ij_formatter_tags_enabled = true
@@ -537,7 +536,7 @@ ij_groovy_wrap_chain_calls_after_dot = false
 ij_groovy_wrap_long_lines = false
 
 [{*.har,*.json,*.png.mcmeta,mcmod.info,pack.mcmeta}]
-indent_size = 2
+indent_size = 4
 ij_json_array_wrapping = split_into_lines
 ij_json_keep_blank_lines_in_code = 0
 ij_json_keep_indents_on_empty_lines = false

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

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

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

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

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

@@ -22,7 +22,9 @@ package com.seibel.distanthorizons.api.enums.config;
 /**
  * UNCOMPRESSED <br>
  * LZ4 <br>
- * XZ <br><br>
+ * Z_STD <br>
+ * Z_STD_STREAM <br>
+ * LZMA2 <br><br>
  * 
  * Note: speed and compression ratios are examples
  * and should only be used for estimated comparisons.
@@ -32,15 +34,11 @@ package com.seibel.distanthorizons.api.enums.config;
  */
 public enum EDhApiDataCompressionMode
 {
-	// Reminder:
-	// when adding items up the API minor version
-	// when removing items up the API major version
-	
 	/** 
 	 * Should only be used internally and for unit testing. <br><br> 
 	 * 
-	 * Read Speed: 1.64 MS / DTO <br>
+	 * Read Speed: 6.09 MS / DTO <br>
-	 * Write Speed: 12.44 MS / DTO <br>
+	 * Write Speed: 6.01 MS / DTO <br>
 	 * Compression ratio: 1.0 <br>
 	 */
 	@DisallowSelectingViaConfigGui
@@ -49,28 +47,42 @@ public enum EDhApiDataCompressionMode
 	/** 
 	 * Extremely fast (often faster than uncompressed), but generally poor compression. <br><br> 
 	 * 
-	 * Read Speed: 1.85 MS / DTO <br>
+	 * Read Speed: 3.25 MS / DTO <br>
-	 * Write Speed: 9.46 MS / DTO <br>
+	 * Write Speed: 5.99 MS / DTO <br>
-	 * Compression ratio: 0.3638 <br>
+	 * Compression ratio: 0.4513 <br>
 	 */
 	LZ4(1),
 	
-	/*
+	/**
-	 * Decent speed and good compression. <br><br> 
+	 * Great speed and good compression. <br><br> 
 	 *
-	 * Read Speed: 11.78 MS / DTO <br>
+	 * Read Speed: 2.1 MS / DTO <br>
-	 * Write Speed: 16.76 MS / DTO <br>
+	 * Write Speed: 4.9 MS / DTO <br>
-	 * Compression ratio: 0.2199 <br>
+	 * Compression ratio: 0.2606 <br>
 	 */
-	//@Deprecated
+	Z_STD_BLOCK(4),
-	//Z_STD(2),
+	
+	/**
+	 * Similar to {@link EDhApiDataCompressionMode#Z_STD_BLOCK}
+	 * except slower. <br><br>
+	 * 
+	 * This option is only provided for legacy support when processing old databases. <br><br>
+	 * 
+	 * Read Speed: 9.31 MS / DTO <br>
+	 * Write Speed: 15.13 MS / DTO <br>
+	 * Compression ratio: 0.2606 <br>
+	 */
+	@Deprecated
+	@DisallowSelectingViaConfigGui
+	Z_STD_STREAM(2),
 	
 	/** 
-	 * Extremely slow, but very good compression. <br><br> 
+	 * Extremely slow, but very good compression. <br>
-	 *
+	 * Often causes whole computer stuttering due to memory bandwidth saturation. <br><br>
-	 * Read Speed: 12.25 MS / DTO <br>
+	 * 
-	 * Write Speed: 490.07 MS / DTO <br>
+	 * Read Speed: 13.29 MS / DTO <br>
-	 * Compression ratio: 0.1242 <br>
+	 * Write Speed: 70.95 MS / DTO <br>
+	 * Compression ratio: 0.2068 <br>
 	 */
 	LZMA2(3);
 	

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

@@ -44,6 +44,10 @@ public enum EDhApiGpuUploadMethod
 	/** Fast rendering but may stutter when uploading. */
 	SUB_DATA(false, false),
 	
+	///** Don't upload, only should be used for debugging */
+	//@Deprecated
+	//NONE(false, false),
+	
 	/**
 	 * May end up storing buffers in System memory. <br>
 	 * Fast rending if in GPU memory, slow if in system memory, <br>

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

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

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

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

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

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

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

@@ -17,23 +17,37 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.distanthorizons.core.generation.tasks;
+package com.seibel.distanthorizons.api.enums.config;
 
-import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
+import org.apache.logging.log4j.Level;
-
-import javax.annotation.Nullable;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Consumer;
 
 /**
- * @author Leetom
+ * ALL
- * @version 2022-11-25
+ * DEBUG
+ * INFO
+ * WARN
+ * ERROR
+ * DISABLED
+ * 
+ * @since API 5.0.0
+ * @version 2024-4-6
  */
-public interface IWorldGenTaskTracker
+public enum EDhApiLoggerLevel
 {
-	@Nullable
+	// ordered from most to least broad
-	Consumer<FullDataSourceV2> getDataSourceConsumer();
+	ALL(Level.ALL),
+	DEBUG(Level.DEBUG),
+	INFO(Level.INFO),
+	WARN(Level.WARN),
+	ERROR(Level.ERROR),
+	DISABLED(Level.OFF),
+	;
+	
+	public final Level level;
+	
+	EDhApiLoggerLevel(Level level)
+	{ this.level = level; }
+	
 	
-	CompletableFuture<Boolean> shouldGenerateSplitChild(long pos);
 	
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

api/src/main/java/com/seibel/distanthorizons/api/interfaces/override/worldGenerator/IDhApiWorldGenerator.java

@@ -169,7 +169,7 @@ public interface IDhApiWorldGenerator extends Closeable, IDhApiOverrideable
 	 *
 	 * After the {@link IDhApiWorldGenerator} has been generated, it should be passed into the
 	 * resultConsumer's {@link Consumer#accept(Object)} method.
-	 * Note: if air blocks aren't included in the with the {@link DhApiChunk} with proper lighting, lower detail levels will appear as black/unlit.
+	 * Note: if air blocks aren't included in the {@link IDhApiFullDataSource} with proper lighting, lower detail levels will appear as black/unlit.
 	 *
 	 * @implNote the default implementation of this method throws an {@link UnsupportedOperationException},
 	 * and must be overridden when {@link #getReturnType()} returns {@link EDhApiWorldGeneratorReturnType#API_CHUNKS}.

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

@@ -0,0 +1,48 @@
+/*
+ *    This file is part of the Distant Horizons mod
+ *    licensed under the GNU LGPL v3 License.
+ *
+ *    Copyright (C) 2020 James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU Lesser General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.distanthorizons.api.methods.events.abstractEvents;
+
+import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEvent;
+import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiEventParam;
+import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiTextureCreatedParam;
+
+/**
+ * Called after Distant Horizons (re)creates 
+ * the color and depth textures it renders to. <br>
+ * 
+ * @author James Seibel
+ * @version 2025-6-9
+ * @since API 4.1.0
+ */
+public abstract class DhApiAfterColorDepthTextureCreatedEvent implements IDhApiEvent<DhApiTextureCreatedParam>
+{
+	/** Fired before Distant Horizons creates. */
+	public abstract void onResize(DhApiEventParam<DhApiTextureCreatedParam> event);
+	
+	
+	//=========================//
+	// internal DH API methods //
+	//=========================//
+	
+	@Override
+	public final void fireEvent(DhApiEventParam<DhApiTextureCreatedParam> event) { this.onResize(event); }
+	
+	
+}

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

@@ -0,0 +1,49 @@
+/*
+ *    This file is part of the Distant Horizons mod
+ *    licensed under the GNU LGPL v3 License.
+ *
+ *    Copyright (C) 2020 James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU Lesser General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.distanthorizons.api.methods.events.abstractEvents;
+
+import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEvent;
+import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEventParam;
+import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiEventParam;
+import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiTextureCreatedParam;
+
+/**
+ * Called before Distant Horizons (re)creates 
+ * the color and depth textures it renders to. <br>
+ * 
+ * @author James Seibel
+ * @version 2025-6-9
+ * @since API 4.1.0
+ */
+public abstract class DhApiBeforeColorDepthTextureCreatedEvent implements IDhApiEvent<DhApiTextureCreatedParam>
+{
+	/** Fired before Distant Horizons creates. */
+	public abstract void onResize(DhApiEventParam<DhApiTextureCreatedParam> event);
+	
+	
+	//=========================//
+	// internal DH API methods //
+	//=========================//
+	
+	@Override
+	public final void fireEvent(DhApiEventParam<DhApiTextureCreatedParam> event) { this.onResize(event); }
+	
+	
+}

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

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

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

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

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

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

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

@@ -20,6 +20,8 @@
 package com.seibel.distanthorizons.api.methods.events.sharedParameterObjects;
 
 import com.seibel.distanthorizons.api.enums.rendering.EDhApiRenderPass;
+import com.seibel.distanthorizons.api.interfaces.world.IDhApiLevelWrapper;
+import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiWorldLoadEvent;
 import com.seibel.distanthorizons.api.methods.events.interfaces.IDhApiEventParam;
 import com.seibel.distanthorizons.api.objects.math.DhApiMat4f;
 
@@ -27,7 +29,7 @@ import com.seibel.distanthorizons.api.objects.math.DhApiMat4f;
  * Contains information relevant to Distant Horizons and Minecraft rendering.
  *
  * @author James Seibel
- * @version 2024-1-31
+ * @version 2025-12-23
  * @since API 1.0.0
  */
 public class DhApiRenderParam implements IDhApiEventParam
@@ -38,7 +40,7 @@ public class DhApiRenderParam implements IDhApiEventParam
 	/** Indicates how far into this tick the frame is. */
 	public final float partialTicks;
 	
-	/** 
+	/**
 	 * Indicates DH's near clip plane, measured in blocks. 
 	 * Note: this may change based on time, player speed, and other factors. 
 	 */
@@ -61,22 +63,29 @@ public class DhApiRenderParam implements IDhApiEventParam
 	
 	public final int worldYOffset;
 	
+	/**
+	 * The level currently being rendered.
+	 * 
+	 * @since API 5.1.0 
+	 */
+	public final IDhApiLevelWrapper clientLevelWrapper;
+	
 	
 	
 	//==============//
 	// constructors //
 	//==============//
 	
-	
 	public DhApiRenderParam(DhApiRenderParam parent)
 	{
 		this(
-				parent.renderPass,
+			parent.renderPass,
-				parent.partialTicks,
+			parent.partialTicks,
-				parent.nearClipPlane, parent.farClipPlane,
+			parent.nearClipPlane, parent.farClipPlane,
-				parent.mcProjectionMatrix.copy(), parent.mcModelViewMatrix.copy(),
+			parent.mcProjectionMatrix.copy(), parent.mcModelViewMatrix.copy(),
-				parent.dhProjectionMatrix.copy(), parent.dhModelViewMatrix.copy(),
+			parent.dhProjectionMatrix.copy(), parent.dhModelViewMatrix.copy(),
-				parent.worldYOffset
+			parent.worldYOffset,
+			parent.clientLevelWrapper
 		);
 	}
 	public DhApiRenderParam(
@@ -85,8 +94,9 @@ public class DhApiRenderParam implements IDhApiEventParam
 			float nearClipPlane, float farClipPlane,
 			DhApiMat4f newMcProjectionMatrix, DhApiMat4f newMcModelViewMatrix,
 			DhApiMat4f newDhProjectionMatrix, DhApiMat4f newDhModelViewMatrix,
-			int worldYOffset
+			int worldYOffset,
-			)
+			IDhApiLevelWrapper clientLevelWrapper
+		)
 	{
 		this.renderPass = renderPass;
 		
@@ -102,6 +112,7 @@ public class DhApiRenderParam implements IDhApiEventParam
 		this.dhModelViewMatrix = newDhModelViewMatrix;
 		
 		this.worldYOffset = worldYOffset;
+		this.clientLevelWrapper = clientLevelWrapper;
 		
 	}
 	
@@ -111,10 +122,9 @@ public class DhApiRenderParam implements IDhApiEventParam
 	// base overrides //
 	//================//
 	
-	@Override 
+	@Override
-	public DhApiRenderParam copy()
+	public DhApiRenderParam copy() { return new DhApiRenderParam(this); }
-	{
+	
-		return new DhApiRenderParam(this); 
+	
-	}
 	
 }

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

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

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

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

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

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

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

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

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

@@ -43,11 +43,9 @@ public class DependencyInjector<BindableType extends IBindable> implements IDepe
 	protected final boolean allowDuplicateBindings;
 	
 	
-	public DependencyInjector(Class<BindableType> newBindableInterface)
+	//==============//
-	{
+	// constructors //
-		this.bindableInterface = newBindableInterface;
+	//==============//
-		this.allowDuplicateBindings = false;
-	}
 	
 	public DependencyInjector(Class<BindableType> newBindableInterface, boolean newAllowDuplicateBindings)
 	{
@@ -57,12 +55,16 @@ public class DependencyInjector<BindableType extends IBindable> implements IDepe
 	
 	
 	
+	//=========//
+	// binding //
+	//=========//
 	
 	@Override
 	public void bind(Class<? extends BindableType> dependencyInterface, BindableType dependencyImplementation) throws IllegalStateException, IllegalArgumentException
 	{
 		// duplicate check if requested
-		if (this.dependencies.containsKey(dependencyInterface) && !this.allowDuplicateBindings)
+		if (this.dependencies.containsKey(dependencyInterface) 
+			&& !this.allowDuplicateBindings)
 		{
 			throw new IllegalStateException("The dependency [" + dependencyInterface.getSimpleName() + "] has already been bound.");
 		}
@@ -130,6 +132,54 @@ public class DependencyInjector<BindableType extends IBindable> implements IDepe
 	public boolean checkIfClassExtends(Class<?> classToTest, Class<?> extensionToLookFor) { return extensionToLookFor.isAssignableFrom(classToTest); }
 	
 	
+	
+	//===========//
+	// unbinding //
+	//===========//
+	
+	// TODO having a bindOrReplace method would probably be better since it wouldn't have the possiblity of having nothing bound
+	public void unbind(Class<? extends BindableType> dependencyInterface, BindableType dependencyImplementation) throws IllegalStateException, IllegalArgumentException
+	{
+		// check if this object is bound
+		if (!this.dependencies.containsKey(dependencyInterface))
+		{
+			return;
+		}
+		
+		
+		// make sure the given dependency implements the necessary interfaces
+		boolean implementsInterface = this.checkIfClassImplements(dependencyImplementation.getClass(), dependencyInterface)
+				|| this.checkIfClassExtends(dependencyImplementation.getClass(), dependencyInterface);
+		boolean implementsBindable = this.checkIfClassImplements(dependencyImplementation.getClass(), this.bindableInterface);
+		
+		// display any errors
+		if (!implementsInterface)
+		{
+			throw new IllegalArgumentException("The dependency [" + dependencyImplementation.getClass().getSimpleName() + "] doesn't implement or extend: [" + dependencyInterface.getSimpleName() + "].");
+		}
+		if (!implementsBindable)
+		{
+			throw new IllegalArgumentException("The dependency [" + dependencyImplementation.getClass().getSimpleName() + "] doesn't implement the interface: [" + IBindable.class.getSimpleName() + "].");
+		}
+		
+		
+		// make sure the hashSet has an array to hold the dependency
+		if (!this.dependencies.containsKey(dependencyInterface))
+		{
+			this.dependencies.put(dependencyInterface, new ArrayList<BindableType>());
+		}
+		
+		// remove the dependency if present
+		this.dependencies.get(dependencyInterface).remove(dependencyImplementation);
+		this.dependencies.remove(dependencyInterface);
+	}
+	
+	
+	
+	//=========//
+	// getters //
+	//=========//
+	
 	@SuppressWarnings("unchecked")
 	@Override
 	public <T extends BindableType> T get(Class<T> interfaceClass) throws ClassCastException

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

@@ -31,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 = 13;
 	public static final String WRAPPER_PACKET_PATH = "message";
 	
 	/** The internal mod name */
 	public static final String NAME = "DistantHorizons";
 	/** Human-readable version of NAME */
 	public static final String READABLE_NAME = "Distant Horizons";
-	public static final String VERSION = "2.3.3-b-dev";
+	public static final String VERSION = "2.4.5-b";
 	/** Returns true if the current build is an unstable developer build, false otherwise. */
 	public static final boolean IS_DEV_BUILD = VERSION.toLowerCase().contains("dev");
 	
 	/** This version should only be updated when breaking changes are introduced to the DH API */
-	public static final int API_MAJOR_VERSION = 4;
+	public static final int API_MAJOR_VERSION = 5;
 	/** This version should be updated whenever new methods are added to the DH API */
-	public static final int API_MINOR_VERSION = 0;
+	public static final int API_MINOR_VERSION = 1;
 	/** This version should be updated whenever non-breaking fixes are added to the DH API */
 	public static final int API_PATCH_VERSION = 0;
 	

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

@@ -1,83 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.coreapi.interfaces.config;
-
-
-import java.util.function.Consumer;
-
-/**
- * Use for making the config variables
- *
- * @author coolGi
- * @version 2022-5-26
- */
-public interface IConfigEntry<T>
-{
-	
-	/** Gets the default value of the option */
-	T getDefaultValue();
-	
-	void setApiValue(T newApiValue);
-	T getApiValue();
-	
-	/** Returns true if this config can be set via the API. */
-	boolean getAllowApiOverride();
-	
-	void set(T newValue);
-	T get();
-	T getTrueValue();
-	
-	/** Sets the value without saving */
-	void setWithoutSaving(T newValue);
-	
-	/** Gets the min value */
-	T getMin();
-	/** Sets the min value */
-	void setMin(T newMin);
-	/** Gets the max value */
-	T getMax();
-	/** Sets the max value */
-	void setMax(T newMax);
-	/** Sets the min and max in 1 setter */
-	void setMinMax(T newMin, T newMax);
-	
-	/** Gets the comment */
-	String getComment();
-	/** Sets the comment */
-	void setComment(String newComment);
-	
-	/**
-	 * Checks if the option is valid
-	 *
-	 * 0 == valid
-	 * 2 == invalid
-	 * 1 == number too high
-	 * -1 == number too low
-	 */
-	byte isValid(); // TODO replace with an enum
-	/** Checks if a value is valid */
-	byte isValid(T value);
-	
-	/** Is the value of this equal to another */
-	boolean equals(IConfigEntry<?> obj);
-	
-	void addValueChangeListener(Consumer<T> onValueChangeFunc);
-	
-}

core/build.gradle

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

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

@@ -19,43 +19,63 @@
 
 package com.seibel.distanthorizons.core;
 
+import com.github.luben.zstd.ZstdOutputStream;
+import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiBeforeRenderEvent;
+import com.seibel.distanthorizons.core.config.Config;
+import com.seibel.distanthorizons.core.config.eventHandlers.IgnoredDimensionCsvHandler;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.render.renderer.generic.GenericRenderObjectFactory;
 import com.seibel.distanthorizons.core.sql.DatabaseUpdater;
 import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
-import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
-import com.seibel.distanthorizons.coreapi.ModInfo;
 import com.seibel.distanthorizons.core.world.DhApiWorldProxy;
 import com.seibel.distanthorizons.core.api.external.methods.config.DhApiConfig;
 import com.seibel.distanthorizons.core.api.external.methods.data.DhApiTerrainDataRepo;
 import com.seibel.distanthorizons.api.DhApi;
 import com.seibel.distanthorizons.core.render.DhApiRenderProxy;
+import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
+import com.seibel.distanthorizons.coreapi.util.StringUtil;
 import net.jpountz.lz4.LZ4FrameOutputStream;
-import org.apache.logging.log4j.LogManager;
+import com.seibel.distanthorizons.core.logging.DhLogger;
-import org.apache.logging.log4j.Logger;
 import org.sqlite.SQLiteJDBCLoader;
-import org.sqlite.util.OSInfo;
 import org.tukaani.xz.XZOutputStream;
 
-import java.awt.*;
+import java.lang.management.GarbageCollectorMXBean;
-import java.io.File;
+import java.lang.management.ManagementFactory;
+import java.util.List;
 
 /** Handles first time Core setup. */
 public class Initializer
 {
-	private static final Logger LOGGER = LogManager.getLogger(ModInfo.NAME + "-" + Initializer.class.getSimpleName());
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	
 	private static final IMinecraftClientWrapper MC_CLIENT = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
 	
 	
+	
 	public static void init()
 	{
+		LOGGER.info("Running library validation...");
+		
 		// confirm that all referenced libraries are available to use
 		try
 		{
 			// if any library isn't present in the jar its class
 			// will throw an error (not an exception)
-			Class<?> fastCompressor = LZ4FrameOutputStream.class;
+			Class<?> lz4Compressor = LZ4FrameOutputStream.class;
-			Class<?> smallCompressor = XZOutputStream.class;
+			Class<?> zstdCompressor = ZstdOutputStream.class;
+			
+			{
+				byte[] testCompressByteArray = new byte[1024];
+				for (int i = 0; i < testCompressByteArray.length; i++)
+				{
+					testCompressByteArray[i] = (byte) (i % 126);
+				}
+				byte[] compressedBytes = com.github.luben.zstd.Zstd.compress(testCompressByteArray);
+				com.github.luben.zstd.Zstd.decompress(compressedBytes);
+			}
+			
+			Class<?> lzmaCompressor = XZOutputStream.class;
 			//Class<?> networking = ByteBuf.class;
 			Class<?> config = com.electronwill.nightconfig.core.Config.class;
 			Class<?> oldFastUtil = it.unimi.dsi.fastutil.longs.LongArrayList.class; // available in 8.2.1
@@ -63,30 +83,6 @@ public class Initializer
 			Class<?> sqliteJava = org.sqlite.SQLiteConnection.class;
 			Class<?> sqliteNative = org.sqlite.core.NativeDB.class;
 			
-			//// maybe these lines are needed to shade SQLite, James isn't sure.
-			//// Although they never seemed to fail, which is a bit odd.
-			//try
-			//{
-			//	// needed by Forge to load the Java database connection
-			//	Class.forName("org.sqlite.JDBC");
-			//	LOGGER.info("loaded normal SQLITE");
-			//}
-			//catch (ClassNotFoundException e)
-			//{
-			//	LOGGER.warn("normal: " + e.getMessage(), e);
-			//}
-			//
-			//try
-			//{
-			//	// needed by Forge to load the Java database connection
-			//	Class.forName("DistantHorizons.libraries.sqlite.JDBC");
-			//	LOGGER.info("loaded shaded SQLITE");
-			//}
-			//catch (ClassNotFoundException e)
-			//{
-			//	LOGGER.warn("shaded: " + e.getMessage(), e);
-			//}
-			
 			boolean sqliteLoaded = SQLiteJDBCLoader.initialize();
 			if (!sqliteLoaded)
 			{
@@ -95,9 +91,7 @@ public class Initializer
 		}
 		catch (Throwable e)
 		{
-			LOGGER.fatal("Critical programmer error: One or more libraries aren't present. Error: [" + e.getMessage() + "].", e);
+			MC_CLIENT.crashMinecraft("Distant Horizons critical setup error: One or more libraries are either in-accessible, corrupted, or overwritten by another mod. Error: [" + e.getMessage() + "].", e);
-			// throwing here should crash the game, notifying the developer that something is wrong
-			throw new RuntimeException(e);
 		}
 		
 		// confirm the resource directory is present
@@ -111,8 +105,7 @@ public class Initializer
 		}
 		catch (Exception e)
 		{
-			LOGGER.fatal("Critical programmer error: Can't read SQL Scripts resource folder is either missing or malformed. Error: [" + e.getMessage() + "].");
+			MC_CLIENT.crashMinecraft("Critical programmer error: Can't read SQL Scripts resource folder is either missing or malformed. Error: [" + e.getMessage() + "].", e);
-			throw new RuntimeException(e);
 		}
 		
 		// This code has been disabled since it can cause Mac
@@ -143,6 +136,45 @@ public class Initializer
 			LOGGER.error("Programmer Error: No ["+IWrapperFactory.class.getSimpleName()+"] assigned to the DhApi.");
 		}
 		
+		// log a warning if G1GC is being used
+		// (this garbage collector is known to cause stuttering)
+		{
+			boolean g1GcInUse = false;
+			
+			StringBuilder garbageCollectorNames = new StringBuilder();
+			List<GarbageCollectorMXBean> gcMxBeans = ManagementFactory.getGarbageCollectorMXBeans();
+			for (GarbageCollectorMXBean gcMxBean : gcMxBeans)
+			{
+				if (!garbageCollectorNames.toString().isEmpty())
+				{
+					garbageCollectorNames.append(", ");
+				}
+				garbageCollectorNames.append(gcMxBean.getName());
+				
+				// "G1 Young Generation" // "G1 Concurrent GC" // "G1 Old Generation"
+				if (gcMxBean.getName().toLowerCase().contains("g1 "))
+				{
+					g1GcInUse = true;
+				}
+			}
+			LOGGER.info("Garbage collectors: ["+garbageCollectorNames+"]");
+			
+			
+			if (g1GcInUse
+				&& Config.Common.Logging.Warning.logGarbageCollectorWarning.get())
+			{
+				LOGGER.warn(
+					"Distant Horizons: G1 Garbage collector detected. \n" +
+					"This garbage collector can cause FPS stuttering. \n" +
+					"It's recommended to use a concurrent garbage collector \n" +
+					"like ZGC (Java 21+) or Shenandoah (Java 8 through 17) for a smoother experience. \n" +
+					"");
+				
+			}
+		}
+		
+		DhApi.events.bind(DhApiBeforeRenderEvent.class, IgnoredDimensionCsvHandler.INSTANCE);
+		
 	}
 	
 }

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

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

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

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

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

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

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

@@ -25,9 +25,10 @@ import com.seibel.distanthorizons.api.interfaces.config.IDhApiConfigValue;
 import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiFarFogConfig;
 import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiFogConfig;
 import com.seibel.distanthorizons.api.interfaces.config.client.IDhApiHeightFogConfig;
-import com.seibel.distanthorizons.api.objects.config.DhApiConfigValue;
+import com.seibel.distanthorizons.core.config.api.DhApiConfigValue;
 import com.seibel.distanthorizons.core.config.Config;
-import com.seibel.distanthorizons.coreapi.util.converters.ApiFogDrawModeConverter;
+import com.seibel.distanthorizons.core.config.api.converters.ApiFogDrawModeConverter;
+import com.seibel.distanthorizons.core.config.api.converters.InvertedBoolConverter;
 
 public class DhApiFogConfig implements IDhApiFogConfig
 {
@@ -67,7 +68,7 @@ public class DhApiFogConfig implements IDhApiFogConfig
 	@Override
 	@Deprecated
 	public IDhApiConfigValue<Boolean> disableVanillaFog()
-	{ return new DhApiConfigValue<>(Config.Client.Advanced.Graphics.Fog.disableVanillaFog); }
+	{ return new DhApiConfigValue<>(Config.Client.Advanced.Graphics.Fog.enableVanillaFog, new InvertedBoolConverter()); }
 	@Override
 	public IDhApiConfigValue<Boolean> enableVanillaFog()
 	{ return new DhApiConfigValue<>(Config.Client.Advanced.Graphics.Fog.enableVanillaFog); }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -23,17 +23,18 @@ import com.seibel.distanthorizons.api.DhApi;
 import com.seibel.distanthorizons.api.enums.config.EDhApiMcRenderingFadeMode;
 import com.seibel.distanthorizons.api.enums.rendering.EDhApiRenderPass;
 import com.seibel.distanthorizons.api.methods.events.abstractEvents.*;
-import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiRenderParam;
+import com.seibel.distanthorizons.core.api.internal.rendering.DhRenderState;
+import com.seibel.distanthorizons.core.enums.EMinecraftColor;
 import com.seibel.distanthorizons.core.file.structure.ClientOnlySaveStructure;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.network.messages.MessageRegistry;
 import com.seibel.distanthorizons.core.pos.DhChunkPos;
 import com.seibel.distanthorizons.core.render.DhApiRenderProxy;
-import com.seibel.distanthorizons.core.render.renderer.FadeRenderer;
+import com.seibel.distanthorizons.core.render.renderer.*;
 import com.seibel.distanthorizons.core.util.TimerUtil;
 import com.seibel.distanthorizons.core.util.objects.Pair;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
 import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector;
-import com.seibel.distanthorizons.core.level.IDhClientLevel;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.network.messages.AbstractNetworkMessage;
 import com.seibel.distanthorizons.core.network.session.NetworkSession;
@@ -42,30 +43,21 @@ import com.seibel.distanthorizons.api.enums.rendering.EDhApiDebugRendering;
 import com.seibel.distanthorizons.api.enums.rendering.EDhApiRendererMode;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.level.IServerKeyedClientLevel;
-import com.seibel.distanthorizons.core.logging.ConfigBasedLogger;
-import com.seibel.distanthorizons.core.logging.ConfigBasedSpamLogger;
-import com.seibel.distanthorizons.core.logging.SpamReducedLogger;
-import com.seibel.distanthorizons.core.util.math.Mat4f;
 import com.seibel.distanthorizons.core.render.glObject.GLProxy;
-import com.seibel.distanthorizons.core.render.renderer.TestRenderer;
-import com.seibel.distanthorizons.core.util.RenderUtil;
 import com.seibel.distanthorizons.core.world.AbstractDhWorld;
-import com.seibel.distanthorizons.core.world.DhClientServerWorld;
 import com.seibel.distanthorizons.core.world.DhClientWorld;
-import com.seibel.distanthorizons.core.world.IDhClientWorld;
 import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IProfilerWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
-import org.apache.logging.log4j.LogManager;
+import com.seibel.distanthorizons.core.logging.DhLogger;
-import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.lwjgl.glfw.GLFW;
 
 import java.io.File;
 import java.util.*;
 import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
 
 /**
  * This holds the methods that should be called
@@ -74,7 +66,7 @@ import java.util.concurrent.TimeUnit;
  */
 public class ClientApi
 {
-	private static final Logger LOGGER = LogManager.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	
 	public static boolean prefLoggerEnabled = false;
 	
@@ -84,18 +76,24 @@ public class ClientApi
 	private static final IMinecraftClientWrapper MC_CLIENT = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
 	private static final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
 	
-	public static final long SPAM_LOGGER_FLUSH_NS = TimeUnit.NANOSECONDS.convert(1, TimeUnit.SECONDS);
-	
 	/** this includes the is dev build message and low allocated memory warning */
 	private static final int MS_BETWEEN_STATIC_STARTUP_MESSAGES = 4_000;
 	
+	/** 
+	 * This isn't the cleanest way of storing variables before passing them to the LOD renderer, 
+	 * but due to how mixins work and the inconsistency between MC versions,
+	 * having a static object that stores a single frame's data
+	 * is often the easiest solution. <br><br>
+	 * 
+	 * Only downside is making sure each variable is populated before rendering.
+	 */
+	public static final DhRenderState RENDER_STATE = new DhRenderState();
 	
 	
 	private boolean isDevBuildMessagePrinted = false;
 	private boolean lowMemoryWarningPrinted = false;
 	private boolean highVanillaRenderDistanceWarningPrinted = false;
 	
-	/** when the last static */
 	private long lastStaticWarningMessageSentMsTime = 0L;
 	
 	private final Queue<String> chatMessageQueueForNextFrame = new LinkedBlockingQueue<>();
@@ -103,8 +101,6 @@ public class ClientApi
 	
 	public boolean rendererDisabledBecauseOfExceptions = false;
 	
-	private long lastFlushNanoTime = 0;
-	
 	private final ClientPluginChannelApi pluginChannelApi = new ClientPluginChannelApi(this::clientLevelLoadEvent, this::clientLevelUnloadEvent);
 	
 	/** Delay loading the first level to give the server some time to respond with level to actually load */
@@ -116,8 +112,8 @@ public class ClientApi
 	/** Holds any chunks that were loaded before the {@link ClientApi#clientLevelLoadEvent(IClientLevelWrapper)} was fired. */
 	public final HashMap<Pair<IClientLevelWrapper, DhChunkPos>, IChunkWrapper> waitingChunkByClientLevelAndPos = new HashMap<>();
 	
-	/** re-set every frame during the opaque rendering stage */
+	@Nullable
-	private boolean renderingCancelledForThisFrame;
+	public String lastRenderParamValidationMessage = null;
 	
 	
 	
@@ -157,10 +153,10 @@ public class ClientApi
 				
 				if (Config.Common.Logging.Warning.showReplayWarningOnStartup.get())
 				{
-					MC_CLIENT.sendChatMessage("\u00A76" + "Distant Horizons: Replay detected." + "\u00A7r"); // gold color
+					MC_CLIENT.sendChatMessage(EMinecraftColor.ORANGE + "Distant Horizons: Replay detected." + EMinecraftColor.CLEAR_FORMATTING);
 					MC_CLIENT.sendChatMessage("DH may behave strangely or have missing functionality.");
 					MC_CLIENT.sendChatMessage("In order to use pre-generated LODs, put your DH database(s) in:");
-					MC_CLIENT.sendChatMessage("\u00A77"+".Minecraft" + File.separator + ClientOnlySaveStructure.SERVER_DATA_FOLDER_NAME + File.separator + ClientOnlySaveStructure.REPLAY_SERVER_FOLDER_NAME + File.separator + "DIMENSION_NAME"+"\u00A7r"); // light gray color
+					MC_CLIENT.sendChatMessage(EMinecraftColor.GRAY +".Minecraft" + File.separator + ClientOnlySaveStructure.SERVER_DATA_FOLDER_NAME + File.separator + ClientOnlySaveStructure.REPLAY_SERVER_FOLDER_NAME + File.separator + "DIMENSION_NAME"+EMinecraftColor.CLEAR_FORMATTING);
 					MC_CLIENT.sendChatMessage("This can be disabled in DH's config under Advanced -> Logging.");
 					MC_CLIENT.sendChatMessage("");
 				}
@@ -246,7 +242,7 @@ public class ClientApi
 		}
 	}
 	
-	public void clientLevelLoadEvent(IClientLevelWrapper levelWrapper)
+	public void clientLevelLoadEvent(@Nullable IClientLevelWrapper levelWrapper)
 	{
 		// wait a moment before loading the level to give the server a chance to handle the client's login request
 		if (MC_CLIENT.clientConnectedToDedicatedServer())
@@ -322,49 +318,6 @@ public class ClientApi
 	
 	
 	
-	//===============//
-	// render events //
-	//===============//
-	
-	public void clientTickEvent()
-	{
-		IProfilerWrapper profiler = MC_CLIENT.getProfiler();
-		profiler.push("DH-ClientTick");
-		
-		try
-		{
-			boolean doFlush = System.nanoTime() - this.lastFlushNanoTime >= SPAM_LOGGER_FLUSH_NS;
-			if (doFlush)
-			{
-				this.lastFlushNanoTime = System.nanoTime();
-				SpamReducedLogger.flushAll();
-			}
-			ConfigBasedLogger.updateAll();
-			ConfigBasedSpamLogger.updateAll(doFlush);
-			
-			IDhClientWorld clientWorld = SharedApi.getIDhClientWorld();
-			if (clientWorld != null)
-			{
-				clientWorld.clientTick();
-				
-				// Ignore local world gen, as it's managed by server ticking
-				if (!(clientWorld instanceof DhClientServerWorld))
-				{
-					SharedApi.worldGenTick(clientWorld::worldGenTick);
-				}
-			}
-		}
-		catch (Exception e)
-		{
-			// handle errors here to prevent blowing up a mixin or API up stream
-			LOGGER.error("Unexpected error in ClientApi.clientTickEvent(), error: "+e.getMessage(), e);
-		}
-		
-		profiler.pop();
-	}
-	
-	
-	
 	//============//
 	// networking //
 	//============//
@@ -385,26 +338,24 @@ public class ClientApi
 	
 	
 	
-	//===========//
+	//===============//
-	// rendering //
+	// LOD rendering //
-	//===========//
+	//===============//
 	
-	/** Should be called before {@link ClientApi#renderDeferredLods} */
+	/** Should be called before {@link ClientApi#renderDeferredLodsForShaders} */
-	public void renderLods(IClientLevelWrapper levelWrapper, Mat4f mcModelViewMatrix, Mat4f mcProjectionMatrix, float partialTicks)
+	public void renderLods() { this.renderLodLayer(false); }
-	{ this.renderLodLayer(levelWrapper, mcModelViewMatrix, mcProjectionMatrix, partialTicks, false); }
 	
 	/** 
 	 * Only necessary when Shaders are in use.
 	 * Should be called after {@link ClientApi#renderLods} 
 	 */
-	public void renderDeferredLods(IClientLevelWrapper levelWrapper, Mat4f mcModelViewMatrix, Mat4f mcProjectionMatrix, float partialTicks)
+	public void renderDeferredLodsForShaders() { this.renderLodLayer(true); }
-	{ this.renderLodLayer(levelWrapper, mcModelViewMatrix, mcProjectionMatrix, partialTicks, true); }
 	
-	private void renderLodLayer(
+	private void renderLodLayer(boolean renderingDeferredLayer)
-			IClientLevelWrapper levelWrapper, Mat4f mcModelViewMatrix, Mat4f mcProjectionMatrix, float partialTicks,
-			boolean renderingDeferredLayer)
 	{
+		//=========//
 		// logging //
+		//=========//
 		
 		this.sendQueuedChatMessages();
 		
@@ -414,7 +365,36 @@ public class ClientApi
 		
 		
 		
-		// render parameter setup //
+		//=====================//
+		// render thread tasks //
+		//=====================//
+		
+		// only run these tasks once per frame
+		if (!renderingDeferredLayer)
+		{
+			profiler.push("DH render thread tasks");
+			
+			try
+			{
+				// make sure the GLProxy is created for future use
+				GLProxy.getInstance();
+				
+				// these tasks always need to be called, regardless of whether the renderer is enabled or not to prevent memory leaks
+				GLProxy.runRenderThreadTasks();
+			}
+			catch (Exception e)
+			{
+				LOGGER.error("Unexpected issue running render thread tasks, error: [" + e.getMessage() + "].", e);
+			}
+			
+			profiler.pop();
+		}
+		
+		
+		
+		//=================//
+		// parameter setup //
+		//=================//
 		
 		EDhApiRenderPass renderPass;
 		if (DhApiRenderProxy.INSTANCE.getDeferTransparentRendering())
@@ -433,67 +413,67 @@ public class ClientApi
 			renderPass = EDhApiRenderPass.OPAQUE_AND_TRANSPARENT;
 		}
 		
-		DhApiRenderParam renderEventParam =
+		// A global render state variable is used since MC has split up their
-				new DhApiRenderParam(
+		// render prep and actual rendering into different threads/methods
-						renderPass,
+		// this is annoying since it's possible to start a render with only
-						partialTicks,
+		// partially complete info, but there isn't a better option at the moment
-						RenderUtil.getNearClipPlaneDistanceInBlocks(partialTicks), RenderUtil.getFarClipPlaneDistanceInBlocks(),
+		RenderParams renderParams =
-						mcProjectionMatrix, mcModelViewMatrix,
+			new RenderParams(
-						RenderUtil.createLodProjectionMatrix(mcProjectionMatrix, partialTicks), RenderUtil.createLodModelViewMatrix(mcModelViewMatrix),
+				renderPass,
-						levelWrapper.getMinHeight()
+				RENDER_STATE.frameTime,
-				);
+				RENDER_STATE.mcProjectionMatrix, RENDER_STATE.mcModelViewMatrix,
+				RENDER_STATE.clientLevelWrapper
+			);
 		
 		
 		
-		// render validation //
+		//============//
+		// validation //
+		//============//
+		
+		// TODO write this message to the F3 menu so people can see when a different mod screws with the lightmap
+		String validationMessage = renderParams.getValidationErrorMessage();
+		if (validationMessage != null)
+		{
+			this.lastRenderParamValidationMessage = validationMessage;
+			return;
+		}
+		else
+		{
+			this.lastRenderParamValidationMessage = null;
+		}
+		
+		if (this.rendererDisabledBecauseOfExceptions)
+		{
+			// re-enable rendering if the user toggles DH rendering
+			if (!Config.Client.quickEnableRendering.get())
+			{
+				LOGGER.info("DH Renderer re-enabled after exception. Some rendering issues may occur. Please reboot Minecraft if you see any rendering issues.");
+				this.rendererDisabledBecauseOfExceptions = false;
+				Config.Client.quickEnableRendering.set(true);
+			}
+			
+			return;
+		}
+		
+		
+		
+		//===========//
+		// rendering //
+		//===========//
 		
 		try
 		{
-			// TODO write this message to the F3 menu so people can see when a different mod screws with the lightmap
-			String reasonLodsCannotRender = RenderUtil.shouldLodsRender(levelWrapper, renderEventParam);
-			if (reasonLodsCannotRender != null)
-			{
-				return;
-			}
-			
-			IDhClientWorld dhClientWorld = SharedApi.getIDhClientWorld();
-			if (dhClientWorld == null)
-			{
-				return;
-			}
-			
-			IDhClientLevel level = (IDhClientLevel) dhClientWorld.getLevel(levelWrapper);
-			if (level == null)
-			{
-				return;
-			}
-			
-			
-			if (this.rendererDisabledBecauseOfExceptions)
-			{
-				// re-enable rendering if the user toggles DH rendering
-				if (!Config.Client.quickEnableRendering.get())
-				{
-					LOGGER.info("DH Renderer re-enabled after exception. Some rendering issues may occur. Please reboot Minecraft if you see any rendering issues.");
-					this.rendererDisabledBecauseOfExceptions = false;
-					Config.Client.quickEnableRendering.set(true);
-				}
-				
-				return;
-			}
-			
-			
-			
 			// render pass //
 			
 			if (!renderingDeferredLayer)
 			{
 				if (Config.Client.Advanced.Debugging.rendererMode.get() == EDhApiRendererMode.DEFAULT)
 				{
-					this.renderingCancelledForThisFrame = ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeRenderEvent.class, renderEventParam);
+					boolean renderingCancelledForThisFrame = ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeRenderEvent.class, renderParams);
-					if (!this.renderingCancelledForThisFrame)
+					if (!renderingCancelledForThisFrame)
 					{
-						level.render(renderEventParam, profiler);
+						LodRenderer.INSTANCE.render(renderParams, profiler);
 					}
 					
 					if (!DhApi.Delayed.renderProxy.getDeferTransparentRendering())
@@ -510,10 +490,10 @@ public class ClientApi
 			}
 			else
 			{
-				boolean renderingCancelled = ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeDeferredRenderEvent.class, renderEventParam);
+				boolean renderingCancelled = ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeDeferredRenderEvent.class, renderParams);
 				if (!renderingCancelled)
 				{
-					level.renderDeferred(renderEventParam, profiler);
+					LodRenderer.INSTANCE.renderDeferred(renderParams, profiler);
 				}
 				
 				
@@ -528,55 +508,70 @@ public class ClientApi
 			this.rendererDisabledBecauseOfExceptions = true;
 			LOGGER.error("Unexpected Renderer error in render pass [" + renderPass + "]. Error: " + e.getMessage(), e);
 			
-			MC_CLIENT.sendChatMessage("\u00A74\u00A7l\u00A7uERROR: Distant Horizons renderer has encountered an exception!");
+			MC_CLIENT.sendChatMessage(EMinecraftColor.DARK_RED + "" + EMinecraftColor.BOLD + "ERROR: Distant Horizons renderer has encountered an exception!" + EMinecraftColor.CLEAR_FORMATTING);
-			MC_CLIENT.sendChatMessage("\u00A74Renderer disabled to try preventing GL state corruption.");
+			MC_CLIENT.sendChatMessage(EMinecraftColor.DARK_RED + "Renderer disabled to try preventing GL state corruption." + EMinecraftColor.CLEAR_FORMATTING);
-			MC_CLIENT.sendChatMessage("\u00A74Toggle DH rendering via the config UI to re-activate DH rendering.");
+			MC_CLIENT.sendChatMessage(EMinecraftColor.DARK_RED + "Toggle DH rendering via the config UI to re-activate DH rendering." + EMinecraftColor.CLEAR_FORMATTING);
-			MC_CLIENT.sendChatMessage("\u00A74Error: " + e);
+			MC_CLIENT.sendChatMessage(EMinecraftColor.DARK_RED + "Error: " + EMinecraftColor.CLEAR_FORMATTING + e);
-		}
-		finally
-		{
-			try
-			{
-				// these tasks always need to be called, regardless of whether the renderer is enabled or not to prevent memory leaks
-				GLProxy.getInstance().runRenderThreadTasks();
-			}
-			catch (Exception e)
-			{
-				LOGGER.error("Unexpected issue running render thread tasks.", e);
-			}
-			
-			
-			profiler.pop(); // end LOD
-			profiler.push("terrain"); // go back into "terrain"
 		}
+		
+		
+		
+		profiler.pop(); // end LOD
+		profiler.push("terrain"); // go back into "terrain"
 	}
 	
-	/** should be called after DH and MC finish rendering so we can smooth the transition between the two */
+	
-	public void renderFadeOpaque(Mat4f mcModelViewMatrix, Mat4f mcProjectionMatrix, float partialTicks, IClientLevelWrapper level)
+	
+	//================//
+	// fade rendering //
+	//================//
+	
+	/** 
+	 * The first fade pass.
+	 * Called after MC finishes rendering the opaque passes. 
+	 */
+	public void renderFadeOpaque()
+	{
+		// only fade when DH is rendering
+		if (Config.Client.Advanced.Debugging.rendererMode.get() == EDhApiRendererMode.DEFAULT
+			&&
+			(
+				// only fade when requested
+				Config.Client.Advanced.Graphics.Quality.vanillaFadeMode.get() == EDhApiMcRenderingFadeMode.DOUBLE_PASS
+				// or if LOD-only mode is enabled (fading is used to remove the MC render pass)
+				|| Config.Client.Advanced.Debugging.lodOnlyMode.get()
+			)
+			// don't fade when Iris shaders are active, otherwise the rendering can get weird
+			&& !DhApiRenderProxy.INSTANCE.getDeferTransparentRendering())
+		{
+			VanillaFadeRenderer.INSTANCE.render(RENDER_STATE.mcModelViewMatrix, RENDER_STATE.mcProjectionMatrix, RENDER_STATE.frameTime, RENDER_STATE.clientLevelWrapper);
+		}
+	}
+	/** 
+	 * The second fade pass.
+	 * Called after MC finishes rendering both opaque
+	 * and transparent passes. 
+	 */
+	public void renderFadeTransparent()
 	{
 		// only fade when DH is rendering
 		if (Config.Client.Advanced.Debugging.rendererMode.get() == EDhApiRendererMode.DEFAULT)
 		{
-			if (Config.Client.Advanced.Graphics.Quality.vanillaFadeMode.get() == EDhApiMcRenderingFadeMode.DOUBLE_PASS)
+			boolean renderFade =
+				(
+					// only fade when requested
+					Config.Client.Advanced.Graphics.Quality.vanillaFadeMode.get() != EDhApiMcRenderingFadeMode.NONE
+					// or if LOD-only mode is enabled (fading is used to remove the MC render pass)
+					|| Config.Client.Advanced.Debugging.lodOnlyMode.get()
+				)
+				// don't fade when Iris shaders are active, otherwise the rendering can get weird
+				&& !DhApiRenderProxy.INSTANCE.getDeferTransparentRendering();
+			if (renderFade)
 			{
-				FadeRenderer.INSTANCE.render(mcModelViewMatrix, mcProjectionMatrix, partialTicks, level);
+				VanillaFadeRenderer.INSTANCE.render(RENDER_STATE.mcModelViewMatrix, RENDER_STATE.mcProjectionMatrix, RENDER_STATE.frameTime, RENDER_STATE.clientLevelWrapper);
 			}
 		}
 	}
-	/** should be called after DH and MC finish rendering so we can smooth the transition between the two */
-	public void renderFade(Mat4f mcModelViewMatrix, Mat4f mcProjectionMatrix, float partialTicks, IClientLevelWrapper level)
-	{
-		// only fade when DH is rendering
-		if (Config.Client.Advanced.Debugging.rendererMode.get() == EDhApiRendererMode.DEFAULT)
-		{
-			// fade if any level fading is active
-			if (Config.Client.Advanced.Graphics.Quality.vanillaFadeMode.get() != EDhApiMcRenderingFadeMode.NONE)
-			{
-				FadeRenderer.INSTANCE.render(mcModelViewMatrix, mcProjectionMatrix, partialTicks, level);
-			}
-		}
-	}
-	
 	
 	
 	
@@ -652,15 +647,16 @@ public class ClientApi
 	private void detectAndSendBootTimeWarnings()
 	{
 		// dev build
-		if (ModInfo.IS_DEV_BUILD && !this.isDevBuildMessagePrinted && MC_CLIENT.playerExists())
+		if (ModInfo.IS_DEV_BUILD 
+			&& !this.isDevBuildMessagePrinted 
+			&& MC_CLIENT.playerExists())
 		{
 			this.isDevBuildMessagePrinted = true;
 			this.lastStaticWarningMessageSentMsTime = System.currentTimeMillis();
 			
 			// remind the user that this is a development build
 			String message =
-					// green text
+					EMinecraftColor.DARK_GREEN + "Distant Horizons: nightly/unstable build, version: [" + ModInfo.VERSION+"]." +EMinecraftColor.CLEAR_FORMATTING + "\n" +
-					"\u00A72" + "Distant Horizons: nightly/unstable build, version: [" + ModInfo.VERSION+"]." + "\u00A7r\n" +
 							"Issues may occur with this version.\n" +
 							"Here be dragons!\n";
 			MC_CLIENT.sendChatMessage(message);
@@ -669,7 +665,8 @@ public class ClientApi
 		
 		// memory
 		if (this.staticStartupMessageSentRecently()) return;
-		if (!this.lowMemoryWarningPrinted && Config.Common.Logging.Warning.showLowMemoryWarningOnStartup.get())
+		if (!this.lowMemoryWarningPrinted 
+			&& Config.Common.Logging.Warning.showLowMemoryWarningOnStartup.get())
 		{
 			this.lowMemoryWarningPrinted = true;
 			this.lastStaticWarningMessageSentMsTime = System.currentTimeMillis();
@@ -683,7 +680,7 @@ public class ClientApi
 			{
 				String message =
 						// orange text		
-						"\u00A76" + "Distant Horizons: Low memory detected." + "\u00A7r \n" +
+						EMinecraftColor.ORANGE + "Distant Horizons: Low memory detected." + EMinecraftColor.CLEAR_FORMATTING + "\n" +
 						"Stuttering or low FPS may occur. \n" +
 						"Please increase Minecraft's available memory to 4 GB or more. \n" +
 						"This warning can be disabled in DH's config under Advanced -> Logging. \n";
@@ -694,24 +691,24 @@ public class ClientApi
 		
 		// high vanilla render distance
 		if (this.staticStartupMessageSentRecently()) return;
-		if (!this.highVanillaRenderDistanceWarningPrinted && Config.Common.Logging.Warning.showHighVanillaRenderDistanceWarning.get())
+		if (!this.highVanillaRenderDistanceWarningPrinted 
+			&& Config.Common.Logging.Warning.showHighVanillaRenderDistanceWarning.get())
 		{
+			this.highVanillaRenderDistanceWarningPrinted = true;
+			
 			// DH generally doesn't need a vanilla render distance above 12 
 			if (MC_RENDER.getRenderDistance() > 12)
 			{
-				this.highVanillaRenderDistanceWarningPrinted = true;
 				this.lastStaticWarningMessageSentMsTime = System.currentTimeMillis();
 				
 				String message =
-						// yellow text
+					EMinecraftColor.YELLOW + "Distant Horizons: High vanilla render distance detected." + EMinecraftColor.CLEAR_FORMATTING + "\n" +
-						"\u00A7e" + "Distant Horizons: High vanilla render distance detected." + "\u00A7r \n" +
+					"Using a high vanilla render distance uses a lot of CPU power \n" +
-						"Using a high vanilla render distance uses a lot of CPU power \n" +
+					"and doesn't improve graphics much after about 12.\n" +
-						"and doesn't improve graphics much after about 12.\n" +
+					"Lowing your vanilla render distance will give you better FPS\n" +
-						"Lowing your vanilla render distance will give you better FPS\n" +
+					"and reduce stuttering at a similar visual quality.\n" +
-						"and reduce stuttering at a similar visual quality.\n" +
+					EMinecraftColor.GRAY + "A vanilla render distance of 8 is recommended." + EMinecraftColor.CLEAR_FORMATTING + "\n" +
-						// gray text		
+					"This message can be disabled in DH's config under Advanced -> Logging.\n";
-						"\u00A77" + "A vanilla render distance of 8 is recommended." + "\u00A7r \n" +
-						"This message can be disabled in DH's config under Advanced -> Logging.\n";
 				MC_CLIENT.sendChatMessage(message);
 			}
 		}
@@ -721,7 +718,8 @@ public class ClientApi
 	{
 		if (this.lastStaticWarningMessageSentMsTime == 0)
 		{
-			return true;
+			// no static message has ever been sent
+			return false;
 		}
 		
 		long timeSinceLastMessage = System.currentTimeMillis() - this.lastStaticWarningMessageSentMsTime; 
@@ -740,4 +738,6 @@ public class ClientApi
 	 */
 	public void showOverlayMessageNextFrame(String message) { this.overlayMessageQueueForNextFrame.add(message); }
 	
+	
+	
 }

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

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

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

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

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

@@ -22,7 +22,10 @@ package com.seibel.distanthorizons.core.api.internal;
 import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiWorldLoadEvent;
 import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiWorldUnloadEvent;
 import com.seibel.distanthorizons.core.Initializer;
+import com.seibel.distanthorizons.core.api.internal.chunkUpdating.ChunkUpdateData;
+import com.seibel.distanthorizons.core.api.internal.chunkUpdating.ChunkUpdateQueueManager;
 import com.seibel.distanthorizons.core.config.Config;
+import com.seibel.distanthorizons.core.config.eventHandlers.IgnoredDimensionCsvHandler;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.generation.DhLightingEngine;
 import com.seibel.distanthorizons.core.level.DhClientLevel;
@@ -45,7 +48,7 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSha
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
 import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector;
-import org.apache.logging.log4j.Logger;
+import com.seibel.distanthorizons.core.logging.DhLogger;
 import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
@@ -56,7 +59,7 @@ public class SharedApi
 {
 	public static final SharedApi INSTANCE = new SharedApi();
 	
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	/** will be null on the server-side */
 	@Nullable
 	private static final IMinecraftRenderWrapper MC_RENDER = SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
@@ -65,20 +68,20 @@ public class SharedApi
 	private static final IMinecraftClientWrapper MC_CLIENT = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
 	private static final IMinecraftSharedWrapper MC_SHARED = SingletonInjector.INSTANCE.get(IMinecraftSharedWrapper.class);
 	
-	private static final UpdateChunkPosManager UPDATE_POS_MANAGER = new UpdateChunkPosManager();
+	public static final ChunkUpdateQueueManager CHUNK_UPDATE_QUEUE_MANAGER = new ChunkUpdateQueueManager();
 	/** 
 	 * how many chunks can be queued for updating per thread + player (in multiplayer), 
 	 * used to prevent updates from infinitely pilling up if the user flies around extremely fast 
 	 */
-	private static final int MAX_UPDATING_CHUNK_COUNT_PER_THREAD_AND_PLAYER = 1_000;
+	public static final int MAX_UPDATING_CHUNK_COUNT_PER_THREAD_AND_PLAYER = 1_000;
 	
 	/** how many milliseconds must pass before an overloaded message can be sent in chat or the log */
-	private static final int MIN_MS_BETWEEN_OVERLOADED_LOG_MESSAGE = 30_000;
+	public static final int MIN_MS_BETWEEN_OVERLOADED_LOG_MESSAGE = 30_000;
 	
 	
+	@Nullable
 	private static AbstractDhWorld currentWorld;
 	private static int lastWorldGenTickDelta = 0;
-	private static long lastOverloadedLogMessageMsTime = 0;
 	
 	
 	
@@ -127,7 +130,7 @@ public class SharedApi
 			// shouldn't be necessary, but if we missed closing one of the connections this should make sure they're all closed
 			AbstractDhRepo.closeAllConnections();
 			// needs to be closed on world shutdown to clear out un-processed chunks
-			UPDATE_POS_MANAGER.clear();
+			CHUNK_UPDATE_QUEUE_MANAGER.clear();
 			
 			// recommend that the garbage collector cleans up any objects from the old world and thread pools
 			System.gc();
@@ -139,23 +142,16 @@ public class SharedApi
 		}
 	}
 	
-	public static void worldGenTick(Runnable worldGenRunnable)
+	@Nullable
-	{
-		lastWorldGenTickDelta--;
-		if (lastWorldGenTickDelta <= 0)
-		{
-			worldGenRunnable.run();
-			lastWorldGenTickDelta = 20;
-		}
-	}
-	
 	public static AbstractDhWorld getAbstractDhWorld() { return currentWorld; }
-	/** returns null if the {@link SharedApi#currentWorld} isn't a {@link DhClientServerWorld} */
+	
-	public static DhClientServerWorld getDhClientServerWorld() { return (currentWorld instanceof DhClientServerWorld) ? (DhClientServerWorld) currentWorld : null; }
 	/** returns null if the {@link SharedApi#currentWorld} isn't a {@link DhClientWorld} or {@link DhClientServerWorld} */
-	public static IDhClientWorld getIDhClientWorld() { return (currentWorld instanceof IDhClientWorld) ? (IDhClientWorld) currentWorld : null; }
+	@Nullable
+	public static IDhClientWorld tryGetDhClientWorld() { return (currentWorld instanceof IDhClientWorld) ? (IDhClientWorld) currentWorld : null; }
+	
 	/** returns null if the {@link SharedApi#currentWorld} isn't a {@link DhServerWorld} or {@link DhClientServerWorld} */
-	public static IDhServerWorld getIDhServerWorld() { return (currentWorld instanceof IDhServerWorld) ? (IDhServerWorld) currentWorld : null; }
+	@Nullable
+	public static IDhServerWorld tryGetDhServerWorld() { return (currentWorld instanceof IDhServerWorld) ? (IDhServerWorld) currentWorld : null; }
 	
 	
 	
@@ -168,10 +164,10 @@ public class SharedApi
 	 * This is important since asking MC for a chunk is slow and may block the render thread.
 	 */
 	public static boolean isChunkAtBlockPosAlreadyUpdating(int blockPosX, int blockPosZ)
-	{ return UPDATE_POS_MANAGER.contains(new DhChunkPos(new DhBlockPos2D(blockPosX, blockPosZ))); }
+	{ return CHUNK_UPDATE_QUEUE_MANAGER.contains(new DhChunkPos(new DhBlockPos2D(blockPosX, blockPosZ))); }
 	
 	public static boolean isChunkAtChunkPosAlreadyUpdating(int chunkPosX, int chunkPosZ)
-	{ return UPDATE_POS_MANAGER.contains(new DhChunkPos(chunkPosX, chunkPosZ)); }
+	{ return CHUNK_UPDATE_QUEUE_MANAGER.contains(new DhChunkPos(chunkPosX, chunkPosZ)); }
 	
 	/** 
 	 * This is often fired when unloading a level.
@@ -179,21 +175,21 @@ public class SharedApi
 	 * rapidly changing dimensions.
 	 * (IE prevent DH from infinitely allocating memory 
 	 */
-	public void clearQueuedChunkUpdates() { UPDATE_POS_MANAGER.clear(); }
+	public void clearQueuedChunkUpdates() { CHUNK_UPDATE_QUEUE_MANAGER.clear(); }
 	
-	public int getQueuedChunkUpdateCount() { return UPDATE_POS_MANAGER.closestQueue.size(); }
+	public int getQueuedChunkUpdateCount() { return CHUNK_UPDATE_QUEUE_MANAGER.getQueuedCount(); }
 	
 	
 	
 	/** handles both block place and break events */
-	public void chunkBlockChangedEvent(IChunkWrapper chunk, ILevelWrapper level) { this.applyChunkUpdate(chunk, level, true); }
+	public void chunkBlockChangedEvent(IChunkWrapper chunk, ILevelWrapper level) { this.applyChunkUpdate(chunk, level, true, false); }
-	public void chunkLoadEvent(IChunkWrapper chunk, ILevelWrapper level) { this.applyChunkUpdate(chunk, level, false); }
+	public void chunkLoadEvent(IChunkWrapper chunk, ILevelWrapper level) { this.applyChunkUpdate(chunk, level, true, true); }
 	
-	public void applyChunkUpdate(IChunkWrapper chunkWrapper, ILevelWrapper level, boolean updateNeighborChunks)
+	public void applyChunkUpdate(IChunkWrapper chunkWrapper, ILevelWrapper level, boolean canGetNeighboringChunks, boolean newlyLoaded)
 	{
-		//========================//
+		//===================//
-		// world and level checks //
+		// validation checks //
-		//========================//
+		//===================//
 		
 		if (chunkWrapper == null)
 		{
@@ -221,7 +217,6 @@ public class SharedApi
 			return;
 		}
 		
-		
 		// only continue if the level is loaded
 		IDhLevel dhLevel = dhWorld.getLevel(level);
 		if (dhLevel == null)
@@ -236,6 +231,7 @@ public class SharedApi
 			return;
 		}
 		
+		// ignore chunk updates if the network should handle them
 		if (dhLevel instanceof DhClientLevel)
 		{
 			if (!((DhClientLevel) dhLevel).shouldProcessChunkUpdate(chunkWrapper.getChunkPos()))
@@ -244,69 +240,64 @@ public class SharedApi
 			}
 		}
 		
-		// shoudln't normally happen, but just in case
+		// ignore chunk updates for non-rendered levels
-		if (UPDATE_POS_MANAGER.contains(chunkWrapper.getChunkPos()))
+		String dimName = dhLevel.getLevelWrapper().getDimensionName();
+		if (IgnoredDimensionCsvHandler.INSTANCE.dimensionNameShouldBeIgnored(dimName))
+		{
+			return;
+		}
+		
+		// shouldn't normally happen, but just in case
+		if (CHUNK_UPDATE_QUEUE_MANAGER.contains(chunkWrapper.getChunkPos()))
 		{
 			// TODO this will prevent some LODs from updating across dimensions if multiple levels are loaded
 			return;
 		}
 		
 		
-		
+		queueChunkUpdate(chunkWrapper, dhLevel);
-		//===============================//
-		// update the necessary chunk(s) //
-		//===============================//
-		
-		if (!updateNeighborChunks)
-		{
-			// only update the center chunk
-			
-			queueChunkUpdate(chunkWrapper, null, dhLevel);
-		}
-		else
-		{
-			// update the center with any existing neighbour chunks. 
-			// this is done so lighting changes are propagated correctly
-			queueChunkUpdate(chunkWrapper, getNeighbourChunkListForChunk(chunkWrapper,dhLevel), dhLevel);
-		}
-	}
-	private static ArrayList<IChunkWrapper> getNeighbourChunkListForChunk(IChunkWrapper chunkWrapper, IDhLevel dhLevel)
-	{
-		// get the neighboring chunk list
-		ArrayList<IChunkWrapper> neighbourChunkList = new ArrayList<>(9);
-		for (int xOffset = -1; xOffset <= 1; xOffset++)
-		{
-			for (int zOffset = -1; zOffset <= 1; zOffset++)
-			{
-				if (xOffset == 0 && zOffset == 0)
-				{
-					// center chunk
-					neighbourChunkList.add(chunkWrapper);
-				}
-				else
-				{
-					// neighboring chunk
-					DhChunkPos neighbourPos = new DhChunkPos(chunkWrapper.getChunkPos().getX() + xOffset, chunkWrapper.getChunkPos().getZ() + zOffset);
-					IChunkWrapper neighbourChunk = dhLevel.getLevelWrapper().tryGetChunk(neighbourPos);
-					if (neighbourChunk != null)
-					{
-						neighbourChunkList.add(neighbourChunk);
-					}
-				}
-			}
-		}
-		return neighbourChunkList;
 	}
 	
-	private static void queueChunkUpdate(IChunkWrapper chunkWrapper, @Nullable ArrayList<IChunkWrapper> neighbourChunkList, IDhLevel dhLevel) 
+	private static void queueChunkUpdate(IChunkWrapper chunkWrapper, IDhLevel dhLevel)
-	{ queueChunkUpdate(chunkWrapper, neighbourChunkList, dhLevel,false); }
-	private static void queueChunkUpdate(IChunkWrapper chunkWrapper, @Nullable ArrayList<IChunkWrapper> neighbourChunkList, IDhLevel dhLevel, boolean lightUpdateOnly)
 	{
+		// return if the chunk is already queued
+		if (CHUNK_UPDATE_QUEUE_MANAGER.contains(chunkWrapper.getChunkPos()))
+		{
+			return;
+		}
+		
+		
+		// add chunk update data to preUpdate queue
+		ChunkUpdateData updateData = new ChunkUpdateData(chunkWrapper, dhLevel);
+		CHUNK_UPDATE_QUEUE_MANAGER.addItemToPreUpdateQueue(chunkWrapper.getChunkPos(), updateData);
+		
+		
+		// queue updates up to the number of CPU cores allocated for the job
+		// (this prevents doing extra work queuing tasks that may not be necessary)
+		// and makes sure the chunks closest to the player are updated first
+		PriorityTaskPicker.Executor executor = ThreadPoolUtil.getChunkToLodBuilderExecutor();
+		if (executor != null
+			&& executor.getQueueSize() < executor.getPoolSize())
+		{
+			try
+			{
+				executor.execute(SharedApi::processQueue);
+			}
+			catch (RejectedExecutionException ignore)
+			{
+				// the executor was shut down, it should be back up shortly and able to accept new jobs
+			}
+		}
+	}
+	
+	private static void processQueue()
+	{
+		// update the center & max size of the queue manager
 		int maxUpdateSizeMultiplier;
 		if (MC_CLIENT != null && MC_CLIENT.playerExists())
 		{
 			// Local worlds & multiplayer
-			UPDATE_POS_MANAGER.setCenter(MC_CLIENT.getPlayerChunkPos());
+			CHUNK_UPDATE_QUEUE_MANAGER.setCenter(MC_CLIENT.getPlayerChunkPos());
 			maxUpdateSizeMultiplier = MC_CLIENT.clientConnectedToDedicatedServer() ? 1 : MC_SHARED.getPlayerCount();
 		}
 		else
@@ -316,151 +307,132 @@ public class SharedApi
 			maxUpdateSizeMultiplier = 1 + MC_SHARED.getPlayerCount();
 		}
 		
-		UPDATE_POS_MANAGER.maxSize = MAX_UPDATING_CHUNK_COUNT_PER_THREAD_AND_PLAYER
+		CHUNK_UPDATE_QUEUE_MANAGER.maxSize = MAX_UPDATING_CHUNK_COUNT_PER_THREAD_AND_PLAYER
 				* Config.Common.MultiThreading.numberOfThreads.get()
 				* maxUpdateSizeMultiplier;
 		
-		UpdateChunkData updateData = new UpdateChunkData(chunkWrapper, neighbourChunkList, dhLevel, lightUpdateOnly);
-		if(lightUpdateOnly)
-		{
-			UPDATE_POS_MANAGER.removeItem(chunkWrapper.getChunkPos());
-		}
-		int remainingCapacity = UPDATE_POS_MANAGER.addItem(chunkWrapper.getChunkPos(), updateData);
-		if (remainingCapacity <= 0)
-		{
-			// limit how often an overloaded message can be sent
-			long msBetweenLastLog = System.currentTimeMillis() - lastOverloadedLogMessageMsTime;
-			if (msBetweenLastLog >= MIN_MS_BETWEEN_OVERLOADED_LOG_MESSAGE)
-			{
-				lastOverloadedLogMessageMsTime = System.currentTimeMillis();
-				
-				String message = "\u00A76" + "Distant Horizons overloaded, too many chunks queued for LOD processing. " + "\u00A7r" +
-						"\nThis may result in holes in your LODs. " +
-						"\nFix: move through the world slower, decrease your vanilla render distance, slow down your world pre-generator (IE Chunky), or increase the Distant Horizons' CPU thread counts. " +
-						"\nMax queue count ["+UPDATE_POS_MANAGER.maxSize+"] (["+ MAX_UPDATING_CHUNK_COUNT_PER_THREAD_AND_PLAYER +"] per thread+players).";
-				
-				boolean showWarningInChat = Config.Common.Logging.Warning.showUpdateQueueOverloadedChatWarning.get();
-				if (showWarningInChat)
-				{
-					ClientApi.INSTANCE.showChatMessageNextFrame(message);
-				}
-				
-				// Don't log warnings in singleplayer or in hosted LAN since it usually isn't a problem (and if it is it's easy to notice).
-				// Servers should always log since being overloaded is harder to notice. 
-				EWorldEnvironment environment = SharedApi.getEnvironment();
-				if (showWarningInChat || environment == EWorldEnvironment.SERVER_ONLY)
-				{
-					LOGGER.warn(message);
-				}
-			}
-		}
 		
 		
+		//===============================//
+		// update the necessary chunk(s) //
+		//===============================//
 		
-		// queue updates up to the number of CPU cores allocated for the job
+		processQueuedChunkPreUpdate();
-		// (this prevents doing extra work queuing tasks that may not be necessary)
+		processQueuedChunkUpdate();
-		// and makes sure the chunks closest to the player are updated first
+		
-		PriorityTaskPicker.Executor executor = ThreadPoolUtil.getChunkToLodBuilderExecutor();
+		// queue the next position if there are still positions to process
-		if (executor != null && executor.getQueueSize() < executor.getPoolSize())
+		AbstractExecutorService executor = ThreadPoolUtil.getChunkToLodBuilderExecutor();
+		if (executor != null && !CHUNK_UPDATE_QUEUE_MANAGER.isEmpty())
 		{
 			try
 			{
-				executor.execute(SharedApi::processQueuedChunkUpdate);
+				executor.execute(SharedApi::processQueue);
 			}
 			catch (RejectedExecutionException ignore)
 			{
 				// the executor was shut down, it should be back up shortly and able to accept new jobs
 			}
 		}
+		
 	}
+	
+	private static void processQueuedChunkPreUpdate()
+	{
+		ChunkUpdateData preUpdateData = CHUNK_UPDATE_QUEUE_MANAGER.preUpdateQueue.popClosest();
+		if (preUpdateData == null)
+		{
+			return;
+		}
+		
+		IDhLevel dhLevel = preUpdateData.dhLevel;
+		IChunkWrapper chunkWrapper = preUpdateData.chunkWrapper;
+		chunkWrapper.createDhHeightMaps();
+		
+		try
+		{
+			// check if this chunk has been converted into an LOD already
+			boolean checkChunkHash = !Config.Common.LodBuilding.disableUnchangedChunkCheck.get();
+			if (checkChunkHash)
+			{
+				int oldChunkHash = dhLevel.getChunkHash(chunkWrapper.getChunkPos()); // shouldn't happen on the render thread since it may take a few moments to run
+				int newChunkHash = chunkWrapper.getBlockBiomeHashCode();
+				
+				boolean hasNewChunkHash = (oldChunkHash != newChunkHash);
+				if (!hasNewChunkHash)
+				{
+					// do not update the chunk if the hash is the same
+					return;
+				}
+			}
+			
+			CHUNK_UPDATE_QUEUE_MANAGER.addItemToUpdateQueue(chunkWrapper.getChunkPos(), preUpdateData);
+		}
+		catch (Exception e)
+		{
+			LOGGER.error("Unexpected error when pre-updating chunk at pos: [" + chunkWrapper.getChunkPos() + "]", e);
+		}
+	}
+	
 	private static void processQueuedChunkUpdate()
 	{
-		//LOGGER.trace(chunkWrapper.getChunkPos() + " " + executor.getActiveCount() + " / " + executor.getQueue().size() + " - " + executor.getCompletedTaskCount());
+		ChunkUpdateData updateData = CHUNK_UPDATE_QUEUE_MANAGER.updateQueue.popClosest();
-		
-		UpdateChunkData updateData = UPDATE_POS_MANAGER.popClosest();
 		if (updateData == null)
 		{
 			return;
 		}
 		
 		IChunkWrapper chunkWrapper = updateData.chunkWrapper;
-		@Nullable ArrayList<IChunkWrapper> neighbourChunkList = updateData.neighbourChunkList;
 		IDhLevel dhLevel = updateData.dhLevel;
+		ILevelWrapper levelWrapper = dhLevel.getLevelWrapper();
+		
+		// having a list of the nearby chunks is needed for lighting and beacon generation
+		ArrayList<IChunkWrapper> nearbyChunkList  = tryGetNeighborChunkListForChunk(chunkWrapper);
+		
 		
 		
 		try
 		{
-			boolean checkChunkHash = !Config.Common.LodBuilding.disableUnchangedChunkCheck.get();
-			
-			// check if this chunk has been converted into an LOD already
-			int oldChunkHash = dhLevel.getChunkHash(chunkWrapper.getChunkPos()); // shouldn't happen on the render thread since it may take a few moments to run
-			int newChunkHash = chunkWrapper.getBlockBiomeHashCode();
-			if (checkChunkHash)
-			{
-				if (oldChunkHash == newChunkHash && !updateData.lightUpdateOnly)
-				{
-					// if the chunk hashes are the same then we don't need to bother with lighting the chunk
-					// or creating/updating the LODs
-					return;
-				}
-			}
-			
-			
-			// having a list of the nearby chunks is needed for lighting and beacon generation
-			ArrayList<IChunkWrapper> nearbyChunkList;
-			if (neighbourChunkList != null)
-			{
-				nearbyChunkList = neighbourChunkList;
-			}
-			else
-			{
-				nearbyChunkList = new ArrayList<>(1);
-				nearbyChunkList.add(chunkWrapper);
-			}
-			
-			// if this chunk will update its lighting
-			// then queue adjacent chunks to update theirs as well
-			// adjacent chunk will have 'lightUpdateOnly' true 
-			// so they won't schedule further chunk updates
-			if (!updateData.lightUpdateOnly)
-			{
-				for (IChunkWrapper adjacentChunk : nearbyChunkList)
-				{
-					// pulling a new chunkWrapper is necessary to prevent concurrent modification on the existing chunkWrappers
-					IChunkWrapper newCenterChunk = dhLevel.getLevelWrapper().tryGetChunk(adjacentChunk.getChunkPos());
-					if (newCenterChunk != null)
-					{
-						queueChunkUpdate(newCenterChunk, getNeighbourChunkListForChunk(newCenterChunk, dhLevel), dhLevel, true);
-					}
-				}
-			}
-			
 			// sky lighting is populated later at the data source level
-			DhLightingEngine.INSTANCE.bakeChunkBlockLighting(chunkWrapper, nearbyChunkList, dhLevel.hasSkyLight() ? LodUtil.MAX_MC_LIGHT : LodUtil.MIN_MC_LIGHT);
+			DhLightingEngine.INSTANCE.bakeChunkBlockLighting(chunkWrapper, nearbyChunkList, levelWrapper.hasSkyLight() ? LodUtil.MAX_MC_LIGHT : LodUtil.MIN_MC_LIGHT);
 			
 			dhLevel.updateBeaconBeamsForChunk(chunkWrapper, nearbyChunkList);
+			
+			int newChunkHash = chunkWrapper.getBlockBiomeHashCode();
 			dhLevel.updateChunkAsync(chunkWrapper, newChunkHash);
 		}
 		catch (Exception e)
 		{
 			LOGGER.error("Unexpected error when updating chunk at pos: [" + chunkWrapper.getChunkPos() + "]", e);
 		}
-		finally
+		
+		CHUNK_UPDATE_QUEUE_MANAGER.queuedChunkWrapperByChunkPos.remove(updateData.chunkWrapper.getChunkPos());
+	}
+	private static ArrayList<IChunkWrapper> tryGetNeighborChunkListForChunk(IChunkWrapper chunkWrapper)
+	{
+		// get the neighboring chunk list
+		ArrayList<IChunkWrapper> neighborChunkList = new ArrayList<>(9);
+		for (int xOffset = -1; xOffset <= 1; xOffset++)
 		{
-			// queue the next position if there are still positions to process
+			for (int zOffset = -1; zOffset <= 1; zOffset++)
-			AbstractExecutorService executor = ThreadPoolUtil.getChunkToLodBuilderExecutor();
-			if (executor != null && !UPDATE_POS_MANAGER.updateDataByChunkPos.isEmpty())
 			{
-				try
+				if (xOffset == 0 && zOffset == 0)
 				{
-					executor.execute(SharedApi::processQueuedChunkUpdate);
+					// center chunk
+					neighborChunkList.add(chunkWrapper);
 				}
-				catch (RejectedExecutionException ignore)
+				else
 				{
-					// the executor was shut down, it should be back up shortly and able to accept new jobs
+					// neighboring chunk 
+					DhChunkPos neighborPos = new DhChunkPos(chunkWrapper.getChunkPos().getX() + xOffset, chunkWrapper.getChunkPos().getZ() + zOffset);
+					IChunkWrapper neighborChunk = CHUNK_UPDATE_QUEUE_MANAGER.tryGetChunk(neighborPos);
+					if (neighborChunk != null)
+					{
+						neighborChunkList.add(neighborChunk);
+					}
 				}
 			}
 		}
+		return neighborChunkList;
 	}
 	
 	
@@ -471,161 +443,13 @@ public class SharedApi
 	
 	public String getDebugMenuString()
 	{
-		String updatingCountStr = F3Screen.NUMBER_FORMAT.format(UPDATE_POS_MANAGER.closestQueue.size());
+		String preUpdatingCountStr = F3Screen.NUMBER_FORMAT.format(CHUNK_UPDATE_QUEUE_MANAGER.preUpdateQueue.getQueuedCount());
-		String maxUpdateCountStr = F3Screen.NUMBER_FORMAT.format(UPDATE_POS_MANAGER.maxSize);
+		String updatingCountStr = F3Screen.NUMBER_FORMAT.format(CHUNK_UPDATE_QUEUE_MANAGER.updateQueue.getQueuedCount());
-		return "Queued chunk updates: "+updatingCountStr+" / "+maxUpdateCountStr;
+		String queuedCountStr = F3Screen.NUMBER_FORMAT.format(CHUNK_UPDATE_QUEUE_MANAGER.getQueuedCount());
-	}
-	
-	
-	
-	//================//
-	// helper classes //
-	//================//
-	
-	/** contains the objects needed to update a chunk */
-	private static class UpdateChunkData
-	{
-		public IChunkWrapper chunkWrapper;
-		@Nullable
-		public ArrayList<IChunkWrapper> neighbourChunkList;
-		public IDhLevel dhLevel;
-		/** adjacent chunks will only update their light */
-		public boolean lightUpdateOnly;
 		
-		public UpdateChunkData(IChunkWrapper chunkWrapper, @Nullable ArrayList<IChunkWrapper> neighbourChunkList, IDhLevel dhLevel, boolean lightUpdateOnly)
+		String maxUpdateCountStr = F3Screen.NUMBER_FORMAT.format(CHUNK_UPDATE_QUEUE_MANAGER.maxSize);
-		{
-			this.chunkWrapper = chunkWrapper;
-			this.neighbourChunkList = neighbourChunkList;
-			this.dhLevel = dhLevel;
-			this.lightUpdateOnly = lightUpdateOnly;
-		}
-	}
-	
-	/** keeps track of which chunks need to be updated */
-	private static class UpdateChunkPosManager
-	{
-		private final PriorityBlockingQueue<DhChunkPos> closestQueue;
-		private final PriorityBlockingQueue<DhChunkPos> furthestQueue;
-		private final ConcurrentHashMap<DhChunkPos, UpdateChunkData> updateDataByChunkPos;
-		
-		private DhChunkPos center;
-		private int maxSize = 500;
-		
-		
-		
-		//=============//
-		// constructor //
-		//=============//
-		
-		public UpdateChunkPosManager()
-		{
-			this.closestQueue = new PriorityBlockingQueue<>(500, Comparator.comparingDouble(pos -> pos.squaredDistance(this.center)));
-			this.furthestQueue = new PriorityBlockingQueue<>(500, Comparator.comparingDouble(pos -> ((DhChunkPos)pos).squaredDistance(this.center)).reversed());
-			this.updateDataByChunkPos = new ConcurrentHashMap<>();
-			// defaulting to 0,0 is fine since it'll be updated once we start adding items 
-			this.center = new DhChunkPos(0, 0);
-		}
-		
-		
-		
-		//==================//
-		// list/set methods //
-		//==================//
-		
-		public boolean contains(DhChunkPos pos) { return this.updateDataByChunkPos.containsKey(pos); }
-		
-		public void clear()
-		{
-			this.updateDataByChunkPos.clear();
-			this.closestQueue.clear();
-			this.furthestQueue.clear();
-		}
-		
-		public void removeItem(DhChunkPos pos)
-		{
-			this.updateDataByChunkPos.remove(pos);
-			this.closestQueue.remove(pos);
-			this.furthestQueue.remove(pos);
-		}
-		
-		/**
-		 * Adds an item to the queue of chunks that need to be updated.
-		 * If there are no more slots, replaces the item furthest from the center.
-		 *
-		 * @return The number of remaining slots available in the queue.
-		 */
-		public int addItem(DhChunkPos pos, UpdateChunkData updateData)
-		{
-			int remainingSlots = this.maxSize - this.updateDataByChunkPos.size();
-			if (this.updateDataByChunkPos.containsKey(pos))
-			{
-				// Chunk is already present in queue, no need to insert
-				return remainingSlots;
-			}
-			
-			// If no slots are left, get one by removing the item furthest from the center
-			if (remainingSlots <= 0)
-			{
-				DhChunkPos furthest = this.furthestQueue.poll();
-				if (furthest != null)
-				{
-					this.closestQueue.remove(furthest);
-					this.updateDataByChunkPos.remove(furthest);
-				}
-			}
-			
-			this.updateDataByChunkPos.put(pos, updateData);
-			this.closestQueue.add(pos);
-			this.furthestQueue.add(pos);
-			
-			return remainingSlots;
-		}
-		
-		
-		
-		//==================//
-		// position methods //
-		//==================//
-		
-		public void setCenter(DhChunkPos newCenter)
-		{
-			// if the rebuild time takes too long 
-			// (in James' testing a queue of 500 items only took around 0.1 milliseconds)
-			// this equation could be changed to only update after moving 2 or 4 chunks from the center
-			if (newCenter.equals(this.center))
-			{
-				return;
-			}
-			
-			this.center = newCenter;
-			
-			// rebuild the priority queues to match the new center
-			this.closestQueue.clear();
-			this.furthestQueue.clear();
-			for (DhChunkPos pos : this.updateDataByChunkPos.keySet())
-			{
-				this.closestQueue.add(pos);
-				this.furthestQueue.add(pos);
-			}
-		}
-		
-		public UpdateChunkData popClosest()
-		{
-			if (this.closestQueue.isEmpty())
-			{
-				return null;
-			}
-			
-			DhChunkPos closest = this.closestQueue.poll();
-			if (closest == null)
-			{
-				return null;
-			}
-			
-			this.furthestQueue.remove(closest);
-			return this.updateDataByChunkPos.remove(closest);
-		}
 		
+		return "Queued chunk updates: "+"( "+preUpdatingCountStr+" + "+updatingCountStr+" )  [ "+queuedCountStr+" / "+maxUpdateCountStr+" ]";
 	}
 	
 	

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

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

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

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

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

@@ -0,0 +1,186 @@
+package com.seibel.distanthorizons.core.api.internal.chunkUpdating;
+
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import com.seibel.distanthorizons.core.api.internal.ClientApi;
+import com.seibel.distanthorizons.core.api.internal.SharedApi;
+import com.seibel.distanthorizons.core.config.Config;
+import com.seibel.distanthorizons.core.enums.EMinecraftColor;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.multiplayer.client.SyncOnLoadRequestQueue;
+import com.seibel.distanthorizons.core.pos.DhChunkPos;
+import com.seibel.distanthorizons.core.world.EWorldEnvironment;
+import com.seibel.distanthorizons.core.logging.DhLogger;
+import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Collections;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.TimeUnit;
+
+public class ChunkUpdateQueueManager
+{
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	
+	
+	public final ChunkPosQueue updateQueue;
+	public final ChunkPosQueue preUpdateQueue;
+	public final Set<DhChunkPos> ignoredChunkPosSet = Collections.newSetFromMap(new ConcurrentHashMap<>());
+	
+	public final ConcurrentMap<DhChunkPos, IChunkWrapper> queuedChunkWrapperByChunkPos = CacheBuilder.newBuilder()
+		.expireAfterWrite(20, TimeUnit.SECONDS)
+		.<DhChunkPos, IChunkWrapper>build()
+		.asMap();
+	
+	/** dynamically changes based on the number of threads currently available */
+	public int maxSize = 500;
+	
+	private static long lastOverloadedLogMessageMsTime = 0;
+	
+	
+	
+	//=============//
+	// constructor //
+	//=============//
+	
+	public ChunkUpdateQueueManager()
+	{
+		this.updateQueue = new ChunkPosQueue();
+		this.preUpdateQueue = new ChunkPosQueue();
+	}
+	
+	
+	
+	//==================//
+	// list/set methods //
+	//==================//
+	
+	public boolean contains(DhChunkPos pos) 
+	{ 
+		return this.updateQueue.contains(pos)
+			|| this.ignoredChunkPosSet.contains(pos)	
+			|| this.preUpdateQueue.contains(pos); 
+	}
+	
+	public void clear()
+	{
+		this.updateQueue.clear();
+		this.preUpdateQueue.clear();
+		this.ignoredChunkPosSet.clear();
+	}
+	public int getQueuedCount() { return this.updateQueue.getQueuedCount() + this.preUpdateQueue.getQueuedCount(); }
+	public boolean isEmpty()
+	{
+		return this.updateQueue.isEmpty()
+				&& this.preUpdateQueue.isEmpty();
+	}
+	
+	/**
+	 * Adds an item to the pre-update queue of chunks that might need to be updated.
+	 * If there are no more slots, replaces the item furthest from the center in the update queue.
+	 */
+	public void addItemToPreUpdateQueue(DhChunkPos pos, ChunkUpdateData updateData)
+	{ this.addItemToQueue(pos, updateData, this.preUpdateQueue); }
+	
+	public void addItemToUpdateQueue(DhChunkPos pos, ChunkUpdateData updateData)
+	{ this.addItemToQueue(pos, updateData, this.updateQueue); }
+	
+	private void addItemToQueue(DhChunkPos pos, ChunkUpdateData updateData, ChunkPosQueue queue)
+	{
+		int remainingSlots = this.maxSize - this.getQueuedCount();
+		
+		// If no slots are left, get one by removing the item furthest from the center
+		if (remainingSlots <= 0)
+		{
+			ChunkUpdateData removedData = queue.popFurthest();
+			if (removedData != null)
+			{
+				this.queuedChunkWrapperByChunkPos.remove(removedData.chunkWrapper.getChunkPos());
+			}
+		}
+		
+		queue.addItem(pos,updateData);
+		this.queuedChunkWrapperByChunkPos.putIfAbsent(pos, updateData.chunkWrapper);
+		
+		remainingSlots = this.maxSize - this.getQueuedCount();
+		if (remainingSlots <= 0)
+		{
+			this.sendOverloadMessage();
+		}
+	}
+	
+	
+	private void sendOverloadMessage()
+	{
+		// limit how often an overloaded message can be sent
+		long msBetweenLastLog = System.currentTimeMillis() - lastOverloadedLogMessageMsTime;
+		if (msBetweenLastLog >= SharedApi.MIN_MS_BETWEEN_OVERLOADED_LOG_MESSAGE)
+		{
+			lastOverloadedLogMessageMsTime = System.currentTimeMillis();
+			
+			String message = EMinecraftColor.ORANGE + "Distant Horizons overloaded, too many chunks queued for LOD processing. " + EMinecraftColor.CLEAR_FORMATTING +
+					"\nThis may result in holes in your LODs. " +
+					"\nFix: move through the world slower, decrease your vanilla render distance, slow down your world pre-generator (IE Chunky), or increase the Distant Horizons' CPU thread counts. " +
+					"\nMax queue count [" + SharedApi.CHUNK_UPDATE_QUEUE_MANAGER.maxSize + "] ([" + SharedApi.MAX_UPDATING_CHUNK_COUNT_PER_THREAD_AND_PLAYER + "] per thread+players).";
+			
+			boolean showWarningInChat = Config.Common.Logging.Warning.showUpdateQueueOverloadedChatWarning.get();
+			if (showWarningInChat)
+			{
+				ClientApi.INSTANCE.showChatMessageNextFrame(message);
+			}
+			
+			// Don't log warnings in singleplayer or in hosted LAN since it usually isn't a problem (and if it is it's easy to notice).
+			// Servers should always log since being overloaded is harder to notice. 
+			EWorldEnvironment environment = SharedApi.getEnvironment();
+			if (showWarningInChat || environment == EWorldEnvironment.SERVER_ONLY)
+			{
+				LOGGER.warn(message);
+			}
+		}
+	}
+	
+	/** 
+	 * Tries to return a cloned chunk wrapper from memory.
+	 * Returns null if no chunk is available.
+	 * <br><br>
+	 * This is done instead of accessing the MC level since
+	 * accessing the level often requires running on the render or server
+	 * thread, which causes stuttering.
+	 */
+	@Nullable
+	public IChunkWrapper tryGetChunk(DhChunkPos pos)
+	{
+		IChunkWrapper existingWrapper = this.queuedChunkWrapperByChunkPos.get(pos);
+		if (existingWrapper == null)
+		{
+			return null;
+		}
+	
+		return existingWrapper.copy();
+	}
+	
+	
+	
+	//=========//
+	// ignores //
+	//=========//
+	
+	public void addPosToIgnore(DhChunkPos chunkPos) { this.ignoredChunkPosSet.add(chunkPos); }
+	public void removePosToIgnore(DhChunkPos chunkPos) { this.ignoredChunkPosSet.remove(chunkPos); }
+	
+	
+	
+	//==================//
+	// position methods //
+	//==================//
+	
+	public void setCenter(DhChunkPos newCenter)
+	{
+		this.updateQueue.setCenter(newCenter);
+		this.preUpdateQueue.setCenter(newCenter);
+	}
+	
+	
+}

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

@@ -0,0 +1,72 @@
+package com.seibel.distanthorizons.core.api.internal.rendering;
+
+import com.seibel.distanthorizons.core.api.internal.ClientApi;
+import com.seibel.distanthorizons.core.util.math.Mat4f;
+import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
+
+/**
+ * Used to track the rendering state for the current frame.
+ * 
+ * @see ClientApi
+ */
+public class DhRenderState
+{
+	public Mat4f mcModelViewMatrix = null;
+	public Mat4f mcProjectionMatrix = null;
+	public float frameTime = -1;
+	public IClientLevelWrapper clientLevelWrapper = null;
+	
+	
+	
+	//========//
+	// checks //
+	//========//
+	
+	public String unableToRenderBecause()
+	{
+		String errorReasons = "";
+		
+		// the matrix may be the identity matrix or and old/incorrect matrix
+		// but we did set it at least once before this
+		if (this.mcModelViewMatrix == null)
+		{
+			errorReasons += "no MVM Matrix, ";
+		}
+		
+		if (this.mcProjectionMatrix == null)
+		{
+			errorReasons += "no Projection Matrix, ";
+		}
+		
+		if (this.frameTime == -1)
+		{
+			errorReasons += "no Frame Time, ";
+		}
+		
+		if (this.clientLevelWrapper == null)
+		{
+			errorReasons += "no Level Wrapper, ";
+		}
+		
+		return errorReasons;
+	}
+	
+	public boolean canRender()
+	{
+		// separated variable to allow for easy checking with the debugger
+		String errorReasons = this.unableToRenderBecause();
+		return errorReasons.isEmpty();
+	}
+	
+	public void canRenderOrThrow() throws IllegalStateException
+	{
+		String errorReasons = this.unableToRenderBecause();
+		if (!errorReasons.isEmpty())
+		{
+			throw new IllegalStateException(errorReasons);
+		}
+	}
+	
+	
+	
+}

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

@@ -1,54 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.core.config;
-
-import com.seibel.distanthorizons.core.config.types.ConfigEntry;
-
-// TODO: Make this integrate with the config system
-public class AppliedConfigState<T>
-{
-	final ConfigEntry<T> entry;
-	T activeValue;
-	
-	
-	
-	public AppliedConfigState(ConfigEntry<T> entryToWatch)
-	{
-		this.entry = entryToWatch;
-		this.activeValue = entryToWatch.get();
-	}
-	
-	
-	
-	/** Returns true if the value was changed */
-	public boolean pollNewValue()
-	{
-		T newValue = this.entry.get();
-		if (newValue.equals(this.activeValue))
-		{
-			return false;
-		}
-		this.activeValue = newValue;
-		return true;
-	}
-	
-	public T get() { return this.activeValue; }
-	
-}

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

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

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

@@ -0,0 +1,331 @@
+/*
+ *    This file is part of the Distant Horizons mod
+ *    licensed under the GNU LGPL v3 License.
+ *
+ *    Copyright (C) 2020 James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU Lesser General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.distanthorizons.core.config;
+
+import com.seibel.distanthorizons.core.config.file.ConfigFileHandler;
+import com.seibel.distanthorizons.core.config.types.*;
+import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.wrapperInterfaces.config.ILangWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper;
+import com.seibel.distanthorizons.coreapi.ModInfo;
+import com.seibel.distanthorizons.core.logging.DhLogger;
+
+import java.lang.reflect.Field;
+import java.nio.file.Path;
+import java.util.*;
+
+/**
+ * Sets up everything in {@link Config} for the file/GUI and keeps track of all
+ * entries therein. <br>
+ * This should be run after the singletons have been bound.
+ *
+ * @author coolGi
+ * @author Ran
+ * 
+ * @see Config
+ */
+public class ConfigHandler
+{
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	
+	private static final IMinecraftSharedWrapper MC_SHARED = SingletonInjector.INSTANCE.get(IMinecraftSharedWrapper.class);
+	
+	/**
+	 * What the config works with
+	 * <br> 
+	 * <br> {@link Enum}
+	 * <br> {@link Boolean}
+	 * <br> {@link Byte}
+	 * <br> {@link Integer}
+	 * <br> {@link Double}
+	 * <br> {@link Short}
+	 * <br> {@link Long}
+	 * <br> {@link Float}
+	 * <br> {@link String}
+	 * <br> 
+	 * <br> // Below, "T" should be a value from above
+	 * <br> // Note: This is not checked, so we trust that you are doing the right thing (TODO: Check it)
+	 * <br> List<T>
+	 * <br> ArrayList<T>
+	 * <br> Map<String, T>
+	 * <br> HashMap<String, T>
+	 */
+	private static final List<Class<?>> ACCEPTABLE_INPUTS = new ArrayList<Class<?>>()
+	{{
+		this.add(Boolean.class);
+		this.add(Byte.class);
+		this.add(Integer.class);
+		this.add(Double.class);
+		this.add(Short.class);
+		this.add(Long.class);
+		this.add(Float.class);
+		this.add(String.class);
+		
+		// partially implemented but not entirely
+		this.add(List.class);
+		this.add(ArrayList.class);
+		this.add(Map.class);
+		this.add(HashMap.class);
+	}};
+	
+	
+	
+	public static final ConfigHandler INSTANCE = new ConfigHandler();
+	
+	public final ConfigFileHandler configFileHandler = new ConfigFileHandler(getConfigPath());
+	public final List<AbstractConfigBase<?>> configBaseList = new ArrayList<>();
+	
+	public boolean isLoaded = false;
+	/** 
+	 * Disables the minimum and maximum validation. <Br>
+	 * Fun to use, but should be disabled by default.
+	 */
+	public boolean runMinMaxValidation = true;
+	
+	
+	
+	//=============//
+	// constructor //
+	//=============//
+	
+	public static void tryRunFirstTimeSetup()
+	{
+		if (INSTANCE.isLoaded)
+		{
+			LOGGER.debug("ConfigHandler setup already run, ignoring.");
+			return;
+		}
+		
+		INSTANCE.runFirstTimeSetup();
+	}
+	private void runFirstTimeSetup()
+	{
+		LOGGER.info("Initialising config for [" + ModInfo.NAME + "]");
+		
+		this.initNestedClass(Config.class, ""); // Init root category
+		
+		this.configFileHandler.loadFromFile();
+		this.runMinMaxValidation = !Config.Client.Advanced.Debugging.allowUnsafeValues.get();
+		
+		this.isLoaded = true;
+		LOGGER.info("[" + ModInfo.NAME + "] Config initialised");
+	}
+	/** Gets the default config path given a mod name */
+	private static Path getConfigPath()
+	{
+		return MC_SHARED
+				.getInstallationDirectory().toPath()
+				.resolve("config")
+				.resolve(ModInfo.NAME + ".toml");
+	}
+	/** Put all the config entries into configEntryList */
+	private void initNestedClass(Class<?> configClass, String category)
+	{
+		Field[] fields = configClass.getFields();
+		for (Field field : fields)
+		{
+			// ignore any non-config variables
+			if (!AbstractConfigBase.class.isAssignableFrom(field.getType()))
+			{
+				continue;
+			}
+			
+			
+			// add this config to the master list
+			try
+			{
+				this.configBaseList.add((AbstractConfigBase<?>) field.get(field.getType()));
+			}
+			catch (IllegalAccessException e)
+			{
+				LOGGER.warn("Unable to add config ["+field.getType().getName()+"], error: ["+e.getMessage()+"].", e);
+				continue;
+			}
+			
+			
+			// set any necessary variables in this config
+			AbstractConfigBase<?> configBase = this.configBaseList.get(this.configBaseList.size() - 1);
+			configBase.category = category;
+			configBase.name = field.getName();
+			
+			
+			// validate the config's input type
+			if (ConfigEntry.class.isAssignableFrom(field.getType()))
+			{
+				if (!isAcceptableType(configBase.getType()))
+				{
+					LOGGER.error("Invalid variable type at [" + (category.isEmpty() ? "" : category + ".") + field.getName() + "].");
+					LOGGER.error("Type [" + configBase.getType() + "] is not one of these types [" + ACCEPTABLE_INPUTS.toString() + "]");
+					this.configBaseList.remove(this.configBaseList.size() - 1); // Delete the entry if it is invalid so the game can still run
+				}
+			}
+			
+			// recursively add deeper categories if present
+			if (ConfigCategory.class.isAssignableFrom(field.getType()))
+			{
+				ConfigCategory configCategory = (ConfigCategory) configBase;
+				
+				if (configCategory.getDestination() == null)
+				{
+					configCategory.destination = configBase.getNameAndCategory();
+				}
+				
+				// shouldn't happen, but just in case
+				if (configBase.get() != null)
+				{
+					this.initNestedClass(configCategory.get(), configCategory.getDestination());
+				}
+			}
+		}
+	}
+	private static boolean isAcceptableType(Class<?> inputClass)
+	{
+		if (inputClass.isEnum())
+		{
+			return true;
+		}
+		
+		return ACCEPTABLE_INPUTS.contains(inputClass);
+	}
+	
+	
+	
+	//===============//
+	// lang handling //
+	//===============//
+	
+	/**
+	 * Used for checking that all the lang files for the config exist.
+	 * This is just to re-format the lang or check if there is something in the lang that is missing
+	 *
+	 * @param onlyShowMissing If false then this will remake the entire config lang
+	 * @param checkEnums Checks if all the lang for the enum's exist
+	 */
+	@SuppressWarnings("unchecked")
+	public String generateLang(boolean onlyShowMissing, boolean checkEnums)
+	{
+		ILangWrapper langWrapper = SingletonInjector.INSTANCE.get(ILangWrapper.class);
+		List<Class<? extends Enum<?>>> enumList = new ArrayList<>();
+		
+		String generatedLang = "";
+		
+		String starter = "  \"";
+		String separator = "\":\n    \"";
+		String ending = "\",\n";
+		
+		// config entries
+		for (AbstractConfigBase<?> entry : this.configBaseList)
+		{
+			String entryPrefix = "distanthorizons.config." + entry.getNameAndCategory();
+			
+			if (checkEnums 
+				&& entry.getType().isEnum() 
+				&& !enumList.contains(entry.getType()))
+			{ 
+				// Put it in an enum list to work with at the end
+				enumList.add((Class<? extends Enum<?>>) entry.getType());
+			}
+			
+			
+			// config file items don't need lang entries
+			if (!entry.getAppearance().showInGui)
+			{
+				continue;
+			}
+			
+			// some entries don't need localization
+			if (ConfigUiLinkedEntry.class.isAssignableFrom(entry.getClass())
+				|| ConfigUISpacer.class.isAssignableFrom(entry.getClass()))
+			{
+				continue;
+			}
+			
+			if (ConfigUIComment.class.isAssignableFrom(entry.getClass())
+				&& ((ConfigUIComment)entry).parentConfigPath != null)
+			{
+				// TODO this could potentially add the same item multiple times
+				entryPrefix = "distanthorizons.config." + ((ConfigUIComment)entry).parentConfigPath;
+			}
+			
+			
+			if (langWrapper.langExists(entryPrefix)
+				&& onlyShowMissing)
+			{
+				continue;
+			}
+			
+			
+			generatedLang += starter
+					+ entryPrefix
+					+ separator
+					+ langWrapper.getLang(entryPrefix)
+					+ ending
+			;
+			
+			// only add tooltips for entries that are also missing
+			// their primary lang
+			// this is done since not all menu items need a tooltip
+			if (!langWrapper.langExists(entryPrefix + ".@tooltip") 
+				|| !onlyShowMissing)
+			{
+				generatedLang += starter
+						+ entryPrefix + ".@tooltip"
+						+ separator
+						+ langWrapper.getLang(entryPrefix + ".@tooltip")
+						.replaceAll("\n", "\\\\n")
+						.replaceAll("\"", "\\\\\"")
+						+ ending
+				;
+			}
+		}
+		
+		
+		// enums
+		if (!enumList.isEmpty())
+		{
+			generatedLang += "\n"; // Separate the main lang with the enum's
+			
+			for (Class<? extends Enum> anEnum : enumList)
+			{
+				for (Object enumStr : new ArrayList<Object>(EnumSet.allOf(anEnum)))
+				{
+					String enumPrefix = "distanthorizons.config.enum." + anEnum.getSimpleName() + "." + enumStr.toString();
+					
+					if (!langWrapper.langExists(enumPrefix) 
+						|| !onlyShowMissing)
+					{
+						generatedLang += starter
+								+ enumPrefix
+								+ separator
+								+ langWrapper.getLang(enumPrefix)
+								+ ending
+						;
+					}
+				}
+			}
+		}
+		
+		return generatedLang;
+	}
+	
+	
+	
+}

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

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

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

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

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

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

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

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

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

@@ -17,34 +17,27 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-package com.seibel.distanthorizons.core.enums.worldGeneration;
+package com.seibel.distanthorizons.core.config.api.converters;
+
+import com.seibel.distanthorizons.api.enums.rendering.EDhApiRendererMode;
+import com.seibel.distanthorizons.coreapi.interfaces.config.IConverter;
 
 /**
- * MULTI_THREADED, <br>
+ * Used to support deprecated config options that may be identical
- * SINGLE_THREADED, <br>
+ * in implementation but with the On/Off values flipped.
- * SERVER_THREAD, <br>
  *
  * @author James Seibel
- * @version 7-25-2022
+ * @version 2025-12-22
  */
-public enum EWorldGenThreadMode
+public class InvertedBoolConverter implements IConverter<Boolean, Boolean>
 {
-	/**
-	 * This world generator can be run on an unlimited number
-	 * of concurrent threads.
-	 */
-	MULTI_THREADED,
 	
-	/**
+	@Override 
-	 * This world generator can only be run on one thread at
+	public Boolean convertToCoreType(Boolean core)
-	 * a time, however that thread can run concurrently
+	{ return !core; }
-	 * to Minecraft's server thread.
+	
-	 */
+	@Override 
-	SINGLE_THREADED,
+	public Boolean convertToApiType(Boolean api)
+	{ return !api; }
 	
-	/**
-	 * This world generator can only be run on Minecraft's
-	 * server thread.
-	 */
-	SERVER_THREAD,
 }

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

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

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

@@ -0,0 +1,125 @@
+/*
+ *    This file is part of the Distant Horizons mod
+ *    licensed under the GNU LGPL v3 License.
+ *
+ *    Copyright (C) 2020 James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU Lesser General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.distanthorizons.core.config.eventHandlers;
+
+import com.seibel.distanthorizons.api.enums.config.EDhApiMcRenderingFadeMode;
+import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiBeforeRenderEvent;
+import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiCancelableEventParam;
+import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiRenderParam;
+import com.seibel.distanthorizons.core.config.Config;
+import com.seibel.distanthorizons.core.config.listeners.IConfigListener;
+import com.seibel.distanthorizons.core.logging.DhLogger;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.coreapi.util.StringUtil;
+
+public class IgnoredDimensionCsvHandler extends DhApiBeforeRenderEvent implements IConfigListener
+{
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
+	
+	public static IgnoredDimensionCsvHandler INSTANCE = new IgnoredDimensionCsvHandler();
+	
+	private String[] dimensionNames = null;
+	
+	
+	
+	//=============//
+ 	// constructor //
+	//=============//
+	
+	/** private since we only ever need one handler at a time */
+	private IgnoredDimensionCsvHandler() { }
+	
+	
+	
+	//=================//
+	// config handling //
+	//=================//
+	
+	@Override
+	public void onConfigValueSet()
+	{
+		String ignoredDimensionCsvString = Config.Client.Advanced.Graphics.Experimental.ignoredDimensionCsv.get();
+		if (ignoredDimensionCsvString == null 
+			|| ignoredDimensionCsvString.isEmpty())
+		{
+			LOGGER.info("Dimension ignoring disabled, DH will render all dimensions.");
+			this.dimensionNames = null;
+		}
+		else
+		{
+			try
+			{
+				this.dimensionNames = ignoredDimensionCsvString.split(",");
+				LOGGER.info("DH set to ignore dimensions: ["+ StringUtil.join(", ", this.dimensionNames)+"].");
+			}
+			catch (Exception e)
+			{
+				LOGGER.error("Failed to separate ignored dimensions from CSV string, error: ["+e.getMessage()+"].", e);
+				this.dimensionNames = null;
+			}
+		}
+		
+	}
+	
+	
+	
+	//===================//
+	// external handling //
+	//===================//
+	
+	@Override
+	public void beforeRender(DhApiCancelableEventParam<DhApiRenderParam> event)
+	{
+		String dimName = event.value.clientLevelWrapper.getDimensionName();
+		if (IgnoredDimensionCsvHandler.INSTANCE.dimensionNameShouldBeIgnored(dimName))
+		{
+			event.cancelEvent();
+			Config.Client.Advanced.Graphics.Fog.enableVanillaFog.setApiValue(true);
+			Config.Client.Advanced.Graphics.Quality.vanillaFadeMode.setApiValue(EDhApiMcRenderingFadeMode.NONE);
+		}
+		else
+		{
+			Config.Client.Advanced.Graphics.Fog.enableVanillaFog.setApiValue(null);
+			Config.Client.Advanced.Graphics.Quality.vanillaFadeMode.setApiValue(null);
+		}
+	}
+	
+	public boolean dimensionNameShouldBeIgnored(String dimName)
+	{
+		if (this.dimensionNames == null 
+			|| this.dimensionNames.length == 0)
+		{
+			return false;
+		}
+		
+		for (int i = 0; i < this.dimensionNames.length; i++)
+		{
+			String dimNameToIgnore = this.dimensionNames[i];
+			if (dimName.equalsIgnoreCase(dimNameToIgnore))
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	
+}

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

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

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

@@ -1,114 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.core.config.eventHandlers;
-
-import com.seibel.distanthorizons.api.DhApi;
-import com.seibel.distanthorizons.api.enums.config.*;
-import com.seibel.distanthorizons.api.enums.rendering.EDhApiDebugRendering;
-import com.seibel.distanthorizons.api.enums.rendering.EDhApiTransparency;
-import com.seibel.distanthorizons.core.config.listeners.ConfigChangeListener;
-import com.seibel.distanthorizons.core.config.Config;
-import com.seibel.distanthorizons.core.util.TimerUtil;
-
-import java.util.Timer;
-import java.util.TimerTask;
-
-/**
- * Listens to the config and will automatically
- * clear the current render cache if certain settings are changed. <br> <br>
- *
- * Note: if additional settings should clear the render cache, add those to this listener, don't create a new listener
- */
-public class RenderCacheConfigEventHandler
-{
-	private static RenderCacheConfigEventHandler INSTANCE;
-	
-	
-	// previous values used to check if a watched setting was actually modified
-	private final ConfigChangeListener<EDhApiMaxHorizontalResolution> horizontalResolutionChangeListener;
-	private final ConfigChangeListener<EDhApiVerticalQuality> verticalQualityChangeListener;
-	private final ConfigChangeListener<EDhApiTransparency> transparencyChangeListener;
-	private final ConfigChangeListener<EDhApiBlocksToAvoid> blocksToIgnoreChangeListener;
-	private final ConfigChangeListener<Boolean> tintWithAvoidedBlocksChangeListener;
-	
-	private final ConfigChangeListener<Double> brightnessMultiplierChangeListener;
-	private final ConfigChangeListener<Double> saturationMultiplierChangeListener;
-	private final ConfigChangeListener<EDhApiLodShading> lodShadingChangeListener;
-	private final ConfigChangeListener<EDhApiGrassSideRendering> grassSideChangeListener;
-	
-	private final ConfigChangeListener<EDhApiDebugRendering> debugRenderingChangeListener;
-	
-	/** how long to wait in milliseconds before applying the config changes */
-	private static final long TIMEOUT_IN_MS = 4_000L;
-	private Timer cacheClearingTimer;
-	
-	
-	
-	public static RenderCacheConfigEventHandler getInstance()
-	{
-		if (INSTANCE == null)
-		{
-			INSTANCE = new RenderCacheConfigEventHandler();
-		}
-		
-		return INSTANCE;
-	}
-	
-	/** private since we only ever need one handler at a time */
-	private RenderCacheConfigEventHandler()
-	{
-		this.horizontalResolutionChangeListener = new ConfigChangeListener<>(Config.Client.Advanced.Graphics.Quality.maxHorizontalResolution, (newValue) -> this.refreshRenderDataAfterTimeout());
-		this.verticalQualityChangeListener = new ConfigChangeListener<>(Config.Client.Advanced.Graphics.Quality.verticalQuality, (newValue) -> this.refreshRenderDataAfterTimeout());
-		this.transparencyChangeListener = new ConfigChangeListener<>(Config.Client.Advanced.Graphics.Quality.transparency, (newValue) -> this.refreshRenderDataAfterTimeout());
-		this.blocksToIgnoreChangeListener = new ConfigChangeListener<>(Config.Client.Advanced.Graphics.Quality.blocksToIgnore, (newValue) -> this.refreshRenderDataAfterTimeout());
-		this.tintWithAvoidedBlocksChangeListener = new ConfigChangeListener<>(Config.Client.Advanced.Graphics.Quality.tintWithAvoidedBlocks, (newValue) -> this.refreshRenderDataAfterTimeout());
-		
-		this.brightnessMultiplierChangeListener = new ConfigChangeListener<>(Config.Client.Advanced.Graphics.Quality.brightnessMultiplier, (newValue) -> this.refreshRenderDataAfterTimeout());
-		this.saturationMultiplierChangeListener = new ConfigChangeListener<>(Config.Client.Advanced.Graphics.Quality.saturationMultiplier, (newValue) -> this.refreshRenderDataAfterTimeout());
-		this.lodShadingChangeListener = new ConfigChangeListener<>(Config.Client.Advanced.Graphics.Quality.lodShading, (newValue) -> this.refreshRenderDataAfterTimeout());
-		this.grassSideChangeListener = new ConfigChangeListener<>(Config.Client.Advanced.Graphics.Quality.grassSideRendering, (newValue) -> this.refreshRenderDataAfterTimeout());
-		
-		this.debugRenderingChangeListener = new ConfigChangeListener<>(Config.Client.Advanced.Debugging.debugRendering, (newValue) -> this.refreshRenderDataAfterTimeout());
-		
-	}
-	
-	
-	/** Calling this method multiple times will reset the timer */
-	private void refreshRenderDataAfterTimeout()
-	{
-		// stop the previous timer if one exists
-		if (this.cacheClearingTimer != null)
-		{
-			this.cacheClearingTimer.cancel();
-		}
-		
-		// create a new timer task
-		TimerTask timerTask = new TimerTask()
-		{
-			public void run()
-			{
-				DhApi.Delayed.renderProxy.clearRenderDataCache();
-			}
-		};
-		this.cacheClearingTimer = TimerUtil.CreateTimer("RenderCacheClearConfigTimer");
-		this.cacheClearingTimer.schedule(timerTask, TIMEOUT_IN_MS);
-	}
-	
-}

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

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

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

@@ -35,7 +35,7 @@ public class WorldCurvatureConfigEventHandler implements IConfigListener
 {
 	public static WorldCurvatureConfigEventHandler INSTANCE = new WorldCurvatureConfigEventHandler();
 	
-	private static final int MIN_VALID_CURVE_VALUE = 50; 
+	public static final int MIN_VALID_CURVE_VALUE = 50; 
 	
 	
 	/** private since we only ever need one handler at a time */
@@ -52,6 +52,11 @@ public class WorldCurvatureConfigEventHandler implements IConfigListener
 			// shouldn't update the UI, otherwise we may end up fighting the user
 			Config.Client.Advanced.Graphics.Experimental.earthCurveRatio.set(MIN_VALID_CURVE_VALUE);
 		}
+		else if (curveRatio < 0 && curveRatio > -MIN_VALID_CURVE_VALUE)
+		{
+			// same as above, but in the negative direction
+			Config.Client.Advanced.Graphics.Experimental.earthCurveRatio.set(-MIN_VALID_CURVE_VALUE);
+		}
 		
 	}
 	

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -23,6 +23,7 @@ import org.jetbrains.annotations.NotNull;
 
 import javax.swing.*;
 import java.awt.*;
+import java.awt.event.ActionEvent;
 import java.awt.event.KeyEvent;
 import java.awt.event.KeyListener;
 
@@ -35,6 +36,8 @@ public class JavaScreenHandlerScreen extends AbstractScreen
 	public static boolean firstRun = true;
 	public final Component jComponent;
 	
+	
+	
 	static
 	{
 		// Note: this code can cause Mac
@@ -54,19 +57,25 @@ public class JavaScreenHandlerScreen extends AbstractScreen
 	public void init()
 	{
 		if (firstRun)
+		{
 			frame = EmbeddedFrameUtil.embeddedFrameCreate(this.minecraftWindow); // Don't call this multiple times
+		}
 		
-		frame.add(jComponent);
+		frame.add(this.jComponent);
+		frame.setBackground(new Color(0, 125, 155));
 		
 		JavaScreenHandlerScreen thiss = this;
 		
-		frame.addKeyListener(new KeyListener() {
+		frame.addKeyListener(new KeyListener() 
+		{
 			@Override
 			public void keyPressed(KeyEvent keyEvent)
 			{
 				System.out.println("Key pressed code=" + keyEvent.getKeyCode() + ", char=" + keyEvent.getKeyChar());
 				if (keyEvent.getKeyCode() == KeyEvent.VK_ESCAPE)
+				{
 					thiss.close = true;
+				}
 			}
 			
 			@Override
@@ -80,8 +89,8 @@ public class JavaScreenHandlerScreen extends AbstractScreen
 			EmbeddedFrameUtil.embeddedFrameSetBounds(frame, 0, 0, this.width, this.height);
 			firstRun = false;
 		}
-		else
+		
-			EmbeddedFrameUtil.showFrame(frame);
+		EmbeddedFrameUtil.showFrame(frame);
 	}
 	
 	/** A testing/debug screen */
@@ -89,13 +98,43 @@ public class JavaScreenHandlerScreen extends AbstractScreen
 	{
 		public ExampleScreen()
 		{
-			setLayout(new GridBagLayout());
+			this.setLayout(new GridBagLayout());
-			GridBagConstraints constraints = new GridBagConstraints();
+			this.setBackground(new Color(255, 0, 0)); // doesn't appear to be used
-			constraints.fill = GridBagConstraints.HORIZONTAL;
+			
-			constraints.weightx = 0.5;
+			GridBagConstraints helloWorldConstraints = new GridBagConstraints();
-			constraints.gridx = 0;
+			helloWorldConstraints.weightx = 0.5;
-			constraints.gridy = 0;
+			helloWorldConstraints.gridx = 0;
-			add(new JLabel("Hello World!"), constraints);
+			helloWorldConstraints.gridy = 0;
+			//helloWorldConstraints.fill = GridBagConstraints.BOTH;
+			this.add(new JLabel("Hello World!"), helloWorldConstraints);
+			
+			
+			GridBagConstraints buttonConstraints = new GridBagConstraints();
+			buttonConstraints.weightx = 0.5;
+			buttonConstraints.gridx = 0;
+			buttonConstraints.gridy = 1;
+			//buttonConstraints.fill = GridBagConstraints.BOTH;
+			JButton button = new JButton();
+			button.setBackground(Color.GREEN);
+			button.setFocusable(false); // otherwise we can't use escape to leave
+			button.setAction(new ExampleButtonEventHandler("Button text"));
+			this.add(button, buttonConstraints);
+		}
+		
+		private class ExampleButtonEventHandler extends AbstractAction
+		{
+			public ExampleButtonEventHandler(String text)
+			{
+				super(text);
+				//this.putValue(SHORT_DESCRIPTION, text);
+				//this.putValue(MNEMONIC_KEY, text);
+			}
+			
+			@Override
+			public void actionPerformed(ActionEvent e)
+			{
+				System.out.println("button pressed");
+			}
 		}
 		
 	}
@@ -116,8 +155,10 @@ public class JavaScreenHandlerScreen extends AbstractScreen
 	@Override
 	public void onClose()
 	{
-		frame.remove(jComponent);
+		frame.remove(this.jComponent);
 		EmbeddedFrameUtil.hideFrame(frame);
 	}
 	
+	
+	
 }

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

@@ -1,126 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod
- *    licensed under the GNU LGPL v3 License.
- *
- *    Copyright (C) 2020 James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU Lesser General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU Lesser General Public License for more details.
- *
- *    You should have received a copy of the GNU Lesser General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.distanthorizons.core.config.gui;
-
-import com.seibel.distanthorizons.api.enums.config.EDhApiGpuUploadMethod;
-import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
-import com.seibel.distanthorizons.core.render.glObject.buffer.GLVertexBuffer;
-import com.seibel.distanthorizons.core.render.glObject.shader.ShaderProgram;
-import com.seibel.distanthorizons.core.render.glObject.vertexAttribute.AbstractVertexAttribute;
-import com.seibel.distanthorizons.core.render.glObject.vertexAttribute.VertexPointer;
-import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftGLWrapper;
-import org.lwjgl.opengl.GL32;
-
-import java.nio.ByteBuffer;
-import java.nio.ByteOrder;
-
-/**
- * @author coolGi
- */
-public class OpenGLConfigScreen extends AbstractScreen
-{
-	private static final IMinecraftGLWrapper GLMC = SingletonInjector.INSTANCE.get(IMinecraftGLWrapper.class);
-	
-	private ShaderProgram basicShader;
-	private GLVertexBuffer sameContextBuffer;
-	private GLVertexBuffer sharedContextBuffer;
-	private AbstractVertexAttribute va;
-	
-	
-	
-	@Override
-	public void init()
-	{
-		System.out.println("init");
-		
-		this.va = AbstractVertexAttribute.create();
-		this.va.bind();
-		// Pos
-		this.va.setVertexAttribute(0, 0, VertexPointer.addVec2Pointer(false));
-		// Color
-		this.va.setVertexAttribute(0, 1, VertexPointer.addVec4Pointer(false));
-		this.va.completeAndCheck(Float.BYTES * 6);
-		this.basicShader = new ShaderProgram("shaders/test/vert.vert", "shaders/test/frag.frag",
-						"fragColor", new String[]{"vPosition", "color"});
-		this.createBuffer();
-	}
-	
-	// Render a square with uv color
-	private static final float[] vertices = {
-			// PosX,Y, ColorR,G,B,A
-			-0.5f, -0.5f, 0.0f, 0.0f, 0.0f, 1.0f,
-			0.4f, -0.4f, 1.0f, 0.0f, 0.0f, 1.0f,
-			0.3f, 0.3f, 1.0f, 1.0f, 0.0f, 0.0f,
-			-0.2f, 0.2f, 0.0f, 1.0f, 1.0f, 1.0f
-	};
-	
-	private static GLVertexBuffer createTextingBuffer()
-	{
-		ByteBuffer buffer = ByteBuffer.allocateDirect(vertices.length * Float.BYTES);
-		// Fill buffer with the vertices.
-		buffer = buffer.order(ByteOrder.nativeOrder());
-		buffer.asFloatBuffer().put(vertices);
-		buffer.rewind();
-		GLVertexBuffer vbo = new GLVertexBuffer(false);
-		vbo.bind();
-		vbo.uploadBuffer(buffer, 4, EDhApiGpuUploadMethod.DATA, vertices.length * Float.BYTES);
-		return vbo;
-	}
-	
-	private void createBuffer()
-	{
-		this.sharedContextBuffer = createTextingBuffer();
-		this.sameContextBuffer = createTextingBuffer();
-	}
-	
-	@Override
-	public void render(float delta)
-	{
-		System.out.println("Updated config screen with the delta of " + delta);
-		
-		GL32.glViewport(0, 0, this.width, this.height);
-		GL32.glPolygonMode(GL32.GL_FRONT_AND_BACK, GL32.GL_FILL);
-		GLMC.disableFaceCulling();
-		GLMC.disableDepthTest();
-		GLMC.disableBlend();
-		
-		this.basicShader.bind();
-		this.va.bind();
-		
-		// Switch between the two buffers per second
-		if (System.currentTimeMillis() % 2000 < 1000)
-		{
-			this.sameContextBuffer.bind();
-			this.va.bindBufferToAllBindingPoints(this.sameContextBuffer.getId());
-		}
-		else
-		{
-			this.sameContextBuffer.bind();
-			this.va.bindBufferToAllBindingPoints(this.sharedContextBuffer.getId());
-		}
-		// Render the square
-		GL32.glDrawArrays(GL32.GL_TRIANGLE_FAN, 0, 4);
-		GL32.glClear(GL32.GL_DEPTH_BUFFER_BIT);
-	}
-	
-	@Override
-	public void tick() { System.out.println("Ticked"); }
-	
-}

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,71 @@
+/*
+ *    This file is part of the Distant Horizons mod
+ *    licensed under the GNU LGPL v3 License.
+ *
+ *    Copyright (C) 2020 James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU Lesser General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.distanthorizons.core.config.types;
+
+import com.seibel.distanthorizons.core.config.types.enums.EConfigEntryAppearance;
+
+/**
+ * Adds empty space the height of a button.
+ * Useful for separating different categories.
+ */
+public class ConfigUISpacer extends AbstractConfigBase<String>
+{
+	//=============//
+	// constructor //
+	//=============//
+	
+	public ConfigUISpacer()
+	{ super(EConfigEntryAppearance.ONLY_IN_GUI, ""); }
+	
+	
+	
+	//=========//
+	// setters //
+	//=========//
+	
+	/** Appearance shouldn't be changed */
+	@Override
+	public void setAppearance(EConfigEntryAppearance newAppearance) { }
+	
+	/** Pointless to set the value */
+	@Override
+	public void set(String newValue) { }
+	
+	
+	
+	//=========//
+	// builder //
+	//=========//
+	
+	public static class Builder extends AbstractConfigBase.Builder<String, Builder>
+	{
+		/** Appearance shouldn't be changed */
+		@Override
+		public Builder setAppearance(EConfigEntryAppearance newAppearance) { return this; }
+		
+		/** Pointless to set the value */
+		@Override
+		public Builder set(String newValue) { return this; }
+		
+		public ConfigUISpacer build() { return new ConfigUISpacer(); }
+		
+	}
+	
+}

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

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

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

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

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

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

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

@@ -0,0 +1,151 @@
+package com.seibel.distanthorizons.core.dataObjects;
+
+import com.seibel.distanthorizons.core.dataObjects.fullData.FullDataPointIdMap;
+import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
+import com.seibel.distanthorizons.core.util.objects.DataCorruptedException;
+import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
+import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
+
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * A pooled compound key between the biome and blockState. <br>
+ * These objects are pooled since we will need this compound key
+ * many times.
+ * 
+ * @see FullDataPointIdMap
+ * @see IBlockStateWrapper
+ * @see IBiomeWrapper
+ */
+public class BlockBiomeWrapperPair
+{
+	private static final IWrapperFactory WRAPPER_FACTORY = SingletonInjector.INSTANCE.get(IWrapperFactory.class);
+	
+	/** two levels are present so we don't need to use a key object */
+	private static final ConcurrentHashMap<IBlockStateWrapper, ConcurrentHashMap<IBiomeWrapper, BlockBiomeWrapperPair>> CACHED_PAIR_BY_BIOME_BY_BLOCK = new ConcurrentHashMap<>();
+	
+	public final IBiomeWrapper biome;
+	public final IBlockStateWrapper blockState;
+	
+	private int hashCode = 0;
+	private boolean hashGenerated = false;
+	private String serialString = null;
+	
+	
+	
+	//=============//
+	// constructor //
+	//=============//
+	
+	public static BlockBiomeWrapperPair get(IBlockStateWrapper blockState, IBiomeWrapper biome)
+	{
+		// check for existing entry
+		ConcurrentHashMap<IBiomeWrapper, BlockBiomeWrapperPair> pairByBiomeWrapper = CACHED_PAIR_BY_BIOME_BY_BLOCK.get(blockState);
+		if (pairByBiomeWrapper != null)
+		{
+			BlockBiomeWrapperPair pair = pairByBiomeWrapper.get(biome);
+			if (pair != null)
+			{
+				return pair;
+			}
+		}
+		
+		// Lazily create the inner map and new BlockBiomeWrapperPair
+		return CACHED_PAIR_BY_BIOME_BY_BLOCK
+				.computeIfAbsent(blockState, newBlockState -> new ConcurrentHashMap<>())
+				.computeIfAbsent(biome, newBiome -> new BlockBiomeWrapperPair(biome, blockState));
+	}
+	private BlockBiomeWrapperPair(IBiomeWrapper biome, IBlockStateWrapper blockState)
+	{
+		this.biome = biome;
+		this.blockState = blockState;
+	}
+	
+	
+	
+	//===========//
+	// overrides //
+	//===========//
+	
+	/** 
+	 * Reminder: this hash code won't always be unique, collisions can occur;
+	 * because of that this hash shouldn't be the only unique identifier for this object.
+	 */
+	@Override
+	public int hashCode()
+	{
+		// cache the hash code to improve speed
+		if (!this.hashGenerated)
+		{
+			this.hashCode = generateHashCode(this);
+			this.hashGenerated = true;
+		}
+		
+		return this.hashCode;
+	}
+	private static int generateHashCode(BlockBiomeWrapperPair pair) { return generateHashCode(pair.biome, pair.blockState); }
+	private static int generateHashCode(IBiomeWrapper biome, IBlockStateWrapper blockState)
+	{
+		final int prime = 31;
+		
+		int result = 1;
+		// the biome and blockstate hashcode should be already calculated by the time
+		// we get here, so this operation should be very fast
+		result = prime * result + (biome == null ? 0 : biome.hashCode());
+		result = prime * result + (blockState == null ? 0 : blockState.hashCode());
+		return result;
+	}
+	
+	@Override
+	public boolean equals(Object otherObj)
+	{
+		if (otherObj == this)
+		{
+			return true;
+		}
+		
+		if (!(otherObj instanceof BlockBiomeWrapperPair))
+		{
+			return false;
+		}
+		
+		BlockBiomeWrapperPair other = (BlockBiomeWrapperPair) otherObj;
+		return other.biome.getSerialString().equals(this.biome.getSerialString())
+				&& other.blockState.getSerialString().equals(this.blockState.getSerialString());
+	}
+	
+	@Override
+	public String toString() { return this.serialize(); }
+	
+	
+	
+	//=================//
+	// (de)serializing //
+	//=================//
+	
+	public String serialize() 
+	{
+		if (this.serialString == null)
+		{
+			this.serialString = this.biome.getSerialString() + FullDataPointIdMap.BLOCK_STATE_SEPARATOR_STRING + this.blockState.getSerialString();
+		}
+		
+		return this.serialString;
+	}
+	
+	public static BlockBiomeWrapperPair deserialize(String str, ILevelWrapper levelWrapper) throws DataCorruptedException
+	{
+		int separatorIndex = str.indexOf(FullDataPointIdMap.BLOCK_STATE_SEPARATOR_STRING);
+		if (separatorIndex == -1)
+		{
+			throw new DataCorruptedException("Failed to deserialize BiomeBlockStateEntry ["+str+"], unable to find separator.");
+		}
+		
+		IBiomeWrapper biome = WRAPPER_FACTORY.deserializeBiomeWrapperOrGetDefault(str.substring(0, separatorIndex), levelWrapper);
+		IBlockStateWrapper blockState = WRAPPER_FACTORY.deserializeBlockStateWrapperOrGetDefault(str.substring(separatorIndex+FullDataPointIdMap.BLOCK_STATE_SEPARATOR_STRING.length()), levelWrapper);
+		return BlockBiomeWrapperPair.get(blockState, biome);
+	}
+	
+}

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

@@ -19,7 +19,8 @@
 
 package com.seibel.distanthorizons.core.dataObjects.fullData;
 
-import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
+import com.seibel.distanthorizons.core.dataObjects.BlockBiomeWrapperPair;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.pos.DhSectionPos;
 import com.seibel.distanthorizons.core.util.LodUtil;
 import com.seibel.distanthorizons.core.util.objects.DataCorruptedException;
@@ -27,16 +28,12 @@ import com.seibel.distanthorizons.core.util.objects.dataStreams.DhDataInputStrea
 import com.seibel.distanthorizons.core.util.objects.dataStreams.DhDataOutputStream;
 import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper;
-import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
-import it.unimi.dsi.fastutil.ints.Int2ReferenceOpenHashMap;
+import com.seibel.distanthorizons.core.logging.DhLogger;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
 
 import java.io.*;
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.locks.ReentrantReadWriteLock;
 
 /**
  * WARNING: This is not THREAD-SAFE! <br><br>
@@ -47,13 +44,13 @@ 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
  */
 public class FullDataPointIdMap
 {
-	private static final Logger LOGGER = LogManager.getLogger();
+	private static final DhLogger LOGGER = new DhLoggerBuilder().build();
 	/**
 	 * Should only be enabled when debugging.
 	 * Has the system check if any duplicate Entries were read/written
@@ -61,15 +58,15 @@ public class FullDataPointIdMap
 	 */
 	private static final boolean RUN_SERIALIZATION_DUPLICATE_VALIDATION = false;
 	/** Distant Horizons - Block State Wrapper */
-	private static final String BLOCK_STATE_SEPARATOR_STRING = "_DH-BSW_";
+	public static final String BLOCK_STATE_SEPARATOR_STRING = "_DH-BSW_";
 	
 	
 	/** should only be used for debugging */
 	private long pos;
 	
-	/** The index should be the same as the Entry's ID */
+	/** The index should be the same as the BlockBiomeWrapperPair's ID */
-	private final ArrayList<Entry> entryList = new ArrayList<>();
+	private final ArrayList<BlockBiomeWrapperPair> blockBiomePairList = new ArrayList<>();
-	private final ConcurrentHashMap<Entry, Integer> idMap = new ConcurrentHashMap<>();
+	private final ConcurrentHashMap<BlockBiomeWrapperPair, Integer> idMap = new ConcurrentHashMap<>();
 	
 	private int cachedHashCode = 0;
 	
@@ -91,28 +88,28 @@ public class FullDataPointIdMap
 	public IBiomeWrapper getBiomeWrapper(int id) throws IndexOutOfBoundsException { return this.getEntry(id).biome; }
 	/** @see FullDataPointIdMap#getEntry(int) */
 	public IBlockStateWrapper getBlockStateWrapper(int id) throws IndexOutOfBoundsException { return this.getEntry(id).blockState; }
-	/** @throws IndexOutOfBoundsException if the given ID isn't in the {@link FullDataPointIdMap#entryList} */
+	/** @throws IndexOutOfBoundsException if the given ID isn't in the {@link FullDataPointIdMap#blockBiomePairList} */
-	private Entry getEntry(int id) throws IndexOutOfBoundsException
+	private BlockBiomeWrapperPair getEntry(int id) throws IndexOutOfBoundsException
 	{
-		Entry entry;
+		BlockBiomeWrapperPair pair;
 		try
 		{
-			entry = this.entryList.get(id);
+			pair = this.blockBiomePairList.get(id);
 		}
 		catch (IndexOutOfBoundsException e)
 		{
-			throw new IndexOutOfBoundsException("FullData ID Map out of sync for pos: "+this.pos+". ID: ["+id+"] greater than the number of known ID's: ["+this.entryList.size()+"].");
+			throw new IndexOutOfBoundsException("FullData ID Map out of sync for pos: "+DhSectionPos.toString(this.pos)+". ID: ["+id+"] greater than the number of known ID's: ["+this.blockBiomePairList.size()+"].");
 		}
 		
-		return entry;
+		return pair;
 	}
 	
 	
 	/** @return -1 if the list is empty */
-	public int getMaxValidId() { return this.entryList.size() - 1; }
+	public int getMaxValidId() { return this.blockBiomePairList.size() - 1; }
-	public int size() { return this.entryList.size(); }
+	public int size() { return this.blockBiomePairList.size(); }
 	
-	public boolean isEmpty() { return this.entryList.isEmpty(); }
+	public boolean isEmpty() { return this.blockBiomePairList.isEmpty(); }
 	
 	public long getPos() { return this.pos; }
 	
@@ -126,11 +123,11 @@ public class FullDataPointIdMap
 	 * If an entry with the given values already exists nothing will
 	 * be added but the existing item's ID will still be returned.
 	 */
-	public int addIfNotPresentAndGetId(IBiomeWrapper biome, IBlockStateWrapper blockState) { return this.addIfNotPresentAndGetId(Entry.getEntry(biome, blockState)); }
+	public int addIfNotPresentAndGetId(IBiomeWrapper biome, IBlockStateWrapper blockState) { return this.addIfNotPresentAndGetId(BlockBiomeWrapperPair.get(blockState, biome)); }
-	private int addIfNotPresentAndGetId(Entry biomeBlockStateEntry)
+	private int addIfNotPresentAndGetId(BlockBiomeWrapperPair pair)
 	{
 		// try getting the existing ID
-		Integer nullableId = this.idMap.get(biomeBlockStateEntry);
+		Integer nullableId = this.idMap.get(pair);
 		if (nullableId != null)
 		{
 			return nullableId;
@@ -138,7 +135,7 @@ public class FullDataPointIdMap
 		
 		
 		// create the new ID
-		return this.idMap.compute(biomeBlockStateEntry, (Entry newBiomeBlockStateEntry, Integer currentId) -> 
+		return this.idMap.compute(pair, (BlockBiomeWrapperPair newPair, Integer currentId) -> 
 		{
 			if (currentId != null)
 			{
@@ -147,8 +144,8 @@ public class FullDataPointIdMap
 			
 			
 			// Add the new ID
-			currentId = this.entryList.size();
+			currentId = this.blockBiomePairList.size();
-			this.entryList.add(biomeBlockStateEntry);
+			this.blockBiomePairList.add(newPair);
 			
 			// invalidate the cached hash code
 			this.cachedHashCode = 0;
@@ -158,7 +155,7 @@ public class FullDataPointIdMap
 	}
 	
 	/**
-	 * Adds every {@link Entry} from inputMap into this map. <br>
+	 * Adds every {@link BlockBiomeWrapperPair} from inputMap into this map. <br>
 	 * Allows duplicate entries. <br><br>
 	 * 
 	 * Allowing duplicate entries should be done if a datasource is just being read in and 
@@ -168,19 +165,19 @@ public class FullDataPointIdMap
 	 */
 	public void addAll(FullDataPointIdMap inputMap)
 	{
-		ArrayList<Entry> entriesToMerge = inputMap.entryList;
+		ArrayList<BlockBiomeWrapperPair> pairsToMerge = inputMap.blockBiomePairList;
-		for (int i = 0; i < entriesToMerge.size(); i++)
+		for (int i = 0; i < pairsToMerge.size(); i++)
 		{
-			Entry entity = entriesToMerge.get(i);
+			BlockBiomeWrapperPair pair = pairsToMerge.get(i);
-			this.add(entity);
+			this.add(pair);
 		}
 	}
-	/** allows for adding duplicate {@link Entry} */
+	/** allows for adding duplicate {@link BlockBiomeWrapperPair} */
-	private void add(Entry biomeBlockStateEntry)
+	private void add(BlockBiomeWrapperPair pair)
 	{
-		int id = this.entryList.size();
+		int id = this.blockBiomePairList.size();
-		this.entryList.add(biomeBlockStateEntry);
+		this.blockBiomePairList.add(pair);
-		this.idMap.put(biomeBlockStateEntry, id);
+		this.idMap.put(pair, id);
 		
 		// invalidate the cached hash code
 		this.cachedHashCode = 0;
@@ -197,23 +194,23 @@ public class FullDataPointIdMap
 	 */
 	public int[] mergeAndReturnRemappedEntityIds(FullDataPointIdMap inputMap)
 	{
-		ArrayList<Entry> entriesToMerge = inputMap.entryList;
+		ArrayList<BlockBiomeWrapperPair> entriesToMerge = inputMap.blockBiomePairList;
-		int[] remappedEntryIds = new int[entriesToMerge.size()];
+		int[] remappedPairIds = new int[entriesToMerge.size()];
 		for (int i = 0; i < entriesToMerge.size(); i++)
 		{
-			Entry entity = entriesToMerge.get(i);
+			BlockBiomeWrapperPair entity = entriesToMerge.get(i);
 			int id = this.addIfNotPresentAndGetId(entity);
-			remappedEntryIds[i] = id;
+			remappedPairIds[i] = id;
 		}
 		
-		return remappedEntryIds;
+		return remappedPairIds;
 	}
 	
 	/** Should only be used if this map is going to be reused, otherwise bad things will happen. */
 	public void clear(long pos)
 	{
 		this.pos = pos;
-		this.entryList.clear();
+		this.blockBiomePairList.clear();
 		this.idMap.clear();
 		this.cachedHashCode = 0;
 	}
@@ -227,27 +224,27 @@ public class FullDataPointIdMap
 	/** Serializes all contained entries into the given stream, formatted in UTF */
 	public void serialize(DhDataOutputStream outputStream) throws IOException
 	{
-		outputStream.writeInt(this.entryList.size());
+		outputStream.writeInt(this.blockBiomePairList.size());
 		
 		// only used when debugging
-		HashMap<String, FullDataPointIdMap.Entry> dataPointEntryBySerialization = new HashMap<>();
+		HashMap<String, BlockBiomeWrapperPair> dataPointEntryBySerialization = new HashMap<>();
 		
-		for (Entry entry : this.entryList)
+		for (BlockBiomeWrapperPair pair : this.blockBiomePairList)
 		{
-			String entryString = entry.serialize();
+			String entryString = pair.serialize();
 			outputStream.writeUTF(entryString);
 			
 			if (RUN_SERIALIZATION_DUPLICATE_VALIDATION)
 			{
 				if (dataPointEntryBySerialization.containsKey(entryString))
 				{
-					LOGGER.error("Duplicate serialized entry found with serial: " + entryString);
+					LOGGER.error("Duplicate serialized pair found with serial: " + entryString);
 				}
-				if (dataPointEntryBySerialization.containsValue(entry))
+				if (dataPointEntryBySerialization.containsValue(pair))
 				{
-					LOGGER.error("Duplicate serialized entry found with value: " + entry.serialize());
+					LOGGER.error("Duplicate serialized pair found with value: " + pair.serialize());
 				}
-				dataPointEntryBySerialization.put(entryString, entry);
+				dataPointEntryBySerialization.put(entryString, pair);
 			}
 		}
 	}
@@ -263,7 +260,7 @@ public class FullDataPointIdMap
 		
 		
 		// only used when debugging
-		HashMap<String, FullDataPointIdMap.Entry> dataPointEntryBySerialization = new HashMap<>();
+		HashMap<String, BlockBiomeWrapperPair> dataPointEntryBySerialization = new HashMap<>();
 		
 		FullDataPointIdMap newMap = new FullDataPointIdMap(pos);
 		for (int i = 0; i < entityCount; i++)
@@ -271,13 +268,13 @@ public class FullDataPointIdMap
 			// necessary to prevent issues with deserializing objects after the level has been closed
 			if (Thread.interrupted())
 			{
-				throw new InterruptedException(FullDataPointIdMap.class.getSimpleName() + " task interrupted.");
+				throw new InterruptedException("[" + FullDataPointIdMap.class.getSimpleName() + "] deserializing interrupted.");
 			}
 			
 			
 			String entryString = inputStream.readUTF();
-			Entry newEntry = Entry.deserialize(entryString, levelWrapper);
+			BlockBiomeWrapperPair newPair = BlockBiomeWrapperPair.deserialize(entryString, levelWrapper);
-			newMap.entryList.add(newEntry);
+			newMap.blockBiomePairList.add(newPair);
 			
 			if (RUN_SERIALIZATION_DUPLICATE_VALIDATION)
 			{
@@ -285,11 +282,11 @@ public class FullDataPointIdMap
 				{
 					LOGGER.error("Duplicate deserialized entry found with serial: " + entryString);
 				}
-				if (dataPointEntryBySerialization.containsValue(newEntry))
+				if (dataPointEntryBySerialization.containsValue(newPair))
 				{
-					LOGGER.error("Duplicate deserialized entry found with value: " + newEntry.serialize());
+					LOGGER.error("Duplicate deserialized entry found with value: " + newPair.serialize());
 				}
-				dataPointEntryBySerialization.put(entryString, newEntry);
+				dataPointEntryBySerialization.put(entryString, newPair);
 			}
 		}
 		
@@ -335,144 +332,13 @@ public class FullDataPointIdMap
 	private void generateHashCode()
 	{
 		int result = DhSectionPos.hashCode(this.pos);
-		for (int i = 0; i < this.entryList.size(); i++)
+		for (int i = 0; i < this.blockBiomePairList.size(); i++)
 		{
-			result = 31 * result + this.entryList.hashCode();
+			result = 31 * result + this.blockBiomePairList.hashCode();
 		}
 		this.cachedHashCode = result;
 	}
 	
 	
 	
-	//==============//
-	// helper class //
-	//==============//
-	
-	private static final class Entry
-	{
-		private static final IWrapperFactory WRAPPER_FACTORY = SingletonInjector.INSTANCE.get(IWrapperFactory.class);
-		
-		private static final ConcurrentHashMap<Integer, Entry> ENTRY_BY_HASH = new ConcurrentHashMap<>();
-		/** lock is necessary since {@link Int2ReferenceOpenHashMap} isn't concurrent and concurrent threads can cause infinite loops */
-		private static final ReentrantReadWriteLock ENTRY_POOL_LOCK = new ReentrantReadWriteLock();
-		
-		public final IBiomeWrapper biome;
-		public final IBlockStateWrapper blockState;
-		
-		private Integer hashCode = null;
-		private String serialString = null;
-		
-		
-		
-		//=============//
-		// constructor //
-		//=============//
-		
-		public static Entry getEntry(IBiomeWrapper biome, IBlockStateWrapper blockState)
-		{
-			int entryHash = generateHashCode(biome, blockState);
-			
-			// try getting the existing Entry
-			Entry entry = ENTRY_BY_HASH.get(entryHash);
-			if (entry != null)
-			{
-				return entry;
-			}
-			
-			// create the missing entry
-			return ENTRY_BY_HASH.compute(entryHash, (Integer newHash, Entry currentEntry) ->
-			{
-				if (currentEntry != null)
-				{
-					return currentEntry;
-				}
-				
-				return new Entry(biome, blockState);
-			});
-		}
-		private Entry(IBiomeWrapper biome, IBlockStateWrapper blockState)
-		{
-			this.biome = biome;
-			this.blockState = blockState;
-		}
-		
-		
-		
-		//===========//
-		// overrides //
-		//===========//
-		
-		@Override
-		public int hashCode()
-		{
-			// cache the hash code to improve speed
-			if (this.hashCode == null)
-			{
-				this.hashCode = generateHashCode(this);
-			}
-			
-			return this.hashCode;
-		}
-		private static int generateHashCode(Entry entry) { return generateHashCode(entry.biome, entry.blockState); }
-		private static int generateHashCode(IBiomeWrapper biome, IBlockStateWrapper blockState)
-		{
-			final int prime = 31;
-			
-			int result = 1;
-			// the biome and blockstate hashcode should be already calculated by the time
-			// we get here, so this operation should be very fast
-			result = prime * result + (biome == null ? 0 : biome.hashCode());
-			result = prime * result + (blockState == null ? 0 : blockState.hashCode());
-			return result;
-		}
-		
-		@Override
-		public boolean equals(Object otherObj)
-		{
-			if (otherObj == this)
-				return true;
-			
-			if (!(otherObj instanceof Entry))
-				return false;
-			
-			Entry other = (Entry) otherObj;
-			return other.biome.getSerialString().equals(this.biome.getSerialString())
-					&& other.blockState.getSerialString().equals(this.blockState.getSerialString());
-		}
-		
-		@Override
-		public String toString() { return this.serialize(); }
-		
-		
-		
-		//=================//
-		// (de)serializing //
-		//=================//
-		
-		public String serialize() 
-		{
-			if (this.serialString == null)
-			{
-				this.serialString = this.biome.getSerialString() + BLOCK_STATE_SEPARATOR_STRING + this.blockState.getSerialString();
-			}
-			
-			return this.serialString;
-		}
-		
-		public static Entry deserialize(String str, ILevelWrapper levelWrapper) throws DataCorruptedException
-		{
-			int separatorIndex = str.indexOf(BLOCK_STATE_SEPARATOR_STRING);
-			if (separatorIndex == -1)
-			{
-				throw new DataCorruptedException("Failed to deserialize BiomeBlockStateEntry ["+str+"], unable to find separator.");
-			}
-			
-			IBiomeWrapper biome = WRAPPER_FACTORY.deserializeBiomeWrapperOrGetDefault(str.substring(0, separatorIndex), levelWrapper);
-			IBlockStateWrapper blockState = WRAPPER_FACTORY.deserializeBlockStateWrapperOrGetDefault(str.substring(separatorIndex+BLOCK_STATE_SEPARATOR_STRING.length()), levelWrapper);
-			return Entry.getEntry(biome, blockState);
-		}
-		
-	}
-	
-	
 }