remove dev from version number

Maybe will help with crashing/memory corruption?
Data is the most basic upload method in GL so Mac should be able to support it a lot better than BUFFER_STORAGE.

.gitlab-ci.yml

@@ -35,7 +35,14 @@ build:
   stage: build
   parallel:
     matrix:
-      - MC_VER: ["1.16.5", "1.17.1", "1.18.2", "1.19.2", "1.19.4", "1.20.1", "1.20.2", "1.20.4", "1.20.6", "1.21.1", "1.21.3", "1.21.4", "1.21.5", "1.21.6", "1.21.7"]
+      - MC_VER: [
+      "1.21.10", "1.21.9", "1.21.8", "1.21.6", "1.21.5", "1.21.4", "1.21.3", "1.21.1", 
+      "1.20.6", "1.20.4", "1.20.2", "1.20.1", 
+      "1.19.4", "1.19.2",
+      "1.18.2", 
+      "1.17.1", 
+      "1.16.5"
+      ]
   script:
     # this both runs the unit tests and assembles the code
     - ./gradlew clean -PmcVer="${MC_VER}" -PinfoGitCommit="${CI_COMMIT_SHA}" -PinfoGitBranch="${CI_COMMIT_BRANCH}" -PinfoBuildSource="GitLab CI (${CI_PIPELINE_ID})" --gradle-user-home cache/;

build.gradle

@@ -19,7 +19,7 @@ plugins {
     id "systems.manifold.manifold-gradle-plugin" version "0.0.2-alpha"
 
     // Architectury is used here only as a replacement for forge's own loom
-    id "dev.architectury.loom" version "1.10-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.11-SNAPSHOT" apply false
 }
 
 
@@ -42,8 +42,10 @@ def writeBuildGradlePredefine(List<String> mcVers, int mcIndex)
         String verStr = mcVers[i].replace(".", "_");
         sb.append("MC_" + verStr + "=" + i.toString() + "\n");
         
-        if (mcIndex == i)
+        if (mcIndex == i) 
+        {
             sb.append("MC_VER=" + i.toString() + "\n");
+        }
     }
     
 
@@ -246,8 +248,7 @@ subprojects { p ->
         // We cannot relocate this library since we call some MC classes that reference it
         implementation("it.unimi.dsi:fastutil:${rootProject.fastutil_version}")
 
-        //forgeShadowMe("com.github.luben:zstd-jni:1.5.7-3")
-        //forgeShadowMe("org.apache.commons:commons-compress:1.27.1")
+        forgeShadowMe("com.github.luben:zstd-jni:1.5.7-4")
         
         // Compression
         forgeShadowMe("org.lz4:lz4-java:${rootProject.lz4_version}") // LZ4

buildSrc/src/main/java/NativeRelocator.java

@@ -34,7 +34,10 @@ class NativeRelocator
 		{
 			processBuilder.command("powershell", "-ExecutionPolicy", "Bypass", "./prepare.ps1");
 		}
-		else if (os.contains("nix") || os.contains("nux") || os.contains("mac"))
+		else if (os.contains("nix") 
+				|| os.contains("nux") 
+				|| os.contains("mac")
+				|| os.contains("freebsd"))
 		{
 			processBuilder.command("./prepare.sh");
 		}

common/src/main/java/com/seibel/distanthorizons/common/AbstractModInitializer.java

@@ -5,11 +5,12 @@ import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiAfterDh
 import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiBeforeDhInitEvent;
 import com.seibel.distanthorizons.common.commands.CommandInitializer;
 import com.seibel.distanthorizons.common.wrappers.DependencySetup;
+import com.seibel.distanthorizons.common.wrappers.gui.DhDebugScreenEntry;
 import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftServerWrapper;
 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.config.ConfigBase;
+import com.seibel.distanthorizons.core.config.ConfigHandler;
 import com.seibel.distanthorizons.core.config.eventHandlers.presets.ThreadPresetConfigEventHandler;
 import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
@@ -45,7 +46,8 @@ public abstract class AbstractModInitializer
 	// abstract methods //
 	//==================//
 	
-	protected abstract void createInitialBindings();
+	protected abstract void createInitialSharedBindings();
+	protected abstract void createInitialClientBindings();
 	protected abstract IEventProxy createClientProxy();
 	protected abstract IEventProxy createServerProxy(boolean isDedicated);
 	protected abstract void initializeModCompat();
@@ -65,8 +67,9 @@ public abstract class AbstractModInitializer
 	public void onInitializeClient()
 	{
 		DependencySetup.createClientBindings();
+		this.createInitialClientBindings();
 		
-		LOGGER.info("Initializing " + ModInfo.READABLE_NAME + " client.");
+		LOGGER.info("Initializing " + ModInfo.READABLE_NAME + " client, firing DhApiBeforeDhInitEvent...");
 		ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeDhInitEvent.class, null);
 		
 		this.startup();
@@ -83,6 +86,12 @@ public abstract class AbstractModInitializer
 		
 		LOGGER.info(ModInfo.READABLE_NAME + " client Initialized.");
 		
+		#if MC_VER < MC_1_21_9
+		// debug screen rendering handled via a mixin
+		#else
+		DhDebugScreenEntry.register();
+		#endif
+		
 		this.subscribeClientStartedEvent(this::postInit);
 	}
 	
@@ -90,7 +99,7 @@ public abstract class AbstractModInitializer
 	{
 		DependencySetup.createServerBindings();
 		
-		LOGGER.info("Initializing " + ModInfo.READABLE_NAME + " server.");
+		LOGGER.info("Initializing " + ModInfo.READABLE_NAME + " server, firing DhApiBeforeDhInitEvent event...");
 		ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeDhInitEvent.class, null);
 		
 		this.startup();
@@ -133,7 +142,7 @@ public abstract class AbstractModInitializer
 	{
 		DependencySetup.createSharedBindings();
 		SharedApi.init();
-		this.createInitialBindings();
+		this.createInitialSharedBindings();
 	}
 	
 	private void logBuildInfo()
@@ -161,7 +170,7 @@ public abstract class AbstractModInitializer
 	
 	private void initConfig()
 	{
-		ConfigBase.INSTANCE = new ConfigBase(ModInfo.ID, ModInfo.NAME, Config.class, ModInfo.CONFIG_FILE_VERSION);
+		ConfigHandler.tryRunFirstTimeSetup();
 		Config.completeDelayedSetup();
 	}
 	
@@ -181,9 +190,15 @@ public abstract class AbstractModInitializer
 	
 	private void postInit()
 	{
-		LOGGER.info("Post-Initializing Mod");
+		LOGGER.info("Running Delayed setup...");
 		this.runDelayedSetup();
-		LOGGER.info("Mod Post-Initialized");
+		
+		if (ConfigHandler.INSTANCE == null)
+		{
+			throw new IllegalStateException("Config was not initialized. Make sure to call LodCommonMain.initConfig() before calling this method.");
+		}
+		
+		LOGGER.info("Delayed setup complete, firing DhApiAfterDhInitEvent event...");
 		
 		// should be fired after all delayed setup so singletons and config can be accessed
 		ApiEventInjector.INSTANCE.fireAllEvents(DhApiAfterDhInitEvent.class, null);

common/src/main/java/com/seibel/distanthorizons/common/commands/ConfigCommand.java

@@ -3,8 +3,8 @@ package com.seibel.distanthorizons.common.commands;
 import com.mojang.brigadier.arguments.*;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import com.mojang.brigadier.context.CommandContext;
-import com.seibel.distanthorizons.core.config.ConfigBase;
-import com.seibel.distanthorizons.core.config.types.AbstractConfigType;
+import com.seibel.distanthorizons.core.config.ConfigHandler;
+import com.seibel.distanthorizons.core.config.types.AbstractConfigBase;
 import com.seibel.distanthorizons.core.config.types.ConfigEntry;
 import net.minecraft.commands.CommandSourceStack;
 
@@ -43,7 +43,7 @@ public class ConfigCommand extends AbstractCommand
 		LiteralArgumentBuilder<CommandSourceStack> builder = literal("config");
 		HashSet<String> addedCommands = new HashSet<>();
 		
-		for (AbstractConfigType<?, ?> type : ConfigBase.INSTANCE.entries)
+		for (AbstractConfigBase<?> type : ConfigHandler.INSTANCE.configBaseList)
 		{
 			// Skip non-config entries
 			if (!(type instanceof ConfigEntry))

common/src/main/java/com/seibel/distanthorizons/common/wrappers/DependencySetup.java

@@ -59,13 +59,9 @@ public class DependencySetup
 		DependencySetupDoneCheck.isDone = true;
 	}
 	
-	//@Environment(EnvType.SERVER)
 	public static void createServerBindings()
-	{
-		SingletonInjector.INSTANCE.bind(IMinecraftSharedWrapper.class, MinecraftServerWrapper.INSTANCE);
-	}
+	{ SingletonInjector.INSTANCE.bind(IMinecraftSharedWrapper.class, MinecraftServerWrapper.INSTANCE); }
 	
-	//@Environment(EnvType.CLIENT)
 	public static void createClientBindings()
 	{
 		SingletonInjector.INSTANCE.bind(IMinecraftClientWrapper.class, MinecraftClientWrapper.INSTANCE);

common/src/main/java/com/seibel/distanthorizons/common/wrappers/VersionConstants.java

@@ -76,8 +76,13 @@ public class VersionConstants implements IVersionConstants
 			return "1.21.5";
 		#elif MC_VER == MC_1_21_6
 			return "1.21.6";
-		#elif MC_VER == MC_1_21_7
-			return "1.21.7";
+		#elif MC_VER == MC_1_21_8
+			return "1.21.8";
+		
+		#elif MC_VER == MC_1_21_9
+			return "1.21.9";
+		#elif MC_VER == MC_1_21_10
+			return "1.21.10";
 		#else
 			ERROR MC version constant missing
 		#endif

common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/AbstractDhTintGetter.java

@@ -0,0 +1,254 @@
+package com.seibel.distanthorizons.common.wrappers.block;
+
+import com.seibel.distanthorizons.core.config.Config;
+import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.pos.DhSectionPos;
+import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPosMutable;
+import com.seibel.distanthorizons.core.util.ColorUtil;
+import com.seibel.distanthorizons.core.util.FullDataPointUtil;
+
+import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.multiplayer.ClientLevel;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.BlockAndTintGetter;
+import net.minecraft.world.level.ColorResolver;
+import net.minecraft.world.level.biome.Biome;
+
+import java.io.IOException;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import org.apache.logging.log4j.Logger;
+
+#if MC_VER >= MC_1_18_2
+import net.minecraft.core.Holder;
+#endif
+
+
+public abstract class AbstractDhTintGetter implements BlockAndTintGetter
+{
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	
+	
+	protected final BiomeWrapper biomeWrapper;
+	
+	protected final int smoothingRadiusInBlocks;
+	protected final FullDataSourceV2 fullDataSource;
+	protected final IClientLevelWrapper clientLevelWrapper;
+	
+	#if MC_VER < MC_1_18_2
+	public static final ConcurrentMap<String, Biome> BIOME_BY_RESOURCE_STRING = new ConcurrentHashMap<>();
+	#else
+	public static final ConcurrentMap<String, Holder<Biome>> BIOME_BY_RESOURCE_STRING = new ConcurrentHashMap<>();
+    #endif
+	
+	
+	
+	//=============//
+	// constructor //
+	//=============//
+	
+	public AbstractDhTintGetter(BiomeWrapper biomeWrapper, FullDataSourceV2 fullDataSource, IClientLevelWrapper clientLevelWrapper)
+	{
+		this.biomeWrapper = biomeWrapper;
+		this.fullDataSource = fullDataSource;
+		this.clientLevelWrapper = clientLevelWrapper;
+		this.smoothingRadiusInBlocks = Config.Client.Advanced.Graphics.Quality.lodBiomeBlending.get();
+	}
+	
+	
+	
+	//================//
+	// shared methods //
+	//================//
+	
+	@Override
+	public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver)
+	{
+		// determine how wide this data source is so we can determine
+		// if blending should be used
+		byte dataSourceDetailLevel = DhSectionPos.getDetailLevel(this.fullDataSource.getPos());
+		// convert from section detail level to absolute detail level
+		dataSourceDetailLevel = (byte)(dataSourceDetailLevel - DhSectionPos.SECTION_MINIMUM_DETAIL_LEVEL);
+		int dataSourceLodWidthInBlocks = DhSectionPos.getDetailLevelWidthInBlocks(dataSourceDetailLevel);
+		
+		// don't do any smoothing if smoothing is disabled or if the LOD
+		// is to large for block-based smoothing to show up
+		if (this.smoothingRadiusInBlocks == 0
+			|| dataSourceLodWidthInBlocks > this.smoothingRadiusInBlocks)
+		{
+			return colorResolver.getColor(unwrapClientBiome(this.biomeWrapper.biome, this.clientLevelWrapper), blockPos.getX(), blockPos.getZ());
+		}
+		
+		
+		// use a rolling average to calculate the color
+		int dataPointCount = 0;
+		int rollingRed = 0;
+		int rollingGreen = 0;
+		int rollingBlue = 0;
+		
+		int xMin = blockPos.getX() - this.smoothingRadiusInBlocks;
+		int xMax = blockPos.getX() + this.smoothingRadiusInBlocks;
+		
+		int zMin = blockPos.getZ() - this.smoothingRadiusInBlocks;
+		int zMax = blockPos.getZ() + this.smoothingRadiusInBlocks;
+		
+		DhBlockPosMutable mutableBlockPos = new DhBlockPosMutable(0, blockPos.getY(), 0);
+		for (int x = xMin; x < xMax; x++)
+		{
+			for (int z = zMin; z < zMax; z++)
+			{
+				mutableBlockPos.setX(x);
+				mutableBlockPos.setZ(z);
+				
+				// this can return the same position/datapoint for larger LODs duplicating work,
+				// however for small smoothing ranges that isn't a big deal and for large LODs
+				// we ignore smoothing anyway
+				long dataPoint = this.fullDataSource.getAtBlockPos(mutableBlockPos);
+				if (dataPoint == FullDataPointUtil.EMPTY_DATA_POINT)
+				{
+					continue;
+				}
+				
+				// get the color for this nearby position
+				int id = FullDataPointUtil.getId(dataPoint);
+				BiomeWrapper biomeWrapper = (BiomeWrapper) this.fullDataSource.mapping.getBiomeWrapper(id);
+				int color = colorResolver.getColor(unwrapClientBiome(biomeWrapper.biome, this.clientLevelWrapper), mutableBlockPos.getX(), mutableBlockPos.getZ());
+				
+				
+				// rolling average
+				rollingRed += ColorUtil.getRed(color);
+				rollingGreen += ColorUtil.getGreen(color);
+				rollingBlue += ColorUtil.getBlue(color);
+				
+				dataPointCount++;
+			}
+		}
+		
+		
+		// if no data was present (rarely possible)
+		// just use the default center's color
+		if (dataPointCount == 0)
+		{
+			return colorResolver.getColor(unwrapClientBiome(this.biomeWrapper.biome, this.clientLevelWrapper), blockPos.getX(), blockPos.getZ());
+		}
+		
+		int colorInt = ColorUtil.argbToInt(
+				255, // blending often ignores alpha, having it always 255 prevents multiplication issues later
+				rollingRed / dataPointCount,
+				rollingGreen / dataPointCount,
+				rollingBlue / dataPointCount);
+		return colorInt;
+	}
+	
+	protected static Biome unwrapClientBiome(#if MC_VER >= MC_1_18_2 Holder<Biome> #else Biome #endif biome, IClientLevelWrapper clientLevelWrapper)
+	{
+		BiomeWrapper biomeWrapper = (BiomeWrapper)BiomeWrapper.getBiomeWrapper(biome, clientLevelWrapper);
+		
+		String biomeString = biomeWrapper.getSerialString();
+		if (biomeString == null
+				|| biomeString.isEmpty()
+				|| biomeString.equals(BiomeWrapper.EMPTY_BIOME_STRING))
+		{
+			// default to "plains" for empty/invalid biomes
+			biomeString = "minecraft:plains";
+		}
+		
+		return unwrapBiome(getClientBiome(biomeString));
+	}
+	
+	protected static Biome unwrapBiome(#if MC_VER >= MC_1_18_2 Holder<Biome> #else Biome #endif biome)
+	{
+		#if MC_VER >= MC_1_18_2
+		return biome.value();
+		#else
+		return biome;
+		#endif
+	}
+	
+	/**
+	 * <p>Previously, this class might have immediately unwrapped the Holder like this:</p>
+	 * <pre>{@code
+	 * // Inside constructor (OLD WAY - PROBLEMATIC):
+	 * Holder<Biome> biomeHolder = getTheHolderFromSomewhere();
+	 * this.biome = biomeHolder.value(); // <-- PROBLEM HERE
+	 * }</pre>
+	 *
+	 * <p>This approach is problematic because the {@link net.minecraft.core.Holder} system,
+	 * particularly {@code Holder.Reference}, is designed for <strong>late binding</strong>. Here's why storing
+	 * the Holder itself is now necessary:</p>
+	 * <ol>
+	 *   <li>A {@code Holder.Reference<Biome>} might be created initially just with a
+	 *       {@link net.minecraft.resources.ResourceKey} (like {@code minecraft:plains}), but its actual
+	 *       {@link net.minecraft.core.Holder#value() value()} (the {@code Biome} object itself) might be {@code null}
+	 *       at construction time.</li>
+	 *   <li>Later, during game loading, registry population, or potentially due to modifications by other mods
+	 *       (e.g., Polytone), the system calls internal binding methods (like {@code bindValue(Biome)})
+	 *       on the {@code Holder} instance. This sets or <strong>updates</strong> the internal reference to the
+	 *       actual {@code Biome} object.</li>
+	 *   <li>Crucially, the binding process might assign a completely <strong>new</strong> {@code Biome} object
+	 *       instance to the {@code Holder} reference, replacing any previous one.</li>
+	 * </ol>
+	 *
+	 * <p>If we unwrapped the {@code Holder} using {@code .value()} within the constructor (the old way),
+	 * our class's internal {@code biome} field would permanently store a reference to whatever {@code Biome}
+	 * object the {@code Holder} pointed to *at that exact moment*. It would have no link back to the
+	 * {@code Holder} and would be unaware if the {@code Holder} was later updated to point to a different
+	 * (or the initially missing) {@code Biome} object. This would lead to using stale or even {@code null} data.</p>
+	 *
+	 * <p>By storing the {@code Holder<Biome>} itself, this class can call {@link net.minecraft.core.Holder#value()}
+	 * whenever the biome information is needed, ensuring it always retrieves the most current {@code Biome}
+	 * instance associated with the holder at that time.</p>
+	 */
+	private static #if MC_VER < MC_1_18_2 Biome #else Holder<Biome> #endif getClientBiome(String biomeResourceString)
+	{
+		// cache the client biomes so we don't have to re-parse the resource location every time
+		return BIOME_BY_RESOURCE_STRING.compute(biomeResourceString,
+				(resourceString, existingBiome) ->
+				{
+					if (existingBiome != null)
+					{
+						return existingBiome;
+					}
+					
+					ClientLevel clientLevel = Minecraft.getInstance().level;
+					if (clientLevel == null)
+					{
+						// shouldn't happen, but just in case
+						throw new IllegalStateException("Attempted to get client biome when no client level was loaded.");
+					}
+					
+					BiomeWrapper.BiomeDeserializeResult result;
+					try
+					{
+						result = BiomeWrapper.deserializeBiome(resourceString, clientLevel.registryAccess());
+					}
+					catch (Exception e)
+					{
+						LOGGER.warn("Unable to deserialize client biome ["+resourceString+"], using fallback...");
+						
+						try
+						{
+							result = BiomeWrapper.deserializeBiome(BiomeWrapper.PLAINS_RESOURCE_LOCATION_STRING, clientLevel.registryAccess());
+						}
+						catch (IOException ex)
+						{
+							// should never happen, if it does this log will explode, but just in case
+							LOGGER.error("Unable to deserialize fallback client biome ["+BiomeWrapper.PLAINS_RESOURCE_LOCATION_STRING+"], returning NULL.");
+							return null;
+						}
+					}
+					
+					if (result.success)
+					{
+						existingBiome = result.biome;
+					}
+					
+					return existingBiome;
+				});
+	}
+	
+	
+	
+}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java

@@ -103,6 +103,7 @@ public class BiomeWrapper implements IBiomeWrapper
 	// constructors //
 	//==============//
 	
+	// TODO why not just return BiomeWrapper?
 	static public IBiomeWrapper getBiomeWrapper(#if MC_VER < MC_1_18_2 Biome #else Holder<Biome> #endif biome, ILevelWrapper levelWrapper)
 	{
 		if (biome == null)

common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java

@@ -81,6 +81,7 @@ public class BlockStateWrapper implements IBlockStateWrapper
 	public static final BlockStateWrapper AIR = new BlockStateWrapper(null, null);
 	
 	public static final String DIRT_RESOURCE_LOCATION_STRING = "minecraft:dirt";
+	public static final String WATER_RESOURCE_LOCATION_STRING = "minecraft:water";
 	
 	public static HashSet<IBlockStateWrapper> rendererIgnoredBlocks = null;
 	public static HashSet<IBlockStateWrapper> rendererIgnoredCaveBlocks = null;

common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/ClientBlockStateColorCache.java

@@ -20,6 +20,7 @@
 package com.seibel.distanthorizons.common.wrappers.block;
 
 import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
+import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos;
 import com.seibel.distanthorizons.core.util.ColorUtil;
@@ -63,6 +64,8 @@ public class ClientBlockStateColorCache
 {
 	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
+	// TODO it isn't that we need the level, but that we need the adjacent data
+	//  maybe we can pass in the full data source?
 	private static final HashSet<BlockState> BLOCK_STATES_THAT_NEED_LEVEL = new HashSet<>();
 	private static final HashSet<BlockState> BROKEN_BLOCK_STATES = new HashSet<>();
 	
@@ -92,6 +95,8 @@ public class ClientBlockStateColorCache
 	#endif
 	
 	private final IClientLevelWrapper clientLevelWrapper;
+	private final BlockStateWrapper blockStateWrapper;
+	
 	private final BlockState blockState;
 	private final LevelReader level;
 	
@@ -176,6 +181,8 @@ public class ClientBlockStateColorCache
 		this.blockState = blockState;
 		this.clientLevelWrapper = samplingLevel;
 		this.level = (LevelReader) samplingLevel.getWrappedMcObject();
+		this.blockStateWrapper = BlockStateWrapper.fromBlockState(this.blockState, this.clientLevelWrapper);
+		
 		this.resolveColors();
 	}
 	
@@ -267,6 +274,14 @@ public class ClientBlockStateColorCache
 				this.baseColor = this.getParticleIconColor();
 			}
 			
+			
+			//String serialString = this.blockStateWrapper.getSerialString();
+			//if (serialString.contains("minecraft:water")
+			//		|| serialString.contains("grass"))
+			//{
+			//	BLOCK_STATES_THAT_NEED_LEVEL.add(this.blockState);
+			//}
+			
 			this.isColorResolved = true;
 		}
 		finally
@@ -414,16 +429,18 @@ public class ClientBlockStateColorCache
 	 * This method was suggested by IMS from the Iris/Sodium team. 
 	 * That's where the numbers and code are based.
 	 */
-	private static int linearToSrgb(float c)
+	private static int linearToSrgb(float color)
 	{
-		if (!(c > MIN_SRGB_BOUND)) {
-			c = MIN_SRGB_BOUND;
+		if (!(color > MIN_SRGB_BOUND)) 
+		{
+			color = MIN_SRGB_BOUND;
 		}
 		
-		if (c > MAX_SRGB_BOUND) {
-			c = MAX_SRGB_BOUND;
+		if (color > MAX_SRGB_BOUND) 
+		{
+			color = MAX_SRGB_BOUND;
 		}
-		int inputBits = Float.floatToRawIntBits(c);
+		int inputBits = Float.floatToRawIntBits(color);
 		int entry = linearToSrgbTable[((inputBits - MIN_SRGB_BITS) >> 20)];
 		
 		int bias = (entry >>> 16) << 9;
@@ -446,7 +463,7 @@ public class ClientBlockStateColorCache
 	// public getter //
 	//===============//
 	
-	public int getColor(BiomeWrapper biome, DhBlockPos pos)
+	public int getColor(BiomeWrapper biomeWrapper, FullDataSourceV2 fullDataSource, DhBlockPos pos)
 	{
 		// only get the tint if the block needs to be tinted
 		if (!this.needPostTinting)
@@ -471,12 +488,15 @@ public class ClientBlockStateColorCache
 				try
 				{
 					tintColor = Minecraft.getInstance().getBlockColors()
-							.getColor(this.blockState, new TintWithoutLevelOverrider(biome, this.clientLevelWrapper), McObjectConverter.Convert(pos), this.tintIndex);
+							.getColor(this.blockState, 
+									new TintWithoutLevelOverrider(biomeWrapper, fullDataSource, this.clientLevelWrapper), // TODO can this object be cached?
+									McObjectConverter.Convert(pos), 
+									this.tintIndex);
 				}
 				catch (UnsupportedOperationException e)
 				{
 					// this exception generally occurs if the tint requires other blocks besides itself
-					LOGGER.debug("Unable to use ["+TintWithoutLevelOverrider.class.getSimpleName()+"] to get the block tint for block: [" + this.blockState + "] and biome: [" + biome + "] at pos: " + pos + ". Error: [" + e.getMessage() + "]. Attempting to use backup method...", e);
+					LOGGER.debug("Unable to use ["+ TintWithoutLevelOverrider.class.getSimpleName()+"] to get the block tint for block: [" + this.blockState + "] and biome: [" + biomeWrapper + "] at pos: " + pos + ". Error: [" + e.getMessage() + "]. Attempting to use backup method...", e);
 					BLOCK_STATES_THAT_NEED_LEVEL.add(this.blockState);
 				}
 			}
@@ -487,7 +507,10 @@ public class ClientBlockStateColorCache
 				// this logic can't be used all the time due to it breaking some blocks tinting
 				// specifically oceans don't render correctly
 				tintColor = Minecraft.getInstance().getBlockColors()
-						.getColor(this.blockState, new TintGetterOverrideFast(this.level), McObjectConverter.Convert(pos), this.tintIndex);
+						.getColor(this.blockState, 
+								new TintGetterOverride(this.level, biomeWrapper, fullDataSource, this.clientLevelWrapper), // TODO can this object be cached?
+								McObjectConverter.Convert(pos), 
+								this.tintIndex);
 			}
 		}
 		catch (Exception e)
@@ -495,7 +518,7 @@ public class ClientBlockStateColorCache
 			// only display the error once per block/biome type to reduce log spam
 			if (!BROKEN_BLOCK_STATES.contains(this.blockState))
 			{
-				LOGGER.warn("Failed to get block color for block: [" + this.blockState + "] and biome: [" + biome + "] at pos: " + pos + ". Error: ["+e.getMessage() + "]. Note: future errors for this block/biome will be ignored.", e);
+				LOGGER.warn("Failed to get block color for block: [" + this.blockState + "] and biome: [" + biomeWrapper + "] at pos: " + pos + ". Error: ["+e.getMessage() + "]. Note: future errors for this block/biome will be ignored.", e);
 				BROKEN_BLOCK_STATES.add(this.blockState);
 			}
 		}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintGetterOverride.java

@@ -19,10 +19,11 @@
 
 package com.seibel.distanthorizons.common.wrappers.block;
 
+import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
+import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.*;
-import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
 import net.minecraft.world.level.block.state.BlockState;
@@ -38,9 +39,9 @@ import java.util.Optional;
 import java.util.function.Supplier;
 import java.util.stream.Stream;
 
-public class TintGetterOverrideFast implements BlockAndTintGetter
+public class TintGetterOverride extends AbstractDhTintGetter
 {
-	LevelReader parent;
+	private final LevelReader parent;
 	
 	
 	
@@ -48,7 +49,11 @@ public class TintGetterOverrideFast implements BlockAndTintGetter
 	// constructor //
 	//=============//
 	
-	public TintGetterOverrideFast(LevelReader parent) { this.parent = parent; }
+	public TintGetterOverride(LevelReader parent, BiomeWrapper biomeWrapper, FullDataSourceV2 fullDataSource, IClientLevelWrapper clientLevelWrapper)
+	{ 
+		super(biomeWrapper, fullDataSource, clientLevelWrapper); 
+		this.parent = parent;
+	}
 	
 	
 	
@@ -56,18 +61,6 @@ public class TintGetterOverrideFast implements BlockAndTintGetter
 	// methods //
 	//=========//
 	
-	private Biome _getBiome(BlockPos pos)
-	{
-		#if MC_VER >= MC_1_18_2
-		return this.parent.getBiome(pos).value();
-		#else
-		return parent.getBiome(pos);
-		#endif
-	}
-	
-	@Override
-	public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver) { return colorResolver.getColor(this._getBiome(blockPos), blockPos.getX(), blockPos.getZ()); }
-	
 	@Override
 	public float getShade(Direction direction, boolean bl) { return this.parent.getShade(direction, bl); }
 	
@@ -87,7 +80,6 @@ public class TintGetterOverrideFast implements BlockAndTintGetter
 	@Nullable
 	public BlockEntity getBlockEntity(BlockPos blockPos) { return this.parent.getBlockEntity(blockPos); }
 	
-	
 	@Override
 	public BlockState getBlockState(BlockPos blockPos) { return this.parent.getBlockState(blockPos); }
 	
@@ -99,26 +91,25 @@ public class TintGetterOverrideFast implements BlockAndTintGetter
 	
 	#if MC_VER < MC_1_21_3
 	@Override
-	public int getMaxLightLevel() { return parent.getMaxLightLevel(); }
+	public int getMaxLightLevel() { return this.parent.getMaxLightLevel(); }
 	#else
 	#endif
 	
 	@Override
-	public Stream<BlockState> getBlockStates(AABB aABB)
-	{ return this.parent.getBlockStates(aABB); }
+	public Stream<BlockState> getBlockStates(AABB aABB) { return this.parent.getBlockStates(aABB); }
 	
 	@Override
-	public BlockHitResult clip(ClipContext clipContext)
-	{ return this.parent.clip(clipContext); }
+	public BlockHitResult clip(ClipContext clipContext) { return this.parent.clip(clipContext); }
 	
 	@Override
 	@Nullable
 	public BlockHitResult clipWithInteractionOverride(Vec3 vec3, Vec3 vec32, BlockPos blockPos, VoxelShape voxelShape, BlockState blockState)
-	{ return this.parent.clipWithInteractionOverride(vec3, vec32, blockPos, voxelShape, blockState); }
+	{
+		return this.parent.clipWithInteractionOverride(vec3, vec32, blockPos, voxelShape, blockState);
+	}
 	
 	@Override
-	public double getBlockFloorHeight(VoxelShape voxelShape, Supplier<VoxelShape> supplier)
-	{ return this.parent.getBlockFloorHeight(voxelShape, supplier); }
+	public double getBlockFloorHeight(VoxelShape voxelShape, Supplier<VoxelShape> supplier) { return this.parent.getBlockFloorHeight(voxelShape, supplier); }
 	
 	@Override
 	public double getBlockFloorHeight(BlockPos blockPos) { return this.parent.getBlockFloorHeight(blockPos); }
@@ -131,20 +122,12 @@ public class TintGetterOverrideFast implements BlockAndTintGetter
 	public int getMaxY() { return this.parent.getMaxY(); }
 	#endif
 	
-	
-	
-	//==============//
-	// post MC 1.17 //
-	//==============//
-	
 	#if MC_VER >= MC_1_17_1
 	@Override
-	public <T extends BlockEntity> Optional<T> getBlockEntity(BlockPos blockPos, BlockEntityType<T> blockEntityType)
-	{ return this.parent.getBlockEntity(blockPos, blockEntityType); }
+	public <T extends BlockEntity> Optional<T> getBlockEntity(BlockPos blockPos, BlockEntityType<T> blockEntityType) { return this.parent.getBlockEntity(blockPos, blockEntityType); }
 	
 	@Override
-	public BlockHitResult isBlockInLine(ClipBlockStateContext clipBlockStateContext)
-	{ return this.parent.isBlockInLine(clipBlockStateContext); }
+	public BlockHitResult isBlockInLine(ClipBlockStateContext clipBlockStateContext) { return this.parent.isBlockInLine(clipBlockStateContext); }
 	
 	@Override
 	public int getHeight() { return this.parent.getHeight(); }
@@ -165,7 +148,7 @@ public class TintGetterOverrideFast implements BlockAndTintGetter
 	public int getMinSection() { return this.parent.getMinSection(); }
 	#else
 	@Override
-	public int getMinSectionY() { return BlockAndTintGetter.super.getMinSectionY(); }	
+	public int getMinSectionY() { return super.getMinSectionY(); }	
 	#endif
 	
 	#if MC_VER < MC_1_21_3
@@ -191,4 +174,7 @@ public class TintGetterOverrideFast implements BlockAndTintGetter
 	@Override
 	public int getSectionYFromSectionIndex(int i) { return this.parent.getSectionYFromSectionIndex(i); }
     #endif
+	
+	
+	
 }

common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintGetterOverrideSmooth.java

@@ -1,214 +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.common.wrappers.block;
-
-import com.seibel.distanthorizons.core.util.LodUtil;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Cursor3D;
-import net.minecraft.core.Direction;
-import net.minecraft.world.level.*;
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.BlockEntityType;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.lighting.LevelLightEngine;
-import net.minecraft.world.level.material.FluidState;
-import net.minecraft.world.phys.AABB;
-import net.minecraft.world.phys.BlockHitResult;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.phys.shapes.VoxelShape;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Optional;
-import java.util.function.Supplier;
-import java.util.stream.Stream;
-
-public class TintGetterOverrideSmooth implements BlockAndTintGetter
-{
-	LevelReader parent;
-	public int smoothingRange;
-	
-	
-	
-	//=============//
-	// constructor //
-	//=============//
-	
-	public TintGetterOverrideSmooth(LevelReader parent, int smoothingRange)
-	{
-		this.parent = parent;
-		this.smoothingRange = smoothingRange;
-	}
-	
-	
-	
-	//=========//
-	// methods //
-	//=========//
-	
-	private Biome _getBiome(BlockPos pos)
-	{
-		#if MC_VER >= MC_1_18_2
-		return this.parent.getBiome(pos).value();
-		#else
-		return parent.getBiome(pos);
-		#endif
-	}
-	
-	public int calculateBlockTint(BlockPos blockPos, ColorResolver colorResolver)
-	{
-		int i = smoothingRange;
-		if (i == 0)
-			return colorResolver.getColor(_getBiome(blockPos), blockPos.getX(), blockPos.getZ());
-		int j = (i * 2 + 1) * (i * 2 + 1);
-		int k = 0;
-		int l = 0;
-		int m = 0;
-		Cursor3D cursor3D = new Cursor3D(blockPos.getX() - i, blockPos.getY(), blockPos.getZ() - i, blockPos.getX() + i, blockPos.getY(), blockPos.getZ() + i);
-		BlockPos.MutableBlockPos mutableBlockPos = new BlockPos.MutableBlockPos();
-		while (cursor3D.advance())
-		{
-			mutableBlockPos.set(cursor3D.nextX(), cursor3D.nextY(), cursor3D.nextZ());
-			int n = colorResolver.getColor(this._getBiome(mutableBlockPos), mutableBlockPos.getX(), mutableBlockPos.getZ());
-			
-			k += (n & 0xFF0000) >> 16;
-			l += (n & 0xFF00) >> 8;
-			m += n & 0xFF;
-		}
-		return (k / j & 0xFF) << 16 | (l / j & 0xFF) << 8 | m / j & 0xFF;
-	}
-	
-	@Override
-	public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver) { return this.calculateBlockTint(blockPos, colorResolver); }
-	
-	@Override
-	public float getShade(Direction direction, boolean bl) { return this.parent.getShade(direction, bl); }
-	
-	@Override
-	public LevelLightEngine getLightEngine() { return this.parent.getLightEngine(); }
-	
-	@Override
-	public int getBrightness(LightLayer lightLayer, BlockPos blockPos) { return this.parent.getBrightness(lightLayer, blockPos); }
-	
-	@Override
-	public int getRawBrightness(BlockPos blockPos, int i) { return this.parent.getRawBrightness(blockPos, i); }
-	
-	@Override
-	public boolean canSeeSky(BlockPos blockPos) { return this.parent.canSeeSky(blockPos); }
-	
-	@Override
-	@Nullable
-	public BlockEntity getBlockEntity(BlockPos blockPos) { return this.parent.getBlockEntity(blockPos); }
-	
-	@Override
-	public BlockState getBlockState(BlockPos blockPos) { return this.parent.getBlockState(blockPos); }
-	
-	@Override
-	public FluidState getFluidState(BlockPos blockPos) { return this.parent.getFluidState(blockPos); }
-	
-	@Override
-	public int getLightEmission(BlockPos blockPos) { return this.parent.getLightEmission(blockPos); }
-	
-	#if MC_VER < MC_1_21_3
-	@Override
-	public int getMaxLightLevel() { return this.parent.getMaxLightLevel(); }
-	#else
-	#endif
-	
-	@Override
-	public Stream<BlockState> getBlockStates(AABB aABB) { return this.parent.getBlockStates(aABB); }
-	
-	@Override
-	public BlockHitResult clip(ClipContext clipContext) { return this.parent.clip(clipContext); }
-	
-	@Override
-	@Nullable
-	public BlockHitResult clipWithInteractionOverride(Vec3 vec3, Vec3 vec32, BlockPos blockPos, VoxelShape voxelShape, BlockState blockState)
-	{
-		return this.parent.clipWithInteractionOverride(vec3, vec32, blockPos, voxelShape, blockState);
-	}
-	
-	@Override
-	public double getBlockFloorHeight(VoxelShape voxelShape, Supplier<VoxelShape> supplier) { return this.parent.getBlockFloorHeight(voxelShape, supplier); }
-	
-	@Override
-	public double getBlockFloorHeight(BlockPos blockPos) { return this.parent.getBlockFloorHeight(blockPos); }
-	
-	#if MC_VER < MC_1_21_3
-	@Override
-	public int getMaxBuildHeight() { return this.parent.getMaxBuildHeight(); }
-	#else
-	@Override
-	public int getMaxY() { return this.parent.getMaxY(); }
-	#endif
-	
-	#if MC_VER >= MC_1_17_1
-	@Override
-	public <T extends BlockEntity> Optional<T> getBlockEntity(BlockPos blockPos, BlockEntityType<T> blockEntityType) { return this.parent.getBlockEntity(blockPos, blockEntityType); }
-	
-	@Override
-	public BlockHitResult isBlockInLine(ClipBlockStateContext clipBlockStateContext) { return this.parent.isBlockInLine(clipBlockStateContext); }
-	
-	@Override
-	public int getHeight() { return this.parent.getHeight(); }
-	
-	#if MC_VER < MC_1_21_3
-	@Override
-	public int getMinBuildHeight() { return this.parent.getMinBuildHeight(); }
-	#else
-	@Override
-	public int getMinY() { return this.parent.getMinY(); }
-	#endif
-	
-	@Override
-	public int getSectionsCount() { return this.parent.getSectionsCount(); }
-	
-	#if MC_VER < MC_1_21_3
-	@Override
-	public int getMinSection() { return this.parent.getMinSection(); }
-	#else
-	@Override
-	public int getMinSectionY() { return BlockAndTintGetter.super.getMinSectionY(); }	
-	#endif
-	
-	#if MC_VER < MC_1_21_3
-	@Override
-	public int getMaxSection() { return this.parent.getMaxSection(); }
-	#else
-	@Override
-	public int getMaxSectionY() { return this.parent.getMaxSectionY(); }
-	#endif
-	
-	@Override
-	public boolean isOutsideBuildHeight(BlockPos blockPos) { return this.parent.isOutsideBuildHeight(blockPos); }
-	
-	@Override
-	public boolean isOutsideBuildHeight(int i) { return this.parent.isOutsideBuildHeight(i); }
-	
-	@Override
-	public int getSectionIndex(int i) { return this.parent.getSectionIndex(i); }
-	
-	@Override
-	public int getSectionIndexFromSectionY(int i) { return this.parent.getSectionIndexFromSectionY(i); }
-	
-	@Override
-	public int getSectionYFromSectionIndex(int i) { return this.parent.getSectionYFromSectionIndex(i); }
-    #endif
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintWithoutLevelOverrider.java

@@ -19,52 +19,25 @@
 
 package com.seibel.distanthorizons.common.wrappers.block;
 
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
-import net.minecraft.world.level.*;
-import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.lighting.LevelLightEngine;
 import net.minecraft.world.level.material.FluidState;
-import org.apache.logging.log4j.Logger;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
-#if MC_VER >= MC_1_18_2
-import net.minecraft.core.Holder;
-#endif
-
-import java.io.IOException;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-
-public class TintWithoutLevelOverrider implements BlockAndTintGetter
+public class TintWithoutLevelOverrider extends AbstractDhTintGetter
 {
-	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
-	
-	#if MC_VER < MC_1_18_2
-	public static final ConcurrentMap<String, Biome> BIOME_BY_RESOURCE_STRING = new ConcurrentHashMap<>();
-	#else
-	public static final ConcurrentMap<String, Holder<Biome>> BIOME_BY_RESOURCE_STRING = new ConcurrentHashMap<>();
-    #endif
-	
-	
-	@NotNull
-	private final BiomeWrapper biomeWrapper;
-	
-	
 	
 	//=============//
 	// constructor //
 	//=============//
 	
-	public TintWithoutLevelOverrider(@NotNull BiomeWrapper biomeWrapper, IClientLevelWrapper clientLevelWrapper)
-	{ this.biomeWrapper = biomeWrapper; }
+	public TintWithoutLevelOverrider(BiomeWrapper biomeWrapper, FullDataSourceV2 fullDataSource, IClientLevelWrapper clientLevelWrapper)
+	{ super(biomeWrapper, fullDataSource, clientLevelWrapper); }
 	
 	
 	
@@ -73,145 +46,22 @@ public class TintWithoutLevelOverrider implements BlockAndTintGetter
 	//=========//
 	
 	@Override
-	public int getBlockTint(@NotNull BlockPos blockPos, @NotNull ColorResolver colorResolver)
-	{
-		String biomeString = this.biomeWrapper.getSerialString();
-		if (biomeString == null 
-			|| biomeString.isEmpty() 
-			|| biomeString.equals(BiomeWrapper.EMPTY_BIOME_STRING))
-		{
-			// default to "plains" for empty/invalid biomes
-			biomeString = "minecraft:plains";
-		}
-		
-		
-		return colorResolver.getColor(unwrap(getClientBiome(biomeString)), blockPos.getX(), blockPos.getZ());
-	}
-	private static Biome unwrap(#if MC_VER >= MC_1_18_2 Holder<Biome> #else Biome #endif biome)
-	{
-		#if MC_VER >= MC_1_18_2
-		return biome.value();
-		#else
-		return biome;
-		#endif
-	}
-	
-	/**
-	 * <p>Previously, this class might have immediately unwrapped the Holder like this:</p>
-	 * <pre>{@code
-	 * // Inside constructor (OLD WAY - PROBLEMATIC):
-	 * Holder<Biome> biomeHolder = getTheHolderFromSomewhere();
-	 * this.biome = biomeHolder.value(); // <-- PROBLEM HERE
-	 * }</pre>
-	 *
-	 * <p>This approach is problematic because the {@link net.minecraft.core.Holder} system,
-	 * particularly {@code Holder.Reference}, is designed for <strong>late binding</strong>. Here's why storing
-	 * the Holder itself is now necessary:</p>
-	 * <ol>
-	 *   <li>A {@code Holder.Reference<Biome>} might be created initially just with a
-	 *       {@link net.minecraft.resources.ResourceKey} (like {@code minecraft:plains}), but its actual
-	 *       {@link net.minecraft.core.Holder#value() value()} (the {@code Biome} object itself) might be {@code null}
-	 *       at construction time.</li>
-	 *   <li>Later, during game loading, registry population, or potentially due to modifications by other mods
-	 *       (e.g., Polytone), the system calls internal binding methods (like {@code bindValue(Biome)})
-	 *       on the {@code Holder} instance. This sets or <strong>updates</strong> the internal reference to the
-	 *       actual {@code Biome} object.</li>
-	 *   <li>Crucially, the binding process might assign a completely <strong>new</strong> {@code Biome} object
-	 *       instance to the {@code Holder} reference, replacing any previous one.</li>
-	 * </ol>
-	 *
-	 * <p>If we unwrapped the {@code Holder} using {@code .value()} within the constructor (the old way),
-	 * our class's internal {@code biome} field would permanently store a reference to whatever {@code Biome}
-	 * object the {@code Holder} pointed to *at that exact moment*. It would have no link back to the
-	 * {@code Holder} and would be unaware if the {@code Holder} was later updated to point to a different
-	 * (or the initially missing) {@code Biome} object. This would lead to using stale or even {@code null} data.</p>
-	 *
-	 * <p>By storing the {@code Holder<Biome>} itself, this class can call {@link net.minecraft.core.Holder#value()}
-	 * whenever the biome information is needed, ensuring it always retrieves the most current {@code Biome}
-	 * instance associated with the holder at that time.</p>
-	 */
-	private static #if MC_VER < MC_1_18_2 Biome #else Holder<Biome> #endif getClientBiome(String biomeResourceString)
-	{
-		// cache the client biomes so we don't have to re-parse the resource location every time
-		return BIOME_BY_RESOURCE_STRING.compute(biomeResourceString, 
-			(resourceString, existingBiome) -> 
-			{ 
-				if (existingBiome != null)
-				{
-					return existingBiome;
-				}
-				
-				ClientLevel clientLevel = Minecraft.getInstance().level;
-				if (clientLevel == null)
-				{
-					// shouldn't happen, but just in case
-					throw new IllegalStateException("Attempted to get client biome when no client level was loaded.");
-				}
-				
-				BiomeWrapper.BiomeDeserializeResult result;
-				try
-				{
-					result = BiomeWrapper.deserializeBiome(resourceString, clientLevel.registryAccess());
-				}
-				catch (Exception e)
-				{
-					LOGGER.warn("Unable to deserialize client biome ["+resourceString+"], using fallback...");
-					
-					try
-					{
-						result = BiomeWrapper.deserializeBiome("minecraft:plains", clientLevel.registryAccess());
-					}
-					catch (IOException ex)
-					{
-						// should never happen, if it does this log will explode, but just in case
-						LOGGER.error("Unable to deserialize fallback client biome [minecraft:plains], returning NULL.");
-						return null;
-					}
-				}
-				
-				if (result.success)
-				{
-					existingBiome = result.biome;
-				}
-				
-				return existingBiome;
-			});
-	}
-	
-	
-	
-	//================//
-	// unused methods //
-	//================//
-	
+	public float getShade(Direction direction, boolean shade)
+	{ throw new UnsupportedOperationException("ERROR: getShade() called on TintWithoutLevelOverrider. Object is for tinting only."); }
 	@Override
-	public float getShade(@NotNull Direction direction, boolean shade)
-	{
-		throw new UnsupportedOperationException("ERROR: getShade() called on TintWithoutLevelOverrider. Object is for tinting only.");
-	}
-	@Override
-	public @NotNull LevelLightEngine getLightEngine()
-	{
-		throw new UnsupportedOperationException("ERROR: getLightEngine() called on TintWithoutLevelOverrider. Object is for tinting only.");
-	}
+	public LevelLightEngine getLightEngine()
+	{ throw new UnsupportedOperationException("ERROR: getLightEngine() called on TintWithoutLevelOverrider. Object is for tinting only."); }
 	@Nullable
 	@Override
-	public BlockEntity getBlockEntity(@NotNull BlockPos pos)
-	{
-		throw new UnsupportedOperationException("ERROR: getBlockEntity() called on TintWithoutLevelOverrider. Object is for tinting only.");
-	}
+	public BlockEntity getBlockEntity(BlockPos pos)
+	{ throw new UnsupportedOperationException("ERROR: getBlockEntity() called on TintWithoutLevelOverrider. Object is for tinting only."); }
 	
 	@Override
-	public @NotNull BlockState getBlockState(@NotNull BlockPos pos)
-	{
-		throw new UnsupportedOperationException("ERROR: getBlockState() called on TintWithoutLevelOverrider. Object is for tinting only.");
-	}
+	public BlockState getBlockState(BlockPos pos)
+	{ throw new UnsupportedOperationException("ERROR: getBlockState() called on TintWithoutLevelOverrider. Object is for tinting only."); }
 	@Override
-	public @NotNull FluidState getFluidState(@NotNull BlockPos pos)
-	{
-		throw new UnsupportedOperationException("ERROR: getFluidState() called on TintWithoutLevelOverrider. Object is for tinting only.");
-	}
-	
+	public FluidState getFluidState(BlockPos pos)
+	{ throw new UnsupportedOperationException("ERROR: getFluidState() called on TintWithoutLevelOverrider. Object is for tinting only."); }
 	
 	
 	//==============//
@@ -227,7 +77,7 @@ public class TintWithoutLevelOverrider implements BlockAndTintGetter
 	#if MC_VER < MC_1_21_3
 	@Override
 	public int getMinBuildHeight() 
-	{ throw new UnsupportedOperationException("ERROR: getMinBuildHeight() called on TintWithoutLevelOverrider. Object is for tinting only."); }
+	{ throw new UnsupportedOperationException("ERROR: getMinBuildHeight() called on TintWithoutLevelSmoothOverrider. Object is for tinting only."); }
 	#else
 	@Override
 	public int getMinY()

common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintWithoutLevelSmoothOverrider.java

@@ -1,144 +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.common.wrappers.block;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.world.level.BlockAndTintGetter;
-import net.minecraft.world.level.ColorResolver;
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.lighting.LevelLightEngine;
-import net.minecraft.world.level.material.FluidState;
-import org.jetbrains.annotations.Nullable;
-
-#if MC_VER >= MC_1_18_2
-import net.minecraft.core.Holder;
-#endif
-
-public class TintWithoutLevelSmoothOverrider implements BlockAndTintGetter
-{
-	final BiomeWrapper biome;
-	public int smoothingRange;
-	
-	
-	
-	//=============//
-	// constructor //
-	//=============//
-	
-	public TintWithoutLevelSmoothOverrider(BiomeWrapper biome, int smoothingRange)
-	{
-		this.biome = biome;
-		this.smoothingRange = smoothingRange;
-	}
-	
-	
-	
-	//=========//
-	// methods //
-	//=========//
-	
-	@Override
-	public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver)
-	{
-		return colorResolver.getColor(_unwrap(biome.biome), blockPos.getX(), blockPos.getZ());
-	}
-	private Biome _unwrap(#if MC_VER >= MC_1_18_2 Holder<Biome> #else Biome #endif biome)
-	{
-		#if MC_VER >= MC_1_18_2
-		return biome.value();
-		#else
-		return biome;
-		#endif
-	}
-
-//    public int calculateBlockTint(BlockPos blockPos, ColorResolver colorResolver)
-//    {
-//        int i = smoothingRange;
-//        if (i == 0)
-//            return colorResolver.getColor(_getBiome(blockPos), blockPos.getX(), blockPos.getZ());
-//        int j = (i * 2 + 1) * (i * 2 + 1);
-//        int k = 0;
-//        int l = 0;
-//        int m = 0;
-//        Cursor3D cursor3D = new Cursor3D(blockPos.getX() - i, blockPos.getY(), blockPos.getZ() - i, blockPos.getX() + i, blockPos.getY(), blockPos.getZ() + i);
-//        BlockPos.MutableBlockPos mutableBlockPos = new BlockPos.MutableBlockPos();
-//        while (cursor3D.advance())
-//        {
-//            mutableBlockPos.set(cursor3D.nextX(), cursor3D.nextY(), cursor3D.nextZ());
-//            int n;
-//            if (LodCommonMain.forgeMethodCaller != null) {
-//                n = LodCommonMain.forgeMethodCaller.colorResolverGetColor(colorResolver, _getBiome(mutableBlockPos),
-//                        mutableBlockPos.getX(), mutableBlockPos.getZ());
-//            } else {
-//                n = colorResolver.getColor(_getBiome(mutableBlockPos), mutableBlockPos.getX(), mutableBlockPos.getZ());
-//            }
-//
-//            k += (n & 0xFF0000) >> 16;
-//            l += (n & 0xFF00) >> 8;
-//            m += n & 0xFF;
-//        }
-//        return (k / j & 0xFF) << 16 | (l / j & 0xFF) << 8 | m / j & 0xFF;
-//    }
-	
-	@Override
-	public float getShade(Direction direction, boolean shade)
-	{ throw new UnsupportedOperationException("ERROR: getShade() called on TintWithoutLevelSmoothOverrider. Object is for tinting only."); }
-	@Override
-	public LevelLightEngine getLightEngine()
-	{ throw new UnsupportedOperationException("ERROR: getLightEngine() called on TintWithoutLevelSmoothOverrider. Object is for tinting only."); }
-	@Nullable
-	@Override
-	public BlockEntity getBlockEntity(BlockPos pos)
-	{ throw new UnsupportedOperationException("ERROR: getBlockEntity() called on TintWithoutLevelSmoothOverrider. Object is for tinting only."); }
-	
-	@Override
-	public BlockState getBlockState(BlockPos pos)
-	{ throw new UnsupportedOperationException("ERROR: getBlockState() called on TintWithoutLevelSmoothOverrider. Object is for tinting only."); }
-	@Override
-	public FluidState getFluidState(BlockPos pos)
-	{ throw new UnsupportedOperationException("ERROR: getFluidState() called on TintWithoutLevelSmoothOverrider. Object is for tinting only."); }
-	
-	
-	//==============//
-	// post MC 1.17 //
-	//==============//
-	
-	#if MC_VER >= MC_1_17_1
-	
-	@Override
-	public int getHeight()
-	{ throw new UnsupportedOperationException("ERROR: getHeight() called on TintWithoutLevelSmoothOverrider. Object is for tinting only."); }
-	
-	#if MC_VER < MC_1_21_3
-	@Override
-	public int getMinBuildHeight() 
-	{ throw new UnsupportedOperationException("ERROR: getMinBuildHeight() called on TintWithoutLevelSmoothOverrider. Object is for tinting only."); }
-	#else
-	@Override
-	public int getMinY()
-	{ throw new UnsupportedOperationException("ERROR: getMinY() called on TintWithoutLevelSmoothOverrider. Object is for tinting only."); }
-	#endif
-	
-	#endif
-	
-}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/DhDebugScreenEntry.java

@@ -0,0 +1,89 @@
+package com.seibel.distanthorizons.common.wrappers.gui;
+
+#if MC_VER < MC_1_21_9
+// not supported for older MC versions
+#else
+import com.seibel.distanthorizons.core.logging.f3.F3Screen;
+import com.seibel.distanthorizons.coreapi.ModInfo;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import net.minecraft.client.gui.components.debug.DebugScreenDisplayer;
+import net.minecraft.client.gui.components.debug.DebugScreenEntries;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.chunk.LevelChunk;
+#endif
+
+#if MC_VER < MC_1_21_9
+// not supported for older MC versions
+public class DhDebugScreenEntry
+{}
+#else
+public class DhDebugScreenEntry implements net.minecraft.client.gui.components.debug.DebugScreenEntry
+{
+	public static void register()
+	{
+		// This method is private, so its access will need to be widened
+		DebugScreenEntries.register(
+				// The id, this will be displayed on the options screen
+				ResourceLocation.fromNamespaceAndPath(ModInfo.RESOURCE_NAMESPACE, "distant_horizons"),
+				// The screen entry
+				new DhDebugScreenEntry()
+		);
+	}
+	
+	
+	@Override
+	public void display(@NotNull DebugScreenDisplayer displayer, @Nullable Level level, @Nullable LevelChunk clientChunk, @Nullable LevelChunk serverChunk)
+	{
+		List<String> messageList = new ArrayList<>();
+		F3Screen.addStringToDisplay(messageList);
+		
+		for (String message : messageList)
+		{
+			displayer.addLine(message);
+		}
+		
+		//// The following will display like so if it is the only entry on the screen:
+		//// First left!                                                First Right!
+		//// 
+		//// Hello world!                                               Random text!
+		//// Lorem ipsum.
+		////                                                            I am another group!
+		//// I am one group                                             This will appear after with no line breaks!
+		//// All in a row
+		//// Provided in a list.
+		////
+		//
+		//displayer.addLine("Hello world!");
+		//displayer.addLine("Lorem ipsum.");
+		//displayer.addLine("Random text!");
+		//
+		//// These will be displayed first
+		//displayer.addPriorityLine("First left!");
+		//displayer.addPriorityLine("First right!");
+		//
+		//// These will be grouped separately based on the key
+		//displayer.addToGroup(GROUP_ONE, List.of(
+		//		"I am one group",
+		//		"All in a row",
+		//		"Provided in a list."
+		//));
+		//
+		//displayer.addToGroup(GROUP_TWO, "I am another group!");
+		//displayer.addToGroup(GROUP_TWO, "This will appear after with no line breaks!");
+	}
+	
+	@Override
+	public boolean isAllowed(boolean reducedDebugInfo)
+	{
+		// Always show regardless of accessibility option
+		return true;
+	}
+}
+#endif

common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/GetConfigScreen.java

@@ -1,40 +1,52 @@
 package com.seibel.distanthorizons.common.wrappers.gui;
 
+import com.seibel.distanthorizons.core.config.ConfigHandler;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.coreapi.ModInfo;
-import com.seibel.distanthorizons.core.config.ConfigBase;
-import com.seibel.distanthorizons.core.config.gui.ConfigScreen;
 import com.seibel.distanthorizons.core.config.gui.JavaScreenHandlerScreen;
-import com.seibel.distanthorizons.core.config.gui.OpenGLConfigScreen;
 import net.minecraft.client.gui.screens.Screen;
+import org.apache.logging.log4j.Logger;
 
 public class GetConfigScreen
 {
-	public static type useScreen = type.Classic;
+	protected static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
-	public enum type
+	public static EType useScreen = EType.Classic;
+	
+	public enum EType
 	{
 		Classic,
-		@Deprecated
-		OpenGL, // This was just an attempt, it didn't work out, and we are going to change to javafx soon (as soon as that works)
-		JavaFX;
+		JavaSwing;
 	}
 	
 	public static Screen getScreen(Screen parent)
 	{
-		// Generate the language
-		// This shouldn't be here, but I need a way to test it after Minecraft inits its assets
-		//System.out.println(ConfigBase.INSTANCE.generateLang(false, true));
+		// TODO it'd be nice to have this run automatically on startup
+		//  but this will only work once MC has added our lang file,
+		//  which won't be for sure added until we request a GUI
+		if (ModInfo.IS_DEV_BUILD)
+		{
+			String missingLangEntries = ConfigHandler.INSTANCE.generateLang(true, true);
+			
+			// trim to remove any newlines/spaces
+			// that may be present when no lang entries need changing
+			// then we can check length != 0 if any items are missing and need adding 
+			String trimmedMissingEntries = missingLangEntries.trim();
+			if (!trimmedMissingEntries.isEmpty())
+			{
+				LOGGER.warn("One or more language entries is missing:");
+				LOGGER.warn(missingLangEntries);
+			}
+		}
+		
 		
 		switch (useScreen)
 		{
 			case Classic:
-				return ClassicConfigGUI.getScreen(ConfigBase.INSTANCE, parent, "client");
-			case OpenGL:
-				MinecraftScreen.getScreen(parent, new OpenGLConfigScreen(), ModInfo.ID + ".title");
-				return null;
-//            case JavaFX -> MinecraftScreen.getScreen(parent, new JavaScreenHandlerScreen(new JavaScreenHandlerScreen.ExampleScreen()), ModInfo.ID + ".title");
-			case JavaFX:
-				return MinecraftScreen.getScreen(parent, new JavaScreenHandlerScreen(new ConfigScreen()), ModInfo.ID + ".title");
+				return ClassicConfigGUI.getScreen(parent, "client");
+			case JavaSwing:
+				//return MinecraftScreen.getScreen(parent, new JavaScreenHandlerScreen(new ConfigScreen()), ModInfo.ID + ".title");
+				return MinecraftScreen.getScreen(parent, new JavaScreenHandlerScreen(new JavaScreenHandlerScreen.ExampleScreen()), ModInfo.ID + ".title");
 			default:
 				throw new IllegalArgumentException("No config screen implementation defined for ["+useScreen+"].");
 		}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/MinecraftScreen.java

@@ -24,26 +24,26 @@ public class MinecraftScreen
 	private static class ConfigScreenRenderer extends DhScreen
 	{
 		private final Screen parent;
-		private ConfigListWidget list;
+		private ConfigListWidget configListWidget;
 		private AbstractScreen screen;
 		
 		
 		#if MC_VER < MC_1_19_2
 		public static net.minecraft.network.chat.TranslatableComponent translate(String str, Object... args)
-		{
-			return new net.minecraft.network.chat.TranslatableComponent(str, args);
-		}
+		{ return new net.minecraft.network.chat.TranslatableComponent(str, args); }
 		#else
 		public static net.minecraft.network.chat.MutableComponent translate(String str, Object... args)
-		{
-			return net.minecraft.network.chat.Component.translatable(str, args);
-		}
-    #endif
+		{ return net.minecraft.network.chat.Component.translatable(str, args); }
+        #endif
 		
 		protected ConfigScreenRenderer(Screen parent, AbstractScreen screen, String translationName)
 		{
 			super(translate(translationName));
+			#if MC_VER < MC_1_21_9
 			screen.minecraftWindow = Minecraft.getInstance().getWindow().getWindow();
+			#else
+			screen.minecraftWindow = Minecraft.getInstance().getWindow().handle();
+			#endif
 			this.parent = parent;
 			this.screen = screen;
 		}
@@ -53,20 +53,22 @@ public class MinecraftScreen
 		{
 			super.init(); // Init Minecraft's screen
 			Window mcWindow = this.minecraft.getWindow();
-			screen.width = mcWindow.getWidth();
-			screen.height = mcWindow.getHeight();
-			screen.scaledWidth = this.width;
-			screen.scaledHeight = this.height;
-			screen.init(); // Init our own config screen
+			this.screen.width = mcWindow.getWidth();
+			this.screen.height = mcWindow.getHeight();
+			this.screen.scaledWidth = this.width;
+			this.screen.scaledHeight = this.height;
+			this.screen.init(); // Init our own config screen
 			
-			this.list = new ConfigListWidget(this.minecraft, this.width, this.height, 0, 0, 25); // Select the area to tint
+			this.configListWidget = new ConfigListWidget(this.minecraft, this.width, this.height, 0, 0, 25); // Select the area to tint
 			
 			#if MC_VER < MC_1_20_6 // no background is rendered in MC 1.20.6+
 			if (this.minecraft != null && this.minecraft.level != null) // Check if in game
-				this.list.setRenderBackground(false); // Disable from rendering
+			{
+				this.configListWidget.setRenderBackground(false); // Disable from rendering
+			}
 			#endif
 			
-			this.addWidget(this.list); // Add the tint to the things to be rendered
+			this.addWidget(this.configListWidget); // Add the tint to the things to be rendered
 		}
 		
 		@Override
@@ -78,14 +80,17 @@ public class MinecraftScreen
 		{
 			#if MC_VER < MC_1_20_2
 			this.renderBackground(matrices); // Render background
-			#else
+			#elif MC_VER < MC_1_21_6
 			this.renderBackground(matrices, mouseX, mouseY, delta); // Render background
+			#else
+			// background blur is already being rendered, rendering again causes the game to crash
 			#endif
-			this.list.render(matrices, mouseX, mouseY, delta); // Renders the items in the render list (currently only used to tint background darker)
 			
-			screen.mouseX = mouseX;
-			screen.mouseY = mouseY;
-			screen.render(delta); // Render everything on the main screen
+			this.configListWidget.render(matrices, mouseX, mouseY, delta); // Renders the items in the render list (currently only used to tint background darker)
+			
+			this.screen.mouseX = mouseX;
+			this.screen.mouseY = mouseY;
+			this.screen.render(delta); // Render everything on the main screen
 			
 			super.render(matrices, mouseX, mouseY, delta); // Render the vanilla stuff (currently only used for the background and tint)
 		}
@@ -95,41 +100,39 @@ public class MinecraftScreen
 		{
 			super.resize(mc, width, height); // Resize Minecraft's screen
 			Window mcWindow = this.minecraft.getWindow();
-			screen.width = mcWindow.getWidth();
-			screen.height = mcWindow.getHeight();
-			screen.scaledWidth = this.width;
-			screen.scaledHeight = this.height;
-			screen.onResize(); // Resize our screen
+			this.screen.width = mcWindow.getWidth();
+			this.screen.height = mcWindow.getHeight();
+			this.screen.scaledWidth = this.width;
+			this.screen.scaledHeight = this.height;
+			this.screen.onResize(); // Resize our screen
 		}
 		
 		@Override
 		public void tick()
 		{
 			super.tick(); // Tick Minecraft's screen
-			screen.tick(); // Tick our screen
-			if (screen.close) // If we decide to close the screen, then actually close the screen
-				onClose();
+			this.screen.tick(); // Tick our screen
+			if (this.screen.close) // If we decide to close the screen, then actually close the screen
+			{
+				this.onClose();
+			}
 		}
 		
 		@Override
 		public void onClose()
 		{
-			screen.onClose(); // Close our screen
-			Objects.requireNonNull(minecraft).setScreen(this.parent); // Goto the parent screen
+			this.screen.onClose(); // Close our screen
+			Objects.requireNonNull(this.minecraft).setScreen(this.parent); // Goto the parent screen
 		}
 		
 		@Override
 		public void onFilesDrop(@NotNull List<Path> files)
-		{
-			screen.onFilesDrop(files);
-		}
+		{ this.screen.onFilesDrop(files); }
 		
 		// For checking if it should close when you press the escape key
 		@Override
 		public boolean shouldCloseOnEsc()
-		{
-			return screen.shouldCloseOnEsc;
-		}
+		{ return this.screen.shouldCloseOnEsc; }
 		
 	}
 	

common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/config/ConfigGuiInfo.java

@@ -0,0 +1,33 @@
+package com.seibel.distanthorizons.common.wrappers.gui.config;
+
+import com.seibel.distanthorizons.core.config.gui.IConfigGuiInfo;
+import com.seibel.distanthorizons.core.config.types.AbstractConfigBase;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.components.EditBox;
+import net.minecraft.network.chat.Component;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.AbstractMap;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import java.util.function.Predicate;
+
+/** 
+ * holds information needed by the config GUI for rendering.
+ * 
+ * @see AbstractConfigBase
+ */
+public class ConfigGuiInfo implements IConfigGuiInfo
+{
+	/**
+	 * Used to display validation errors.
+	 * Null if no error is present.
+	 */
+	@Nullable
+	public Component errorMessage;
+	
+	public BiFunction<EditBox, Button, Predicate<String>> tooltipFunction;
+	/** determines which options the button will show */
+	public AbstractMap.SimpleEntry<Button.OnPress, Function<Object, Component>> buttonOptionMap;
+	
+}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/ChangelogScreen.java

@@ -74,6 +74,7 @@ public class ChangelogScreen extends DhScreen
 		{
 			return;
 		}
+		
 		try
 		{
 			this.setupChangelog(versionID);
@@ -175,9 +176,12 @@ public class ChangelogScreen extends DhScreen
 	{
 		#if MC_VER < MC_1_20_2
 		this.renderBackground(matrices); // Render background
-		#else
+		#elif MC_VER < MC_1_21_6
 		this.renderBackground(matrices, mouseX, mouseY, delta); // Render background
+		#else
+		// background blur is already being rendered, rendering again causes the game to crash
 		#endif
+		
 		if (!this.usable)
 		{
 			return;
@@ -249,42 +253,35 @@ public class ChangelogScreen extends DhScreen
 		private final Component text;
 		private final List<AbstractWidget> children = new ArrayList<>();
 		
-		private ButtonEntry(Component text)
-		{
-			this.text = text;
-		}
+		private ButtonEntry(Component text) { this.text = text; }
 		
 		public static ButtonEntry create(Component text)
-		{
-			return new ButtonEntry(text);
-		}
+		{ return new ButtonEntry(text); }
 		
 		#if MC_VER < MC_1_20_1
 		@Override
 		public void render(PoseStack matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta)
-		{
-			GuiComponent.drawString(matrices, textRenderer, text, 12, y + 5, 0xFFFFFF);
-		}
-		#else
+		{ GuiComponent.drawString(matrices, textRenderer, text, 12, y + 5, 0xFFFFFF); }
+		#elif MC_VER < MC_1_21_9
 		@Override
 		public void render(GuiGraphics matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta)
-		{
-			matrices.drawString(textRenderer, this.text, 12, y + 5, 0xFFFFFF);
-		}
+		{ matrices.drawString(textRenderer, this.text, 12, y + 5, 0xFFFFFF); }
+		#else
+		@Override 
+		public void renderContent(GuiGraphics matrices, int y, int x, boolean hovered, float tickDelta)
+		{ matrices.drawString(textRenderer, this.text, 12, y + 5, 0xFFFFFF); }
         #endif
 		
 		@Override
-		public List<? extends GuiEventListener> children()
-		{
-			return this.children;
-		}
+		public List<? extends GuiEventListener> children() { return this.children; }
+		
 		#if MC_VER >= MC_1_17_1
 		@Override
-		public List<? extends NarratableEntry> narratables()
-		{
-			return this.children;
-		}
+		public List<? extends NarratableEntry> narratables() { return this.children; }
 		#endif
+		
+		
+		
 	}
 	
 }

common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftClientWrapper.java

@@ -33,6 +33,7 @@ import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.enums.EDhDirection;
 import com.seibel.distanthorizons.core.file.structure.ClientOnlySaveStructure;
+import com.seibel.distanthorizons.core.render.glObject.GLProxy;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import com.seibel.distanthorizons.coreapi.ModInfo;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
@@ -157,9 +158,17 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
 	@Override
 	public boolean hasSinglePlayerServer() { return MINECRAFT.hasSingleplayerServer(); }
 	@Override
-	public boolean clientConnectedToDedicatedServer() { return MINECRAFT.getCurrentServer() != null && !this.hasSinglePlayerServer(); }
+	public boolean clientConnectedToDedicatedServer() 
+	{ 
+		return MINECRAFT.getCurrentServer() != null 
+				&& !this.hasSinglePlayerServer(); 
+	}
 	@Override
-	public boolean connectedToReplay() { return !MINECRAFT.hasSingleplayerServer() && MINECRAFT.getCurrentServer() == null; }
+	public boolean connectedToReplay() 
+	{ 
+		return MINECRAFT.getCurrentServer() == null
+				&& !this.hasSinglePlayerServer() ; 
+	}
 	
 	@Override
 	public String getCurrentServerName() 
@@ -306,10 +315,22 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
 			return;
 		}
 		
+		if (!GLProxy.hasInstance())
+		{
+			// rendering setup hasn't finished
+			return;
+		}
+		
         #if MC_VER < MC_1_19_2
 		player.sendMessage(new TextComponent(string), getPlayer().getUUID());
-        #else
+        #elif MC_VER < MC_1_21_9
 		player.displayClientMessage(net.minecraft.network.chat.Component.translatable(string), /*isOverlay*/false);
+		#else
+		
+		GLProxy.getInstance().queueRunningOnRenderThread(() -> 
+		{
+			player.displayClientMessage(net.minecraft.network.chat.Component.translatable(string), /*isOverlay*/false);
+		});
         #endif
 	}
 	

common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftGLWrapper.java

@@ -21,7 +21,7 @@ package com.seibel.distanthorizons.common.wrappers.minecraft;
 
 #if MC_VER < MC_1_21_5
 import com.mojang.blaze3d.platform.GlStateManager;
-#elif MC_VER >= MC_1_21_5
+#else
 import com.mojang.blaze3d.opengl.GlStateManager;
 #endif
 

common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftRenderWrapper.java

@@ -25,7 +25,6 @@ import java.util.concurrent.ConcurrentHashMap;
 
 import com.mojang.blaze3d.pipeline.RenderTarget;
 import com.mojang.blaze3d.platform.NativeImage;
-import com.seibel.distanthorizons.common.wrappers.WrapperFactory;
 import com.seibel.distanthorizons.common.wrappers.misc.LightMapWrapper;
 import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector;
 
@@ -74,23 +73,19 @@ import org.joml.Vector4f;
 
 #if MC_VER >= MC_1_21_5
 import com.mojang.blaze3d.opengl.GlTexture;
+#else
 #endif
 
 /**
  * A singleton that contains everything
  * related to rendering in Minecraft.
- *
- * @author James Seibel
- * @version 12-12-2021
  */
-//@Environment(EnvType.CLIENT)
 public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 {
 	public static final MinecraftRenderWrapper INSTANCE = new MinecraftRenderWrapper();
 	
 	private static final Logger LOGGER = DhLoggerBuilder.getLogger(MethodHandles.lookup().lookupClass().getSimpleName());
 	private static final Minecraft MC = Minecraft.getInstance();
-	private static final IWrapperFactory FACTORY = WrapperFactory.INSTANCE;
 	
 	private static final IOptifineAccessor OPTIFINE_ACCESSOR = ModAccessorInjector.INSTANCE.get(IOptifineAccessor.class);
 	
@@ -300,7 +295,7 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 		return height;
 	}
 	
-	private RenderTarget getRenderTarget() { return MC.getMainRenderTarget(); }
+	protected RenderTarget getRenderTarget() { return MC.getMainRenderTarget(); }
 	
 	@Override
 	public boolean mcRendersToFrameBuffer()
@@ -350,17 +345,18 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 		return this.getRenderTarget().getDepthTextureId();
 		#else
 		try
-		{
+		{		
 			GlTexture glTexture = (GlTexture) this.getRenderTarget().getDepthTexture();
 			if (glTexture == null)
 			{
 				// shouldn't happen, but just in case
 				return 0;
 			}
-			
+
 			return glTexture.glId();
+			
 		}
-		catch (ClassCastException e)
+		catch (Exception e)
 		{
 			// only log this error once per session
 			if (!this.depthTextureCastFailLogged)
@@ -389,7 +385,7 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 			
 			return glTexture.glId();
 		}
-		catch (ClassCastException e)
+		catch (Exception e)
 		{
 			// only log this error once per session
 			if (!this.colorTextureCastFailLogged)
@@ -405,13 +401,21 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 	@Override
 	public int getTargetFrameBufferViewportWidth()
 	{
+		#if MC_VER < MC_1_21_9
 		return this.getRenderTarget().viewWidth;
+		#else
+		return this.getRenderTarget().width;
+		#endif
 	}
 	
 	@Override
 	public int getTargetFrameBufferViewportHeight()
 	{
+		#if MC_VER < MC_1_21_9
 		return this.getRenderTarget().viewHeight;
+		#else
+		return this.getRenderTarget().height;
+		#endif
 	}
 	
 	@Override

common/src/main/java/com/seibel/distanthorizons/common/wrappers/misc/ServerPlayerWrapper.java

@@ -71,26 +71,6 @@ public class ServerPlayerWrapper implements IServerPlayerWrapper
 		return new Vec3d(position.x, position.y, position.z);
 	}
 	
-	@Override
-	public int getViewDistance() 
-	{
-		#if MC_VER < MC_1_21_6
-		return this.getServerPlayer().server.getPlayerList().getViewDistance();
-		#else
-		return this.getServerPlayer().getServer().getPlayerList().getViewDistance();
-		#endif
-	}
-	
-	@Override
-	public SocketAddress getRemoteAddress()
-	{
-		#if MC_VER >= MC_1_19_4
-		return this.getServerPlayer().connection.getRemoteAddress();
-		#else // < 1.19.4
-		return this.getServerPlayer().connection.connection.getRemoteAddress();
-		#endif
-	}
-	
 	
 	
 	//================//

common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ClientLevelWrapper.java

@@ -7,6 +7,7 @@ import com.seibel.distanthorizons.common.wrappers.block.BiomeWrapper;
 import com.seibel.distanthorizons.common.wrappers.block.BlockStateWrapper;
 import com.seibel.distanthorizons.common.wrappers.block.ClientBlockStateColorCache;
 import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
+import com.seibel.distanthorizons.core.dataObjects.fullData.sources.FullDataSourceV2;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.level.*;
 import com.seibel.distanthorizons.core.level.IServerKeyedClientLevel;
@@ -72,6 +73,7 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 	
 	
 	private BlockStateWrapper dirtBlockWrapper;
+	private BlockStateWrapper waterBlockWrapper;
 	private BiomeWrapper plainsBiomeWrapper;
 	@Deprecated // TODO circular references are bad
 	private IDhLevel parentDhLevel;
@@ -90,6 +92,29 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 	// instance methods //
 	//==================//
 	
+	/** 
+	 * can be used when speed is important and the same level is likely to be passed in,
+	 * IE rendering.
+	 */
+	@Nullable
+	public static IClientLevelWrapper getWrapperIfDifferent(@Nullable IClientLevelWrapper levelWrapper, @NotNull ClientLevel level)
+	{
+		if (KEYED_CLIENT_LEVEL_MANAGER.isEnabled() && KEYED_CLIENT_LEVEL_MANAGER.getServerKeyedLevel() != levelWrapper)
+		{
+			return getWrapper(level);
+		}
+		
+		ClientLevelWrapper clientLevelWrapper = (ClientLevelWrapper)levelWrapper;
+		if (clientLevelWrapper == null
+			|| clientLevelWrapper.level != level)
+		{
+			return getWrapper(level);
+		}
+		
+		return clientLevelWrapper;
+	}
+	
+	@Nullable
 	public static IClientLevelWrapper getWrapper(@NotNull ClientLevel level) { return getWrapper(level, false); }
 	
 	@Nullable
@@ -175,13 +200,13 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 	//====================//
 	
 	@Override
-	public int getBlockColor(DhBlockPos pos, IBiomeWrapper biome, IBlockStateWrapper blockWrapper)
+	public int getBlockColor(DhBlockPos pos, IBiomeWrapper biome, FullDataSourceV2 fullDataSource, IBlockStateWrapper blockWrapper)
 	{
 		ClientBlockStateColorCache blockColorCache = this.blockCache.computeIfAbsent(
 				((BlockStateWrapper) blockWrapper).blockState,
 				this.cachedBlockColorCacheFunction);
 		
-		return blockColorCache.getColor((BiomeWrapper) biome, pos);
+		return blockColorCache.getColor((BiomeWrapper) biome, fullDataSource, pos);
 	}
 	/** used by {@link ClientLevelWrapper#cachedBlockColorCacheFunction} */
 	private ClientBlockStateColorCache createBlockColorCache(BlockState block) { return new ClientBlockStateColorCache(block, this); }
@@ -204,7 +229,27 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 			}
 		}
 		
-		return this.getBlockColor(DhBlockPos.ZERO,BiomeWrapper.EMPTY_WRAPPER, this.dirtBlockWrapper);
+		return this.getBlockColor(DhBlockPos.ZERO, BiomeWrapper.EMPTY_WRAPPER, null, this.dirtBlockWrapper);
+	}
+	
+	@Override
+	public int getWaterBlockColor()
+	{
+		if (this.waterBlockWrapper == null)
+		{
+			try
+			{
+				this.waterBlockWrapper = (BlockStateWrapper) BlockStateWrapper.deserialize(BlockStateWrapper.WATER_RESOURCE_LOCATION_STRING, this);
+			}
+			catch (IOException e)
+			{
+				// shouldn't happen, but just in case
+				LOGGER.warn("Unable to get water color with resource location ["+BlockStateWrapper.WATER_RESOURCE_LOCATION_STRING+"] with level ["+this+"].", e);
+				return -1;
+			}
+		}
+		
+		return this.getBlockColor(DhBlockPos.ZERO, BiomeWrapper.EMPTY_WRAPPER, null, this.waterBlockWrapper);
 	}
 	
 	@Override 

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/BatchGenerationEnvironment.java

@@ -50,6 +50,9 @@ import java.util.function.Function;
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
 import com.seibel.distanthorizons.common.wrappers.DependencySetupDoneCheck;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.step.StepBiomes;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.step.StepFeatures;
@@ -60,10 +63,7 @@ import com.seibel.distanthorizons.common.wrappers.worldGeneration.step.StepSurfa
 
 import net.minecraft.server.level.*;
 import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.chunk.ProtoChunk;
-import net.minecraft.world.level.chunk.UpgradeData;
+import net.minecraft.world.level.chunk.*;
 import net.minecraft.world.level.chunk.storage.IOWorker;
 import net.minecraft.world.level.chunk.storage.RegionFileStorage;
 import net.minecraft.world.level.levelgen.DebugLevelSource;
@@ -73,19 +73,17 @@ import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator;
 import net.minecraft.nbt.CompoundTag;
 import org.apache.logging.log4j.LogManager;
 
-#if MC_VER >= MC_1_19_4
-import net.minecraft.core.registries.Registries;
-#else
+#if MC_VER <= MC_1_17_1
+#elif MC_VER <= MC_1_19_2
 import net.minecraft.core.Registry;
+#else
+import net.minecraft.core.registries.Registries;
 #endif
 
 #if MC_VER <= MC_1_20_4
 import net.minecraft.world.level.chunk.ChunkStatus;
-import org.jetbrains.annotations.Nullable;
 #else
 import net.minecraft.world.level.chunk.status.ChunkStatus;
-
-import javax.annotation.Nullable;
 #endif
 
 /*
@@ -115,8 +113,10 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 	
 	#if MC_VER < MC_1_21_5
 	private static final TicketType<ChunkPos> DH_SERVER_GEN_TICKET = TicketType.create("dh_server_gen_ticket", Comparator.comparingLong(ChunkPos::toLong));
-	#else
+	#elif MC_VER < MC_1_21_9
 	private static final TicketType DH_SERVER_GEN_TICKET = new TicketType(/* timeout, 0 = disabled*/0L, /* persist */ false, TicketType.TicketUse.LOADING);
+	#else
+	private static final TicketType DH_SERVER_GEN_TICKET = new TicketType(/* timeout, 0 = disabled*/0L, /* flags */0);
 	#endif
 	
 	private static final IModChecker MOD_CHECKER = SingletonInjector.INSTANCE.get(IModChecker.class);
@@ -174,6 +174,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 	// constructors //
 	//==============//
 	
+	@NotNull
 	public static final ImmutableMap<EDhApiWorldGenerationStep, Integer> WORLD_GEN_CHUNK_BORDER_NEEDED_BY_GEN_STEP;
 	public static final int MAX_WORLD_GEN_CHUNK_BORDER_NEEDED;
 	
@@ -205,11 +206,12 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 		builder.put(EDhApiWorldGenerationStep.LIGHT, 0);
 		WORLD_GEN_CHUNK_BORDER_NEEDED_BY_GEN_STEP = builder.build();
 		
-		// TODO this is a test to see if the additional boarder is actually necessary or not.
-		//  If world generators end up having infinite loops or other unexplained issues,
-		//  this should be set back to the commented out logic below
+		// in James' testing as of 2025-09-13 a border here of 2
+		// and a getChunkPosToGenerateStream() radius of 14 provided more accurate
+		// structure generation, however it also caused extreme server lag
+		// a border of 0 here and a getChunkPosToGenerateStream() radius of 8 provided 
+		// good-enough structure generation while not lagging the server
 		MAX_WORLD_GEN_CHUNK_BORDER_NEEDED = 0;
-		//MAX_WORLD_GEN_CHUNK_BORDER_NEEDED = WORLD_GEN_CHUNK_BORDER_NEEDED_BY_GEN_STEP.values().stream().mapToInt(Integer::intValue).max().getAsInt();
 	}
 	
 	public BatchGenerationEnvironment(IDhServerLevel serverlevel)
@@ -387,7 +389,9 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 		CompletableFuture.allOf(readFutures).join();
 		
 		// future chain for generation
-		return CompletableFuture.runAsync(() -> 
+		return CompletableFuture.runAsync(() ->
+		{
+			try
 			{
 				// offset 1 chunk in both X and Z direction so we can generate an even number of chunks wide
 				// while still submitting an odd number width to MC's internal generators
@@ -410,10 +414,10 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 						int centerZ = refPosZ + radius + zOffset;
 						
 						// get/create the list of chunks we're going to generate
-						IEmptyChunkRetrievalFunc fallbackFunc = 
+						IEmptyChunkRetrievalFunc fallbackFunc =
 								(chunkPosX, chunkPosZ) -> Objects.requireNonNull(
-											generatedChunkByDhPos.get(new DhChunkPos(chunkPosX, chunkPosZ)), 
-											() -> String.format("Requested chunk [%d, %d] unavailable during world generation", chunkPosX, chunkPosZ));
+										generatedChunkByDhPos.get(new DhChunkPos(chunkPosX, chunkPosZ)),
+										() -> String.format("Requested chunk [%d, %d] unavailable during world generation", chunkPosX, chunkPosZ));
 						
 						ArrayGridList<ChunkAccess> regionChunks = new ArrayGridList<>(
 								refSize,
@@ -435,7 +439,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 								// this method shouldn't be necessary since we're passing in a pre-populated
 								// list of chunks, but just in case
 								fallbackFunc
-							);
+						);
 						lightGetterAdaptor.setRegion(region);
 						genEvent.threadedParam.makeStructFeat(region, this.params);
 						
@@ -524,7 +528,12 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 					genEvent.threadedParam.perf.recordEvent(genEvent.timer);
 					PREF_LOGGER.debugInc(genEvent.timer.toString());
 				}
-			}, executor);
+			}
+			catch (Exception e)
+			{
+				EVENT_LOGGER.error("Unexpected error during world gen for min chunk pos ["+genEvent.minPos+"], error: ["+e.getMessage()+"].", e);
+			}
+		}, executor);
 	}
 	/** @param extraRadius in both the positive and negative directions */
 	private static Stream<ChunkPos> getChunkPosToGenerateStream(int genMinX, int genMinZ, int width, int extraRadius)
@@ -563,7 +572,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 				if (Config.Common.LodBuilding.pullLightingForPregeneratedChunks.get())
 				{
 					// attempt to get chunk lighting
-					ChunkLoader.CombinedChunkLightStorage combinedLights = ChunkLoader.readLight(newChunk, chunkData);
+					ChunkFileReader.CombinedChunkLightStorage combinedLights = ChunkFileReader.readLight(newChunk, chunkData);
 					if (combinedLights != null)
 					{
 						chunkSkyLightingByDhPos.put(dhChunkPos, combinedLights.skyLightStorage);
@@ -693,7 +702,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 				LOAD_LOGGER.debug("DistantHorizons: Loading chunk [" + chunkPos + "] from disk.");
 				
 				@Nullable
-				ChunkAccess chunk = ChunkLoader.read(level, chunkPos, chunkData);
+				ChunkAccess chunk = ChunkFileReader.read(level, chunkPos, chunkData);
 				if (chunk != null)
 				{
 					if (Config.Common.LodBuilding.assumePreExistingChunksAreFinished.get())
@@ -735,8 +744,10 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 		return new ProtoChunk(chunkPos, UpgradeData.EMPTY, level, level.registryAccess().registryOrThrow(Registries.BIOME), null);
 		#elif MC_VER < MC_1_21_3
 		return new ProtoChunk(chunkPos, UpgradeData.EMPTY, level, level.registryAccess().registryOrThrow(Registries.BIOME), null);
-		#else
+		#elif MC_VER < MC_1_21_9
 		return new ProtoChunk(chunkPos, UpgradeData.EMPTY, level, level.registryAccess().lookupOrThrow(Registries.BIOME), null);
+		#else
+		return new ProtoChunk(chunkPos, UpgradeData.EMPTY, level, PalettedContainerFactory.create(level.registryAccess()), null);
 		#endif
 	}
 	
@@ -1078,8 +1089,8 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 		}
 	}
 	private static <T> ArrayGridList<T> GetCutoutFrom(ArrayGridList<T> total, int border) { return new ArrayGridList<>(total, border, total.gridSize - border); }
-	//private static <T> ArrayGridList<T> GetCutoutFrom(ArrayGridList<T> total, EDhApiWorldGenerationStep step) { return GetCutoutFrom(total, MaxBorderNeeded - WORLD_GEN_CHUNK_BORDER_NEEDED_BY_GEN_STEP.get(step)); }
-	private static <T> ArrayGridList<T> GetCutoutFrom(ArrayGridList<T> total, EDhApiWorldGenerationStep step) { return GetCutoutFrom(total, 0); }
+	private static <T> ArrayGridList<T> GetCutoutFrom(ArrayGridList<T> total, EDhApiWorldGenerationStep step) { return GetCutoutFrom(total, WORLD_GEN_CHUNK_BORDER_NEEDED_BY_GEN_STEP.get(step)); }
+	//private static <T> ArrayGridList<T> GetCutoutFrom(ArrayGridList<T> total, EDhApiWorldGenerationStep step) { return GetCutoutFrom(total, 0); }
 	
 	
 	@Override

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/ChunkFileReader.java

@@ -89,16 +89,20 @@ import net.minecraft.world.level.material.Fluid;
 import org.jetbrains.annotations.Nullable;
 
 
-public class ChunkLoader
+public class ChunkFileReader
 {
 	private static final AtomicBoolean ZERO_CHUNK_POS_ERROR_LOGGED_REF = new AtomicBoolean(false);
 	
 	
-	#if MC_VER >= MC_1_19_2
+	#if MC_VER >= MC_1_21_9
+	// BLOCK_STATE_CODEC can no longer be statically created since
+	// it needs a level reference
+	#elif MC_VER >= MC_1_19_2
 	private static final Codec<PalettedContainer<BlockState>> BLOCK_STATE_CODEC = PalettedContainer.codecRW(Block.BLOCK_STATE_REGISTRY, BlockState.CODEC, PalettedContainer.Strategy.SECTION_STATES, Blocks.AIR.defaultBlockState());
 	#elif MC_VER >= MC_1_18_2
 	private static final Codec<PalettedContainer<BlockState>> BLOCK_STATE_CODEC = PalettedContainer.codec(Block.BLOCK_STATE_REGISTRY, BlockState.CODEC, PalettedContainer.Strategy.SECTION_STATES, Blocks.AIR.defaultBlockState());
 	#endif
+	
 	private static final String TAG_UPGRADE_DATA = "UpgradeData";
 	private static final String BLOCK_TICKS_TAG_18 = "block_ticks";
 	private static final String FLUID_TICKS_TAG_18 = "fluid_ticks";
@@ -259,6 +263,14 @@ public class ChunkLoader
 	}
 	private static LevelChunkSection[] readSections(LevelAccessor level, ChunkPos chunkPos, CompoundTag chunkData)
 	{
+		#if MC_VER < MC_1_21_9
+		// BLOCK_STATE_CODEC is created statically
+		// TODO clean up this code separation
+		#else
+		final Codec<PalettedContainer<BlockState>> BLOCK_STATE_CODEC = PalettedContainerFactory.create(level.registryAccess()).blockStatesContainerCodec();
+		#endif
+		
+		
 		#if MC_VER >= MC_1_18_2
 		#if MC_VER < MC_1_19_4
 		Registry<Biome> biomes = level.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY);
@@ -276,9 +288,12 @@ public class ChunkLoader
 			#elif MC_VER < MC_1_21_3
 			Codec<PalettedContainer<Holder<Biome>>> biomeCodec = PalettedContainer.codecRW(
 				biomes.asHolderIdMap(), biomes.holderByNameCodec(), PalettedContainer.Strategy.SECTION_BIOMES, biomes.getHolderOrThrow(Biomes.PLAINS));
-			#else
+			#elif MC_VER < MC_1_21_9
 			Codec<PalettedContainer<Holder<Biome>>> biomeCodec = PalettedContainer.codecRW(
 				biomes.asHolderIdMap(), biomes.holderByNameCodec(), PalettedContainer.Strategy.SECTION_BIOMES, biomes.getOrThrow(Biomes.PLAINS));
+			#else
+			Codec<PalettedContainer<Holder<Biome>>> biomeCodec = PalettedContainer.codecRW(
+				biomes.holderByNameCodec(), PalettedContainerFactory.create(level.registryAccess()).biomeStrategy(), biomes.getOrThrow(Biomes.PLAINS));
 			#endif
 		#endif
 		
@@ -348,7 +363,11 @@ public class ChunkLoader
 					}
 					else
 					{
+						#if MC_VER < MC_1_21_9
 						blockStateContainer = new PalettedContainer<BlockState>(Block.BLOCK_STATE_REGISTRY, Blocks.AIR.defaultBlockState(), PalettedContainer.Strategy.SECTION_STATES);
+						#else
+						blockStateContainer = PalettedContainerFactory.create(level.registryAccess()).createForBlockStates();
+						#endif
 					}
 				
 				
@@ -380,13 +399,18 @@ public class ChunkLoader
 					}
 					else
 					{
-						biomeContainer = new PalettedContainer<Holder<Biome>>(biomes.asHolderIdMap(), 
-							#if MC_VER < MC_1_21_3
-							biomes.getHolderOrThrow(Biomes.PLAINS), 
-							#else
+						#if MC_VER < MC_1_21_3
+						biomeContainer = new PalettedContainer<Holder<Biome>>(
+								biomes.asHolderIdMap(), 
+								biomes.getHolderOrThrow(Biomes.PLAINS), PalettedContainer.Strategy.SECTION_BIOMES);
+						#elif MC_VER < MC_1_21_9
+						biomeContainer = new PalettedContainer<Holder<Biome>>(biomes.asHolderIdMap(),
 								biomes.getOrThrow(Biomes.PLAINS),
-							#endif
 								PalettedContainer.Strategy.SECTION_BIOMES);
+						#else
+						biomeContainer = PalettedContainerFactory.create(level.registryAccess()).createForBiomes();
+						#endif
+						
 					}
 				
 					#endif

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/AbstractWorldGenStep.java

@@ -0,0 +1,54 @@
+package com.seibel.distanthorizons.common.wrappers.worldGeneration.step;
+
+import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
+import com.seibel.distanthorizons.common.wrappers.worldGeneration.ThreadedParameters;
+import com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject.DhLitWorldGenRegion;
+import com.seibel.distanthorizons.core.util.gridList.ArrayGridList;
+import net.minecraft.world.level.chunk.ChunkAccess;
+import net.minecraft.world.level.chunk.ProtoChunk;
+
+import java.util.ArrayList;
+import java.util.List;
+
+#if MC_VER <= MC_1_20_4
+import net.minecraft.world.level.chunk.ChunkStatus;
+#else
+import net.minecraft.world.level.chunk.status.ChunkStatus;
+#endif
+
+public abstract class AbstractWorldGenStep
+{
+	public abstract void generateGroup(
+			ThreadedParameters tParams, DhLitWorldGenRegion worldGenRegion,
+			ArrayGridList<ChunkWrapper> chunkWrappers);
+	
+	public abstract ChunkStatus getChunkStatus();
+	
+	
+	
+	/** @return the list of chunks that have an earlier status and can be generated */
+	protected ArrayList<ChunkAccess> getChunksToGenerate(List<ChunkWrapper> chunkWrappers)
+	{
+		ArrayList<ChunkAccess> chunksToGenerate = new ArrayList<>();
+		
+		for (ChunkWrapper chunkWrapper : chunkWrappers)
+		{
+			ChunkAccess chunk = chunkWrapper.getChunk();
+			if (chunkWrapper.getStatus().isOrAfter(this.getChunkStatus()))
+			{
+				// this chunk has already generated this step
+				continue;
+			}
+			else if (chunk instanceof ProtoChunk)
+			{
+				chunkWrapper.trySetStatus(this.getChunkStatus());
+				chunksToGenerate.add(chunk);
+			}
+		}
+		
+		return chunksToGenerate;
+	}
+	
+	
+	
+}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepBiomes.java

@@ -20,12 +20,13 @@
 package com.seibel.distanthorizons.common.wrappers.worldGeneration.step;
 
 import java.util.ArrayList;
-import java.util.List;
 
 import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.ThreadedParameters;
 
+import com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject.DhLitWorldGenRegion;
+import com.seibel.distanthorizons.core.util.gridList.ArrayGridList;
 import net.minecraft.server.level.WorldGenRegion;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ProtoChunk;
@@ -40,39 +41,35 @@ import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.status.ChunkStatus;
 #endif
 
-public final class StepBiomes
+public final class StepBiomes extends AbstractWorldGenStep
 {
-	public static final ChunkStatus STATUS = ChunkStatus.BIOMES;
-	
 	private final BatchGenerationEnvironment environment;
 	
+	public static final ChunkStatus STATUS = ChunkStatus.BIOMES;
+	
+	
+	
+	//=============//
+	// constructor //
+	//=============//
 	
 	public StepBiomes(BatchGenerationEnvironment batchGenerationEnvironment) { this.environment = batchGenerationEnvironment; }
 	
 	
 	
+	//==================//
+	// abstract methods //
+	//==================//
+	
+	@Override
+	public ChunkStatus getChunkStatus() { return STATUS; }
+	
+	@Override 
 	public void generateGroup(
-			ThreadedParameters tParams, WorldGenRegion worldGenRegion,
-			List<ChunkWrapper> chunkWrappers)
+			ThreadedParameters tParams, DhLitWorldGenRegion worldGenRegion, 
+			ArrayGridList<ChunkWrapper> chunkWrappers)
 	{
-		
-		ArrayList<ChunkAccess> chunksToDo = new ArrayList<>();
-		
-		for (ChunkWrapper chunkWrapper : chunkWrappers)
-		{
-			ChunkAccess chunk = chunkWrapper.getChunk();
-			if (chunkWrapper.getStatus().isOrAfter(STATUS))
-			{
-				// this chunk has already generated this step
-				continue;
-			}
-			else if (chunk instanceof ProtoChunk)
-			{
-				chunkWrapper.trySetStatus(STATUS);
-				chunksToDo.add(chunk);
-			}
-		}
-		
+		ArrayList<ChunkAccess> chunksToDo = this.getChunksToGenerate(chunkWrappers);
 		for (ChunkAccess chunk : chunksToDo)
 		{
 			#if MC_VER < MC_1_18_2

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepFeatures.java

@@ -37,8 +37,10 @@ import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.status.ChunkStatus;
 #endif
 
+import java.util.ConcurrentModificationException;
 
-public final class StepFeatures
+
+public final class StepFeatures extends AbstractWorldGenStep
 {
 	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
@@ -48,10 +50,22 @@ public final class StepFeatures
 	
 	
 	
+	//=============//
+	// constructor //
+	//=============//
+	
 	public StepFeatures(BatchGenerationEnvironment batchGenerationEnvironment) { this.environment = batchGenerationEnvironment; }
 	
 	
 	
+	//==================//
+	// abstract methods //
+	//==================//
+	
+	@Override
+	public ChunkStatus getChunkStatus() { return STATUS; }
+	
+	@Override
 	public void generateGroup(
 			ThreadedParameters tParams, DhLitWorldGenRegion worldGenRegion,
 			ArrayGridList<ChunkWrapper> chunkWrappers)
@@ -88,6 +102,10 @@ public final class StepFeatures
 				
 				Heightmap.primeHeightmaps(chunk, STATUS.heightmapsAfter());
 			}
+			catch (ConcurrentModificationException e) // ReportedException
+			{
+				// TODO
+			}
 			catch (Exception e)
 			{
 				LOGGER.warn("Unexpected issue when generating features for chunk at pos ["+chunkWrapper.getChunkPos()+"], error: ["+e.getMessage()+"].", e);

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepNoise.java

@@ -26,6 +26,8 @@ import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.ThreadedParameters;
 
+import com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject.DhLitWorldGenRegion;
+import com.seibel.distanthorizons.core.util.gridList.ArrayGridList;
 import com.seibel.distanthorizons.core.util.objects.UncheckedInterruptedException;
 import net.minecraft.server.level.WorldGenRegion;
 import net.minecraft.world.level.chunk.ChunkAccess;
@@ -41,7 +43,7 @@ import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.status.ChunkStatus;
 #endif
 
-public final class StepNoise
+public final class StepNoise extends AbstractWorldGenStep
 {
 	private static final ChunkStatus STATUS = ChunkStatus.NOISE;
 	
@@ -49,15 +51,26 @@ public final class StepNoise
 	
 	
 	
+	//=============//
+	// constructor //
+	//=============//
+	
 	public StepNoise(BatchGenerationEnvironment batchGenerationEnvironment) { this.environment = batchGenerationEnvironment; }
 	
 	
 	
+	//==================//
+	// abstract methods //
+	//==================//
+	
+	@Override
+	public ChunkStatus getChunkStatus() { return STATUS; }
+	
+	@Override
 	public void generateGroup(
-			ThreadedParameters tParams, WorldGenRegion worldGenRegion,
-			List<ChunkWrapper> chunkWrappers)
+			ThreadedParameters tParams, DhLitWorldGenRegion worldGenRegion,
+			ArrayGridList<ChunkWrapper> chunkWrappers)
 	{
-		
 		ArrayList<ChunkAccess> chunksToDo = new ArrayList<>();
 		
 		for (ChunkWrapper chunkWrapper : chunkWrappers)

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureReference.java

@@ -26,6 +26,8 @@ import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.ThreadedParameters;
 
+import com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject.DhLitWorldGenRegion;
+import com.seibel.distanthorizons.core.util.gridList.ArrayGridList;
 import net.minecraft.server.level.WorldGenRegion;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ProtoChunk;
@@ -37,7 +39,7 @@ import net.minecraft.world.level.chunk.status.ChunkStatus;
 #endif
 
 
-public final class StepStructureReference
+public final class StepStructureReference extends AbstractWorldGenStep
 {
 	private static final ChunkStatus STATUS = ChunkStatus.STRUCTURE_REFERENCES;
 	
@@ -45,15 +47,26 @@ public final class StepStructureReference
 	
 	
 	
+	//=============//
+	// constructor //
+	//=============//
+	
 	public StepStructureReference(BatchGenerationEnvironment batchGenerationEnvironment) { this.environment = batchGenerationEnvironment; }
 	
 	
 	
+	//==================//
+	// abstract methods //
+	//==================//
+	
+	@Override
+	public ChunkStatus getChunkStatus() { return STATUS; }
+	
+	@Override
 	public void generateGroup(
-			ThreadedParameters tParams, WorldGenRegion worldGenRegion,
-			List<ChunkWrapper> chunkWrappers)
+			ThreadedParameters tParams, DhLitWorldGenRegion worldGenRegion,
+			ArrayGridList<ChunkWrapper> chunkWrappers)
 	{
-		
 		ArrayList<ChunkAccess> chunksToDo = new ArrayList<ChunkAccess>();
 		
 		for (ChunkWrapper chunkWrapper : chunkWrappers)
@@ -67,6 +80,7 @@ public final class StepStructureReference
 			else if (chunk instanceof ProtoChunk)
 			{
 				chunkWrapper.trySetStatus(STATUS);
+				chunksToDo.add(chunk);
 			}
 		}
 		

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepStructureStart.java

@@ -27,7 +27,9 @@ import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.ThreadedParameters;
 
+import com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject.DhLitWorldGenRegion;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.util.gridList.ArrayGridList;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.level.WorldGenRegion;
 import net.minecraft.world.level.Level;
@@ -42,7 +44,7 @@ import net.minecraft.world.level.chunk.status.ChunkStatus;
 #endif
 
 
-public final class StepStructureStart
+public final class StepStructureStart extends AbstractWorldGenStep
 {
 	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	private static final ChunkStatus STATUS = ChunkStatus.STRUCTURE_STARTS;
@@ -52,42 +54,27 @@ public final class StepStructureStart
 	
 	
 	
+	//=============//
+	// constructor //
+	//=============//
+	
 	public StepStructureStart(BatchGenerationEnvironment batchGenerationEnvironment) { this.environment = batchGenerationEnvironment; }
 	
 	
 	
-	public static class StructStartCorruptedException extends RuntimeException
-	{
-		private static final long serialVersionUID = -8987434342051563358L;
-		
-		public StructStartCorruptedException(ArrayIndexOutOfBoundsException e)
-		{
-			super("StructStartCorruptedException");
-			super.initCause(e);
-			fillInStackTrace();
-		}
-		
-	}
+	//==================//
+	// abstract methods //
+	//==================//
 	
+	@Override
+	public ChunkStatus getChunkStatus() { return STATUS; }
+	
+	@Override
 	public void generateGroup(
-			ThreadedParameters tParams, WorldGenRegion worldGenRegion,
-			List<ChunkWrapper> chunkWrappers) throws InterruptedException
+			ThreadedParameters tParams, DhLitWorldGenRegion worldGenRegion,
+			ArrayGridList<ChunkWrapper> chunkWrappers)
 	{
-		ArrayList<ChunkAccess> chunksToDo = new ArrayList<>();
-		
-		for (ChunkWrapper chunkWrapper : chunkWrappers)
-		{
-			ChunkAccess chunk = chunkWrapper.getChunk();
-			if (chunkWrapper.getStatus().isOrAfter(STATUS))
-			{
-				// this chunk has already generated this step
-				continue;
-			}
-			else if (chunk instanceof ProtoChunk)
-			{
-				chunkWrapper.trySetStatus(STATUS);
-			}
-		}
+		ArrayList<ChunkAccess> chunksToDo = this.getChunksToGenerate(chunkWrappers);
 		
 		#if MC_VER < MC_1_19_2
 		if (this.environment.params.worldGenSettings.generateFeatures())
@@ -101,12 +88,6 @@ public final class StepStructureStart
 		#endif
 			for (ChunkAccess chunk : chunksToDo)
 			{
-				// System.out.println("StepStructureStart: "+chunk.getPos());
-				
-				// there are a few cases where the structure generator call may lock up (either due to teleporting or leaving the world).
-				// hopefully allowing interrupts here will prevent that from happening.
-				BatchGenerationEnvironment.throwIfThreadInterrupted();
-				
 				// hopefully this shouldn't cause any performance issues (this step is generally quite quick so hopefully it should be fine)
 				// and should prevent some concurrency issues
 				STRUCTURE_PLACEMENT_LOCK.lock();
@@ -151,8 +132,6 @@ public final class StepStructureStart
 					{
 						// the structure logic failed again, log it and move on
 						LOGGER.error("Unable to create structure starts for " + chunk.getPos() + ". This is an error with MC's world generation. Ignoring and continuing generation. Error: " + secondEx.getMessage()); // don't log the full stack trace since it is long and will generally end up in MC's code
-						
-						//throw new StepStructureStart.StructStartCorruptedException(secondEx);
 					}
 				}
 				

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/step/StepSurface.java

@@ -26,6 +26,8 @@ import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.ThreadedParameters;
 
+import com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject.DhLitWorldGenRegion;
+import com.seibel.distanthorizons.core.util.gridList.ArrayGridList;
 import net.minecraft.server.level.WorldGenRegion;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ProtoChunk;
@@ -37,7 +39,7 @@ import net.minecraft.world.level.chunk.status.ChunkStatus;
 #endif
 
 
-public final class StepSurface
+public final class StepSurface extends AbstractWorldGenStep
 {
 	private static final ChunkStatus STATUS = ChunkStatus.SURFACE;
 	
@@ -45,13 +47,25 @@ public final class StepSurface
 	
 	
 	
+	//=============//
+	// constructor //
+	//=============//
+	
 	public StepSurface(BatchGenerationEnvironment batchGenerationEnvironment) { this.environment = batchGenerationEnvironment; }
 	
 	
 	
+	//==================//
+	// abstract methods //
+	//==================//
+	
+	@Override
+	public ChunkStatus getChunkStatus() { return STATUS; }
+	
+	@Override
 	public void generateGroup(
-			ThreadedParameters tParams, WorldGenRegion worldGenRegion,
-			List<ChunkWrapper> chunkWrappers)
+			ThreadedParameters tParams, DhLitWorldGenRegion worldGenRegion,
+			ArrayGridList<ChunkWrapper> chunkWrappers)
 	{
 		ArrayList<ChunkAccess> chunksToDo = new ArrayList<>();
 		

common/src/main/resources/1_21_10.distanthorizons.accesswidener

@@ -0,0 +1,54 @@
+accessWidener v1 named
+
+# used when determining where to save files to
+accessible field net/minecraft/world/level/storage/DimensionDataStorage dataFolder Ljava/nio/file/Path;
+# used to help determine what folder a clientLevel is
+accessible field net/minecraft/world/level/biome/BiomeManager biomeZoomSeed J
+
+# used when rendering
+accessible method net/minecraft/client/renderer/GameRenderer getFov (Lnet/minecraft/client/Camera;FZ)F
+accessible field net/minecraft/client/Minecraft deltaTracker Lnet/minecraft/client/DeltaTracker$Timer;
+accessible field net/minecraft/client/renderer/LevelRenderer level Lnet/minecraft/client/multiplayer/ClientLevel;
+
+
+# used for grabbing vanilla rendered chunks
+accessible field net/minecraft/client/renderer/LevelRenderer visibleSections Lit/unimi/dsi/fastutil/objects/ObjectArrayList;
+
+# world generation
+# accessible method net/minecraft/world/level/lighting/LayerLightEngine queueSectionData (JLnet/minecraft/world/level/chunk/DataLayer;Z)V
+accessible field net/minecraft/world/level/chunk/LevelChunk loaded Z
+accessible field net/minecraft/world/level/lighting/LightEngine storage Lnet/minecraft/world/level/lighting/LayerLightSectionStorage;
+accessible method net/minecraft/world/level/lighting/LayerLightSectionStorage lightOnInSection (J)Z
+accessible field net/minecraft/server/level/ServerChunkCache distanceManager Lnet/minecraft/server/level/DistanceManager;
+accessible method net/minecraft/server/level/ChunkMap getUpdatingChunkIfPresent (J)Lnet/minecraft/server/level/ChunkHolder;
+accessible method net/minecraft/server/level/ChunkMap tick (Ljava/util/function/BooleanSupplier;)V
+accessible field net/minecraft/server/level/ServerLevel entityManager Lnet/minecraft/world/level/entity/PersistentEntitySectionManager;
+accessible field net/minecraft/server/level/ChunkMap mainThreadExecutor Lnet/minecraft/util/thread/BlockableEventLoop;
+
+# lod generation from save file
+accessible field net/minecraft/world/level/chunk/storage/ChunkStorage worker Lnet/minecraft/world/level/chunk/storage/IOWorker;
+accessible field net/minecraft/world/level/chunk/storage/IOWorker storage Lnet/minecraft/world/level/chunk/storage/RegionFileStorage;
+accessible field net/minecraft/world/level/chunk/storage/RegionFileStorage regionCache Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap;
+accessible field net/minecraft/world/level/chunk/storage/RegionFileStorage folder Ljava/nio/file/Path;
+
+# grabbing textures
+accessible class net/minecraft/client/renderer/texture/SpriteContents$AnimatedTexture
+accessible method net/minecraft/client/renderer/texture/SpriteContents$AnimatedTexture getFrameX (I)I
+accessible method net/minecraft/client/renderer/texture/SpriteContents$AnimatedTexture getFrameY (I)I
+accessible field net/minecraft/client/renderer/texture/SpriteContents animatedTexture Lnet/minecraft/client/renderer/texture/SpriteContents$AnimatedTexture;
+accessible field net/minecraft/client/renderer/texture/SpriteContents originalImage Lcom/mojang/blaze3d/platform/NativeImage;
+
+# UI stuff
+accessible field net/minecraft/client/gui/components/AbstractButton SPRITES Lnet/minecraft/client/gui/components/WidgetSprites;
+# Handles inserting the config button
+accessible field net/minecraft/client/gui/layouts/HeaderAndFooterLayout headerFrame Lnet/minecraft/client/gui/layouts/FrameLayout;
+accessible field net/minecraft/client/gui/layouts/FrameLayout children Ljava/util/List;
+accessible class net/minecraft/client/gui/layouts/FrameLayout$ChildContainer
+accessible field net/minecraft/client/gui/layouts/LinearLayout wrapped Lnet/minecraft/client/gui/layouts/GridLayout;
+accessible method net/minecraft/client/gui/components/debug/DebugScreenEntries register (Lnet/minecraft/resources/ResourceLocation;Lnet/minecraft/client/gui/components/debug/DebugScreenEntry;)Lnet/minecraft/resources/ResourceLocation;
+
+# hacky stuff
+accessible field net/minecraft/util/ThreadingDetector lock Ljava/util/concurrent/Semaphore;
+mutable field net/minecraft/util/ThreadingDetector lock Ljava/util/concurrent/Semaphore;
+
+

fabric/build.gradle

@@ -19,7 +19,9 @@ loom {
                     "-Dminecraft.api.session.host=https://nope.invalid",
                     "-Dminecraft.api.services.host=https://nope.invalid",
                     // https://netty.io/wiki/reference-counted-objects.html#leak-detection-levels
-                    "-Dio.netty.leakDetection.level=advanced"
+                    "-Dio.netty.leakDetection.level=advanced",
+                    "-XX:+UseZGC",
+                    "-XX:+ZGenerational"
             )
             programArgs("--username", "Dev")
         }
@@ -72,19 +74,27 @@ dependencies {
 //    runtimeOnly "javax.annotation:javax.annotation-api:1.3.2"
 //    compileOnly "javax.annotation:javax.annotation-api:1.3.2"
 //    modImplementation "javax.annotation:javax.annotation-api:1.3.2"
-    
+
     // Fabric API
     addModJar(fabricApi.module("fabric-api-base", rootProject.fabric_api_version))
     addModJar(fabricApi.module("fabric-lifecycle-events-v1", rootProject.fabric_api_version))
-    addModJar(fabricApi.module("fabric-resource-loader-v0", rootProject.fabric_api_version))
+    if (buildVersionBefore(minecraft_version, "1.21.9")) 
+    {
+        addModJar(fabricApi.module("fabric-resource-loader-v0", rootProject.fabric_api_version))
+    }
+    else // > 1.21.9
+    {
+        addModJar(fabricApi.module("fabric-resource-loader-v0", rootProject.fabric_api_version))
+        addModJar(fabricApi.module("fabric-resource-loader-v1", rootProject.fabric_api_version))
+    }
     addModJar(fabricApi.module("fabric-events-interaction-v0", rootProject.fabric_api_version))
-    addModJar(fabricApi.module("fabric-rendering-v1", rootProject.fabric_api_version)) // TODO: Remove this as it is only needed in 1 line (FabricClientProxy)
+    addModJar(fabricApi.module("fabric-rendering-v1", rootProject.fabric_api_version))
     addModJar(fabricApi.module("fabric-networking-api-v1", rootProject.fabric_api_version))
     addModJar(fabricApi.module("fabric-entity-events-v1", rootProject.fabric_api_version))
-    if (minecraft_version >= "1.19.2")
-        addModJar(fabricApi.module("fabric-command-api-v2", rootProject.fabric_api_version))
-    else // < 1.19.2
+    if (buildVersionBefore(minecraft_version, "1.19.2"))
         addModJar(fabricApi.module("fabric-command-api-v1", rootProject.fabric_api_version))
+    else
+        addModJar(fabricApi.module("fabric-command-api-v2", rootProject.fabric_api_version))
     
     // used by mod menu in MC 1.20.6+
     addModJar(fabricApi.module("fabric-screen-api-v1", rootProject.fabric_api_version))
@@ -143,6 +153,40 @@ dependencies {
     }
 }
 
+private static boolean buildVersionBefore(String minecraft_version, String compareVersion)
+{
+    int sortValue = sortSemanticVersionOldestToNewest(minecraft_version, compareVersion);
+    return sortValue == -1;
+}
+/**
+ * input format: "major.minor.patch"
+ * needed so we can sort versions with different length strings
+ * IE: 1.21.1 should come before 1.21.10
+ */
+private static int sortSemanticVersionOldestToNewest(String version1, String version2)
+{
+    String[] parts1 = version1.split("\\.");
+    String[] parts2 = version2.split("\\.");
+
+    int major1 = Integer.parseInt(parts1[0]);
+    int major2 = Integer.parseInt(parts2[0]);
+    if (major1 != major2)
+    {
+        return Integer.compare(major1, major2);
+    }
+
+    int minor1 = Integer.parseInt(parts1[1]);
+    int minor2 = Integer.parseInt(parts2[1]);
+    if (minor1 != minor2)
+    {
+        return Integer.compare(minor1, minor2);
+    }
+
+    int patch1 = Integer.parseInt(parts1[2]);
+    int patch2 = Integer.parseInt(parts2[2]);
+    return Integer.compare(patch1, patch2);
+}
+
 
 task deleteResources(type: Delete) {
     delete file("build/resources/main")

fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java

@@ -24,26 +24,24 @@ import com.seibel.distanthorizons.common.AbstractPluginPacketSender;
 import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
 import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
 import com.seibel.distanthorizons.core.api.internal.ClientApi;
-import com.mojang.blaze3d.platform.InputConstants;
 import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
 
 import com.seibel.distanthorizons.core.api.internal.SharedApi;
 import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.util.math.Mat4f;
 import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IPluginPacketSender;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.ISodiumAccessor;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
-import com.seibel.distanthorizons.core.util.math.Mat4f;
 import com.seibel.distanthorizons.fabric.wrappers.modAccessor.SodiumAccessor;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientChunkEvents;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
-import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
 import net.fabricmc.fabric.api.event.player.AttackBlockCallback;
 import net.fabricmc.fabric.api.event.player.UseBlockCallback;
 import net.minecraft.client.Minecraft;
@@ -61,7 +59,10 @@ import java.nio.FloatBuffer;
 #endif
 import java.util.HashSet;
 import java.util.concurrent.AbstractExecutorService;
-import java.util.concurrent.ThreadPoolExecutor;
+
+#if MC_VER < MC_1_21_9
+import net.fabricmc.fabric.api.client.rendering.v1.WorldRenderEvents;
+#endif
 
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.world.InteractionResult;
@@ -103,6 +104,7 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 		LOGGER.info("Registering Fabric Client Events");
 		
 		
+		
 		//========================//
 		// register mod accessors //
 		//========================//
@@ -128,8 +130,16 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 		{
 			if (MC.clientConnectedToDedicatedServer())
 			{
-				IClientLevelWrapper wrappedLevel = ClientLevelWrapper.getWrapper(level);
-				SharedApi.INSTANCE.chunkLoadEvent(new ChunkWrapper(chunk, wrappedLevel), wrappedLevel);
+				// executor to prevent locking up the render/event thread
+				AbstractExecutorService executor = ThreadPoolUtil.getFileHandlerExecutor();
+				if (executor != null)
+				{
+					executor.execute(() ->
+					{
+						IClientLevelWrapper wrappedLevel = ClientLevelWrapper.getWrapper(level);
+						SharedApi.INSTANCE.chunkLoadEvent(new ChunkWrapper(chunk, wrappedLevel), wrappedLevel);
+					});
+				}
 			}
 		});
 		
@@ -143,8 +153,6 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 				if (SharedApi.isChunkAtBlockPosAlreadyUpdating(blockPos.getX(), blockPos.getZ()))
 				{
 					// executor to prevent locking up the render/event thread
-					// if the getChunk() takes longer than expected 
-					// (which can be caused by certain mods) 
 					AbstractExecutorService executor = ThreadPoolUtil.getFileHandlerExecutor();
 					if (executor != null)
 					{
@@ -183,8 +191,6 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 					if (SharedApi.isChunkAtBlockPosAlreadyUpdating(hitResult.getBlockPos().getX(), hitResult.getBlockPos().getZ()))
 					{
 						// executor to prevent locking up the render/event thread
-						// if the getChunk() takes longer than expected 
-						// (which can be caused by certain mods) 
 						AbstractExecutorService executor = ThreadPoolUtil.getFileHandlerExecutor();
 						if (executor != null)
 						{
@@ -217,95 +223,83 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 		// render event //
 		//==============//
 
+		// TODO wait for fabric to re-add their rendering API
+		#if MC_VER < MC_1_21_9
 		WorldRenderEvents.AFTER_SETUP.register((renderContext) ->
 		{
-			Mat4f projectionMatrix = McObjectConverter.Convert(renderContext.projectionMatrix());
+			ClientApi.RENDER_STATE.mcProjectionMatrix = McObjectConverter.Convert(renderContext.projectionMatrix());
 			
-			Mat4f modelViewMatrix;
 			#if MC_VER < MC_1_20_6
-			modelViewMatrix = McObjectConverter.Convert(renderContext.matrixStack().last().pose());
+			ClientApi.RENDER_STATE.mcModelViewMatrix = McObjectConverter.Convert(renderContext.matrixStack().last().pose());
 			#else
-			modelViewMatrix = McObjectConverter.Convert(renderContext.positionMatrix());
+			ClientApi.RENDER_STATE.mcModelViewMatrix = McObjectConverter.Convert(renderContext.positionMatrix());
 			#endif
 			
+			#if MC_VER < MC_1_21_1
+			ClientApi.RENDER_STATE.frameTime = renderContext.tickDelta();
+			#else
+			ClientApi.RENDER_STATE.frameTime = renderContext.tickCounter().getGameTimeDeltaTicks();
+			#endif
 			
-			//LOGGER.info("\n\n" +
-			//		"Level Render\n" +
-			//		"Mc MVM: \n" + modelViewMatrix.toString() + "\n" +
-			//		"Mc Proj: \n" + projectionMatrix.toString()
-			//);
+			ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, renderContext.world());
 			
 			
-			this.clientApi.renderLods(ClientLevelWrapper.getWrapper(renderContext.world()),
-					modelViewMatrix,
-					projectionMatrix,
-					#if MC_VER < MC_1_21_1
-					renderContext.tickDelta()
-					#else
-					renderContext.tickCounter().getGameTimeDeltaTicks()
-					#endif
-					);
+			this.clientApi.renderLods();
 		});
 		
 		
-		// TODO add to forge and neo
 		WorldRenderEvents.AFTER_ENTITIES.register((renderContext) ->
 		{
-			Mat4f projectionMatrix = McObjectConverter.Convert(renderContext.projectionMatrix());
+			ClientApi.RENDER_STATE.mcProjectionMatrix = McObjectConverter.Convert(renderContext.projectionMatrix());
 			
-			Mat4f modelViewMatrix;
 			#if MC_VER < MC_1_20_6
-			modelViewMatrix = McObjectConverter.Convert(renderContext.matrixStack().last().pose());
+			ClientApi.RENDER_STATE.mcModelViewMatrix = McObjectConverter.Convert(renderContext.matrixStack().last().pose());
 			#else
-			modelViewMatrix = McObjectConverter.Convert(renderContext.positionMatrix());
+			ClientApi.RENDER_STATE.mcModelViewMatrix = McObjectConverter.Convert(renderContext.positionMatrix());
 			#endif
 			
-			this.clientApi.renderFadeOpaque(
-					modelViewMatrix,
-					projectionMatrix,
-					#if MC_VER < MC_1_21_1
-					renderContext.tickDelta(),
-					#else
-					renderContext.tickCounter().getGameTimeDeltaTicks(),
-					#endif
-					ClientLevelWrapper.getWrapper(renderContext.world())
-			);
+			#if MC_VER < MC_1_21_1
+			ClientApi.RENDER_STATE.frameTime = renderContext.tickDelta();
+			#else
+			ClientApi.RENDER_STATE.frameTime = renderContext.tickCounter().getGameTimeDeltaTicks();
+			#endif
+			
+			ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, renderContext.world());
+			
+			
+			this.clientApi.renderFadeOpaque();
 		});
 		
-		// TODO add to forge and neo
 		WorldRenderEvents.AFTER_TRANSLUCENT.register((renderContext) ->
 		{
-			Mat4f projectionMatrix = McObjectConverter.Convert(renderContext.projectionMatrix());
+			ClientApi.RENDER_STATE.mcProjectionMatrix = McObjectConverter.Convert(renderContext.projectionMatrix());
 			
-			Mat4f modelViewMatrix;
 			#if MC_VER < MC_1_20_6
-			modelViewMatrix = McObjectConverter.Convert(renderContext.matrixStack().last().pose());
+			ClientApi.RENDER_STATE.mcModelViewMatrix = McObjectConverter.Convert(renderContext.matrixStack().last().pose());
 			#else
-			modelViewMatrix = McObjectConverter.Convert(renderContext.positionMatrix());
+			ClientApi.RENDER_STATE.mcModelViewMatrix = McObjectConverter.Convert(renderContext.positionMatrix());
 			#endif
 			
+			#if MC_VER < MC_1_21_1
+			ClientApi.RENDER_STATE.frameTime = renderContext.tickDelta();
+			#else
+			ClientApi.RENDER_STATE.frameTime = renderContext.tickCounter().getGameTimeDeltaTicks();
+			#endif
+			
+			ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, renderContext.world());
+			
+			
+			
 			
 			#if MC_VER < MC_1_21_6
 			// rendered in MixinLevelRenderer
 			#else
-			ClientApi.INSTANCE.renderDeferredLodsForShaders(ClientLevelWrapper.getWrapper(renderContext.world()),
-					ClientApi.RENDER_STATE.mcModelViewMatrix,
-					ClientApi.RENDER_STATE.mcProjectionMatrix,
-					ClientApi.RENDER_STATE.frameTime
-			);
+			ClientApi.INSTANCE.renderDeferredLodsForShaders();
 			#endif
 			
-			this.clientApi.renderFade(
-					modelViewMatrix,
-					projectionMatrix,
-					#if MC_VER < MC_1_21_1
-					renderContext.tickDelta(),
-					#else
-					renderContext.tickCounter().getGameTimeDeltaTicks(),
-					#endif
-					ClientLevelWrapper.getWrapper(renderContext.world())
-			);
+			this.clientApi.renderFadeTransparent();
 		});
+		#endif
 		
 		
 		// Debug keyboard event
@@ -355,18 +349,18 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 		// Check all keys we need
 		for (int keyCode = GLFW.GLFW_KEY_A; keyCode <= GLFW.GLFW_KEY_Z; keyCode++)
 		{
-			if (InputConstants.isKeyDown(Minecraft.getInstance().getWindow().getWindow(), keyCode))
-			{
-				currentKeyDown.add(keyCode);
-			}
+			//if (InputConstants.isKeyDown(Minecraft.getInstance().getWindow().getWindow(), keyCode))
+			//{
+			//	currentKeyDown.add(keyCode);
+			//}
 		}
 		
 		for (int keyCode : KEY_TO_CHECK_FOR)
 		{
-			if (InputConstants.isKeyDown(Minecraft.getInstance().getWindow().getWindow(), keyCode))
-			{
-				currentKeyDown.add(keyCode);
-			}
+			//if (InputConstants.isKeyDown(Minecraft.getInstance().getWindow().getWindow(), keyCode))
+			//{
+			//	currentKeyDown.add(keyCode);
+			//}
 		}
 		
 		// Diff and trigger events

fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricMain.java

@@ -20,10 +20,8 @@
 package com.seibel.distanthorizons.fabric;
 
 import com.mojang.brigadier.CommandDispatcher;
-import com.seibel.distanthorizons.api.enums.config.EDhApiMcRenderingFadeMode;
 import com.seibel.distanthorizons.common.AbstractModInitializer;
 import com.seibel.distanthorizons.core.config.Config;
-import com.seibel.distanthorizons.core.config.ConfigBase;
 import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
@@ -71,11 +69,14 @@ public class FabricMain extends AbstractModInitializer implements ClientModIniti
 	
 	
 	@Override
-	protected void createInitialBindings()
+	protected void createInitialSharedBindings()
 	{
 		SingletonInjector.INSTANCE.bind(IModChecker.class, ModChecker.INSTANCE);
 		SingletonInjector.INSTANCE.bind(IPluginPacketSender.class, new FabricPluginPacketSender());
 	}
+	@Override
+	protected void createInitialClientBindings() { /* no additional setup needed currently */ }
+	
 	
 	@Override
 	protected IEventProxy createClientProxy() { return new FabricClientProxy(); }
@@ -127,7 +128,8 @@ public class FabricMain extends AbstractModInitializer implements ClientModIniti
 	}
 	
 	@Override
-	protected void subscribeClientStartedEvent(Runnable eventHandler) { ClientLifecycleEvents.CLIENT_STARTED.register((mc) -> eventHandler.run()); }
+	protected void subscribeClientStartedEvent(Runnable eventHandler) 
+	{ ClientLifecycleEvents.CLIENT_STARTED.register((mc) -> eventHandler.run()); }
 	
 	@Override
 	protected void subscribeServerStartingEvent(Consumer<MinecraftServer> eventHandler)
@@ -152,11 +154,6 @@ public class FabricMain extends AbstractModInitializer implements ClientModIniti
 			ModAccessorInjector.INSTANCE.get(ISodiumAccessor.class).setFogOcclusion(false);
 		}
 		#endif
-		
-		if (ConfigBase.INSTANCE == null)
-		{
-			throw new IllegalStateException("Config was not initialized. Make sure to call LodCommonMain.initConfig() before calling this method.");
-		}
 	}
 	
 }

fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricServerProxy.java

@@ -1,5 +1,7 @@
 package com.seibel.distanthorizons.fabric;
 
+import com.seibel.distanthorizons.api.DhApi;
+import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiChunkProcessingEvent;
 import com.seibel.distanthorizons.api.methods.events.DhApiEventRegister;
 import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiLevelLoadEvent;
 import com.seibel.distanthorizons.common.AbstractModInitializer;
@@ -7,7 +9,6 @@ import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.distanthorizons.common.wrappers.misc.ServerPlayerWrapper;
 import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
 import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper;
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
 import com.seibel.distanthorizons.core.api.internal.ServerApi;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.common.AbstractPluginPacketSender;
@@ -15,6 +16,7 @@ import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IPluginPacketSender;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
+import com.seibel.distanthorizons.fabric.testing.TestChunkInputReplacerEvent;
 import com.seibel.distanthorizons.fabric.testing.TestWorldGenBindingEvent;
 import net.fabricmc.fabric.api.entity.event.v1.ServerEntityWorldChangeEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerChunkEvents;
@@ -37,8 +39,6 @@ import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
 import com.seibel.distanthorizons.core.network.messages.AbstractNetworkMessage;
 #endif
 
-import java.util.function.Supplier;
-
 /**
  * This handles all events sent to the server,
  * and is the starting point for most of the mod.
@@ -97,10 +97,11 @@ public class FabricServerProxy implements AbstractModInitializer.IEventProxy
 		ServerTickEvents.END_SERVER_TICK.register((server) -> SERVER_API.serverTickEvent());
 		
 		
-		// can be enabled to test world gen overrides without having to build a separate API project 
+		// can be enabled to test overrides/events without having to build a separate API project 
 		if (false)
 		{
 			DhApiEventRegister.on(DhApiLevelLoadEvent.class, new TestWorldGenBindingEvent());
+			DhApi.events.bind(DhApiChunkProcessingEvent.class, new TestChunkInputReplacerEvent());
 		}
 		
 		

fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinChunkSectionsToRender.java

@@ -0,0 +1,70 @@
+/*
+ *    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.fabric.mixins.client;
+
+#if MC_VER < MC_1_21_9
+import net.minecraft.world.entity.Entity;
+import org.spongepowered.asm.mixin.Mixin;
+
+@Mixin(Entity.class)
+public class MixinChunkSectionsToRender
+{ /* rendering before was handled via Fabric API events */ }
+#else
+
+import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
+import com.seibel.distanthorizons.core.api.internal.ClientApi;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.chunk.ChunkSectionLayerGroup;
+import net.minecraft.client.renderer.chunk.ChunkSectionsToRender;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+@Mixin(ChunkSectionsToRender.class)
+public class MixinChunkSectionsToRender
+{
+	
+	
+	// needs to fire at HEAD with a lower than normal order (less than 1000)
+	// otherwise it will be canceled by Sodium
+	@Inject(at = @At("HEAD"), method = "renderGroup", order = 800)
+	private void renderDeferredLayer(ChunkSectionLayerGroup chunkSectionLayerGroup, CallbackInfo ci)
+	{
+		ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, Minecraft.getInstance().levelRenderer.level);
+		
+		
+		if (chunkSectionLayerGroup == ChunkSectionLayerGroup.TRANSLUCENT)
+		{
+			ClientApi.INSTANCE.renderFadeTransparent();
+			ClientApi.INSTANCE.renderDeferredLodsForShaders();
+		}
+		else if (chunkSectionLayerGroup == ChunkSectionLayerGroup.TRIPWIRE)
+		{
+			ClientApi.INSTANCE.renderFadeOpaque();
+		}
+	}
+	
+	
+	
+}
+
+#endif
+

fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinClientPacketListener.java

@@ -3,8 +3,10 @@ package com.seibel.distanthorizons.fabric.mixins.client;
 import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
 import com.seibel.distanthorizons.core.api.internal.ClientApi;
 import com.seibel.distanthorizons.core.api.internal.SharedApi;
+import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.multiplayer.ClientPacketListener;
+import net.minecraft.world.level.chunk.ChunkAccess;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.Unique;
@@ -16,6 +18,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import net.minecraft.world.level.chunk.LevelChunk;
 import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
+
+import java.util.concurrent.AbstractExecutorService;
 #endif
 
 @Mixin(ClientPacketListener.class)
@@ -45,8 +49,24 @@ public class MixinClientPacketListener
 	@Inject(method = "enableChunkLight", at = @At("TAIL"))
 	void onEnableChunkLight(LevelChunk chunk, int x, int z, CallbackInfo ci)
 	{
-		IClientLevelWrapper clientLevel = ClientLevelWrapper.getWrapper((ClientLevel) chunk.getLevel());
-		SharedApi.INSTANCE.chunkLoadEvent(new ChunkWrapper(chunk, clientLevel), clientLevel);
+		if (chunk == null)
+		{
+			return;
+		}
+		
+		// executor to prevent locking up the render thread
+		AbstractExecutorService executor = ThreadPoolUtil.getFileHandlerExecutor();
+		if (executor == null)
+		{
+			return;
+		}
+		
+		
+		executor.execute(() ->
+		{
+			IClientLevelWrapper clientLevel = ClientLevelWrapper.getWrapper((ClientLevel) this.level);
+			SharedApi.INSTANCE.chunkLoadEvent(new ChunkWrapper(chunk, clientLevel), clientLevel);
+		});
 	}
 
 	#endif

fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinDebugScreenOverlay.java

@@ -12,12 +12,15 @@ import java.util.List;
 @Mixin(DebugScreenOverlay.class)
 public class MixinDebugScreenOverlay
 {
-	
+	#if MC_VER < MC_1_21_9
 	@Inject(method = "getSystemInformation", at = @At("RETURN"))
 	private void addCustomF3(CallbackInfoReturnable<List<String>> cir)
 	{
 		List<String> messages = cir.getReturnValue();
 		F3Screen.addStringToDisplay(messages);
 	}
+	#else
+	// handled by DhDebugScreenEntry for MC versions after 1.21.10
+	#endif
 	
 }

fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLevelRenderer.java

@@ -30,9 +30,34 @@ import net.minecraft.client.renderer.RenderType;
 import com.mojang.blaze3d.vertex.PoseStack;
 import org.joml.Matrix4f;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-#else
+#elif MC_VER < MC_1_21_9
+import com.mojang.blaze3d.buffers.GpuBufferSlice;
+import com.mojang.blaze3d.framegraph.FrameGraphBuilder;
+import com.mojang.blaze3d.resource.GraphicsResourceAllocator;
+import net.minecraft.client.Camera;
+import net.minecraft.client.DeltaTracker;
 import net.minecraft.client.renderer.chunk.ChunkSectionsToRender;
+import net.minecraft.client.renderer.culling.Frustum;
+import net.minecraft.util.profiling.ProfilerFiller;
+import org.joml.Matrix4f;
 import org.joml.Matrix4fc;
+import org.joml.Vector4f;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+#else
+import com.mojang.blaze3d.buffers.GpuBufferSlice;
+import com.mojang.blaze3d.framegraph.FrameGraphBuilder;
+import com.mojang.blaze3d.resource.GraphicsResourceAllocator;
+import net.minecraft.client.Camera;
+import net.minecraft.client.DeltaTracker;
+import net.minecraft.client.renderer.chunk.ChunkSectionsToRender;
+import net.minecraft.client.renderer.culling.Frustum;
+import net.minecraft.client.renderer.state.LevelRenderState;
+import net.minecraft.util.profiling.ProfilerFiller;
+import org.joml.Matrix4f;
+import org.joml.Matrix4fc;
+import org.joml.Vector4f;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 #endif
 
@@ -41,11 +66,9 @@ import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
 import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
 import com.seibel.distanthorizons.core.api.internal.ClientApi;
 import com.seibel.distanthorizons.coreapi.ModInfo;
-import com.seibel.distanthorizons.fabric.FabricClientProxy;
 import com.seibel.distanthorizons.core.util.math.Mat4f;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import net.minecraft.client.Minecraft;
-import com.seibel.distanthorizons.core.config.Config;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.renderer.LevelRenderer;
 import org.spongepowered.asm.mixin.Mixin;
@@ -57,6 +80,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.apache.logging.log4j.Logger;
 
 
+
 @Mixin(LevelRenderer.class)
 public class MixinLevelRenderer
 {
@@ -92,9 +116,16 @@ public class MixinLevelRenderer
 			method = "Lnet/minecraft/client/renderer/LevelRenderer;renderSectionLayer(Lnet/minecraft/client/renderer/RenderType;DDDLorg/joml/Matrix4f;Lorg/joml/Matrix4f;)V",
 			cancellable = true)
 	private void renderChunkLayer(RenderType renderType, double x, double y, double z, Matrix4f projectionMatrix, Matrix4f frustumMatrix, CallbackInfo callback)
-	#else
+	#elif MC_VER < MC_1_21_9
 	@Inject(at = @At("HEAD"), method = "prepareChunkRenders", cancellable = true)
 	private void prepareChunkRenders(Matrix4fc projectionMatrix, double d, double e, double f, CallbackInfoReturnable<ChunkSectionsToRender> callback)
+	#else
+	@Inject(at = @At("HEAD"), method = "renderLevel")
+	private void renderLevel(
+			GraphicsResourceAllocator resourceAllocator, DeltaTracker deltaTracker,
+			boolean renderBlockOutline, Camera camera,
+			Matrix4f positionMatrix, Matrix4f projectionMatrix, Matrix4f idkMatrix, GpuBufferSlice gpuBufferSlice,
+			Vector4f skyColor, boolean thinFog, CallbackInfo callback)
     #endif
     {
 		#if MC_VER == MC_1_16_5
@@ -110,11 +141,14 @@ public class MixinLevelRenderer
 		// get the matrices directly from MC
 		ClientApi.RENDER_STATE.mcModelViewMatrix = McObjectConverter.Convert(modelViewMatrixStack.last().pose());
 		ClientApi.RENDER_STATE.mcProjectionMatrix = McObjectConverter.Convert(projectionMatrix);
-		#else
-	    // MC combined the model view and projection matricies
+		#elif MC_VER < MC_1_21_9
+		// MC combined the model view and projection matricies
 	    ClientApi.RENDER_STATE.mcModelViewMatrix = McObjectConverter.Convert(projectionMatrix);
 	    ClientApi.RENDER_STATE.mcProjectionMatrix = new Mat4f();
 	    ClientApi.RENDER_STATE.mcProjectionMatrix.setIdentity();
+		#else
+	    ClientApi.RENDER_STATE.mcModelViewMatrix = McObjectConverter.Convert(positionMatrix);
+	    ClientApi.RENDER_STATE.mcProjectionMatrix = McObjectConverter.Convert(projectionMatrix);
 		#endif
 	    
 		// TODO move this into a common place
@@ -126,34 +160,45 @@ public class MixinLevelRenderer
 	    ClientApi.RENDER_STATE.frameTime = Minecraft.getInstance().deltaTracker.getRealtimeDeltaTicks();
 		#endif
 	    
+	    ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, this.level);
 	    
-	    //LOGGER.info("\n\n" +
-		//	    "Level Mixin\n" +
-		//	    "Mc MVM: \n" + mcModelViewMatrix.toString() + "\n" +
-		//	    "Mc Proj: \n" + mcProjectionMatrix.toString()
-	    //);
 	    
 	    
 	    #if MC_VER < MC_1_21_6
 	    if (renderType.equals(RenderType.translucent())) 
 		{
-		    ClientApi.INSTANCE.renderDeferredLodsForShaders(ClientLevelWrapper.getWrapper(this.level),
-				    ClientApi.RENDER_STATE.mcModelViewMatrix,
-				    ClientApi.RENDER_STATE.mcProjectionMatrix,
-				    ClientApi.RENDER_STATE.frameTime
-				    );
+		    ClientApi.INSTANCE.renderDeferredLodsForShaders();
 	    }
+		#elif MC_VER < MC_1_21_9
+	    // rendering handled via Fabric Api render event
 		#else
-		// rendering handled via Fabric Api render event
+		// handled here and in MixinChunkSectionsToRender
 	    #endif
-		
-		// FIXME completely disables rendering when sodium is installed
-		if (Config.Client.Advanced.Debugging.lodOnlyMode.get())
-		{
-		    callback.cancel();
-		}
     }
 	
 	
 	
+	#if MC_VER < MC_1_21_9
+	// rendering handled via Fabric Api render event
+	#else
+	@Inject(at = @At("HEAD"), method = "prepareChunkRenders")
+	private void prepareChunkRenders(Matrix4fc modelViewMatrix, double d, double e, double f, CallbackInfoReturnable<ChunkSectionsToRender> callback)
+	{
+		ClientApi.RENDER_STATE.mcModelViewMatrix = McObjectConverter.Convert(modelViewMatrix);
+		ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, this.level);
+		
+		// only crash during development
+		if (ModInfo.IS_DEV_BUILD)
+		{
+			ClientApi.RENDER_STATE.canRenderOrThrow();
+		}
+		
+		ClientApi.INSTANCE.renderLods();
+		
+	}
+	
+	#endif
+	
+	
+	
 }

fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLightTexture.java

@@ -22,12 +22,14 @@ package com.seibel.distanthorizons.fabric.mixins.client;
 import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftRenderWrapper;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import net.minecraft.client.renderer.LightTexture;
 
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -60,27 +62,40 @@ public class MixinLightTexture
 	private GpuTexture texture;
 	#endif
 	
+	@Unique
+	private MinecraftRenderWrapper renderWrapper = null;
+	
 	
 	
 	@Inject(method = "updateLightTexture(F)V", at = @At("RETURN"))
 	public void updateLightTexture(float partialTicks, CallbackInfo ci)
 	{
 		IMinecraftClientWrapper mc = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
-		if (mc == null || mc.getWrappedClientLevel() == null)
+		if (mc == null)
 		{
 			return;
 		}
 		
-		
 		IClientLevelWrapper clientLevel = mc.getWrappedClientLevel();
+		if (clientLevel == null)
+		{
+			return;
+		}
+		
+		// lazy initialization to make sure we don't call this too early
+		if (this.renderWrapper == null)
+		{
+			this.renderWrapper = (MinecraftRenderWrapper)SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
+		}
+		
 		
 		#if MC_VER < MC_1_21_3
-		MinecraftRenderWrapper.INSTANCE.updateLightmap(this.lightPixels, clientLevel);
+		this.renderWrapper.updateLightmap(this.lightPixels, clientLevel);
 		#elif MC_VER < MC_1_21_5
-		MinecraftRenderWrapper.INSTANCE.setLightmapId(this.target.getColorTextureId(), clientLevel);
+		this.renderWrapper.setLightmapId(this.target.getColorTextureId(), clientLevel);
 		#else
 		GlTexture glTexture = (GlTexture) this.texture;
-		MinecraftRenderWrapper.INSTANCE.setLightmapId(glTexture.glId(), clientLevel);
+		this.renderWrapper.setLightmapId(glTexture.glId(), clientLevel);
 		#endif
 	}
 	

fabric/src/main/java/com/seibel/distanthorizons/fabric/testing/TestChunkInputReplacerEvent.java

@@ -0,0 +1,64 @@
+package com.seibel.distanthorizons.fabric.testing;
+
+import com.seibel.distanthorizons.api.DhApi;
+import com.seibel.distanthorizons.api.interfaces.block.IDhApiBlockStateWrapper;
+import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiChunkProcessingEvent;
+import com.seibel.distanthorizons.api.methods.events.sharedParameterObjects.DhApiEventParam;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import org.apache.logging.log4j.Logger;
+
+import java.io.IOException;
+
+public class TestChunkInputReplacerEvent extends DhApiChunkProcessingEvent
+{
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	
+	private static final String REPLACEMENT_BLOCK_STATE_NAMESPACE = "minecraft:stone";
+	
+	private IDhApiBlockStateWrapper stoneBlockWrapper = null;
+	private boolean initialBlockSetupComplete = false;
+	
+	
+	
+	@Override
+	public void blockOrBiomeChangedDuringChunkProcessing(DhApiEventParam<EventParam> event)
+	{
+		if (!this.initialBlockSetupComplete)
+		{
+			// this method can be called on multiple threads
+			synchronized (this)
+			{
+				this.initialBlockSetupComplete = true;
+				try
+				{
+					this.stoneBlockWrapper = DhApi.Delayed.wrapperFactory.getDefaultBlockStateWrapper(REPLACEMENT_BLOCK_STATE_NAMESPACE, event.value.levelWrapper);
+				}
+				catch (IOException e)
+				{
+					LOGGER.error("Unable to get ["+REPLACEMENT_BLOCK_STATE_NAMESPACE+"] block replacement cannot continue and is now disabled, error: ["+e.getMessage()+"].", e);
+					DhApi.events.unbind(DhApiChunkProcessingEvent.class, this.getClass());
+				}
+			}
+		}
+		
+		// will happen if the initial setup fails until the unbind call is processed
+		// which likely won't happen until the current chunk has finished processing
+		if (this.stoneBlockWrapper == null)
+		{
+			return;
+		}
+		
+		
+		
+		// replace any dirt or grass block with stone
+		IDhApiBlockStateWrapper block = event.value.currentBlock;
+		if (block.getSerialString().contains("grass_block")
+			|| block.getSerialString().contains("dirt"))
+		{
+			event.value.setBlockOverride(this.stoneBlockWrapper);
+		}
+	}
+	
+	
+	
+}

fabric/src/main/java/com/seibel/distanthorizons/fabric/testing/TestChunkWorldGenerator.java

@@ -10,11 +10,9 @@ import com.seibel.distanthorizons.api.interfaces.world.IDhApiLevelWrapper;
 import com.seibel.distanthorizons.api.objects.data.DhApiChunk;
 import com.seibel.distanthorizons.api.objects.data.DhApiTerrainDataPoint;
 import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper;
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.chunk.ChunkAccess;
-import org.apache.logging.log4j.Logger;
 
 import java.util.ArrayList;
 

fabric/src/main/resources/DistantHorizons.fabric.mixins.json

@@ -17,6 +17,7 @@
     "client.MixinDebugScreenOverlay",
     "client.MixinFogRenderer",
     "client.MixinLevelRenderer",
+    "client.MixinChunkSectionsToRender",
     "client.MixinLightTexture",
     "client.MixinMinecraft",
     "client.MixinOptionsScreen",

forge/src/main/java/com/seibel/distanthorizons/forge/ForgeMain.java

@@ -86,11 +86,13 @@ public class ForgeMain extends AbstractModInitializer
 	}
 	
 	@Override
-	protected void createInitialBindings()
+	protected void createInitialSharedBindings()
 	{
 		SingletonInjector.INSTANCE.bind(IModChecker.class, ModChecker.INSTANCE);
 		SingletonInjector.INSTANCE.bind(IPluginPacketSender.class, new ForgePluginPacketSender());
 	}
+	@Override
+	protected void createInitialClientBindings() { /* no additional setup needed currently */ }
 	
 	@Override
 	protected IEventProxy createClientProxy() { return new ForgeClientProxy(); }
@@ -118,14 +120,14 @@ public class ForgeMain extends AbstractModInitializer
 	
 	@Override
 	protected void subscribeRegisterCommandsEvent(Consumer<CommandDispatcher<CommandSourceStack>> eventHandler)
-	{
-		MinecraftForge.EVENT_BUS.addListener((RegisterCommandsEvent e) -> { eventHandler.accept(e.getDispatcher()); });
-	}
+	{ MinecraftForge.EVENT_BUS.addListener((RegisterCommandsEvent e) -> { eventHandler.accept(e.getDispatcher()); }); }
 	
 	@Override
 	protected void subscribeClientStartedEvent(Runnable eventHandler)
 	{
-		// FIXME What event is this?
+		// Just run the event handler, since there are no proper ClientLifecycleEvent for the client 
+		// to signify readiness other than FmlClientSetupEvent
+		eventHandler.run();
 	}
 	
 	@Override

forge/src/main/java/com/seibel/distanthorizons/forge/mixins/client/MixinLevelRenderer.java

@@ -129,34 +129,35 @@ public class MixinLevelRenderer
 		// get the matrices from the OpenGL fixed pipeline
 		float[] mcProjMatrixRaw = new float[16];
 		GL15.glGetFloatv(GL15.GL_PROJECTION_MATRIX, mcProjMatrixRaw);
-		Mat4f mcProjectionMatrix = new Mat4f(mcProjMatrixRaw);
-		mcProjectionMatrix.transpose();
+		ClientApi.RENDER_STATE.mcProjectionMatrix = new Mat4f(mcProjMatrixRaw);
+		ClientApi.RENDER_STATE.mcProjectionMatrix.transpose();
 		
-		Mat4f mcModelViewMatrix = McObjectConverter.Convert(matrixStackIn.last().pose());
+		ClientApi.RENDER_STATE.mcModelViewMatrix = McObjectConverter.Convert(matrixStackIn.last().pose());
 		
 		#else
 		// get the matrices directly from MC
-		Mat4f mcModelViewMatrix = McObjectConverter.Convert(modelViewMatrixStack.last().pose());
-		Mat4f mcProjectionMatrix = McObjectConverter.Convert(projectionMatrix);
+		ClientApi.RENDER_STATE.mcModelViewMatrix = McObjectConverter.Convert(modelViewMatrixStack.last().pose());
+		ClientApi.RENDER_STATE.mcProjectionMatrix = McObjectConverter.Convert(projectionMatrix);
 		#endif
 		
 		
-		float frameTime;
 		#if MC_VER < MC_1_21_1
-		frameTime = Minecraft.getInstance().getFrameTime();
+		ClientApi.RENDER_STATE.frameTime = Minecraft.getInstance().getFrameTime();
 		#else
-		frameTime = Minecraft.getInstance().getTimer().getRealtimeDeltaTicks();
+		ClientApi.RENDER_STATE.frameTime = Minecraft.getInstance().getTimer().getRealtimeDeltaTicks();
 		#endif
 		
+		ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, this.level);
+		
 		
 		// only render before solid blocks
 		if (renderType.equals(RenderType.solid()))
 		{
-			ClientApi.INSTANCE.renderLods(ClientLevelWrapper.getWrapper(this.level), mcModelViewMatrix, mcProjectionMatrix, frameTime);
+			ClientApi.INSTANCE.renderLods();
 		} 
 		else if (renderType.equals(RenderType.translucent())) 
 		{
-			ClientApi.INSTANCE.renderDeferredLodsForShaders(ClientLevelWrapper.getWrapper(this.level), mcModelViewMatrix, mcProjectionMatrix, frameTime);
+			ClientApi.INSTANCE.renderDeferredLodsForShaders();
 		}
 		
 		// render fade
@@ -165,27 +166,11 @@ public class MixinLevelRenderer
 		// we need to trigger for the renderType after those passes are done
 		if (renderType.equals(RenderType.cutout()))
 		{
-			ClientApi.INSTANCE.renderFadeOpaque(
-					mcModelViewMatrix,
-					mcProjectionMatrix,
-					frameTime,
-					ClientLevelWrapper.getWrapper(this.level)
-			);
+			ClientApi.INSTANCE.renderFadeOpaque();
 		}
 		else if (renderType.equals(RenderType.tripwire()))
 		{
-			ClientApi.INSTANCE.renderFade(
-					mcModelViewMatrix,
-					mcProjectionMatrix,
-					frameTime,
-					ClientLevelWrapper.getWrapper(this.level)
-			);
-		}
-		
-		
-		if (Config.Client.Advanced.Debugging.lodOnlyMode.get())
-		{
-			callback.cancel();
+			ClientApi.INSTANCE.renderFadeTransparent();
 		}
 	}
 	

gradle.properties

@@ -5,8 +5,8 @@ org.gradle.caching=true
 
 # Mod Info
 mod_name=DistantHorizons
-mod_version=2.3.3-b
-api_version=4.0.0
+mod_version=2.3.6-b
+api_version=4.1.0
 maven_group=com.seibel.distanthorizons
 mod_readable_name=Distant Horizons
 mod_description=This mod generates and renders simplified terrain beyond the normal view distance at a low performance cost. Allowing you to see much farther without turning your game into a slideshow.
@@ -18,7 +18,7 @@ mod_issues=https://gitlab.com/jeseibel/distant-horizons/-/issues
 mod_discord=https://discord.gg/xAB8G4cENx
 
 # Global Plugin Versions
-manifold_version=2025.1.20
+manifold_version=2025.1.27
 # 2023.1.17 can be used if there are mystery Java compiler issues
 nightconfig_version=3.6.6
 lz4_version=1.8.0
@@ -31,7 +31,10 @@ fastutil_version=8.2.1
 
 # Minecraft related libraries (included in MC's jar)
 log4j_version=2.23.1
-lwjgl_version=3.3.1
+# if we actually want to use LWJGL methods, this needs to be a MC version variable
+# since different MC versions have different LWJGL versions that aren't compatible
+# 3.3.3 is for MC 1.21.8
+lwjgl_version=3.3.3
 joml_version=1.10.2
 
 # Architectury config
@@ -51,7 +54,7 @@ versionStr=
 
 # This defines what MC version Intellij will use for the preprocessor
 # and what version is used automatically by build and run commands
-mcVer=1.21.7
+mcVer=1.21.10
 
 # Defines the maximum amount of memory Minecraft is allowed when run in a development environment
 #minecraftMemoryJavaArg="-Xmx4G"

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeClientProxy.java

@@ -21,16 +21,13 @@ package com.seibel.distanthorizons.neoforge;
 
 import com.seibel.distanthorizons.common.AbstractModInitializer;
 import com.seibel.distanthorizons.common.util.ProxyUtil;
-import com.seibel.distanthorizons.common.wrappers.McObjectConverter;
 import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftRenderWrapper;
 import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
 import com.seibel.distanthorizons.core.api.internal.ClientApi;
 import com.seibel.distanthorizons.core.api.internal.SharedApi;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.util.math.Mat4f;
 import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
-import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
 
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
@@ -40,7 +37,6 @@ import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.neoforged.neoforge.client.event.RenderLevelStageEvent;
 import net.neoforged.neoforge.common.NeoForge;
-import net.neoforged.neoforge.event.level.ChunkEvent;
 import net.neoforged.neoforge.event.level.LevelEvent;
 
 import net.neoforged.neoforge.event.entity.player.PlayerInteractEvent;
@@ -62,17 +58,9 @@ import net.neoforged.neoforge.event.TickEvent;
 import net.neoforged.neoforge.client.event.ClientTickEvent;
 
 import java.util.concurrent.AbstractExecutorService;
-import java.util.concurrent.ThreadPoolExecutor;
 #endif
 
 
-/**
- * This handles all events sent to the client,
- * and is the starting point for most of the mod.
- *
- * @author James_Seibel
- * @version 2023-7-27
- */
 public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
 {
 	private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
@@ -161,8 +149,6 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
 			}
 			
 			// executor to prevent locking up the render/event thread
-			// if the getChunk() takes longer than expected 
-			// (which can be caused by certain mods) 
 			AbstractExecutorService executor = ThreadPoolUtil.getFileHandlerExecutor();
 			if (executor != null)
 			{
@@ -188,8 +174,6 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
 			}
 			
 			// executor to prevent locking up the render/event thread
-			// if the getChunk() takes longer than expected 
-			// (which can be caused by certain mods) 
 			AbstractExecutorService executor = ThreadPoolUtil.getFileHandlerExecutor();
 			if (executor != null)
 			{
@@ -262,28 +246,38 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
 	@SubscribeEvent
 	public void afterLevelEntityRenderEvent(RenderLevelStageEvent.AfterEntities event)
 	{
-		ClientApi.INSTANCE.renderFade(
-				ClientApi.RENDER_STATE.mcModelViewMatrix,
-				ClientApi.RENDER_STATE.mcProjectionMatrix,
-				ClientApi.RENDER_STATE.frameTime,
-				ClientLevelWrapper.getWrapper((ClientLevel)event.getLevel())
-		);
+		#if MC_VER < MC_1_21_9
+		ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, (ClientLevel)event.getLevel());
+		#else
+		ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, event.getLevelRenderer().level);
+		#endif
+		
+		ClientApi.INSTANCE.renderFadeTransparent();
 	}
 	
 	
 	@SubscribeEvent
 	public void afterLevelTranslucentRenderEvent(RenderLevelStageEvent.AfterTranslucentBlocks event)
 	{
-		ClientApi.INSTANCE.renderDeferredLodsForShaders(ClientLevelWrapper.getWrapper((ClientLevel)event.getLevel()),
-				ClientApi.RENDER_STATE.mcModelViewMatrix,
-				ClientApi.RENDER_STATE.mcProjectionMatrix,
-				ClientApi.RENDER_STATE.frameTime
-		);
+		#if MC_VER < MC_1_21_9
+		ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, (ClientLevel)event.getLevel());
+		#else
+		ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, event.getLevelRenderer().level);
+		#endif
+		
+		ClientApi.INSTANCE.renderDeferredLodsForShaders();
 	}
 	
 	@SubscribeEvent
 	public void afterLevelRenderEvent(RenderLevelStageEvent.AfterLevel event)
 	{
+		#if MC_VER < MC_1_21_9
+		ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, (ClientLevel)event.getLevel());
+		#else
+		ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, event.getLevelRenderer().level);
+		#endif
+		
+		
 		try
 		{
 			// should generally only need to be set once per game session
@@ -297,24 +291,11 @@ public class NeoforgeClientProxy implements AbstractModInitializer.IEventProxy
 		}
 		
 		
-		ClientApi.INSTANCE.renderFadeOpaque(
-				ClientApi.RENDER_STATE.mcModelViewMatrix,
-				ClientApi.RENDER_STATE.mcProjectionMatrix,
-				ClientApi.RENDER_STATE.frameTime,
-				ClientLevelWrapper.getWrapper((ClientLevel)event.getLevel())
-		);
+		ClientApi.INSTANCE.renderFadeOpaque();
 	}
 	
 	#endif
 	
 	
 	
-	//================//
-	// helper methods //
-	//================//
-	
-	private static LevelAccessor GetEventLevel(LevelEvent e) { return e.getLevel(); }
-	
-	
-	
 }

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeMain.java

@@ -22,15 +22,18 @@ package com.seibel.distanthorizons.neoforge;
 import com.mojang.brigadier.CommandDispatcher;
 import com.seibel.distanthorizons.common.AbstractModInitializer;
 import com.seibel.distanthorizons.common.wrappers.gui.GetConfigScreen;
+import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftRenderWrapper;
 import com.seibel.distanthorizons.core.api.internal.ClientApi;
 import com.seibel.distanthorizons.core.api.internal.ServerApi;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.network.messages.AbstractNetworkMessage;
+import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IPluginPacketSender;
 import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IServerPlayerWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IModChecker;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IOptifineAccessor;
 import com.seibel.distanthorizons.coreapi.ModInfo;
+import com.seibel.distanthorizons.neoforge.wrappers.NeoforgeMinecraftRenderWrapper;
 import com.seibel.distanthorizons.neoforge.wrappers.modAccessor.ModChecker;
 import com.seibel.distanthorizons.neoforge.wrappers.modAccessor.OptifineAccessor;
 import net.minecraft.commands.CommandSourceStack;
@@ -50,7 +53,7 @@ import java.util.function.Consumer;
 
 #if MC_VER < MC_1_20_6
 import net.neoforged.neoforge.client.ConfigScreenHandler;
-#elif MC_VER < MC_1_21_7
+#elif MC_VER < MC_1_21_8
 import net.neoforged.neoforge.client.gui.IConfigScreenFactory;
 import org.jetbrains.annotations.NotNull;
 #else
@@ -76,7 +79,7 @@ public class NeoforgeMain extends AbstractModInitializer
 			this.onInitializeClient();
 			eventBus.addListener(this::registerNetworkingClientServer);
 			
-			#if MC_VER < MC_1_21_7
+			#if MC_VER < MC_1_21_8
 			#else
 			eventBus.addListener(this::registerClientPayloadEvent);
 			#endif
@@ -107,7 +110,7 @@ public class NeoforgeMain extends AbstractModInitializer
 	public void registerNetworkingServer(RegisterPayloadHandlersEvent event)
 	{ NeoforgePluginPacketSender.setPacketHandler(event, ServerApi.INSTANCE::pluginMessageReceived); }
 	
-	#if MC_VER < MC_1_21_7
+	#if MC_VER < MC_1_21_8
 	#else
 	public void registerClientPayloadEvent(RegisterClientPayloadHandlersEvent event)
 	{ NeoforgePluginPacketSender.registerClientPacketHandler(event); }
@@ -121,11 +124,18 @@ public class NeoforgeMain extends AbstractModInitializer
 	protected IEventProxy createServerProxy(boolean isDedicated) { return new NeoforgeServerProxy(isDedicated); }
 	
 	@Override
-	protected void createInitialBindings()
+	protected void createInitialSharedBindings()
 	{
 		SingletonInjector.INSTANCE.bind(IModChecker.class, ModChecker.INSTANCE);
 		SingletonInjector.INSTANCE.bind(IPluginPacketSender.class, new NeoforgePluginPacketSender());
 	}
+	@Override
+	protected void createInitialClientBindings()
+	{
+		// replace MC RenderWrapper with more specific neoforge version
+		SingletonInjector.INSTANCE.unbind(IMinecraftRenderWrapper.class, MinecraftRenderWrapper.INSTANCE); // TODO replace with a replaceOrBind for simplicity
+		SingletonInjector.INSTANCE.bind(IMinecraftRenderWrapper.class, NeoforgeMinecraftRenderWrapper.INSTANCE);
+	}
 	
 	@Override
 	protected IEventProxy createClientProxy() { return new NeoforgeClientProxy(); }
@@ -155,7 +165,9 @@ public class NeoforgeMain extends AbstractModInitializer
 	@Override
 	protected void subscribeClientStartedEvent(Runnable eventHandler)
 	{
-		// FIXME What event is this?
+		// Just run the event handler, since there are no proper ClientLifecycleEvent for the client 
+		// to signify readiness other than FmlClientSetupEvent
+		eventHandler.run(); 
 	}
 	
 	@Override

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgePluginPacketSender.java

@@ -14,7 +14,7 @@ import java.util.Optional;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
-#if MC_VER < MC_1_21_7
+#if MC_VER < MC_1_21_8
 #else
 import net.neoforged.neoforge.client.network.ClientPacketDistributor;
 import net.neoforged.neoforge.client.network.event.RegisterClientPayloadHandlersEvent;
@@ -48,7 +48,7 @@ public class NeoforgePluginPacketSender extends AbstractPluginPacketSender
 		});
 	}
 	
-	#if MC_VER < MC_1_21_7
+	#if MC_VER < MC_1_21_8
 	#else
 	public static void registerClientPacketHandler(RegisterClientPayloadHandlersEvent event)
 	{
@@ -67,7 +67,7 @@ public class NeoforgePluginPacketSender extends AbstractPluginPacketSender
 	@Override
 	public void sendToServer(AbstractNetworkMessage message)
 	{
-		#if MC_VER < MC_1_21_7
+		#if MC_VER < MC_1_21_8
 		PacketDistributor.sendToServer(new CommonPacketPayload(message));
 		#else
 		ClientPacketDistributor.sendToServer(new CommonPacketPayload(message));

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/NeoforgeServerProxy.java

@@ -152,8 +152,12 @@ public class NeoforgeServerProxy implements AbstractModInitializer.IEventProxy
 	private static ServerLevelWrapper getServerLevelWrapper(ServerLevel level) { return ServerLevelWrapper.getWrapper(level); }
 	private static ServerLevelWrapper getServerLevelWrapper(ResourceKey<Level> resourceKey, PlayerEvent event)
 	{
+		#if MC_VER < MC_1_21_9
 		//noinspection DataFlowIssue (possible NPE after getServer())
 		return getServerLevelWrapper(event.getEntity().getServer().getLevel(resourceKey));
+		#else
+		return getServerLevelWrapper(event.getEntity().level().getServer().getLevel(resourceKey));
+		#endif
 	}
 	
 	private static ServerPlayerWrapper getServerPlayerWrapper(PlayerEvent event) { return ServerPlayerWrapper.getWrapper((ServerPlayer) event.getEntity()); }

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinDebugScreenOverlay.java

@@ -1,5 +1,6 @@
 package com.seibel.distanthorizons.neoforge.mixins.client;
 
+#if MC_VER < MC_1_21_9
 import com.seibel.distanthorizons.core.logging.f3.F3Screen;
 import net.minecraft.client.gui.components.DebugScreenOverlay;
 import org.spongepowered.asm.mixin.Mixin;
@@ -8,16 +9,24 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import java.util.List;
+#else
+import org.spongepowered.asm.mixin.Mixin;
+import net.minecraft.client.gui.components.DebugScreenOverlay;
+#endif
 
 @Mixin(DebugScreenOverlay.class)
 public class MixinDebugScreenOverlay
 {
 	
+	#if MC_VER < MC_1_21_9
 	@Inject(method = "getSystemInformation", at = @At("RETURN"))
 	private void addCustomF3(CallbackInfoReturnable<List<String>> cir)
 	{
 		List<String> messages = cir.getReturnValue();
 		F3Screen.addStringToDisplay(messages);
 	}
+	#else
+	// handled by DhDebugScreenEntry for MC versions after 1.21.10
+	#endif
 	
 }

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinLevelRenderer.java

@@ -66,15 +66,6 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-/**
- * This class is used to mix in DH's rendering code
- * before Minecraft starts rendering blocks.
- * If this wasn't done, and we used Forge's
- * render last event, the LODs would render on top
- * of the normal terrain. <br><br>
- *
- * This is also the mixin for rendering the clouds
- */
 @Mixin(LevelRenderer.class)
 public class MixinLevelRenderer
 {
@@ -90,11 +81,22 @@ public class MixinLevelRenderer
 	
 	
 	#if MC_VER < MC_1_21_6
-	@Inject(at = @At("HEAD"), method = "renderSectionLayer", cancellable = true)
+	@Inject(at = @At("HEAD"), method = "renderSectionLayer")
 	private void renderChunkLayer(RenderType renderType, double x, double y, double z, Matrix4f modelViewMatrix, Matrix4f projectionMatrix, CallbackInfo callback)
+	#elif MC_VER < MC_1_21_9
+	@Inject(at = @At("HEAD"), method = "renderLevel")
+	private void onRenderLevel(
+			GraphicsResourceAllocator resourceAllocator, DeltaTracker deltaTracker, 
+			boolean renderBlockOutline, Camera camera, 
+			Matrix4f positionMatrix, Matrix4f projectionMatrix, GpuBufferSlice gpuBufferSlice, 
+			Vector4f skyColor, boolean thinFog, CallbackInfo callback)
 	#else
-	@Inject(at = @At("HEAD"), method = "renderLevel", cancellable = true)
-	private void onRenderLevel(GraphicsResourceAllocator resourceAllocator, DeltaTracker deltaTracker, boolean renderBlockOutline, Camera camera, Matrix4f positionMatrix, Matrix4f projectionMatrix, GpuBufferSlice gpuBufferSlice, Vector4f skyColor, boolean thinFog, CallbackInfo callback)
+	@Inject(at = @At("HEAD"), method = "renderLevel")
+	private void renderLevel(
+			GraphicsResourceAllocator resourceAllocator, DeltaTracker deltaTracker, 
+			boolean renderBlockOutline, Camera camera, 
+			Matrix4f positionMatrix, Matrix4f projectionMatrix, Matrix4f idkMatrix, GpuBufferSlice gpuBufferSlice, 
+			Vector4f skyColor, boolean thinFog, CallbackInfo callback)
     #endif
 	{
 		#if MC_VER < MC_1_21_6
@@ -105,12 +107,6 @@ public class MixinLevelRenderer
 		ClientApi.RENDER_STATE.mcProjectionMatrix = McObjectConverter.Convert(projectionMatrix);
 		#endif
 	
-		//LOGGER.info("\n\n" +
-		//		"Level Mixin\n" +
-		//		"Mc MVM: \n" + ClientApi.RENDER_STATE.mcModelViewMatrix.toString() + "\n" +
-		//		"Mc Proj: \n" + ClientApi.RENDER_STATE.mcProjectionMatrix.toString()
-		//);
-		
 		
 		
 		#if MC_VER < MC_1_21_1
@@ -121,6 +117,8 @@ public class MixinLevelRenderer
 		ClientApi.RENDER_STATE.frameTime = Minecraft.getInstance().deltaTracker.getRealtimeDeltaTicks();
 		#endif
 		
+		ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, this.level);
+		
 		
 		#if MC_VER < MC_1_21_6
 		
@@ -133,17 +131,11 @@ public class MixinLevelRenderer
 		// render LODs
 		if (renderType.equals(RenderType.solid()))
 		{
-			ClientApi.INSTANCE.renderLods(ClientLevelWrapper.getWrapper(this.level),
-					ClientApi.RENDER_STATE.mcModelViewMatrix,
-					ClientApi.RENDER_STATE.mcProjectionMatrix,
-					ClientApi.RENDER_STATE.frameTime);
+			ClientApi.INSTANCE.renderLods();
 		} 
 		else if (renderType.equals(RenderType.translucent())) 
 		{
-			ClientApi.INSTANCE.renderDeferredLodsForShaders(ClientLevelWrapper.getWrapper(this.level),
-					ClientApi.RENDER_STATE.mcModelViewMatrix,
-					ClientApi.RENDER_STATE.mcProjectionMatrix,
-					ClientApi.RENDER_STATE.frameTime);
+			ClientApi.INSTANCE.renderDeferredLodsForShaders();
 		}
 		
 		// render fade
@@ -152,28 +144,13 @@ public class MixinLevelRenderer
 		// we need to trigger for the renderType after those passes are done
 		if (renderType.equals(RenderType.cutout()))
 		{
-			ClientApi.INSTANCE.renderFadeOpaque(
-					ClientApi.RENDER_STATE.mcModelViewMatrix,
-					ClientApi.RENDER_STATE.mcProjectionMatrix,
-					ClientApi.RENDER_STATE.frameTime,
-					ClientLevelWrapper.getWrapper(this.level)
-			);
+			ClientApi.INSTANCE.renderFadeOpaque();
 		}
 		else if (renderType.equals(RenderType.tripwire()))
 		{
-			ClientApi.INSTANCE.renderFade(
-					ClientApi.RENDER_STATE.mcModelViewMatrix,
-					ClientApi.RENDER_STATE.mcProjectionMatrix,
-					ClientApi.RENDER_STATE.frameTime,
-					ClientLevelWrapper.getWrapper(this.level)
-			);
+			ClientApi.INSTANCE.renderFadeTransparent();
 		}
 		#endif
-		
-		if (Config.Client.Advanced.Debugging.lodOnlyMode.get())
-		{
-			callback.cancel();
-		}
 	}
 	
 	
@@ -182,21 +159,19 @@ public class MixinLevelRenderer
 	// formerly handled in renderChunkLayer()
 	
 	#else
-	@Inject(at = @At("HEAD"), method = "prepareChunkRenders", cancellable = true)
+	@Inject(at = @At("HEAD"), method = "prepareChunkRenders")
 	private void renderChunkLayer(Matrix4fc modelViewMatrix, double d, double e, double f, CallbackInfoReturnable<ChunkSectionsToRender> callback)
 	{
 		ClientApi.RENDER_STATE.mcModelViewMatrix = McObjectConverter.Convert(modelViewMatrix);
-
+		ClientApi.RENDER_STATE.clientLevelWrapper = ClientLevelWrapper.getWrapperIfDifferent(ClientApi.RENDER_STATE.clientLevelWrapper, this.level);
+		
 		// only crash during development
 		if (ModInfo.IS_DEV_BUILD)
 		{
 			ClientApi.RENDER_STATE.canRenderOrThrow();
 		}
 		
-		ClientApi.INSTANCE.renderLods(ClientLevelWrapper.getWrapper(this.level), 
-				ClientApi.RENDER_STATE.mcModelViewMatrix, 
-				ClientApi.RENDER_STATE.mcProjectionMatrix, 
-				ClientApi.RENDER_STATE.frameTime);
+		ClientApi.INSTANCE.renderLods();
 	}
 	
 	#endif

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/mixins/client/MixinLightTexture.java

@@ -22,7 +22,9 @@ package com.seibel.distanthorizons.neoforge.mixins.client;
 import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftRenderWrapper;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
+import com.seibel.distanthorizons.neoforge.wrappers.NeoforgeTextureUnwrapper;
 import net.minecraft.client.renderer.LightTexture;
 
 import org.spongepowered.asm.mixin.Final;
@@ -36,10 +38,14 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import com.mojang.blaze3d.platform.NativeImage;
 #elif MC_VER < MC_1_21_5
 import com.mojang.blaze3d.pipeline.TextureTarget;
-#else
+#elif MC_VER < MC_1_21_9
 import com.mojang.blaze3d.opengl.GlTexture;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.textures.GpuTexture;
+#else
+import net.neoforged.neoforge.client.blaze3d.validation.ValidationGpuTexture;
+import com.mojang.blaze3d.opengl.GlTexture;
+import com.mojang.blaze3d.textures.GpuTexture;
 #endif
 
 @Mixin(LightTexture.class)
@@ -70,14 +76,18 @@ public class MixinLightTexture
 		
 		
 		IClientLevelWrapper clientLevel = mc.getWrappedClientLevel();
+		MinecraftRenderWrapper renderWrapper = (MinecraftRenderWrapper)SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class);
 		
 		#if MC_VER < MC_1_21_3
-		MinecraftRenderWrapper.INSTANCE.updateLightmap(this.lightPixels, clientLevel);
+		renderWrapper.updateLightmap(this.lightPixels, clientLevel);
 		#elif MC_VER < MC_1_21_5
-		MinecraftRenderWrapper.INSTANCE.setLightmapId(this.target.getColorTextureId(), clientLevel);
-		#else
+		renderWrapper.setLightmapId(this.target.getColorTextureId(), clientLevel);
+		#elif MC_VER < MC_1_21_9
 		GlTexture glTexture = (GlTexture) this.texture;
-		MinecraftRenderWrapper.INSTANCE.setLightmapId(glTexture.glId(), clientLevel);
+		renderWrapper.setLightmapId(glTexture.glId(), clientLevel);
+		#else
+		int id = NeoforgeTextureUnwrapper.getGlTextureIdFromGpuTexture(this.texture);
+		renderWrapper.setLightmapId(id, clientLevel);
 		#endif
 	}
 	

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/wrappers/NeoforgeMinecraftRenderWrapper.java

@@ -0,0 +1,82 @@
+package com.seibel.distanthorizons.neoforge.wrappers;
+
+import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftRenderWrapper;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import net.minecraft.client.Minecraft;
+import org.apache.logging.log4j.Logger;
+
+#if MC_VER < MC_1_21_9
+#else
+import com.mojang.blaze3d.opengl.GlTexture;
+import com.mojang.blaze3d.textures.GpuTexture;
+import net.neoforged.neoforge.client.blaze3d.validation.ValidationGpuTexture;
+#endif
+
+import java.lang.invoke.MethodHandles;
+
+public class NeoforgeMinecraftRenderWrapper extends MinecraftRenderWrapper
+{
+	public static final NeoforgeMinecraftRenderWrapper INSTANCE = new NeoforgeMinecraftRenderWrapper();
+	
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger(MethodHandles.lookup().lookupClass().getSimpleName());
+	private static final Minecraft MC = Minecraft.getInstance();
+	
+	
+	
+	@Override
+	public int getDepthTextureId()
+	{
+		#if MC_VER < MC_1_21_9
+		// no special handling required,
+		// both neo/fabric uses the same back end objects
+		return super.getDepthTextureId();
+		#else
+		try
+		{
+			GpuTexture gpuTexture = this.getRenderTarget().getDepthTexture();
+			int id = NeoforgeTextureUnwrapper.getGlTextureIdFromGpuTexture(gpuTexture);
+			return id;
+		}
+		catch (Exception e)
+		{
+			// only log this error once per session
+			if (!this.depthTextureCastFailLogged)
+			{
+				this.depthTextureCastFailLogged = true;
+				LOGGER.error("Unable to cast render Target depth texture to GlTexture. MC or a rendering mod may have changed the object type.", e);
+			}
+			return 0;
+		}
+		#endif
+	}
+	
+	@Override
+	public int getColorTextureId()
+	{
+		#if MC_VER < MC_1_21_9
+		// no special handling required,
+		// both neo/fabric uses the same back end objects
+		return super.getColorTextureId();
+		#else
+		try
+		{
+			GpuTexture gpuTexture = this.getRenderTarget().getColorTexture();
+			int id = NeoforgeTextureUnwrapper.getGlTextureIdFromGpuTexture(gpuTexture);
+			return id;
+		}
+		catch (Exception e)
+		{
+			// only log this error once per session
+			if (!this.colorTextureCastFailLogged)
+			{
+				this.colorTextureCastFailLogged = true;
+				LOGGER.error("Unable to cast render Target color texture to ValidationGpuTexture or GlTexture. MC, Neoforge, or a rendering mod may have changed the object type.", e);
+			}
+			return 0;
+		}
+		#endif
+	}
+	
+	
+	
+}

neoforge/src/main/java/com/seibel/distanthorizons/neoforge/wrappers/NeoforgeTextureUnwrapper.java

@@ -0,0 +1,39 @@
+package com.seibel.distanthorizons.neoforge.wrappers;
+
+#if MC_VER < MC_1_21_9
+public class NeoforgeTextureUnwrapper
+{ /* not needed for older MC versions */ }
+#else
+
+import com.mojang.blaze3d.opengl.GlTexture;
+import com.mojang.blaze3d.textures.GpuTexture;
+import net.neoforged.neoforge.client.blaze3d.validation.ValidationGpuTexture;
+
+public class NeoforgeTextureUnwrapper
+{
+	/**
+	 * if Neoforge texture validation is enabled the GlTexture object will be wrapped with a
+	 * Neoforge specific ValidationGpuTexture object.
+	 * This helper allows us to get the underlying OpenGL texture ID
+	 * regardless of what Neoforge returns.
+	 */
+	public static int getGlTextureIdFromGpuTexture(GpuTexture gpuTexture) throws ClassCastException
+	{
+		GlTexture glTexture;
+		
+		if (gpuTexture instanceof ValidationGpuTexture)
+		{
+			ValidationGpuTexture validationTexture = (ValidationGpuTexture) gpuTexture;
+			glTexture = (GlTexture)validationTexture.getRealTexture();
+		}
+		else
+		{
+			glTexture = (GlTexture) gpuTexture;
+		}
+		
+		int id = glTexture.glId();
+		return id;
+	}
+	
+}
+#endif

settings.gradle

@@ -59,24 +59,31 @@ If you still need help with compiling, please read the Readme.md
 
 
 /** Loads the VersionProperties fiel for the currently selected Minecraft version. */
-def loadProperties() {
+def loadProperties() 
+{
     def defaultMcVersion = "1.20.1" // 1.20.1 is our current most stable version so we use that if no version was defined
 
     def mcVersion = ""
     def mcVers = fileTree("versionProperties").files.name // Get all the files in "versionProperties"
-    for (int i = 0; i < mcVers.size(); i++) {
-        mcVers[i] = mcVers[i].replaceAll("\\.properties", "") // As we are getting the file names, we should remove the ".properties" at the end to get the versions
+    for (int i = 0; i < mcVers.size(); i++) 
+    {
+        String version = mcVers[i];
+        version = version.replaceAll("\\.properties", "") // As we are getting the file names, we should remove the ".properties" at the end to get the versions
+        mcVers[i] = version;
     }
 
-    mcVers.sort() // Sort so it always goes from oldest to newest
+    mcVers.sort((a,b) -> sortSemanticVersionOldestToNewest(a,b)) // Sort so it always goes from oldest to newest
 
     int mcIndex = -1
     println "Avalible MC versions: ${mcVers}"
-    if (hasProperty("mcVer")) {
+    if (hasProperty("mcVer")) 
+    {
         mcVersion = mcVer
         mcIndex = mcVers.indexOf(mcVer)
     }
-    if (mcIndex == -1) {
+    
+    if (mcIndex == -1) 
+    {
         println "No mcVer set or the set mcVer is invalid! Defaulting to ${defaultMcVersion}."
         println "Tip: Use -PmcVer=\"${defaultMcVersion}\" in cmd arg to set mcVer."
         mcVersion = defaultMcVersion
@@ -95,6 +102,35 @@ def loadProperties() {
     gradle.ext.mcVers = mcVers
     gradle.ext.mcIndex = mcIndex
 }
+/** 
+ * input format: "major.minor.patch"
+ * needed so we can sort versions with different length strings
+ * IE: 1.21.1 should come before 1.21.10
+ */
+private static int sortSemanticVersionOldestToNewest(String version1, String version2) 
+{
+    String[] parts1 = version1.split("\\.");
+    String[] parts2 = version2.split("\\.");
+    
+    int major1 = Integer.parseInt(parts1[0]);
+    int major2 = Integer.parseInt(parts2[0]);
+    if (major1 != major2) 
+    {
+        return Integer.compare(major1, major2);
+    }
+    
+    int minor1 = Integer.parseInt(parts1[1]);
+    int minor2 = Integer.parseInt(parts2[1]);
+    if (minor1 != minor2) 
+    {
+        return Integer.compare(minor1, minor2);
+    }
+    
+    int patch1 = Integer.parseInt(parts1[2]);
+    int patch2 = Integer.parseInt(parts2[2]);
+    return Integer.compare(patch1, patch2);
+}
+
 loadProperties()
 
 

versionProperties/1.16.5.properties

@@ -25,8 +25,7 @@ fabric_api_version=0.42.0+1.16
     canvas_version=
 
     # iris - needs 1.7.4+ to support the DH API
-    # chunky - isn't recommended since it can cause holes in the LODs
-    fabric_incompatibility_list={ "iris": "*", "chunky": "*" }
+    fabric_incompatibility_list={ "iris": "*" }
     fabric_recommend_list={}
 
     # Fabric mod run

versionProperties/1.17.1.properties

@@ -25,8 +25,7 @@ fabric_api_version=0.46.1+1.17
     canvas_version=
 
     # iris - needs 1.7.4+ to support the DH API
-    # chunky - isn't recommended since it can cause holes in the LODs
-    fabric_incompatibility_list={ "iris": "*", "chunky": "*" }
+    fabric_incompatibility_list={ "iris": "*" }
     fabric_recommend_list={}
 
     # Fabric mod run

versionProperties/1.18.2.properties

@@ -26,8 +26,7 @@ fabric_api_version=0.76.0+1.18.2
     canvas_version=mc118:1.0.2616
 
     # iris - needs 1.7.4+ to support the DH API
-    # chunky - isn't recommended since it can cause holes in the LODs
-    fabric_incompatibility_list={ "iris": "*", "chunky": "*" }
+    fabric_incompatibility_list={ "iris": "*" }
     fabric_recommend_list={}
 
     # Fabric mod run

versionProperties/1.19.2.properties

@@ -25,8 +25,7 @@ fabric_api_version=0.76.1+1.19.2
     canvas_version=mc119-1.0.2480
 
     # iris - needs 1.7.4+ to support the DH API
-    # chunky - isn't recommended since it can cause holes in the LODs
-    fabric_incompatibility_list={ "iris": "*", "chunky": "*" }
+    fabric_incompatibility_list={ "iris": "*" }
     fabric_recommend_list={}
 
     # Fabric mod run

versionProperties/1.19.4.properties

@@ -24,8 +24,7 @@ fabric_api_version=0.87.1+1.19.4
     canvas_version=
 
     # iris - needs 1.7.4+ to support the DH API
-    # chunky - isn't recommended since it can cause holes in the LODs
-    fabric_incompatibility_list={ "iris": "*", "chunky": "*" }
+    fabric_incompatibility_list={ "iris": "*" }
     fabric_recommend_list={}
 
     # Fabric mod run

versionProperties/1.20.1.properties

@@ -24,8 +24,7 @@ fabric_api_version=0.90.4+1.20.1
     canvas_version=
 
     # iris - needs 1.7.4+ to support the DH API
-    # chunky - isn't recommended since it can cause holes in the LODs
-    fabric_incompatibility_list={ "iris": "<=1.7.4", "chunky": "*" }
+    fabric_incompatibility_list={ "iris": "<=1.7.4" }
     fabric_recommend_list={}
     
     # Fabric mod run

versionProperties/1.20.2.properties

@@ -24,8 +24,7 @@ fabric_api_version=0.90.4+1.20.2
     canvas_version=
 
     # iris - needs 1.7.4+ to support the DH API
-    # chunky - isn't recommended since it can cause holes in the LODs
-    fabric_incompatibility_list={ "iris": "<=1.7.4", "chunky": "*" }
+    fabric_incompatibility_list={ "iris": "<=1.7.4" }
     fabric_recommend_list={}
     
     # Fabric mod run

versionProperties/1.20.4.properties

@@ -25,8 +25,7 @@ fabric_api_version=0.91.2+1.20.4
     canvas_version=
 
     # iris - needs 1.7.4+ to support the DH API
-    # chunky - isn't recommended since it can cause holes in the LODs
-    fabric_incompatibility_list={ "iris": "<=1.7.4", "chunky": "*" }
+    fabric_incompatibility_list={ "iris": "<=1.7.4" }
     fabric_recommend_list={}
     
     # Fabric mod run
@@ -44,7 +43,7 @@ fabric_api_version=0.91.2+1.20.4
 
 # (Neo)Forge loader
 forge_version=49.1.13
-neoforge_version=20.4.233
+neoforge_version=20.4.246
     neoforge_version_range=[*,)
 
     # (Neo)Forge mod versions

versionProperties/1.20.6.properties

@@ -25,8 +25,7 @@ fabric_api_version=0.97.8+1.20.6
     canvas_version=
 
     # iris - needs 1.7.4+ to support the DH API
-    # chunky - isn't recommended since it can cause holes in the LODs
-    fabric_incompatibility_list={ "iris": "<=1.7.4", "chunky": "*" }
+    fabric_incompatibility_list={ "iris": "<=1.7.4" }
     fabric_recommend_list={}
     
     # Fabric mod run
@@ -44,7 +43,7 @@ fabric_api_version=0.97.8+1.20.6
 
 # (Neo)Forge loader
 forge_version=50.0.19
-neoforge_version=20.6.70-beta
+neoforge_version=20.6.136
     neoforge_version_range=[*,)
 
     # (Neo)Forge mod versions

versionProperties/1.21.1.properties

@@ -25,8 +25,7 @@ fabric_api_version=0.115.0+1.21.1
     canvas_version=
 
     # iris - needs 1.7.4+ to support the DH API
-    # chunky - isn't recommended since it can cause holes in the LODs
-    fabric_incompatibility_list={ "iris": "<=1.7.4", "chunky": "*" }
+    fabric_incompatibility_list={ "iris": "<=1.7.4" }
     fabric_recommend_list={}
     
     # Fabric mod run
@@ -44,7 +43,7 @@ fabric_api_version=0.115.0+1.21.1
 
 # (Neo)Forge loader
 forge_version=
-neoforge_version=21.1.92
+neoforge_version=21.1.192
     neoforge_version_range=[*,)
     
     # (Neo)Forge mod versions

versionProperties/1.21.10.properties

@@ -0,0 +1,57 @@
+# 1.21.10 version
+java_version=21
+minecraft_version=1.21.10
+parchment_version=1.21:2024.07.28
+compatible_minecraft_versions=["1.21.10"]
+accessWidenerVersion=1_21_10
+builds_for=fabric,neoforge
+# forge is broken due to gradle/build script issues
+
+# Netty
+netty_version=4.1.97.Final
+
+# Fabric loader
+fabric_loader_version=0.17.3
+fabric_api_version=0.135.0+1.21.10
+    modmenu_version=16.0.0-rc.1
+    starlight_version_fabric=
+    phosphor_version_fabric=
+    lithium_version=
+    sodium_version=mc1.21.10-0.7.2-fabric
+    iris_version=1.9.6+1.21.10-fabric
+    bclib_version=
+    immersive_portals_version=
+    canvas_version=
+
+    fabric_incompatibility_list={ }
+    fabric_recommend_list={}
+    
+    # Fabric mod run
+    # 0 = Don't enable and don't run
+    # 1 = Can be referenced in code but doesn't run
+    # 2 = Can be referenced in code and runs in client
+    enable_starlight=0
+    enable_phosphor=0
+    enable_sodium=1
+    enable_lithium=0
+    enable_iris=1
+    enable_bclib=0
+    enable_immersive_portals=0
+    enable_canvas=0
+
+# (Neo)Forge loader
+forge_version=
+neoforge_version=21.10.6-beta
+    neoforge_version_range=[21.10.6-beta,)
+    
+    # (Neo)Forge mod versions
+    starlight_version_forge=
+    terraforged_version=
+
+    # (Neo)Forge mod run
+    # 0 = Don't enable and don't run
+    # 1 = Can be referenced in code but doesn't run
+    # 2 = Can be referenced in code and runs in client
+    enable_starlight_forge=0
+    enable_terraforged=0
+    enable_terrafirmacraft=0

versionProperties/1.21.3.properties

@@ -25,8 +25,7 @@ fabric_api_version=0.110.0+1.21.3
     canvas_version=
     
     # fabric-api 0.110.0 fixed a bug in MC 1.21.3 with the rendering API DH relied on
-    # chunky - isn't recommended since it can cause holes in the LODs
-    fabric_incompatibility_list={ "fabric-api": "<0.110.0", "chunky": "*" }
+    fabric_incompatibility_list={ "fabric-api": "<0.110.0" }
     fabric_recommend_list={}
     
     # Fabric mod run
@@ -44,7 +43,7 @@ fabric_api_version=0.110.0+1.21.3
 
 # (Neo)Forge loader
 forge_version=
-neoforge_version=21.3.11-beta
+neoforge_version=21.3.86
     neoforge_version_range=[*,)
 
     # (Neo)Forge mod versions

versionProperties/1.21.4.properties

@@ -24,8 +24,7 @@ fabric_api_version=0.110.5+1.21.4
     immersive_portals_version=
     canvas_version=
 
-    # chunky - isn't recommended since it can cause holes in the LODs
-    fabric_incompatibility_list={ "chunky": "*" }
+    fabric_incompatibility_list={ }
     fabric_recommend_list={}
     
     # Fabric mod run
@@ -43,8 +42,9 @@ fabric_api_version=0.110.5+1.21.4
 
 # (Neo)Forge loader
 forge_version=
-neoforge_version=21.4.3-beta
-    neoforge_version_range=[*,)
+neoforge_version=21.4.147
+    # version range may not be necessary, but having compiled DH for an older version caused issues with shaders
+    neoforge_version_range=[21.4.147,)
 
     # (Neo)Forge mod versions
     starlight_version_forge=

versionProperties/1.21.5.properties

@@ -24,8 +24,7 @@ fabric_api_version=0.119.5+1.21.5
     canvas_version=
     
     # Iris - some versions of 1.8.11 nightly builds may not work, but the ones after 2025-03-30 should
-    # chunky - isn't recommended since it can cause holes in the LODs
-    fabric_incompatibility_list={ "iris": "<=1.8.10", "chunky": "*" }
+    fabric_incompatibility_list={ "iris": "<=1.8.10" }
     fabric_recommend_list={}
     
     # Fabric mod run
@@ -43,7 +42,7 @@ fabric_api_version=0.119.5+1.21.5
 
 # (Neo)Forge loader
 forge_version=
-neoforge_version=21.5.0-beta
+neoforge_version=21.5.87
     neoforge_version_range=[*,)
 
     # (Neo)Forge mod versions

versionProperties/1.21.6.properties

@@ -23,8 +23,7 @@ fabric_api_version=0.127.0+1.21.6
     immersive_portals_version=
     canvas_version=
 
-    # chunky - isn't recommended since it can cause holes in the LODs
-    fabric_incompatibility_list={ "chunky": "*" }
+    fabric_incompatibility_list={ }
     fabric_recommend_list={}
     
     # Fabric mod run
@@ -42,7 +41,7 @@ fabric_api_version=0.127.0+1.21.6
 
 # (Neo)Forge loader
 forge_version=
-neoforge_version=21.6.19-beta
+neoforge_version=21.6.20-beta
     # around 6.19 neo changed how their render API works, failing to meet this causes the game to crash
     neoforge_version_range=[21.6.19-beta,)
     

versionProperties/1.21.8.properties

@@ -1,8 +1,8 @@
-# 1.21.7 version
+# 1.21.8 version
 java_version=21
-minecraft_version=1.21.7
+minecraft_version=1.21.8
 parchment_version=1.21:2024.07.28
-compatible_minecraft_versions=["1.21.7"]
+compatible_minecraft_versions=["1.21.8"]
 accessWidenerVersion=1_21_4
 builds_for=fabric,neoforge
 # forge is broken due to gradle/build script issues
@@ -11,8 +11,8 @@ builds_for=fabric,neoforge
 netty_version=4.1.97.Final
 
 # Fabric loader
-fabric_loader_version=0.16.13
-fabric_api_version=0.128.2+1.21.7
+fabric_loader_version=0.17.2
+fabric_api_version=0.133.4+1.21.8
     modmenu_version=15.0.0-beta.3
     starlight_version_fabric=
     phosphor_version_fabric=
@@ -23,8 +23,7 @@ fabric_api_version=0.128.2+1.21.7
     immersive_portals_version=
     canvas_version=
 
-    # chunky - isn't recommended since it can cause holes in the LODs
-    fabric_incompatibility_list={ "chunky": "*" }
+    fabric_incompatibility_list={ }
     fabric_recommend_list={}
     
     # Fabric mod run
@@ -42,7 +41,7 @@ fabric_api_version=0.128.2+1.21.7
 
 # (Neo)Forge loader
 forge_version=
-neoforge_version=21.7.3-beta
+neoforge_version=21.8.2-beta
     # around 6.19 neo changed how their render API works, failing to meet this causes the game to crash
     neoforge_version_range=[*,)
     

versionProperties/1.21.9.properties

@@ -0,0 +1,59 @@
+# 1.21.9 version
+java_version=21
+minecraft_version=1.21.9
+parchment_version=1.21:2024.07.28
+compatible_minecraft_versions=["1.21.9"]
+accessWidenerVersion=1_21_10
+builds_for=fabric,neoforge
+# forge is broken due to gradle/build script issues
+
+# Netty
+netty_version=4.1.97.Final
+
+# Fabric loader
+fabric_loader_version=0.17.3
+fabric_api_version=0.134.0+1.21.9
+    modmenu_version=16.0.0-rc.1
+    starlight_version_fabric=
+    phosphor_version_fabric=
+    lithium_version=
+    sodium_version=mc1.21.10-0.7.2-fabric
+    iris_version=1.9.3+1.21.9-fabric
+    bclib_version=
+    immersive_portals_version=
+    canvas_version=
+
+    fabric_incompatibility_list={ }
+    fabric_recommend_list={}
+    
+    # Fabric mod run
+    # 0 = Don't enable and don't run
+    # 1 = Can be referenced in code but doesn't run
+    # 2 = Can be referenced in code and runs in client
+    enable_starlight=0
+    enable_phosphor=0
+    enable_sodium=1
+    enable_lithium=0
+    enable_iris=1
+    enable_bclib=0
+    enable_immersive_portals=0
+    enable_canvas=0
+
+# (Neo)Forge loader
+forge_version=
+neoforge_version=21.9.15-beta
+    # sometime before 21.9.15-beta Neoforge changed how their rendering API events handle levels
+    # so we can't support both versions at once
+    neoforge_version_range=[21.9.15-beta,)
+    
+    # (Neo)Forge mod versions
+    starlight_version_forge=
+    terraforged_version=
+
+    # (Neo)Forge mod run
+    # 0 = Don't enable and don't run
+    # 1 = Can be referenced in code but doesn't run
+    # 2 = Can be referenced in code and runs in client
+    enable_starlight_forge=0
+    enable_terraforged=0
+    enable_terrafirmacraft=0