Update the version number to 1.6.2a

please check if it works looks better.

.gitignore

@@ -50,4 +50,4 @@ classes/
 Merged/
 
 # file from notepad++
-*.bak
+*.bak

.gitlab-ci.yml

@@ -3,9 +3,9 @@ image: gradle:eclipse-temurin
 
 # all stages need to be defined here
 stages:
-    - gradleSetup
-    - build
-    - merge
+  - gradleSetup
+  - build
+  - merge
 
 variables:
     # Disable the Gradle daemon for Continuous Integration servers as correctness
@@ -34,11 +34,11 @@ gradleSetup:
     image: eclipse-temurin:17
     cache:
         key:
-            files:
-                - gradle/wrapper/gradle-wrapper.properties
+          files:
+            - gradle/wrapper/gradle-wrapper.properties 
         policy: push
         paths:
-            - cache/
+          - cache/
 
 
 
@@ -67,7 +67,7 @@ build:
             - .gradle
             - cache/
     artifacts:
-        name: "NightlyBuild-$CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
+        name: "NightlyBuild-$CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"  
         paths:
             # relative to the root directory
             - fabric/build/libs
@@ -89,7 +89,7 @@ build:
 # third stage
 merge:
     stage: merge
-    script: ./gradlew merge --gradle-user-home cache/
+    script: ./gradlew merge --gradle-user-home cache/ 
     # build using Java 17
     image: eclipse-temurin:17
     cache:
@@ -100,7 +100,7 @@ merge:
             - .gradle
             - cache/
     artifacts:
-        name: "Merged_NightlyBuild-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
+        name: "Merged_NightlyBuild-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"  
         paths:
             # relative to the root directory
             - Merged
@@ -129,4 +129,4 @@ merge:
 #                - name: 'Fabric Jars'
 #                  url: 'https://gitlab.com/jeseibel/minecraft-lod-mod/cw/-/jobs/${GE_JOB_ID}/artifacts/file/fabric/build/libs'
 #                - name: 'Forge Jars'
-#                  url: 'https://gitlab.com/jeseibel/minecraft-lod-mod/cw/-/jobs/${GE_JOB_ID}/artifacts/file/forge/build/libs'
+#                  url: 'https://gitlab.com/jeseibel/minecraft-lod-mod/cw/-/jobs/${GE_JOB_ID}/artifacts/file/forge/build/libs' 

Readme.md

@@ -10,38 +10,39 @@ If you want to see a quick demo, check out a video covering the mod here:
 <a href="https://www.youtube.com/watch?v=H2tnvEVbO1c" target="_blank">![Minecraft Level Of Detail (LOD) mod - Alpha 1.5](https://i.ytimg.com/vi_webp/H2tnvEVbO1c/mqdefault.webp)</a>
 
 Architectury version: 3.4-SNAPSHOT\
-Forge version: 37.1.0\
-Fabric version: 0.12.6\
-Fabric API version: 0.37.1+1.17
+Forge version: 39.0.5 and 38.0.14\
+Fabric version: 0.12.12\
+Fabric API version: 0.44.0+1.18
 
-Modmenu version: 2.0.14\
-Sodium version: mc1.17.1-0.3.3
+Modmenu version: 3.0.0\
+Sodium version: mc1.18-0.4.0-alpha5
 
 Notes:\
 This version has been confirmed to work in Eclipse and Retail Minecraft.\
-(Retail running forge version 1.17.1-37.1.0 and fabric version 1.17.1-0.12.6)
+(Retail running forge version 1.18.1-39.0.5 and fabric version 1.18-0.12.12 and 1.18.1-0.12.12)
 
 
 ## source code installation
 
-See the Forge Documentation online for more detailed instructions:\
-http://mcforge.readthedocs.io/en/latest/gettingstarted/
+See the Fabric Documentation online for more detailed instructions:\
+https://fabricmc.net/wiki/tutorial:setup
 
 ### Prerequisites
 
-* A Java Development Kit (JDK) for Java 16 (recommended) or newer. Visit https://www.oracle.com/java/technologies/downloads/ for installers.
+* A Java Development Kit (JDK) for Java 17 (recommended) or newer. Visit https://www.oracle.com/java/technologies/downloads/ for installers.
 * Git or someway to clone git projects. Visit https://git-scm.com/ for installers.
 * (Not required) Any Java IDE, for example Intellij IDEA and Eclipse. You may also use any other code editors, such as Visual Studio Code. (Optional)
-  It's better to use IntelliJ IDEA since Eclipse is not supported by Architectury, but it still works.
+It's better to use IntelliJ IDEA since Eclipse is not supported by Architectury, but it still works.
 
 **If using IntelliJ:**
 1. open IDEA and import the build.gradle
 2. refresh the Gradle project in IDEA if required
 
 **If using Ecplise:**
-Not supported...
-
-Side note: invalidate caches and restart if required
+1. run the command: `./gradlew geneclipseruns`
+2. run the command: `./gradlew eclipse`
+3. Make sure eclipse has the JDK 17 installed. (This is needed so that eclipse can run minecraft)
+4. Import the project into eclipse
 
 ## Compiling
 
@@ -51,7 +52,7 @@ Side note: invalidate caches and restart if required
 3. The compiled jar file will be in the folder `fabric/build/libs/` and `forge/build/libs/`
 
 **If in terminal:**
-1. `git clone -b 1.17.1 --recurse-submodules https://gitlab.com/jeseibel/minecraft-lod-mod.git`
+1. `git clone -b 1.18.X --recurse-submodules https://gitlab.com/jeseibel/minecraft-lod-mod.git`
 2. `cd minecraft-lod-mod`
 3. `./gradlew assemble` or `./gradlew build`
 4. The build should be in `fabric/build/libs/` and `forge/build/libs/`
@@ -83,4 +84,4 @@ XZ for Java (data compression)\
 https://tukaani.org/xz/java.html
 
 DHJarMerger (To merge multiple mod versions into one jar)\
-https://github.com/Ran-helo/DHJarMerger
+https://github.com/Ran-helo/DHJarMerger

build.gradle

@@ -8,7 +8,7 @@ buildscript {
 
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "0.10.0.195" apply false
+    id "dev.architectury.loom" version "0.10.0-SNAPSHOT" apply false
 }
 
 apply plugin: JarMergerPlugin
@@ -52,7 +52,7 @@ subprojects { p ->
     }
 }
 
-allprojects {
+allprojects { p ->
     apply plugin: "java"
     apply plugin: "architectury-plugin"
     apply plugin: "maven-publish"
@@ -98,12 +98,54 @@ allprojects {
         }
     }
 
+
+    // Put stuff from gradle.properties into the mod info
+    processResources {
+        def resourceTargets = ["fabric.mod.json", "META-INF/mods.toml"] // Location of where to put
+        def intoTargets = ["$buildDir/resources/main/"] // Location of the built resources folder
+        def replaceProperties = [
+                version: mod_version,
+                mod_name: mod_name,
+                authors: mod_authors,
+                description: mod_description,
+                homepage: mod_homepage,
+                source: mod_source,
+                issues: mod_issues
+        ]   // The left side is what gets replaced in the mod info and the right side is where to get it from in the gradle.properties
+
+        inputs.properties replaceProperties
+        replaceProperties.put 'project', project
+        filesMatching(resourceTargets) {
+            expand replaceProperties
+        }
+
+        intoTargets.each { target ->
+            if (file(target).exists()) {
+                copy {
+                    from(sourceSets.main.resources) {
+                        include resourceTargets
+                        expand replaceProperties
+                    }
+                    into target
+                }
+            }
+        }
+    }
+
+
     tasks.withType(JavaCompile) {
-        options.encoding = "UTF-8"
-        options.release = 16
+        if (p != project(":core")) {
+            // Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
+            options.release = 17
+        }
     }
 
     java {
         withSourcesJar()
     }
+
+    if (p == project(":core") || p == project(":common")) {
+        runClient.enabled = false
+        runServer.enabled = false
+    }
 }

common/src/main/java/com/seibel/lod/common/LodCommonMain.java

@@ -4,6 +4,8 @@ import com.seibel.lod.common.forge.LodForgeMethodCaller;
 import com.seibel.lod.common.networking.NetworkInterface;
 import com.seibel.lod.common.wrappers.DependencySetup;
 import com.seibel.lod.common.wrappers.config.ConfigGui;
+import com.seibel.lod.core.Config;
+import com.seibel.lod.core.config.ConfigBase;
 
 /**
  * This is the common main class
@@ -15,6 +17,8 @@ public class LodCommonMain {
     public static LodForgeMethodCaller forgeMethodCaller;
     public static NetworkInterface networkInterface;
 
+    public static final boolean IsNewConfig = false;
+
     public static void startup(LodForgeMethodCaller caller, boolean serverSided) {
         LodCommonMain.serverSided = serverSided;
         if (caller != null) {
@@ -25,8 +29,10 @@ public class LodCommonMain {
         DependencySetup.createInitialBindings();
     }
 
+
     public static void initConfig() {
-        ConfigGui.init(Config.class);
+        if (!IsNewConfig)
+            ConfigGui.init(OldConfig.class);
     }
 
     public static void registerNetworking(NetworkInterface networkInterface) {

common/src/main/java/com/seibel/lod/common/OldConfig.java

@@ -33,7 +33,7 @@ import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.I
  * @author coolGi2007
  * @version 12-12-2021
  */
-public class Config extends ConfigGui
+public class OldConfig
 //public class Config extends TinyConfig
 {
 	// CONFIG STRUCTURE
@@ -263,7 +263,7 @@ public class Config extends ConfigGui
 
 				@ConfigAnnotations.FileComment
 				public static String _gpuUploadPerMegabyteInMilliseconds = IBuffers.GPU_UPLOAD_PER_MEGABYTE_IN_MILLISECONDS_DESC;
-				@ConfigAnnotations.Entry(minValue = 0, maxValue = 5000)
+				@ConfigAnnotations.Entry(minValue = 0, maxValue = 50)
 				public static int gpuUploadPerMegabyteInMilliseconds = IBuffers.GPU_UPLOAD_PER_MEGABYTE_IN_MILLISECONDS_DEFAULT.defaultValue;
 
 				@ConfigAnnotations.FileComment

common/src/main/java/com/seibel/lod/common/forge/LodForgeMethodCaller.java

@@ -2,7 +2,6 @@ package com.seibel.lod.common.forge;
 
 import com.seibel.lod.common.wrappers.minecraft.MinecraftWrapper;
 import net.minecraft.client.renderer.block.model.BakedQuad;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
@@ -17,5 +16,4 @@ import java.util.Random;
  */
 public interface LodForgeMethodCaller {
     List<BakedQuad> getQuads(MinecraftWrapper mc, Block block, BlockState blockState, Direction direction, Random random);
-    int getPixelRGBA(TextureAtlasSprite sprite, int frameIndex, int x, int y);
 }

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

@@ -30,8 +30,10 @@ public class DependencySetup {
             SingletonHandler.bind(IMinecraftWrapper.class, MinecraftWrapper.INSTANCE);
             SingletonHandler.bind(IMinecraftRenderWrapper.class, MinecraftRenderWrapper.INSTANCE);
             SingletonHandler.bind(IReflectionHandler.class, ReflectionHandler.createSingleton(MinecraftWrapper.INSTANCE.getOptions().getClass().getDeclaredFields(), MinecraftWrapper.INSTANCE.getOptions()));
-            SingletonHandler.bind(IVersionConstants.class, VersionConstants.INSTANCE);
         }
+        SingletonHandler.bind(IVersionConstants.class, VersionConstants.INSTANCE);
+
         SingletonHandler.bind(IWrapperFactory.class, WrapperFactory.INSTANCE);
+        DependencySetupDoneCheck.isDone = true;
     }
 }

common/src/main/java/com/seibel/lod/common/wrappers/DependencySetupDoneCheck.java

@@ -0,0 +1,10 @@
+package com.seibel.lod.common.wrappers;
+
+import java.util.function.Supplier;
+
+public class DependencySetupDoneCheck
+{
+	public static boolean isDone = false;
+	public static Supplier<Boolean> getIsCurrentThreadDistantGeneratorThread = (() -> {return false;});
+	
+}

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

@@ -1,3 +1,4 @@
+
 package com.seibel.lod.common.wrappers;
 
 import com.seibel.lod.core.enums.config.DistanceGenerationMode;
@@ -7,49 +8,54 @@ import com.seibel.lod.core.wrapperInterfaces.IVersionConstants;
  * @author James Seibel
  * @version 12-11-2021
  */
-public class VersionConstants implements IVersionConstants {
-    public static final VersionConstants INSTANCE = new VersionConstants();
-
-
-    private VersionConstants() {
-
-    }
-
-
-    @Override
-    public int getMinimumWorldHeight() {
-        return 0;
-    }
-
-    @Override
-    public boolean isWorldGeneratorSingleThreaded(DistanceGenerationMode distanceGenerationMode) {
-        // We are always asking the server to generate the chunk,
-        // so no use running this stuff multithreaded.
-        return true;
-        /*
-        switch (distanceGenerationMode) {
-            default:
-            case NONE:
-            case BIOME_ONLY:
-            case BIOME_ONLY_SIMULATE_HEIGHT:
-            case SURFACE:
-            case FEATURES:
-                return false;
-
-            case FULL:
-                return true;
-        }
-         */
-    }
-
-    @Override
-    public int getWorldGenerationCountPerThread() {
-        return 1;
-    }
-
-
+public class VersionConstants implements IVersionConstants
+{
+	public static final VersionConstants INSTANCE = new VersionConstants();
+	
+	
+	private VersionConstants()
+	{
+		
+	}
+	
+	
 	@Override
-	public boolean hasBatchGenerationImplementation() {
+	public int getMinimumWorldHeight()
+	{
+		return 0;
+	}
+	
+	@Override
+	public boolean isWorldGeneratorSingleThreaded(DistanceGenerationMode distanceGenerationMode)
+	{
+		// We are always asking the server to generate the chunk,
+		// so no use running this stuff multithreaded.
+		return true;
+		/*
+		switch (distanceGenerationMode) {
+		    default:
+		    case NONE:
+		    case BIOME_ONLY:
+		    case BIOME_ONLY_SIMULATE_HEIGHT:
+		    case SURFACE:
+		    case FEATURES:
+		        return false;
+		
+		    case FULL:
+		        return true;
+		}*/
+	}
+	
+	@Override
+	public int getWorldGenerationCountPerThread()
+	{
+		return 1;
+	}
+	
+	
+	@Override
+	public boolean hasBatchGenerationImplementation()
+	{
 		return true;
 	}
 }

common/src/main/java/com/seibel/lod/common/wrappers/WrapperFactory.java

@@ -38,53 +38,67 @@ import com.seibel.lod.common.wrappers.worldGeneration.WorldGeneratorWrapper;
  * @author James Seibel
  * @version 11-20-2021
  */
-public class WrapperFactory implements IWrapperFactory {
-    public static final WrapperFactory INSTANCE = new WrapperFactory();
-
-
-    @Override
-    public AbstractBlockPosWrapper createBlockPos() {
-        return new BlockPosWrapper();
-    }
-
-    @Override
-    public AbstractBlockPosWrapper createBlockPos(int x, int y, int z) {
-        return new BlockPosWrapper(x, y, z);
-    }
-
-    @Override
-    public AbstractChunkPosWrapper createChunkPos() {
-        return new ChunkPosWrapper();
-    }
-
-    @Override
-    public AbstractChunkPosWrapper createChunkPos(long xAndZPositionCombined) {
-        return new ChunkPosWrapper(xAndZPositionCombined);
-    }
-
-    @Override
-    public AbstractChunkPosWrapper createChunkPos(int x, int z) {
-        return new ChunkPosWrapper(x, z);
-    }
-
-    @Override
-    public AbstractChunkPosWrapper createChunkPos(AbstractChunkPosWrapper newChunkPos) {
-        return new ChunkPosWrapper(newChunkPos);
-    }
-
-    @Override
-    public AbstractChunkPosWrapper createChunkPos(AbstractBlockPosWrapper blockPos) {
-        return new ChunkPosWrapper(blockPos);
-    }
-
-    @Override
-    public AbstractWorldGeneratorWrapper createWorldGenerator(LodBuilder newLodBuilder, LodDimension newLodDimension, IWorldWrapper worldWrapper) {
-        return new WorldGeneratorWrapper(newLodBuilder, newLodDimension, worldWrapper);
-    }
-    
-    @Override
-    public AbstractBatchGenerationEnvionmentWrapper createBatchGenerator(LodBuilder newLodBuilder,
-			LodDimension newLodDimension, IWorldWrapper worldWrapper) {
+public class WrapperFactory implements IWrapperFactory
+{
+	public static final WrapperFactory INSTANCE = new WrapperFactory();
+	
+	
+	@Override
+	public AbstractBlockPosWrapper createBlockPos()
+	{
+		return new BlockPosWrapper();
+	}
+	
+	@Override
+	public AbstractBlockPosWrapper createBlockPos(int x, int y, int z)
+	{
+		return new BlockPosWrapper(x, y, z);
+	}
+	
+	
+	
+	
+	@Override
+	public AbstractChunkPosWrapper createChunkPos()
+	{
+		return new ChunkPosWrapper();
+	}
+	
+	@Override
+	public AbstractChunkPosWrapper createChunkPos(long xAndZPositionCombined)
+	{
+		return new ChunkPosWrapper(xAndZPositionCombined);
+	}
+	
+	@Override
+	public AbstractChunkPosWrapper createChunkPos(int x, int z)
+	{
+		return new ChunkPosWrapper(x, z);
+	}
+	
+	@Override
+	public AbstractChunkPosWrapper createChunkPos(AbstractChunkPosWrapper newChunkPos)
+	{
+		return new ChunkPosWrapper(newChunkPos);
+	}
+	
+	@Override
+	public AbstractChunkPosWrapper createChunkPos(AbstractBlockPosWrapper blockPos)
+	{
+		return new ChunkPosWrapper(blockPos);
+	}
+	
+	
+	
+	@Override
+	public AbstractWorldGeneratorWrapper createWorldGenerator(LodBuilder newLodBuilder, LodDimension newLodDimension, IWorldWrapper worldWrapper)
+	{
+		return new WorldGeneratorWrapper(newLodBuilder, newLodDimension, worldWrapper);
+	}
+	
+	public AbstractBatchGenerationEnvionmentWrapper createBatchGenerator(LodBuilder newLodBuilder,
+			LodDimension newLodDimension, IWorldWrapper worldWrapper)
+	{
 		return new BatchGenerationEnvironment(worldWrapper, newLodBuilder, newLodDimension);
 	}
 }

common/src/main/java/com/seibel/lod/common/wrappers/block/BlockColorWrapper.java

@@ -6,7 +6,6 @@ import java.util.Random;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import com.seibel.lod.common.LodCommonMain;
 import com.seibel.lod.common.wrappers.minecraft.MinecraftWrapper;
 import com.seibel.lod.core.util.ColorUtil;
 import com.seibel.lod.core.wrapperInterfaces.block.AbstractBlockPosWrapper;
@@ -15,13 +14,7 @@ import com.seibel.lod.core.wrapperInterfaces.block.IBlockColorWrapper;
 import net.minecraft.client.renderer.block.model.BakedQuad;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.core.Direction;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.BushBlock;
-import net.minecraft.world.level.block.FlowerBlock;
-import net.minecraft.world.level.block.GrassBlock;
-import net.minecraft.world.level.block.LeavesBlock;
-import net.minecraft.world.level.block.TallGrassBlock;
+import net.minecraft.world.level.block.*;
 import net.minecraft.world.level.block.state.BlockState;
 
 
@@ -81,16 +74,15 @@ public class BlockColorWrapper implements IBlockColorWrapper
     public static IBlockColorWrapper getBlockColorWrapper(Block block)
     {
         //first we check if the block has already been wrapped
-        if (blockColorWrapperMap.containsKey(block) && blockColorWrapperMap.get(block) != null)
-            return blockColorWrapperMap.get(block);
-
+    	BlockColorWrapper colorWrapper = blockColorWrapperMap.get(block);
+        if (colorWrapper != null)
+            return colorWrapper;
 
         //if it hasn't been created yet, we create it and save it in the map
-        BlockColorWrapper blockWrapper = new BlockColorWrapper(block);
-        blockColorWrapperMap.put(block, blockWrapper);
-
+        colorWrapper = new BlockColorWrapper(block);
+        BlockColorWrapper colorWrapperCAS = blockColorWrapperMap.putIfAbsent(block, colorWrapper);
         //we return the newly created wrapper
-        return blockWrapper;
+        return colorWrapperCAS==null ? colorWrapper : colorWrapperCAS;
     }
 
     /**
@@ -127,7 +119,7 @@ public class BlockColorWrapper implements IBlockColorWrapper
         for (Direction direction : directions)
         {
             quads = mc.getModelManager().getBlockModelShaper().getBlockModel(block.defaultBlockState()).getQuads(blockState, direction, random);
-            if (!quads.isEmpty())
+            if (!quads.isEmpty() && !(block instanceof RotatedPillarBlock && direction == Direction.UP))
                 break;
         }
 
@@ -154,7 +146,7 @@ public class BlockColorWrapper implements IBlockColorWrapper
 
         // generate the block's color
 //        for (int frameIndex = 0; frameIndex < texture.getFrameCount(); frameIndex++)
-        boolean lookForTint = grassInstance() || leavesInstance() || waterIstance();
+        boolean lookForTint = grassInstance() || leavesInstance() || waterInstance();
     
         int frameIndex = 0; // TODO
         {
@@ -163,19 +155,16 @@ public class BlockColorWrapper implements IBlockColorWrapper
             {
                 for (int v = 0; v < texture.getHeight(); v++)
                 {
-                	//FIXME: Better way on the TextureAtlasSpriteWrapper!!!
-                    tempColor = LodCommonMain.forge ?
-                    		LodCommonMain.forgeMethodCaller.getPixelRGBA(texture, frameIndex, u, v)
-                    		: TextureAtlasSpriteWrapper.getPixelRGBA(texture, frameIndex, u, v);
+                    tempColor = TextureAtlasSpriteWrapper.getPixelRGBA(texture, frameIndex, u, v);
 
-                    if (tempColor == 0)
+                    if (ColorUtil.getAlpha(TextureAtlasSpriteWrapper.getPixelRGBA(texture, frameIndex, u, v)) == 0)
                         continue;
 
                     if (lookForTint)
                     {
                         // determine if this pixel is gray
                         int colorMax = Math.max(Math.max(ColorUtil.getBlue(tempColor), ColorUtil.getGreen(tempColor)), ColorUtil.getRed(tempColor));
-                        int colorMin = 4 + Math.min(Math.min(ColorUtil.getBlue(tempColor), ColorUtil.getGreen(tempColor)), ColorUtil.getRed(tempColor));
+                        int colorMin = 16 + Math.min(Math.min(ColorUtil.getBlue(tempColor), ColorUtil.getGreen(tempColor)), ColorUtil.getRed(tempColor));
                         boolean isGray = colorMax < colorMin;
                         if (isGray)
                             numberOfGreyPixel++;
@@ -191,10 +180,10 @@ public class BlockColorWrapper implements IBlockColorWrapper
 
                     // add to the running averages
                     count += colorMultiplier;
-                    alpha += ColorUtil.getAlpha(tempColor) * colorMultiplier;
-                    red += ColorUtil.getBlue(tempColor) * colorMultiplier;
-                    green += ColorUtil.getGreen(tempColor) * colorMultiplier;
-                    blue += ColorUtil.getRed(tempColor) * colorMultiplier;
+                    alpha += ColorUtil.getAlpha(tempColor) * ColorUtil.getAlpha(tempColor) * colorMultiplier;
+                    red += ColorUtil.getBlue(tempColor) * ColorUtil.getBlue(tempColor) * colorMultiplier;
+                    green += ColorUtil.getGreen(tempColor) * ColorUtil.getGreen(tempColor) * colorMultiplier;
+                    blue += ColorUtil.getRed(tempColor) * ColorUtil.getRed(tempColor) * colorMultiplier;
                 }
             }
         }
@@ -206,11 +195,11 @@ public class BlockColorWrapper implements IBlockColorWrapper
         else
         {
             // determine the average color
-            alpha /= count;
-            red /= count;
-            green /= count;
-            blue /= count;
-            tempColor = ColorUtil.rgbToInt(alpha, red, green, blue);
+            tempColor = ColorUtil.rgbToInt(
+                    (int) Math.sqrt(alpha / count),
+                    (int) Math.sqrt(red / count),
+                    (int) Math.sqrt(green / count),
+                    (int) Math.sqrt(blue / count));
         }
 
         // determine if this block should use the biome color tint
@@ -222,8 +211,8 @@ public class BlockColorWrapper implements IBlockColorWrapper
 
         this.foliageTint = leavesInstance() && toTint;
 
-        this.waterTint = waterIstance() && toTint;
-
+        this.waterTint = waterInstance();
+        
         //hardcoded leaves
         if (block == Blocks.SPRUCE_LEAVES)
             color = ColorUtil.multiplyRGBcolors(tempColor, 0xFF619961);
@@ -253,7 +242,7 @@ public class BlockColorWrapper implements IBlockColorWrapper
     }
 
     /** determine if the given block should use the biome's foliage color */
-    private boolean waterIstance()
+    private boolean waterInstance()
     {
         return block == Blocks.WATER;
     }

common/src/main/java/com/seibel/lod/common/wrappers/block/BlockPosWrapper.java

@@ -14,7 +14,7 @@ import net.minecraft.core.BlockPos;
  */
 public class BlockPosWrapper extends AbstractBlockPosWrapper
 {
-    private BlockPos.MutableBlockPos blockPos;
+    private final BlockPos.MutableBlockPos blockPos;
 
 
     public BlockPosWrapper()

common/src/main/java/com/seibel/lod/common/wrappers/block/BlockShapeWrapper.java

@@ -58,16 +58,15 @@ public class BlockShapeWrapper implements IBlockShapeWrapper
     static public BlockShapeWrapper getBlockShapeWrapper(Block block, ChunkWrapper chunkWrapper, int x, int y, int z)
     {
         //first we check if the block has already been wrapped
-        if (blockShapeWrapperMap.containsKey(block) && blockShapeWrapperMap.get(block) != null)
-            return blockShapeWrapperMap.get(block);
-
+    	BlockShapeWrapper blockWrapper = blockShapeWrapperMap.get(block);
+        if (blockWrapper != null)
+            return blockWrapper;
 
         //if it hasn't been created yet, we create it and save it in the map
-        BlockShapeWrapper blockWrapper = new BlockShapeWrapper(block, chunkWrapper, x, y, z);
-        blockShapeWrapperMap.put(block, blockWrapper);
-
+        blockWrapper = new BlockShapeWrapper(block, chunkWrapper, x, y, z);
+        BlockShapeWrapper blockWrapperCAS = blockShapeWrapperMap.putIfAbsent(block, blockWrapper);
         //we return the newly created wrapper
-        return blockWrapper;
+        return blockWrapperCAS==null ? blockWrapper : blockWrapperCAS;
     }
 
     private void setupShapes(IChunkWrapper chunkWrapper, int x, int y, int z)
@@ -155,4 +154,4 @@ public class BlockShapeWrapper implements IBlockShapeWrapper
     {
         return Objects.hash(block);
     }
-}
+}

common/src/main/java/com/seibel/lod/common/wrappers/chunk/ChunkPosWrapper.java

@@ -18,7 +18,7 @@ import net.minecraft.world.level.ChunkPos;
  */
 public class ChunkPosWrapper extends AbstractChunkPosWrapper
 {
-    private net.minecraft.world.level.ChunkPos chunkPos;
+    private final net.minecraft.world.level.ChunkPos chunkPos;
 
     public ChunkPosWrapper()
     {
@@ -45,9 +45,8 @@ public class ChunkPosWrapper extends AbstractChunkPosWrapper
         this.chunkPos = new ChunkPos(chunkX, chunkZ);
     }
     
-    public ChunkPosWrapper(long l)
-    {
-        this.chunkPos = new ChunkPos(l);
+    public ChunkPosWrapper(long l) {
+    	this.chunkPos = new ChunkPos(l);
     }
 
 
@@ -94,21 +93,21 @@ public class ChunkPosWrapper extends AbstractChunkPosWrapper
     {
     	return LevelPosUtil.convert(LodUtil.CHUNK_DETAIL_LEVEL, chunkPos.z, LodUtil.REGION_DETAIL_LEVEL);
     }
+    
+    @Override
+    public long getLong() {
+    	return chunkPos.toLong();
+    }
 
     public ChunkPos getChunkPos()
     {
         return chunkPos;
     }
-    
-	@Override
-	public long getLong() {
-		return chunkPos.toLong();
-	}
 
     @Override
     public boolean equals(Object o)
     {
-        // If the object is compared with itself then return true
+		// If the object is compared with itself then return true 
         if (o == this) {
             return true;
         }
@@ -134,5 +133,4 @@ public class ChunkPosWrapper extends AbstractChunkPosWrapper
         return new BlockPosWrapper(blockPos.getX(), blockPos.getY(), blockPos.getZ());
     }
 
-
 }

common/src/main/java/com/seibel/lod/common/wrappers/chunk/ChunkWrapper.java

@@ -15,6 +15,7 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.core.QuartPos;
 import net.minecraft.world.level.BlockAndTintGetter;
 import net.minecraft.world.level.LightLayer;
+import net.minecraft.world.level.block.AirBlock;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.LiquidBlock;
 import net.minecraft.world.level.block.LiquidBlockContainer;
@@ -22,6 +23,7 @@ import net.minecraft.world.level.block.SimpleWaterloggedBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.chunk.ChunkAccess;
+import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.world.level.chunk.LevelChunkSection;
 import net.minecraft.world.level.levelgen.Heightmap;
 
@@ -32,24 +34,24 @@ import net.minecraft.world.level.levelgen.Heightmap;
  */
 public class ChunkWrapper implements IChunkWrapper
 {
-    private ChunkAccess chunk;
-    private BlockAndTintGetter lightSource;
+    private final ChunkAccess chunk;
+    private final BlockAndTintGetter lightSource;
 
     @Override
     public int getHeight(){
         return chunk.getHeight();
     }
 
-    @Override
-    public int getMinBuildHeight()
-    {
-        return chunk.getMinBuildHeight();
-    }
-    @Override
-    public int getMaxBuildHeight()
-    {
-        return chunk.getMaxBuildHeight();
-    }
+	@Override
+	public int getMinBuildHeight()
+	{
+		return chunk.getMinBuildHeight();
+	}
+	@Override
+	public int getMaxBuildHeight()
+	{
+		return chunk.getMaxBuildHeight();
+	}
 
     @Override
     public int getHeightMapValue(int xRel, int zRel)
@@ -60,8 +62,8 @@ public class ChunkWrapper implements IChunkWrapper
     @Override
     public IBiomeWrapper getBiome(int x, int y, int z)
     {
-        return BiomeWrapper.getBiomeWrapper(chunk.getBiomes().getNoiseBiome(
-                QuartPos.fromBlock(x), QuartPos.fromBlock(y), QuartPos.fromBlock(z)));
+        return BiomeWrapper.getBiomeWrapper(chunk.getNoiseBiome(
+        		QuartPos.fromBlock(x), QuartPos.fromBlock(y), QuartPos.fromBlock(z)));
     }
 
     @Override
@@ -108,12 +110,12 @@ public class ChunkWrapper implements IChunkWrapper
 
     @Override
     public int getRegionPosX(){
-    	return LevelPosUtil.convert(LodUtil.CHUNK_DETAIL_LEVEL, getChunkPosX(), LodUtil.REGION_DETAIL_LEVEL);
+    	return LevelPosUtil.convert(LodUtil.CHUNK_DETAIL_LEVEL, chunk.getPos().x, LodUtil.REGION_DETAIL_LEVEL);
     }
 
     @Override
     public int getRegionPosZ(){
-    	return LevelPosUtil.convert(LodUtil.CHUNK_DETAIL_LEVEL, getChunkPosZ(), LodUtil.REGION_DETAIL_LEVEL);
+    	return LevelPosUtil.convert(LodUtil.CHUNK_DETAIL_LEVEL, chunk.getPos().z, LodUtil.REGION_DETAIL_LEVEL);
     }
 
     @Override
@@ -137,16 +139,19 @@ public class ChunkWrapper implements IChunkWrapper
     public int getMinZ() {
         return chunk.getPos().getMinBlockZ();
     }
-
-	@Override
-	public long getLongChunkPos() {
-		return chunk.getPos().toLong();
-	}
+    
+    @Override
+    public long getLongChunkPos() {
+    	return chunk.getPos().toLong();
+    }
 
     @Override
     public boolean isLightCorrect(){
-    	return true;
-        //return chunk.isLightCorrect();
+    	//return true;
+    	if (chunk instanceof LevelChunk) {
+    		return ((LevelChunk) chunk).isClientLightReady();
+    	}
+        return chunk.isLightCorrect();
     }
 
     public boolean isWaterLogged(int x, int y, int z)
@@ -164,15 +169,16 @@ public class ChunkWrapper implements IChunkWrapper
         return chunk.getLightEmission(new BlockPos(x,y,z));
     }
 
-    @Override
-    public int getBlockLight(int x, int y, int z) {
-        if (lightSource == null) return -1;
+	@Override
+	public int getBlockLight(int x, int y, int z) {
+		if (lightSource == null) return -1;
         return lightSource.getBrightness(LightLayer.BLOCK, new BlockPos(x,y,z));
-    }
+	}
+
+	@Override
+	public int getSkyLight(int x, int y, int z) {
+		if (lightSource == null) return -1;
+        return lightSource.getBrightness(LightLayer.SKY, new BlockPos(x,y,z));
+	}
 
-    @Override
-    public int getSkyLight(int x, int y, int z) {
-        if (lightSource == null) return -1;
-        return lightSource.getBrightness(LightLayer.SKY, new BlockPos(x, y, z));
-    }
 }

common/src/main/java/com/seibel/lod/common/wrappers/config/ConfigGui.java

@@ -379,7 +379,7 @@ public abstract class ConfigGui
 		// Just put this here for the future
 		config.setComment("_Version", " DONT TOUCH THIS, IF YOU DO THEN CONFIG FILE WOULD BREAK");
 		config.set("_Versions", ModInfo.VERSION);
-		
+
 
 		// Puts everything into its variable
 		for (EntryInfo info : entries) {
@@ -752,10 +752,10 @@ public abstract class ConfigGui
 
 		// Only for 1.17 and over
 		// Remove in 1.16 and below
-		@Override
-		public List<? extends NarratableEntry> narratables()
-		{
-			return children;
-		}
+        @Override
+        public List<? extends NarratableEntry> narratables()
+        {
+            return children;
+        }
 	}
 }

common/src/main/java/com/seibel/lod/common/wrappers/config/LodConfigWrapperSingleton.java

@@ -3,7 +3,7 @@ package com.seibel.lod.common.wrappers.config;
 import com.seibel.lod.core.enums.config.*;
 import com.seibel.lod.core.enums.rendering.*;
 import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
-import com.seibel.lod.common.Config;
+import com.seibel.lod.common.OldConfig;
 
 /**
  * This holds the config defaults and setters/getters
@@ -53,7 +53,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 		@Override
 		public boolean getOptionsButton()
 		{
-			return Config.optionsButton;
+			return OldConfig.optionsButton;
 		}
 		@Override
 		public void setOptionsButton(boolean newOptionsButton)
@@ -117,7 +117,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public HorizontalResolution getDrawResolution()
 				{
-					return Config.Client.Graphics.Quality.drawResolution;
+					return OldConfig.Client.Graphics.Quality.drawResolution;
 				}
 				@Override
 				public void setDrawResolution(HorizontalResolution newHorizontalResolution)
@@ -130,7 +130,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public int getLodChunkRenderDistance()
 				{
-					return Config.Client.Graphics.Quality.lodChunkRenderDistance;
+					return OldConfig.Client.Graphics.Quality.lodChunkRenderDistance;
 				}
 				@Override
 				public void setLodChunkRenderDistance(int newLodChunkRenderDistance)
@@ -143,7 +143,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public VerticalQuality getVerticalQuality()
 				{
-					return Config.Client.Graphics.Quality.verticalQuality;
+					return OldConfig.Client.Graphics.Quality.verticalQuality;
 				}
 				@Override
 				public void setVerticalQuality(VerticalQuality newVerticalQuality)
@@ -156,7 +156,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public int getHorizontalScale()
 				{
-					return Config.Client.Graphics.Quality.horizontalScale;
+					return OldConfig.Client.Graphics.Quality.horizontalScale;
 				}
 				@Override
 				public void setHorizontalScale(int newHorizontalScale)
@@ -169,7 +169,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public HorizontalQuality getHorizontalQuality()
 				{
-					return Config.Client.Graphics.Quality.horizontalQuality;
+					return OldConfig.Client.Graphics.Quality.horizontalQuality;
 				}
 				@Override
 				public void setHorizontalQuality(HorizontalQuality newHorizontalQuality)
@@ -180,7 +180,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				
 				@Override
 				public DropoffQuality getDropoffQuality() {
-					return Config.Client.Graphics.Quality.dropoffQuality;
+					return OldConfig.Client.Graphics.Quality.dropoffQuality;
 				}
 				@Override
 				public void setDropoffQuality(DropoffQuality newDropoffQuality) {
@@ -195,7 +195,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public FogDistance getFogDistance()
 				{
-					return Config.Client.Graphics.FogQuality.fogDistance;
+					return OldConfig.Client.Graphics.FogQuality.fogDistance;
 				}
 				@Override
 				public void setFogDistance(FogDistance newFogDistance)
@@ -208,7 +208,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public FogDrawMode getFogDrawMode()
 				{
-					return Config.Client.Graphics.FogQuality.fogDrawMode;
+					return OldConfig.Client.Graphics.FogQuality.fogDrawMode;
 				}
 
 				@Override
@@ -222,7 +222,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public FogColorMode getFogColorMode()
 				{
-					return Config.Client.Graphics.FogQuality.fogColorMode;
+					return OldConfig.Client.Graphics.FogQuality.fogColorMode;
 				}
 
 				@Override
@@ -236,7 +236,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public boolean getDisableVanillaFog()
 				{
-					return Config.Client.Graphics.FogQuality.disableVanillaFog;
+					return OldConfig.Client.Graphics.FogQuality.disableVanillaFog;
 				}
 				@Override
 				public void setDisableVanillaFog(boolean newDisableVanillaFog)
@@ -252,7 +252,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public boolean getDisableDirectionalCulling()
 				{
-					return Config.Client.Graphics.AdvancedGraphics.disableDirectionalCulling;
+					return OldConfig.Client.Graphics.AdvancedGraphics.disableDirectionalCulling;
 				}
 				@Override
 				public void setDisableDirectionalCulling(boolean newDisableDirectionalCulling)
@@ -261,10 +261,11 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 					ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.disableDirectionalCulling");
 				}
 
+
 				@Override
 				public VanillaOverdraw getVanillaOverdraw()
 				{
-					return Config.Client.Graphics.AdvancedGraphics.vanillaOverdraw;
+					return OldConfig.Client.Graphics.AdvancedGraphics.vanillaOverdraw;
 				}
 				@Override
 				public void setVanillaOverdraw(VanillaOverdraw newVanillaOverdraw)
@@ -276,7 +277,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public int getBacksideCullingRange()
 				{
-					return Config.Client.Graphics.AdvancedGraphics.backsideCullingRange;
+					return OldConfig.Client.Graphics.AdvancedGraphics.backsideCullingRange;
 				}
 				@Override
 				public void setBacksideCullingRange(int newBacksideCullingRange)
@@ -288,7 +289,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public boolean getUseExtendedNearClipPlane()
 				{
-					return Config.Client.Graphics.AdvancedGraphics.useExtendedNearClipPlane;
+					return OldConfig.Client.Graphics.AdvancedGraphics.useExtendedNearClipPlane;
 				}
 				@Override
 				public void setUseExtendedNearClipPlane(boolean newUseExtendedNearClipPlane)
@@ -310,7 +311,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 			@Override
 			public GenerationPriority getGenerationPriority()
 			{
-				return Config.Client.WorldGenerator.generationPriority;
+				return OldConfig.Client.WorldGenerator.generationPriority;
 			}
 			@Override
 			public void setGenerationPriority(GenerationPriority newGenerationPriority)
@@ -323,7 +324,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 			@Override
 			public DistanceGenerationMode getDistanceGenerationMode()
 			{
-				return Config.Client.WorldGenerator.distanceGenerationMode;
+				return OldConfig.Client.WorldGenerator.distanceGenerationMode;
 			}
 			@Override
 			public void setDistanceGenerationMode(DistanceGenerationMode newDistanceGenerationMode)
@@ -336,7 +337,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 			@Override
 			public boolean getAllowUnstableFeatureGeneration()
 			{
-				return Config.Client.WorldGenerator.allowUnstableFeatureGeneration;
+				return OldConfig.Client.WorldGenerator.allowUnstableFeatureGeneration;
 			}
 			@Override
 			public void setAllowUnstableFeatureGeneration(boolean newAllowUnstableFeatureGeneration)
@@ -349,7 +350,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 			@Override
 			public BlocksToAvoid getBlocksToAvoid()
 			{
-				return Config.Client.WorldGenerator.blocksToAvoid;
+				return OldConfig.Client.WorldGenerator.blocksToAvoid;
 			}
 			@Override
 			public void setBlockToAvoid(BlocksToAvoid newBlockToAvoid)
@@ -360,7 +361,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 			@Override
 			public boolean getEnableDistantGeneration()
 			{
-				return Config.Client.WorldGenerator.enableDistantGeneration;
+				return (boolean) ConfigGui.editSingleOption.getEntry("client.worldGenerator.enableDistantGeneration").value;
 			}
 			@Override
 			public void setEnableDistantGeneration(boolean newEnableDistantGeneration)
@@ -371,7 +372,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 			@Override
 			public LightGenerationMode getLightGenerationMode()
 			{
-				return Config.Client.WorldGenerator.lightGenerationMode;
+				return OldConfig.Client.WorldGenerator.lightGenerationMode;
 			}
 			@Override
 			public void setLightGenerationMode(LightGenerationMode newLightGenerationMode)
@@ -427,7 +428,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public int getNumberOfWorldGenerationThreads()
 				{
-					return Config.Client.Advanced.Threading.numberOfWorldGenerationThreads;
+					return OldConfig.Client.Advanced.Threading.numberOfWorldGenerationThreads;
 				}
 				@Override
 				public void setNumberOfWorldGenerationThreads(int newNumberOfWorldGenerationThreads)
@@ -440,7 +441,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public int getNumberOfBufferBuilderThreads()
 				{
-					return Config.Client.Advanced.Threading.numberOfBufferBuilderThreads;
+					return OldConfig.Client.Advanced.Threading.numberOfBufferBuilderThreads;
 				}
 				@Override
 				public void setNumberOfBufferBuilderThreads(int newNumberOfWorldBuilderThreads)
@@ -504,7 +505,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public GpuUploadMethod getGpuUploadMethod()
 				{
-					return Config.Client.Advanced.Buffers.gpuUploadMethod;
+					return OldConfig.Client.Advanced.Buffers.gpuUploadMethod;
 				}
 				@Override
 				public void setGpuUploadMethod(GpuUploadMethod newDisableVanillaFog)
@@ -517,7 +518,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public int getGpuUploadPerMegabyteInMilliseconds()
 				{
-					return Config.Client.Advanced.Buffers.gpuUploadPerMegabyteInMilliseconds;
+					return OldConfig.Client.Advanced.Buffers.gpuUploadPerMegabyteInMilliseconds;
 				}
 				@Override
 				public void setGpuUploadPerMegabyteInMilliseconds(int newMilliseconds) {
@@ -529,7 +530,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public BufferRebuildTimes getRebuildTimes()
 				{
-					return Config.Client.Advanced.Buffers.rebuildTimes;
+					return OldConfig.Client.Advanced.Buffers.rebuildTimes;
 				}
 				@Override
 				public void setRebuildTimes(BufferRebuildTimes newBufferRebuildTimes)

common/src/main/java/com/seibel/lod/common/wrappers/config/NewLodConfigWrapperSingleton.java

@@ -0,0 +1,505 @@
+package com.seibel.lod.common.wrappers.config;
+
+import com.seibel.lod.core.enums.config.*;
+import com.seibel.lod.core.enums.rendering.*;
+import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
+import com.seibel.lod.core.Config;
+
+/**
+ * This is temporary for testing the new config
+ *
+ * @author coolGi2007
+ * @version 02-13-2022
+ */
+public class NewLodConfigWrapperSingleton implements ILodConfigWrapperSingleton
+{
+    public static final NewLodConfigWrapperSingleton INSTANCE = new NewLodConfigWrapperSingleton();
+
+
+    private static final Client client = new Client();
+    @Override
+    public IClient client()
+    {
+        return client;
+    }
+
+    public static class Client implements IClient
+    {
+        public final IGraphics graphics;
+        public final IWorldGenerator worldGenerator;
+        public final IAdvanced advanced;
+
+
+        @Override
+        public IGraphics graphics()
+        {
+            return graphics;
+        }
+
+        @Override
+        public IWorldGenerator worldGenerator()
+        {
+            return worldGenerator;
+        }
+
+        @Override
+        public IAdvanced advanced()
+        {
+            return advanced;
+        }
+
+
+        @Override
+        public boolean getOptionsButton()
+        {
+            return Config.client.optionsButton.get();
+        }
+        @Override
+        public void setOptionsButton(boolean newOptionsButton)
+        {
+            Config.client.optionsButton.set(newOptionsButton);
+        }
+
+
+        //================//
+        // Client Configs //
+        //================//
+        public Client()
+        {
+            graphics = new Graphics();
+            worldGenerator = new WorldGenerator();
+            advanced = new Advanced();
+        }
+
+
+        //==================//
+        // Graphics Configs //
+        //==================//
+        public static class Graphics implements IGraphics
+        {
+            public final IQuality quality;
+            public final IFogQuality fogQuality;
+            public final IAdvancedGraphics advancedGraphics;
+
+
+
+            @Override
+            public IQuality quality()
+            {
+                return quality;
+            }
+
+            @Override
+            public IFogQuality fogQuality()
+            {
+                return fogQuality;
+            }
+
+            @Override
+            public IAdvancedGraphics advancedGraphics()
+            {
+                return advancedGraphics;
+            }
+
+
+            Graphics()
+            {
+                quality = new Quality();
+                fogQuality = new FogQuality();
+                advancedGraphics = new AdvancedGraphics();
+            }
+
+
+            public static class Quality implements IQuality
+            {
+                @Override
+                public HorizontalResolution getDrawResolution()
+                {
+                    return Config.Client.Graphics.Quality.drawResolution.get();
+                }
+                @Override
+                public void setDrawResolution(HorizontalResolution newHorizontalResolution)
+                {
+                    Config.Client.Graphics.Quality.drawResolution.set(newHorizontalResolution);
+                }
+
+
+                @Override
+                public int getLodChunkRenderDistance()
+                {
+                    return Config.Client.Graphics.Quality.lodChunkRenderDistance.get();
+                }
+                @Override
+                public void setLodChunkRenderDistance(int newLodChunkRenderDistance)
+                {
+                    Config.Client.Graphics.Quality.lodChunkRenderDistance.set(newLodChunkRenderDistance);
+                }
+
+
+                @Override
+                public VerticalQuality getVerticalQuality()
+                {
+                    return Config.Client.Graphics.Quality.verticalQuality.get();
+                }
+                @Override
+                public void setVerticalQuality(VerticalQuality newVerticalQuality)
+                {
+                    Config.Client.Graphics.Quality.verticalQuality.set(newVerticalQuality);
+                }
+
+
+                @Override
+                public int getHorizontalScale()
+                {
+                    return Config.Client.Graphics.Quality.horizontalScale.get();
+                }
+                @Override
+                public void setHorizontalScale(int newHorizontalScale)
+                {
+                    Config.Client.Graphics.Quality.horizontalScale.set(newHorizontalScale);
+                }
+
+
+                @Override
+                public HorizontalQuality getHorizontalQuality()
+                {
+                    return Config.Client.Graphics.Quality.horizontalQuality.get();
+                }
+                @Override
+                public void setHorizontalQuality(HorizontalQuality newHorizontalQuality)
+                {
+                    Config.Client.Graphics.Quality.horizontalQuality.set(newHorizontalQuality);
+                }
+
+                @Override
+                public DropoffQuality getDropoffQuality() {
+                    return Config.Client.Graphics.Quality.dropoffQuality.get();
+                }
+                @Override
+                public void setDropoffQuality(DropoffQuality newDropoffQuality) {
+                    Config.Client.Graphics.Quality.dropoffQuality.set(newDropoffQuality);
+                }
+            }
+
+
+            public static class FogQuality implements IFogQuality
+            {
+                @Override
+                public FogDistance getFogDistance()
+                {
+                    return Config.Client.Graphics.FogQuality.fogDistance.get();
+                }
+                @Override
+                public void setFogDistance(FogDistance newFogDistance)
+                {
+                    Config.Client.Graphics.FogQuality.fogDistance.set(newFogDistance);
+                }
+
+
+                @Override
+                public FogDrawMode getFogDrawMode()
+                {
+                    return Config.Client.Graphics.FogQuality.fogDrawMode.get();
+                }
+
+                @Override
+                public void setFogDrawMode(FogDrawMode setFogDrawMode)
+                {
+                    Config.Client.Graphics.FogQuality.fogDrawMode.set(setFogDrawMode);
+                }
+
+
+                @Override
+                public FogColorMode getFogColorMode()
+                {
+                    return Config.Client.Graphics.FogQuality.fogColorMode.get();
+                }
+
+                @Override
+                public void setFogColorMode(FogColorMode newFogColorMode)
+                {
+                    Config.Client.Graphics.FogQuality.fogColorMode.set(newFogColorMode);
+                }
+
+
+                @Override
+                public boolean getDisableVanillaFog()
+                {
+                    return Config.Client.Graphics.FogQuality.disableVanillaFog.get();
+                }
+                @Override
+                public void setDisableVanillaFog(boolean newDisableVanillaFog)
+                {
+                    Config.Client.Graphics.FogQuality.disableVanillaFog.set(newDisableVanillaFog);
+                }
+            }
+
+
+            public static class AdvancedGraphics implements IAdvancedGraphics
+            {
+                @Override
+                public boolean getDisableDirectionalCulling()
+                {
+                    return Config.Client.Graphics.AdvancedGraphics.disableDirectionalCulling.get();
+                }
+                @Override
+                public void setDisableDirectionalCulling(boolean newDisableDirectionalCulling)
+                {
+                    Config.Client.Graphics.AdvancedGraphics.disableDirectionalCulling.set(newDisableDirectionalCulling);
+                }
+
+
+                @Override
+                public VanillaOverdraw getVanillaOverdraw()
+                {
+                    return Config.Client.Graphics.AdvancedGraphics.vanillaOverdraw.get();
+                }
+                @Override
+                public void setVanillaOverdraw(VanillaOverdraw newVanillaOverdraw)
+                {
+                    Config.Client.Graphics.AdvancedGraphics.vanillaOverdraw.set(newVanillaOverdraw);
+                }
+
+
+                @Override
+                public boolean getUseExtendedNearClipPlane()
+                {
+                    return Config.Client.Graphics.AdvancedGraphics.useExtendedNearClipPlane.get();
+                }
+                @Override
+                public void setUseExtendedNearClipPlane(boolean newUseExtendedNearClipPlane)
+                {
+                    Config.Client.Graphics.AdvancedGraphics.useExtendedNearClipPlane.set(newUseExtendedNearClipPlane);
+                }
+            }
+        }
+
+
+
+
+        //========================//
+        // WorldGenerator Configs //
+        //========================//
+        public static class WorldGenerator implements IWorldGenerator
+        {
+            @Override
+            public GenerationPriority getGenerationPriority()
+            {
+                return Config.Client.WorldGenerator.generationPriority.get();
+            }
+            @Override
+            public void setGenerationPriority(GenerationPriority newGenerationPriority)
+            {
+                Config.Client.WorldGenerator.generationPriority.set(newGenerationPriority);
+            }
+
+
+            @Override
+            public DistanceGenerationMode getDistanceGenerationMode()
+            {
+                return Config.Client.WorldGenerator.distanceGenerationMode.get();
+            }
+            @Override
+            public void setDistanceGenerationMode(DistanceGenerationMode newDistanceGenerationMode)
+            {
+                Config.Client.WorldGenerator.distanceGenerationMode.set(newDistanceGenerationMode);
+            }
+
+			/*
+			@Override
+			public boolean getAllowUnstableFeatureGeneration()
+			{
+				return Config.Client.WorldGenerator.allowUnstableFeatureGeneration;
+			}
+			@Override
+			public void setAllowUnstableFeatureGeneration(boolean newAllowUnstableFeatureGeneration)
+			{
+				ConfigGui.editSingleOption.getEntry("client.worldGenerator.allowUnstableFeatureGeneration").value = newAllowUnstableFeatureGeneration;
+				ConfigGui.editSingleOption.saveOption("client.worldGenerator.allowUnstableFeatureGeneration");
+			}*/
+
+
+            @Override
+            public BlocksToAvoid getBlocksToAvoid()
+            {
+                return Config.Client.WorldGenerator.blocksToAvoid.get();
+            }
+            @Override
+            public void setBlockToAvoid(BlocksToAvoid newBlockToAvoid)
+            {
+                Config.Client.WorldGenerator.blocksToAvoid.set(newBlockToAvoid);
+            }
+            @Override
+            public boolean getEnableDistantGeneration()
+            {
+                return Config.Client.WorldGenerator.enableDistantGeneration.get();
+            }
+            @Override
+            public void setEnableDistantGeneration(boolean newEnableDistantGeneration)
+            {
+                Config.Client.WorldGenerator.enableDistantGeneration.set(newEnableDistantGeneration);
+            }
+            @Override
+            public LightGenerationMode getLightGenerationMode()
+            {
+                return Config.Client.WorldGenerator.lightGenerationMode.get();
+            }
+            @Override
+            public void setLightGenerationMode(LightGenerationMode newLightGenerationMode)
+            {
+                Config.Client.WorldGenerator.lightGenerationMode.set(newLightGenerationMode);
+            }
+        }
+
+
+
+
+        //============================//
+        // AdvancedModOptions Configs //
+        //============================//
+        public static class Advanced implements IAdvanced
+        {
+            public final IThreading threading;
+            public final IDebugging debugging;
+            public final IBuffers buffers;
+
+
+            @Override
+            public IThreading threading()
+            {
+                return threading;
+            }
+
+
+            @Override
+            public IDebugging debugging()
+            {
+                return debugging;
+            }
+
+
+            @Override
+            public IBuffers buffers()
+            {
+                return buffers;
+            }
+
+
+            public Advanced()
+            {
+                threading = new Threading();
+                debugging = new Debugging();
+                buffers = new Buffers();
+            }
+
+            public static class Threading implements IThreading
+            {
+                @Override
+                public int getNumberOfWorldGenerationThreads()
+                {
+                    return Config.Client.Advanced.Threading.numberOfWorldGenerationThreads.get();
+                }
+                @Override
+                public void setNumberOfWorldGenerationThreads(int newNumberOfWorldGenerationThreads)
+                {
+                    Config.Client.Advanced.Threading.numberOfWorldGenerationThreads.set(newNumberOfWorldGenerationThreads);
+                }
+
+
+                @Override
+                public int getNumberOfBufferBuilderThreads()
+                {
+                    return Config.Client.Advanced.Threading.numberOfBufferBuilderThreads.get();
+                }
+                @Override
+                public void setNumberOfBufferBuilderThreads(int newNumberOfWorldBuilderThreads)
+                {
+                    Config.Client.Advanced.Threading.numberOfBufferBuilderThreads.set(newNumberOfWorldBuilderThreads);
+                }
+            }
+
+
+
+
+            //===============//
+            // Debug Options //
+            //===============//
+            public static class Debugging implements IDebugging
+            {
+                @Override
+                public boolean getDrawLods()
+                {
+                    return Config.Client.Advanced.Debugging.drawLods.get();
+                }
+                @Override
+                public void setDrawLods(boolean newDrawLods)
+                {
+                    Config.Client.Advanced.Debugging.drawLods.set(newDrawLods);
+                }
+
+
+                @Override
+                public DebugMode getDebugMode()
+                {
+                    return Config.Client.Advanced.Debugging.debugMode.get();
+                }
+                @Override
+                public void setDebugMode(DebugMode newDebugMode)
+                {
+                    Config.Client.Advanced.Debugging.debugMode.set(newDebugMode);
+                }
+
+
+                @Override
+                public boolean getDebugKeybindingsEnabled()
+                {
+                    return Config.Client.Advanced.Debugging.enableDebugKeybindings.get();
+                }
+                @Override
+                public void setDebugKeybindingsEnabled(boolean newEnableDebugKeybindings)
+                {
+                    Config.Client.Advanced.Debugging.enableDebugKeybindings.set(newEnableDebugKeybindings);
+                }
+            }
+
+
+            public static class Buffers implements IBuffers
+            {
+
+                @Override
+                public GpuUploadMethod getGpuUploadMethod()
+                {
+                    return Config.Client.Advanced.Buffers.gpuUploadMethod.get();
+                }
+                @Override
+                public void setGpuUploadMethod(GpuUploadMethod newDisableVanillaFog)
+                {
+                    Config.Client.Advanced.Buffers.gpuUploadMethod.set(newDisableVanillaFog);
+                }
+
+
+                @Override
+                public int getGpuUploadPerMegabyteInMilliseconds()
+                {
+                    return Config.Client.Advanced.Buffers.gpuUploadPerMegabyteInMilliseconds.get();
+                }
+                @Override
+                public void setGpuUploadPerMegabyteInMilliseconds(int newMilliseconds) {
+                    Config.Client.Advanced.Buffers.gpuUploadPerMegabyteInMilliseconds.set(newMilliseconds);
+                }
+
+
+                @Override
+                public BufferRebuildTimes getRebuildTimes()
+                {
+                    return Config.Client.Advanced.Buffers.rebuildTimes.get();
+                }
+                @Override
+                public void setRebuildTimes(BufferRebuildTimes newBufferRebuildTimes)
+                {
+                    Config.Client.Advanced.Buffers.rebuildTimes.set(newBufferRebuildTimes);
+                }
+            }
+        }
+    }
+}

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

@@ -2,28 +2,29 @@ package com.seibel.lod.common.wrappers.minecraft;
 
 import java.awt.*;
 import java.util.HashSet;
+import java.util.LinkedHashSet;
 import java.util.stream.Collectors;
 
 import com.mojang.blaze3d.platform.NativeImage;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.seibel.lod.common.wrappers.misc.LightMapWrapper;
+import com.seibel.lod.core.api.ClientApi;
 import com.seibel.lod.core.api.ModAccessorApi;
 import com.seibel.lod.core.util.LodUtil;
-
 import com.seibel.lod.core.util.SingletonHandler;
-import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory;
-import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftWrapper;
-import com.seibel.lod.core.wrapperInterfaces.modAccessor.IOptifineAccessor;
-import it.unimi.dsi.fastutil.objects.ObjectArrayList;
+
 import net.minecraft.client.renderer.LightTexture;
 
 import com.mojang.math.Vector3f;
 import com.seibel.lod.core.objects.math.Mat4f;
 import com.seibel.lod.core.objects.math.Vec3d;
 import com.seibel.lod.core.objects.math.Vec3f;
+import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory;
 import com.seibel.lod.core.wrapperInterfaces.block.AbstractBlockPosWrapper;
 import com.seibel.lod.core.wrapperInterfaces.chunk.AbstractChunkPosWrapper;
 import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
+import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftWrapper;
+import com.seibel.lod.core.wrapperInterfaces.modAccessor.IOptifineAccessor;
 import com.seibel.lod.core.wrapperInterfaces.modAccessor.ISodiumAccessor;
 import com.seibel.lod.common.wrappers.McObjectConverter;
 import com.seibel.lod.common.wrappers.WrapperFactory;
@@ -103,7 +104,7 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 
     @Override
     public Color getFogColor(float partialTicks) {
-        FogRenderer.setupColor(GAME_RENDERER.getMainCamera(), partialTicks, MC.level, 1, GAME_RENDERER.getDarkenWorldAmount(partialTicks));
+    	FogRenderer.setupColor(GAME_RENDERER.getMainCamera(), partialTicks, MC.level, 1, GAME_RENDERER.getDarkenWorldAmount(partialTicks));
         float[] colorValues = RenderSystem.getShaderFogColor();
         return new Color(colorValues[0], colorValues[1], colorValues[2], colorValues[3]);
     }
@@ -148,58 +149,73 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
      * <p>
      */
 
+    public boolean usingBackupGetVanillaRenderedChunks = false;
+	@Override
+	public HashSet<AbstractChunkPosWrapper> getVanillaRenderedChunks()
+	{
+		ISodiumAccessor sodium = ModAccessorApi.get(ISodiumAccessor.class);
+		if (sodium != null)
+		{
+			return sodium.getNormalRenderedChunks();
+		}
+		IOptifineAccessor optifine = ModAccessorApi.get(IOptifineAccessor.class);
+		if (optifine != null)
+		{
+			HashSet<AbstractChunkPosWrapper> pos = optifine.getNormalRenderedChunks();
+			if (pos == null)
+				pos = getMaximumRenderedChunks();
+			return pos;
+		}
+		if (!usingBackupGetVanillaRenderedChunks) {
+			try {
+			LevelRenderer levelRenderer = MC.levelRenderer;
+			LinkedHashSet<LevelRenderer.RenderChunkInfo> chunks = levelRenderer.renderChunkStorage.get().renderChunks;
+			return (chunks.stream().map((chunk) -> {
+				AABB chunkBoundingBox = chunk.chunk.bb;
+				return FACTORY.createChunkPos(Math.floorDiv((int) chunkBoundingBox.minX, 16),
+						Math.floorDiv((int) chunkBoundingBox.minZ, 16));
+			}).collect(Collectors.toCollection(HashSet::new)));
+			} catch (LinkageError e) {
+				try {
+					MinecraftWrapper.INSTANCE.sendChatMessage(
+							"\u00A7e\u00A7l\u00A7uWARNING: Distant Horizons: getVanillaRenderedChunks method failed."
+							+ " Using Backup Method.");
+					MinecraftWrapper.INSTANCE.sendChatMessage(
+							"\u00A7eOverdraw prevention will be worse than normal.");
+				} catch (Exception e2) {}
+				ClientApi.LOGGER.error("getVanillaRenderedChunks Error: {}", e);
+				usingBackupGetVanillaRenderedChunks = true;
+			}
+		}
+		return getMaximumRenderedChunks();
+	}
+    
     @Override
-    public HashSet<AbstractChunkPosWrapper> getVanillaRenderedChunks()
-    {
-        ISodiumAccessor sodium = ModAccessorApi.get(ISodiumAccessor.class);
-        if (sodium != null)
-        {
-            return sodium.getNormalRenderedChunks();
-        }
-        IOptifineAccessor optifine = ModAccessorApi.get(IOptifineAccessor.class);
-        if (optifine != null)
-        {
-            HashSet<AbstractChunkPosWrapper> pos = optifine.getNormalRenderedChunks();
-            if (pos==null)
-                pos = getMaximumRenderedChunks();
-            return pos;
-        }
-
-        LevelRenderer levelRenderer = MC.levelRenderer;
-        ObjectArrayList<LevelRenderer.RenderChunkInfo> chunks = levelRenderer.renderChunks;
-        return (chunks.stream().map((chunk) -> {
-            AABB chunkBoundingBox = chunk.chunk.bb;
-            return FACTORY.createChunkPos(Math.floorDiv((int) chunkBoundingBox.minX, 16),
-                    Math.floorDiv((int) chunkBoundingBox.minZ, 16));
-        }).collect(Collectors.toCollection(HashSet::new)));
-    }
-
-    @Override
-    public HashSet<AbstractChunkPosWrapper> getMaximumRenderedChunks()
-    {
-        //TODO: Make this a circle
-        IMinecraftWrapper mcWrapper = SingletonHandler.get(IMinecraftWrapper.class);
-        IWrapperFactory factory = SingletonHandler.get(IWrapperFactory.class);
-
-        int chunkRenderDist = this.getRenderDistance();
-
-        AbstractChunkPosWrapper centerChunkPos = mcWrapper.getPlayerChunkPos();
-        int startChunkX = centerChunkPos.getX() - chunkRenderDist;
-        int startChunkZ = centerChunkPos.getZ() - chunkRenderDist;
-
-        // add every position within render distance
-        HashSet<AbstractChunkPosWrapper> renderedPos = new HashSet<AbstractChunkPosWrapper>();
-        for (int chunkX = 0; chunkX < (chunkRenderDist * 2+1); chunkX++)
-        {
-            for(int chunkZ = 0; chunkZ < (chunkRenderDist * 2+1); chunkZ++)
-            {
-                renderedPos.add(factory.createChunkPos(startChunkX + chunkX, startChunkZ + chunkZ));
-            }
-        }
-
-        return renderedPos;
-    }
-
+	public HashSet<AbstractChunkPosWrapper> getMaximumRenderedChunks()
+	{
+    	//TODO: Make this a circle
+		IMinecraftWrapper mcWrapper = SingletonHandler.get(IMinecraftWrapper.class);
+		IWrapperFactory factory = SingletonHandler.get(IWrapperFactory.class);
+		
+		int chunkRenderDist = this.getRenderDistance();
+		
+		AbstractChunkPosWrapper centerChunkPos = mcWrapper.getPlayerChunkPos();
+		int startChunkX = centerChunkPos.getX() - chunkRenderDist;
+		int startChunkZ = centerChunkPos.getZ() - chunkRenderDist;
+		
+		// add every position within render distance
+		HashSet<AbstractChunkPosWrapper> renderedPos = new HashSet<AbstractChunkPosWrapper>();
+		for (int chunkX = 0; chunkX < (chunkRenderDist * 2+1); chunkX++)
+		{
+			for(int chunkZ = 0; chunkZ < (chunkRenderDist * 2+1); chunkZ++)
+			{
+				renderedPos.add(factory.createChunkPos(startChunkX + chunkX, startChunkZ + chunkZ));
+			}
+		}
+		
+		return renderedPos;	
+	}
+	
 
 
     @Override
@@ -219,7 +235,7 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
         {
             for (int v = 0; v < lightMapWidth; v++)
             {
-                // this could probably be kept as an int, but
+                // this could probably be kept as a int, but
                 // it is easier to test and see the colors when debugging this way.
                 // When creating a new release this should be changed to the int version.
                 Color c = LodUtil.intToColor(lightMap.getLightValue(u, v));
@@ -235,9 +251,9 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 
                 int col =
                         ((c.getRed() & 0xFF) << 16) | // blue
-                                ((c.getGreen() & 0xFF) << 8) | // green
-                                ((c.getBlue() & 0xFF)) | // red
-                                ((c.getAlpha() & 0xFF) << 24); // alpha
+                        ((c.getGreen() & 0xFF) << 8) | // green
+                        ((c.getBlue() & 0xFF)) | // red
+                        ((c.getAlpha() & 0xFF) << 24); // alpha
 
                 // 2D array stored in a 1D array.
                 // Thank you Tim from College ;)
@@ -300,7 +316,7 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 
         return glFormat;
     }
-
+    
     @Override
     public boolean isFogStateSpecial() {
 	    Entity entity = GAME_RENDERER.getMainCamera().getEntity();
@@ -310,6 +326,6 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 
 	@Override
 	public boolean tryDisableVanillaFog() {
-		return true; // Handled via MixinFogRenderer in both Fabric and Forge
+		return true; // Handled via MixinFogRenderer in both forge and fabric
 	}
 }

common/src/main/java/com/seibel/lod/common/wrappers/world/BiomeWrapper.java

@@ -36,7 +36,7 @@ public class BiomeWrapper implements IBiomeWrapper
 {
 
     public static final ConcurrentMap<Biome, BiomeWrapper> biomeWrapperMap = new ConcurrentHashMap<>();
-    private Biome biome;
+    private final Biome biome;
 
     public BiomeWrapper(Biome biome)
     {
@@ -119,12 +119,12 @@ public class BiomeWrapper implements IBiomeWrapper
 
         return colorInt;
     }
-
-    @Override
-    public String getName() {
+    
+    @Override public String getName()
+    {
         return biome.toString();
     }
-
+    
     @Override
     public int getGrassTint(int x, int z)
     {

common/src/main/java/com/seibel/lod/common/wrappers/world/DimensionTypeWrapper.java

@@ -34,7 +34,7 @@ import net.minecraft.world.level.dimension.DimensionType;
 public class DimensionTypeWrapper implements IDimensionTypeWrapper
 {
     private static final ConcurrentMap<DimensionType, DimensionTypeWrapper> dimensionTypeWrapperMap = new ConcurrentHashMap<>();
-    private DimensionType dimensionType;
+    private final DimensionType dimensionType;
 
     public DimensionTypeWrapper(DimensionType dimensionType)
     {

common/src/main/java/com/seibel/lod/common/wrappers/world/WorldWrapper.java

@@ -145,7 +145,7 @@ public class WorldWrapper implements IWorldWrapper
     {
         return (short) world.getMinBuildHeight();
     }
-
+    
     /** @throws UnsupportedOperationException if the WorldWrapper isn't for a ServerWorld */
     @Override
     public File getSaveFolder() throws UnsupportedOperationException
@@ -173,12 +173,12 @@ public class WorldWrapper implements IWorldWrapper
         // TODO this is depreciated, what should we use instead?
         return world.getSeaLevel();
     }
-
+    
     @Override
-    public IChunkWrapper tryGetChunk(AbstractChunkPosWrapper pos) {
-        ChunkAccess chunk = world.getChunk(pos.getX(), pos.getZ(), ChunkStatus.EMPTY, false);
-        if (chunk == null) return null;
-        return new ChunkWrapper(chunk, world);
+	public IChunkWrapper tryGetChunk(AbstractChunkPosWrapper pos) {
+    	ChunkAccess chunk = world.getChunk(pos.getX(), pos.getZ(), ChunkStatus.EMPTY, false);
+    	if (chunk == null) return null;
+    	return new ChunkWrapper(chunk, world);
     }
 
 

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

@@ -29,17 +29,19 @@ import com.seibel.lod.core.util.GridList;
 import com.seibel.lod.core.util.LodThreadFactory;
 import com.seibel.lod.core.util.SingletonHandler;
 import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
+import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftWrapper;
 import com.seibel.lod.core.wrapperInterfaces.world.IWorldWrapper;
 import com.seibel.lod.core.wrapperInterfaces.worldGeneration.AbstractBatchGenerationEnvionmentWrapper;
 
-import java.io.IOException;
 import java.time.Duration;
 import java.util.Iterator;
 import java.util.LinkedList;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
+import com.seibel.lod.common.wrappers.DependencySetupDoneCheck;
 import com.seibel.lod.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.lod.common.wrappers.world.WorldWrapper;
 import com.seibel.lod.common.wrappers.worldGeneration.mimicObject.ChunkLoader;
@@ -57,10 +59,15 @@ import com.seibel.lod.common.wrappers.worldGeneration.step.StepSurface;
 import net.minecraft.server.level.ServerLevel;
 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.ChunkStatus;
 import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.world.level.chunk.ProtoChunk;
 import net.minecraft.world.level.chunk.UpgradeData;
+import net.minecraft.world.level.levelgen.DebugLevelSource;
+import net.minecraft.world.level.levelgen.FlatLevelSource;
+import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator;
+import net.minecraft.core.Registry;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.lighting.LevelLightEngine;
 
@@ -203,7 +210,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 		}
 	}
 	
-	public static final int TIMEOUT_SECONDS = 30;
+	public static final int TIMEOUT_SECONDS = 60;
 	
 	//=================Generation Step===================
 	
@@ -216,12 +223,39 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 	public final StepSurface stepSurface = new StepSurface(this);
 	public final StepFeatures stepFeatures = new StepFeatures(this);
 	public final StepLight stepLight = new StepLight(this);
+	public boolean unsafeThreadingRecorded = false;
+	//public boolean safeMode = false;
 	private static final ILodConfigWrapperSingleton CONFIG = SingletonHandler.get(ILodConfigWrapperSingleton.class);
+	private static final IMinecraftWrapper MC = SingletonHandler.get(IMinecraftWrapper.class);
+	public static final long EXCEPTION_TIMER_RESET_TIME = TimeUnit.NANOSECONDS.convert(1, TimeUnit.SECONDS);
+	public static final int EXCEPTION_COUNTER_TRIGGER = 20;
+	public int unknownExceptionCount = 0;
+	public long lastExceptionTriggerTime = 0;
 	
 	public static final LodThreadFactory threadFactory = new LodThreadFactory("Gen-Worker-Thread", Thread.MIN_PRIORITY);
 	
+	public static ThreadLocal<Boolean> isDistantGeneratorThread = new ThreadLocal<Boolean>();
+	
+	public static boolean isCurrentThreadDistantGeneratorThread() {
+		return (isDistantGeneratorThread.get() != null);
+	}
+	
+	static {
+		DependencySetupDoneCheck.getIsCurrentThreadDistantGeneratorThread = BatchGenerationEnvironment::isCurrentThreadDistantGeneratorThread;
+	}
+	
 	public ExecutorService executors = Executors.newFixedThreadPool(
 			CONFIG.client().advanced().threading().getNumberOfWorldGenerationThreads(), threadFactory);
+
+	public <T> T joinSync(CompletableFuture<T> f) {
+		if (!unsafeThreadingRecorded && !f.isDone()) {
+			MC.sendChatMessage("\u00A74\u00A7l\u00A7uERROR: Distant Horizons: Unsafe Threading in Chunk Generator Detected!");
+			MC.sendChatMessage("\u00A7eTo increase stability, it is recommended to set world generation threads count to 1.");
+			ClientApi.LOGGER.error("Unsafe Threading in Chunk Generator: ", new RuntimeException("Concurrent future"));
+			unsafeThreadingRecorded = true;
+		}
+		return f.join();
+	}
 	
 	public void resizeThreadPool(int newThreadCount)
 	{
@@ -247,6 +281,12 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 	
 	public void updateAllFutures()
 	{
+		if (unknownExceptionCount > 0) {
+			if (System.nanoTime() - lastExceptionTriggerTime >= EXCEPTION_TIMER_RESET_TIME) {
+				unknownExceptionCount = 0;
+			}
+		}
+		
 		// Update all current out standing jobs
 		Iterator<GenerationEvent> iter = events.iterator();
 		while (iter.hasNext())
@@ -260,12 +300,10 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 				}
 				catch (Throwable e)
 				{
-					e.printStackTrace();
-					while (e.getCause() != null)
-					{
-						e = e.getCause();
-						e.printStackTrace();
-					}
+					ClientApi.LOGGER.error("Batching World Generator: Event {} gotten an exception", event);
+					ClientApi.LOGGER.error("Exception: ", e);
+					unknownExceptionCount++;
+					lastExceptionTriggerTime = System.nanoTime();
 				}
 				finally
 				{
@@ -287,22 +325,31 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 				}
 			}
 		}
+		if (unknownExceptionCount > EXCEPTION_COUNTER_TRIGGER) {
+			try {
+				MC.sendChatMessage("\u00A74\u00A7l\u00A7uERROR: Distant Horizons: Too many exceptions in Batching World Generator! Disabling the generator.");
+			} catch (Exception e) {}
+			ClientApi.LOGGER.error("Too many exceptions in Batching World Generator! Now disabling.");
+			unknownExceptionCount = 0;
+			CONFIG.client().worldGenerator().setEnableDistantGeneration(false);
+		}
 	}
 	
 	public BatchGenerationEnvironment(IWorldWrapper serverlevel, LodBuilder lodBuilder, LodDimension lodDim)
 	{
 		super(serverlevel, lodBuilder, lodDim);
 		ClientApi.LOGGER.info("================WORLD_GEN_STEP_INITING=============");
+		ChunkGenerator generator =  ((WorldWrapper) serverlevel).getServerWorld().getChunkSource().getGenerator();
+		if (!(generator instanceof NoiseBasedChunkGenerator ||
+				generator instanceof DebugLevelSource ||
+				generator instanceof FlatLevelSource)) {
+			MC.sendChatMessage("\u00A74\u00A7l\u00A7uWARNING: Distant Horizons: Unknown Chunk Generator Detected! Distant Generation May Fail!");
+			MC.sendChatMessage("\u00A7eIf it does crash, set Distant Generation to OFF or Generation Mode to None.");
+			ClientApi.LOGGER.warn("Unknown Chunk Generator detected: {}", generator.getClass());
+		}
 		params = new GlobalParameters((ServerLevel) ((WorldWrapper) serverlevel).getWorld(), lodBuilder, lodDim);
 	}
 	
-	public void startLoadingAllRegionsFromFile(LodDimension lodDim)
-	{
-		ServerLevel level = params.level;
-		level.getChunkSource();
-		
-	}
-	
 	@SuppressWarnings("resource")
 	public static ChunkAccess loadOrMakeChunk(ChunkPos chunkPos, ServerLevel level, LevelLightEngine lightEngine)
 	{
@@ -311,23 +358,26 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 		{
 			chunkData = level.getChunkSource().chunkMap.readChunk(chunkPos);
 		}
-		catch (IOException e)
+		catch (Exception e)
 		{
 			ClientApi.LOGGER.error("DistantHorizons: Couldn't load chunk {}", chunkPos, e);
 		}
 		if (chunkData == null)
 		{
-			return new ProtoChunk(chunkPos, UpgradeData.EMPTY, level);
+			return new ProtoChunk(chunkPos, UpgradeData.EMPTY, level, level.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY), null);
 		}
 		else
 		{
+			try {
 			return ChunkLoader.read(level, lightEngine, chunkPos, chunkData);
+			} catch (Exception e) {
+				ClientApi.LOGGER.error("DistantHorizons: Couldn't load chunk {}", chunkPos, e);
+				return new ProtoChunk(chunkPos, UpgradeData.EMPTY, level, level.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY), null);
+			}
 		}
 		
 	}
 	
-	
-	
 	public void generateLodFromList(GenerationEvent e)
 	{
 		if (ENABLE_EVENT_LOGGING)
@@ -361,10 +411,10 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 				catch (RuntimeException e2)
 				{
 					// Continue...
-					e2.printStackTrace();
 				}
 				if (target == null)
-					target = new ProtoChunk(chunkPos, UpgradeData.EMPTY, params.level);
+					target = new ProtoChunk(chunkPos, UpgradeData.EMPTY, params.level,
+							params.biomes, null);
 				return target;
 			};
 			
@@ -423,26 +473,35 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 			{
 				int targetIndex = referencedChunks.offsetOf(centreIndex, ox, oy);
 				ChunkAccess target = referencedChunks.get(targetIndex);
-				target.setLightCorrect(true);
-				//if (target instanceof LevelChunk)
-				//	((LevelChunk) target).setClientLightReady(true);
+				ChunkWrapper wrappedChunk = new ChunkWrapper(target, region);
+				if (!wrappedChunk.isLightCorrect()) {
+					throw new RuntimeException("The generated chunk somehow has isLightCorrect() returning false");
+				}
+				
 				boolean isFull = target.getStatus() == ChunkStatus.FULL || target instanceof LevelChunk;
-				//boolean isPartial = target.isOldNoiseGeneration();
+				boolean isPartial = target.isOldNoiseGeneration();
 				if (isFull)
 				{
 					if (ENABLE_LOAD_EVENT_LOGGING)
 						ClientApi.LOGGER.info("Detected full existing chunk at {}", target.getPos());
-					params.lodBuilder.generateLodNodeFromChunk(params.lodDim, new ChunkWrapper(target, region),
+					params.lodBuilder.generateLodNodeFromChunk(params.lodDim, wrappedChunk,
 							new LodBuilderConfig(DistanceGenerationMode.FULL), true, e.genAllDetails);
 				}
+				else if (isPartial)
+				{
+					if (ENABLE_LOAD_EVENT_LOGGING)
+						ClientApi.LOGGER.info("Detected old existing chunk at {}", target.getPos());
+					params.lodBuilder.generateLodNodeFromChunk(params.lodDim, wrappedChunk,
+							new LodBuilderConfig(generationMode), true, e.genAllDetails);
+				}
 				else if (target.getStatus() == ChunkStatus.EMPTY && generationMode == DistanceGenerationMode.NONE)
 				{
-					params.lodBuilder.generateLodNodeFromChunk(params.lodDim, new ChunkWrapper(target, region),
+					params.lodBuilder.generateLodNodeFromChunk(params.lodDim,wrappedChunk,
 							LodBuilderConfig.getFillVoidConfig(), true, e.genAllDetails);
 				}
 				else
 				{
-					params.lodBuilder.generateLodNodeFromChunk(params.lodDim, new ChunkWrapper(target, region),
+					params.lodBuilder.generateLodNodeFromChunk(params.lodDim, wrappedChunk,
 							new LodBuilderConfig(generationMode), true, e.genAllDetails);
 				}
 				if (e.lightMode == LightGenerationMode.FANCY || isFull)
@@ -520,6 +579,10 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 				{
 					if (p instanceof ProtoChunk)
 						((ProtoChunk) p).setLightCorrect(true);
+					if (p instanceof LevelChunk) {
+						((LevelChunk) p).setLightCorrect(true);
+						((LevelChunk) p).setClientLightReady(true);
+					}
 				});
 				break;
 			}

common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/GenerationEvent.java

@@ -46,7 +46,12 @@ public final class GenerationEvent
 		
 		future = generationGroup.executors.submit(() ->
 		{
-			generationGroup.generateLodFromList(this);
+			BatchGenerationEnvironment.isDistantGeneratorThread.set(true);
+			try {
+				generationGroup.generateLodFromList(this);
+			} finally {
+				BatchGenerationEnvironment.isDistantGeneratorThread.remove();
+			}
 		});
 	}
 	
@@ -78,7 +83,7 @@ public final class GenerationEvent
 		}
 		catch (InterruptedException | ExecutionException e)
 		{
-			e.printStackTrace();
+			throw new RuntimeException(e.getCause()==null? e : e.getCause());
 		}
 	}
 	

common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/GlobalParameters.java

@@ -4,6 +4,8 @@ package com.seibel.lod.common.wrappers.worldGeneration;
 import com.mojang.datafixers.DataFixer;
 import com.seibel.lod.core.builders.lodBuilding.LodBuilder;
 import com.seibel.lod.core.objects.lod.LodDimension;
+import com.seibel.lod.core.util.SingletonHandler;
+import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftWrapper;
 
 import net.minecraft.core.Registry;
 import net.minecraft.core.RegistryAccess;
@@ -11,7 +13,12 @@ import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.ThreadedLevelLightEngine;
 import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.biome.BiomeManager;
 import net.minecraft.world.level.chunk.ChunkGenerator;
+import net.minecraft.world.level.chunk.storage.ChunkScanAccess;
+import net.minecraft.world.level.levelgen.DebugLevelSource;
+import net.minecraft.world.level.levelgen.FlatLevelSource;
+import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator;
 import net.minecraft.world.level.levelgen.WorldGenSettings;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
 import net.minecraft.world.level.storage.WorldData;
@@ -20,7 +27,7 @@ public final class GlobalParameters
 {
 	public final ChunkGenerator generator;
 	public final StructureManager structures;
-	//public final BiomeManager biomeManager;
+	public final BiomeManager biomeManager;
 	public final WorldGenSettings worldGenSettings;
 	public final ThreadedLevelLightEngine lightEngine;
 	public final LodBuilder lodBuilder;
@@ -28,6 +35,7 @@ public final class GlobalParameters
 	public final Registry<Biome> biomes;
 	public final RegistryAccess registry;
 	public final long worldSeed;
+	public final ChunkScanAccess chunkScanner;
 	public final ServerLevel level; // TODO: Figure out a way to remove this. Maybe ClientLevel also works?
 	public final DataFixer fixerUpper;
 	
@@ -43,9 +51,10 @@ public final class GlobalParameters
 		registry = server.registryAccess();
 		biomes = registry.registryOrThrow(Registry.BIOME_REGISTRY);
 		worldSeed = worldGenSettings.seed();
-		//biomeManager = new BiomeManager(level, BiomeManager.obfuscateSeed(worldSeed));
+		biomeManager = new BiomeManager(level, BiomeManager.obfuscateSeed(worldSeed));
 		structures = server.getStructureManager();
 		generator = level.getChunkSource().getGenerator();
+		chunkScanner = level.getChunkSource().chunkScanner();
 		fixerUpper = server.getFixerUpper();
 	}
 }

common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/ThreadedParameters.java

@@ -6,13 +6,14 @@ import com.seibel.lod.common.wrappers.worldGeneration.mimicObject.WorldGenStruct
 
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.WorldGenLevel;
-import net.minecraft.world.level.levelgen.WorldGenSettings;
+import net.minecraft.world.level.levelgen.structure.StructureCheck;
 
 public final class ThreadedParameters
 {
 	private static final ThreadLocal<ThreadedParameters> localParam = new ThreadLocal<ThreadedParameters>();
 	final ServerLevel level;
 	public final WorldGenStructFeatManager structFeat;
+	public final StructureCheck structCheck;
 	boolean isValid = true;
 	public final PerfCalculator perf = new PerfCalculator();
 	
@@ -34,7 +35,10 @@ public final class ThreadedParameters
 	private ThreadedParameters(GlobalParameters param)
 	{
 		level = param.level;
-		structFeat = new WorldGenStructFeatManager(level, param.worldGenSettings, null);
+		structCheck = new StructureCheck(param.chunkScanner, param.registry, param.structures,
+				param.level.dimension(), param.generator, level, param.generator.getBiomeSource(), param.worldSeed,
+				param.fixerUpper);
+		structFeat = new WorldGenStructFeatManager(level, param.worldGenSettings, null, structCheck);
 	}
 	
 	public void makeStructFeat(WorldGenLevel genLevel)

common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/WorldGeneratorWrapper.java

@@ -1,19 +1,29 @@
+
 package com.seibel.lod.common.wrappers.worldGeneration;
 
 import com.seibel.lod.core.builders.lodBuilding.LodBuilder;
 import com.seibel.lod.core.builders.lodBuilding.LodBuilderConfig;
 import com.seibel.lod.core.enums.config.DistanceGenerationMode;
 import com.seibel.lod.core.objects.lod.LodDimension;
-//import com.seibel.lod.core.util.SingletonHandler;
 import com.seibel.lod.core.wrapperInterfaces.chunk.AbstractChunkPosWrapper;
-//import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
 import com.seibel.lod.core.wrapperInterfaces.world.IWorldWrapper;
 import com.seibel.lod.core.wrapperInterfaces.worldGeneration.AbstractWorldGeneratorWrapper;
+
 import com.seibel.lod.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.lod.common.wrappers.world.WorldWrapper;
 
-import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.chunk.*;
+/*     */
+/*     */ import net.minecraft.server.level.ServerLevel;
+/*     */
+/*     */
+/*     */
+/*     */
+/*     */
+/*     */
+/*     */
+/*     */
+/*     */
 
 /**
  * @author James Seibel
@@ -21,132 +31,123 @@ import net.minecraft.world.level.chunk.*;
  */
 public class WorldGeneratorWrapper extends AbstractWorldGeneratorWrapper
 {
-    public final ServerLevel serverWorld;
-    public final LodDimension lodDim;
-    public final LodBuilder lodBuilder;
-
-    public WorldGeneratorWrapper(LodBuilder newLodBuilder, LodDimension newLodDimension, IWorldWrapper worldWrapper)
-    {
-        super(newLodBuilder, newLodDimension, worldWrapper);
-
-        lodBuilder = newLodBuilder;
-        lodDim = newLodDimension;
-        serverWorld = ((WorldWrapper) worldWrapper).getServerWorld();
-    }
-
-
-    /** takes about 2-5 ms */
-    @Override
-    public void generateBiomesOnly(AbstractChunkPosWrapper pos, DistanceGenerationMode generationMode)
-    {
-        generate(pos.getX(), pos.getZ(), generationMode);
-    }
-
-
-    /** takes about 10 - 20 ms */
-    @Override
-    public void generateSurface(AbstractChunkPosWrapper pos)
-    {
-        generate(pos.getX(), pos.getZ(), DistanceGenerationMode.SURFACE);
-    }
-
-
-    /**
-     * takes about 15 - 20 ms
-     * <p>
-     */
-    @Override
-    public void generateFeatures(AbstractChunkPosWrapper pos)
-    {
-        generate(pos.getX(), pos.getZ(), DistanceGenerationMode.FEATURES);
-    }
-
-
-    /**
-     * Generates using MC's ServerWorld.
-     * <p>
-     * on pre generated chunks 0 - 1 ms <br>
-     * on un generated chunks 0 - 50 ms <br>
-     * with the median seeming to hover around 15 - 30 ms <br>
-     * and outliers in the 100 - 200 ms range <br>
-     * <p>
-     * Note this should not be multithreaded and does cause server/simulation lag
-     * (Higher lag for generating than loading)
-     */
-    @Override
-    public void generateFull(AbstractChunkPosWrapper pos)
-    {
-        generate(pos.getX(), pos.getZ(), DistanceGenerationMode.FULL);
-    }
-
-    private void generate(int chunkX, int chunkZ, DistanceGenerationMode generationMode) {
-
-//        long t = System.nanoTime();
-
-        ChunkStatus targetStatus;
-        switch (generationMode) {
+	public final ServerLevel serverWorld;
+	public final LodDimension lodDim;
+	public final LodBuilder lodBuilder;
+	
+	public WorldGeneratorWrapper(LodBuilder newLodBuilder, LodDimension newLodDimension, IWorldWrapper worldWrapper)
+	{
+		super(newLodBuilder, newLodDimension, worldWrapper);
+		
+		lodBuilder = newLodBuilder;
+		lodDim = newLodDimension;
+		serverWorld = ((WorldWrapper) worldWrapper).getServerWorld();
+	}
+	
+	/** takes about 2-5 ms */
+	@Override
+	public void generateBiomesOnly(AbstractChunkPosWrapper pos, DistanceGenerationMode generationMode)
+	{
+		generate(pos.getX(), pos.getZ(), generationMode);
+	}
+	
+	/** takes about 10 - 20 ms */
+	@Override
+	public void generateSurface(AbstractChunkPosWrapper pos)
+	{
+		generate(pos.getX(), pos.getZ(), DistanceGenerationMode.SURFACE);
+	}
+	
+	/**
+	 * takes about 15 - 20 ms
+	 */
+	@Override
+	public void generateFeatures(AbstractChunkPosWrapper pos)
+	{
+		generate(pos.getX(), pos.getZ(), DistanceGenerationMode.FEATURES);
+	}
+	
+	/**
+	 * Generates using MC's ServerWorld.
+	 * <p>
+	 * on pre generated chunks 0 - 1 ms <br>
+	 * on un generated chunks 0 - 50 ms <br>
+	 * with the median seeming to hover around 15 - 30 ms <br>
+	 * and outliers in the 100 - 200 ms range <br>
+	 * <p>
+	 * Note this should not be multithreaded and does cause server/simulation lag
+	 * (Higher lag for generating than loading)
+	 */
+	@Override
+	public void generateFull(AbstractChunkPosWrapper pos)
+	{
+		generate(pos.getX(), pos.getZ(), DistanceGenerationMode.FULL);
+	}
+	
+	private void generate(int chunkX, int chunkZ, DistanceGenerationMode generationMode)
+	{
+		
+		// long t = System.nanoTime();
+		
+		ChunkStatus targetStatus;
+		switch (generationMode)
+		{
 		case BIOME_ONLY:
-                targetStatus = ChunkStatus.BIOMES;
-                break;
-            case BIOME_ONLY_SIMULATE_HEIGHT:
-                targetStatus = ChunkStatus.NOISE;
-                break;
-            case SURFACE:
-                targetStatus = ChunkStatus.SURFACE;
-                break;
-            case FEATURES:
-                targetStatus = ChunkStatus.FEATURES;
-                break;
-            case FULL:
-                targetStatus = ChunkStatus.FULL;
-                break;
+			targetStatus = ChunkStatus.BIOMES;
+			break;
+		case BIOME_ONLY_SIMULATE_HEIGHT:
+			targetStatus = ChunkStatus.NOISE;
+			break;
+		case SURFACE:
+			targetStatus = ChunkStatus.SURFACE;
+			break;
+		case FEATURES:
+			targetStatus = ChunkStatus.FEATURES;
+			break;
+		case FULL:
+			targetStatus = ChunkStatus.FULL;
+			break;
 		case NONE:
 		default:
-                return;
-        }
-
-        // The bool=true means that we want to generate chunk, and that the returned ChunkAccess must not be null
-
-        ChunkAccess ca = serverWorld.getChunkSource().getChunk(chunkX, chunkZ, targetStatus, true);
-        if (ca == null) throw new RuntimeException("This should NEVER be null due to bool being true");
-        lodBuilder.generateLodNodeFromChunk(lodDim, new ChunkWrapper(ca, serverWorld), new LodBuilderConfig(generationMode), false, true);
-
-        // long duration = System.nanoTime()-t;
-
-        // Debug print the duration
-        // System.out.println("LodChunkGenFull["+chunkX+","+chunkZ+"]: "+(double)(duration)/1000.);
-    }
-
-
-
-
-
-
-
-	/* TODO: Ask leetom to update chart
+			return;
+		}
+		
+		// The bool=true means that we wants to generate chunk, and that the returned ChunkAccess must not be null
+		ChunkAccess ca = serverWorld.getChunkSource().getChunk(chunkX, chunkZ, targetStatus, true);
+		if (ca == null)
+			throw new RuntimeException("This should NEVER be null due to bool being true");
+		lodBuilder.generateLodNodeFromChunk(lodDim, new ChunkWrapper(ca, serverWorld), new LodBuilderConfig(generationMode), false, true);
+		
+		// long duration = System.nanoTime()-t;
+		
+		// Debug print the duration
+		// System.out.println("LodChunkGenFull["+chunkX+","+chunkZ+"]: "+(double)(duration)/1000.);
+		
+	}
+	
+	/* TODO: Update this chart
 	 * performance/generation tests related to
 	 * serverWorld.getChunk(x, z, ChunkStatus. *** )
-
-     true/false is whether they generated blocks or not
-     the time is how long it took to generate
-
-     ChunkStatus.EMPTY					0  - 1  ms	false	(empty, what did you expect? :P)
-     ChunkStatus.STRUCTURE_REFERENCES	1  - 2  ms  false	(no height, only generates some chunks)
-     ChunkStatus.BIOMES 				1  - 10 ms	false	(no height)
-     ChunkStatus.NOISE					4  - 15 ms	true	(all blocks are stone)
-     ChunkStatus.LIQUID_CARVERS			6  - 12 ms	true	(no snow/trees, just grass)
-     ChunkStatus.SURFACE				5  - 15 ms	true	(no snow/trees, just grass)
-     ChunkStatus.CARVERS				5  - 30 ms	true	(no snow/trees, just grass)
-     ChunkStatus.FEATURES				7  - 25 ms	true
-     ChunkStatus.HEIGHTMAPS 			20 - 40 ms	true
-     ChunkStatus.LIGHT					20 - 40 ms	true
-     ChunkStatus.FULL 					30 - 50 ms	true
-     ChunkStatus.SPAWN			   		50 - 80 ms	true
-
-
-     At this point I would suggest using FEATURES, as it generates snow and trees
-     (and any other object that are needed to make biomes distinct)
-
-     Otherwise, if snow/trees aren't necessary SURFACE is the next fastest (although not by much)
+	
+	 true/false is whether they generated blocks or not
+	 the time is how long it took to generate
+	
+	 ChunkStatus.EMPTY					0  - 1  ms	false	(empty, what did you expect? :P)
+	 ChunkStatus.STRUCTURE_REFERENCES	1  - 2  ms  false	(no height, only generates some chunks)
+	 ChunkStatus.BIOMES 				1  - 10 ms	false	(no height)
+	 ChunkStatus.NOISE					4  - 15 ms	true	(all blocks are stone)
+	 ChunkStatus.LIQUID_CARVERS			6  - 12 ms	true	(no snow/trees, just grass)
+	 ChunkStatus.SURFACE				5  - 15 ms	true	(no snow/trees, just grass)
+	 ChunkStatus.CARVERS				5  - 30 ms	true	(no snow/trees, just grass)
+	 ChunkStatus.FEATURES				7  - 25 ms	true
+	 ChunkStatus.HEIGHTMAPS 			20 - 40 ms	true
+	 ChunkStatus.LIGHT					20 - 40 ms	true
+	 ChunkStatus.FULL 					30 - 50 ms	true
+	 ChunkStatus.SPAWN			   		50 - 80 ms	true
+	
+	 At this point I would suggest using FEATURES, as it generates snow and trees
+	 (and any other object that are needed to make biomes distinct)
+	
+	 Otherwise, if snow/trees aren't necessary SURFACE is the next fastest (although not by much)
 	 */
-}
+}

common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/ChunkLoader.java

@@ -1,148 +1,247 @@
 
 package com.seibel.lod.common.wrappers.worldGeneration.mimicObject;
 
+import com.google.common.collect.Maps;
+import com.mojang.serialization.Codec;
+import com.mojang.serialization.Dynamic;
 import com.seibel.lod.core.api.ClientApi;
 
+import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
+import it.unimi.dsi.fastutil.longs.LongSet;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
 import java.util.Objects;
 
 import net.minecraft.core.Registry;
 import net.minecraft.core.SectionPos;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
+import net.minecraft.nbt.NbtOps;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.level.ChunkTickList;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.LightLayer;
-import net.minecraft.world.level.TickList;
 import net.minecraft.world.level.WorldGenLevel;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.biome.Biomes;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.chunk.ChunkBiomeContainer;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.DataLayer;
 import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.world.level.chunk.LevelChunkSection;
-import net.minecraft.world.level.chunk.ProtoTickList;
+import net.minecraft.world.level.chunk.PalettedContainer;
 import net.minecraft.world.level.chunk.UpgradeData;
 import net.minecraft.world.level.levelgen.Heightmap;
+import net.minecraft.world.level.levelgen.blending.BlendingData;
+import net.minecraft.world.level.levelgen.feature.StructureFeature;
+import net.minecraft.world.level.levelgen.structure.StructureStart;
+import net.minecraft.world.level.levelgen.structure.pieces.StructurePieceSerializationContext;
 import net.minecraft.world.level.lighting.LevelLightEngine;
 import net.minecraft.world.level.material.Fluid;
-import net.minecraft.world.level.material.Fluids;
-
+import net.minecraft.world.ticks.LevelChunkTicks;
 import org.apache.logging.log4j.Logger;
 
-public class ChunkLoader {
+public class ChunkLoader
+{
+	private static final Codec<PalettedContainer<BlockState>> BLOCK_STATE_CODEC = PalettedContainer.codec(Block.BLOCK_STATE_REGISTRY, BlockState.CODEC, PalettedContainer.Strategy.SECTION_STATES, Blocks.AIR.defaultBlockState());
 	private static final Logger LOGGER = ClientApi.LOGGER;
-
-	private static LevelChunkSection[] readSections(WorldGenLevel level, LevelLightEngine lightEngine,
-			ChunkPos chunkPos, CompoundTag tagLevel) {
-		boolean isLightOn = tagLevel.getBoolean("isLightOn");
-		ListTag listTag = tagLevel.getList("Sections", 10);
-        int i = level.getSectionsCount();
-		LevelChunkSection[] levelChunkSections = new LevelChunkSection[i];
-		boolean bl2 = level.getLevel().dimensionType().hasSkyLight();
-		if (isLightOn)
-			lightEngine.retainData(chunkPos, true);
-		for (int j = 0; j < listTag.size(); j++) {
-			CompoundTag compoundTag3 = listTag.getCompound(j);
-			int k = compoundTag3.getByte("Y");
-			if (compoundTag3.contains("Palette", 9) && compoundTag3.contains("BlockStates", 12)) {
-				LevelChunkSection levelChunkSection = new LevelChunkSection(k << 4);
-				levelChunkSection.getStates().read(compoundTag3.getList("Palette", 10),
-						compoundTag3.getLongArray("BlockStates"));
-				levelChunkSection.recalcBlockCounts();
-				if (!levelChunkSection.isEmpty())
-					levelChunkSections[level.getSectionIndexFromSectionY(k)] = levelChunkSection;
-			}
-			if (isLightOn) {
-				if (compoundTag3.contains("BlockLight", 7))
-					lightEngine.queueSectionData(LightLayer.BLOCK, SectionPos.of(chunkPos, k),
-							new DataLayer(compoundTag3.getByteArray("BlockLight")), true);
-				if (bl2 && compoundTag3.contains("SkyLight", 7))
-					lightEngine.queueSectionData(LightLayer.SKY, SectionPos.of(chunkPos, k),
-							new DataLayer(compoundTag3.getByteArray("SkyLight")), true);
-			}
+	private static final String TAG_UPGRADE_DATA = "UpgradeData";
+	private static final String BLOCK_TICKS_TAG = "block_ticks";
+	private static final String FLUID_TICKS_TAG = "fluid_ticks";
+	
+	private static BlendingData readBlendingData(CompoundTag chunkData)
+	{
+		BlendingData blendingData = null;
+		if (chunkData.contains("blending_data", 10))
+		{
+			@SuppressWarnings({ "unchecked", "rawtypes" })
+			Dynamic<CompoundTag> blendingDataTag = new Dynamic(NbtOps.INSTANCE, chunkData.getCompound("blending_data"));
+			blendingData = BlendingData.CODEC.parse(blendingDataTag).resultOrPartial(LOGGER::error).orElse(null);
 		}
-		return levelChunkSections;
+		return blendingData;
 	}
-
-	private static void readHeightmaps(LevelChunk chunk, CompoundTag chunkData) {
+	
+	private static LevelChunkSection[] readSections(LevelAccessor level, LevelLightEngine lightEngine, ChunkPos chunkPos, CompoundTag chunkData)
+	{
+		Registry<Biome> biomes = level.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY);
+		Codec<PalettedContainer<Biome>> biomeCodec = PalettedContainer.codec(
+				biomes, biomes.byNameCodec(), PalettedContainer.Strategy.SECTION_BIOMES, biomes.getOrThrow(Biomes.PLAINS));
+		
+		int i = level.getSectionsCount();
+		LevelChunkSection[] chunkSections = new LevelChunkSection[i];
+		
+		boolean isLightOn = chunkData.getBoolean("isLightOn");
+		boolean hasSkyLight = level.dimensionType().hasSkyLight();
+		ListTag tagSections = chunkData.getList("sections", 10);
+		
+		for (int j = 0; j < tagSections.size(); ++j)
+		{
+			CompoundTag tagSection = tagSections.getCompound(j);
+			byte sectionYPos = tagSection.getByte("Y");
+			int sectionId = level.getSectionIndexFromSectionY(sectionYPos);
+			if (sectionId >= 0 && sectionId < chunkSections.length)
+			{
+				PalettedContainer<BlockState> blockStateContainer;
+				PalettedContainer<Biome> biomeContainer;
+				
+				blockStateContainer = tagSection.contains("block_states", 10)
+						? BLOCK_STATE_CODEC.parse(NbtOps.INSTANCE, tagSection.getCompound("block_states")).promotePartial(string -> logErrors(chunkPos, sectionYPos, string)).getOrThrow(false, LOGGER::error)
+						: new PalettedContainer<BlockState>(Block.BLOCK_STATE_REGISTRY, Blocks.AIR.defaultBlockState(), PalettedContainer.Strategy.SECTION_STATES);
+				
+				biomeContainer = tagSection.contains("biomes", 10)
+						? biomeCodec.parse(NbtOps.INSTANCE, tagSection.getCompound("biomes")).promotePartial(string -> logErrors(chunkPos, sectionYPos, string)).getOrThrow(false, LOGGER::error)
+						: new PalettedContainer<Biome>(biomes, biomes.getOrThrow(Biomes.PLAINS), PalettedContainer.Strategy.SECTION_BIOMES);
+				
+				chunkSections[sectionId] = new LevelChunkSection(sectionYPos, blockStateContainer, biomeContainer);
+			}
+			
+			if (!isLightOn)
+				continue;
+			
+			if (tagSection.contains("BlockLight", 7))
+				lightEngine.queueSectionData(LightLayer.BLOCK, SectionPos.of(chunkPos, sectionYPos), new DataLayer(tagSection.getByteArray("BlockLight")), true);
+			if (hasSkyLight && tagSection.contains("SkyLight", 7))
+				lightEngine.queueSectionData(LightLayer.SKY, SectionPos.of(chunkPos, sectionYPos), new DataLayer(tagSection.getByteArray("SkyLight")), true);
+		}
+		return chunkSections;
+	}
+	
+	private static void readHeightmaps(LevelChunk chunk, CompoundTag chunkData)
+	{
 		CompoundTag tagHeightmaps = chunkData.getCompound("Heightmaps");
-		for (Heightmap.Types type : ChunkStatus.FULL.heightmapsAfter()) {
+		for (Heightmap.Types type : ChunkStatus.FULL.heightmapsAfter())
+		{
 			String heightmap = type.getSerializationKey();
 			if (tagHeightmaps.contains(heightmap, 12))
 				chunk.setHeightmap(type, tagHeightmaps.getLongArray(heightmap));
 		}
 		Heightmap.primeHeightmaps(chunk, ChunkStatus.FULL.heightmapsAfter());
 	}
-
-	private static void readPostPocessings(LevelChunk chunk, CompoundTag chunkData) {
+	
+	private static Map<StructureFeature<?>, StructureStart<?>> unpackStructureStart(StructurePieceSerializationContext structurePieceSerializationContext, CompoundTag compoundTag, long l)
+	{
+		HashMap<StructureFeature<?>, StructureStart<?>> map = Maps.newHashMap();
+		CompoundTag compoundTag2 = compoundTag.getCompound("starts");
+		for (String string : compoundTag2.getAllKeys())
+		{
+			String string2 = string.toLowerCase(Locale.ROOT);
+			StructureFeature<?> structureFeature = StructureFeature.STRUCTURES_REGISTRY.get(string2);
+			if (structureFeature == null)
+			{
+				LOGGER.error("Unknown structure start: {}", (Object) string2);
+				continue;
+			}
+			StructureStart<?> structureStart = StructureFeature.loadStaticStart(structurePieceSerializationContext, compoundTag2.getCompound(string), l);
+			if (structureStart == null)
+				continue;
+			map.put(structureFeature, structureStart);
+		}
+		return map;
+	}
+	
+	private static Map<StructureFeature<?>, LongSet> unpackStructureReferences(ChunkPos chunkPos, CompoundTag compoundTag)
+	{
+		HashMap<StructureFeature<?>, LongSet> map = Maps.newHashMap();
+		CompoundTag compoundTag2 = compoundTag.getCompound("References");
+		for (String string : compoundTag2.getAllKeys())
+		{
+			String string2 = string.toLowerCase(Locale.ROOT);
+			StructureFeature<?> structureFeature = StructureFeature.STRUCTURES_REGISTRY.get(string2);
+			if (structureFeature == null)
+			{
+				LOGGER.warn("Found reference to unknown structure '{}' in chunk {}, discarding", (Object) string2, (Object) chunkPos);
+				continue;
+			}
+			map.put(structureFeature, new LongOpenHashSet(Arrays.stream(compoundTag2.getLongArray(string)).filter(l ->
+			{
+				ChunkPos chunkPos2 = new ChunkPos(l);
+				if (chunkPos2.getChessboardDistance(chunkPos) > 8)
+				{
+					LOGGER.warn("Found invalid structure reference [ {} @ {} ] for chunk {}.", (Object) string2, (Object) chunkPos2, (Object) chunkPos);
+					return false;
+				}
+				return true;
+			}).toArray()));
+		}
+		return map;
+	}
+	
+	private static void readStructures(WorldGenLevel level, LevelChunk chunk, CompoundTag chunkData)
+	{
+		CompoundTag tagStructures = chunkData.getCompound("structures");
+		chunk.setAllStarts(
+				unpackStructureStart(StructurePieceSerializationContext.fromLevel(level.getLevel()), tagStructures, level.getSeed()));
+		chunk.setAllReferences(unpackStructureReferences(chunk.getPos(), tagStructures));
+	}
+	
+	private static void readPostPocessings(LevelChunk chunk, CompoundTag chunkData)
+	{
 		ListTag tagPostProcessings = chunkData.getList("PostProcessing", 9);
-		for (int n = 0; n < tagPostProcessings.size(); ++n) {
+		for (int n = 0; n < tagPostProcessings.size(); ++n)
+		{
 			ListTag listTag3 = tagPostProcessings.getList(n);
-			for (int o = 0; o < listTag3.size(); ++o) {
+			for (int o = 0; o < listTag3.size(); ++o)
+			{
 				chunk.addPackedPostProcess(listTag3.getShort(o), n);
 			}
 		}
 	}
-
-	public static ChunkStatus.ChunkType readChunkType(CompoundTag tagLevel) {
-		ChunkStatus chunkStatus = ChunkStatus.byName(tagLevel.getString("Status"));
-		if (chunkStatus != null) {
-			return chunkStatus.getChunkType();
-		}
-		return ChunkStatus.ChunkType.PROTOCHUNK;
+	
+	public static ChunkStatus.ChunkType readChunkType(CompoundTag compoundTag)
+	{
+		return ChunkStatus.byName(compoundTag.getString("Status")).getChunkType();
 	}
-
-	public static LevelChunk read(WorldGenLevel level, LevelLightEngine lightEngine, ChunkPos chunkPos,
-			CompoundTag chunkData) {
-		CompoundTag tagLevel = chunkData.getCompound("Level");
-
-		ChunkStatus.ChunkType chunkType = readChunkType(tagLevel);
-		if (chunkType != ChunkStatus.ChunkType.LEVELCHUNK)
-			return null;
-
-		ChunkPos actualPos = new ChunkPos(tagLevel.getInt("xPos"), tagLevel.getInt("zPos"));
-		if (!Objects.equals(chunkPos, actualPos)) {
-			LOGGER.error("Distant Horizons: Chunk file at {} is in the wrong location; Ignoring. (Expected {}, got {})",
-					(Object) chunkPos, (Object) chunkPos, (Object) actualPos);
+	
+	public static LevelChunk read(WorldGenLevel level, LevelLightEngine lightEngine, ChunkPos chunkPos, CompoundTag chunkData)
+	{
+		
+		ChunkPos actualPos = new ChunkPos(chunkData.getInt("xPos"), chunkData.getInt("zPos"));
+		if (!Objects.equals(chunkPos, actualPos))
+		{
+			LOGGER.error("Distant Horizons: Chunk file at {} is in the wrong location; Ignoring. (Expected {}, got {})", (Object) chunkPos, (Object) chunkPos, (Object) actualPos);
 			return null;
 		}
-
-		// ====================== Read params for making the LevelChunk
-		// ============================
-		ChunkBiomeContainer chunkBiomeContainer = new ChunkBiomeContainer(
-				level.getLevel().registryAccess().registryOrThrow(Registry.BIOME_REGISTRY), level, chunkPos,
-				level.getLevel().getChunkSource().getGenerator().getBiomeSource(),
-				tagLevel.contains("Biomes", 11) ? tagLevel.getIntArray("Biomes") : null);
-
-		UpgradeData upgradeData = tagLevel.contains("UpgradeData", 10)
-				? new UpgradeData(tagLevel.getCompound("UpgradeData"), level)
+		
+		ChunkStatus.ChunkType chunkType = readChunkType(chunkData);
+		BlendingData blendingData = readBlendingData(chunkData);
+		if (chunkType == ChunkStatus.ChunkType.PROTOCHUNK && (blendingData == null || !blendingData.oldNoise()))
+			return null;
+		
+		// Prepare the light engine
+		boolean isLightOn = chunkData.getBoolean("isLightOn");
+		if (isLightOn)
+			level.getLightEngine().retainData(chunkPos, true);
+		
+		// Read params for making the LevelChunk
+		UpgradeData upgradeData = chunkData.contains(TAG_UPGRADE_DATA, 10)
+				? new UpgradeData(chunkData.getCompound(TAG_UPGRADE_DATA), level)
 				: UpgradeData.EMPTY;
-
-		TickList<Block> blockTicks = tagLevel.contains("TileTicks", 9)
-				? ChunkTickList.create(tagLevel.getList("TileTicks", 10), Registry.BLOCK::getKey, Registry.BLOCK::get)
-				: new ProtoTickList<Block>(block -> (block == null || block.defaultBlockState().isAir()), chunkPos,
-						tagLevel.getList("ToBeTicked", 9), level);
-
-		TickList<Fluid> liquidTicks = tagLevel.contains("LiquidTicks", 9)
-				? ChunkTickList.create(tagLevel.getList("LiquidTicks", 10), Registry.FLUID::getKey, Registry.FLUID::get)
-				: new ProtoTickList<Fluid>(fluid -> (fluid == null || fluid == Fluids.EMPTY), chunkPos,
-						tagLevel.getList("LiquidsToBeTicked", 9), level);
-
-		long inhabitedTime = tagLevel.getLong("InhabitedTime");
-
-		LevelChunkSection[] levelChunkSections = readSections(level, lightEngine, chunkPos, tagLevel);
-
-		// ======================== Make the chunk
-		// ===========================================
-		LevelChunk chunk = new LevelChunk(level.getLevel(), chunkPos, chunkBiomeContainer, upgradeData, blockTicks,
-				liquidTicks, inhabitedTime, levelChunkSections, null);
-
-		// ========================== Post setup some chunk data
-		// ==============================
-		chunk.setLightCorrect(tagLevel.getBoolean("isLightOn"));
-		readHeightmaps(chunk, tagLevel);
-		readPostPocessings(chunk, tagLevel);
-		// ClientApi.LOGGER.info("Loaded chunk @ "+chunk.getPos());
+		LevelChunkTicks<Block> blockTicks = LevelChunkTicks.load(chunkData.getList(BLOCK_TICKS_TAG, 10),
+				string -> Registry.BLOCK.getOptional(ResourceLocation.tryParse(string)), chunkPos);
+		LevelChunkTicks<Fluid> fluidTicks = LevelChunkTicks.load(chunkData.getList(FLUID_TICKS_TAG, 10),
+				string -> Registry.FLUID.getOptional(ResourceLocation.tryParse(string)), chunkPos);
+		long inhabitedTime = chunkData.getLong("InhabitedTime");
+		LevelChunkSection[] chunkSections = readSections(level, lightEngine, actualPos, chunkData);
+		
+		// Make chunk
+		LevelChunk chunk = new LevelChunk((Level) level, chunkPos, upgradeData, blockTicks, fluidTicks, inhabitedTime, chunkSections, null, blendingData);
+		
+		// Set some states after object creation
+		chunk.setLightCorrect(isLightOn);
+		readHeightmaps(chunk, chunkData);
+		readStructures(level, chunk, chunkData);
+		readPostPocessings(chunk, chunkData);
 		return chunk;
 	}
+	
+	private static void logErrors(ChunkPos chunkPos, int i, String string)
+	{
+		LOGGER.error("Distant Horizons: Recoverable errors when loading section [" + chunkPos.x + ", " + i + ", " + chunkPos.z + "]: " + string);
+	}
 }
+

common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/LightedWorldGenRegion.java

@@ -1,7 +1,6 @@
 package com.seibel.lod.common.wrappers.worldGeneration.mimicObject;
 
 import java.util.List;
-import java.util.stream.Stream;
 
 import org.jetbrains.annotations.Nullable;
 
@@ -17,6 +16,7 @@ import net.minecraft.server.level.WorldGenRegion;
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.LevelHeightAccessor;
 import net.minecraft.world.level.LightLayer;
 import net.minecraft.world.level.StructureFeatureManager;
 import net.minecraft.world.level.block.Blocks;
@@ -41,13 +41,6 @@ public class LightedWorldGenRegion extends WorldGenRegion {
 	private final List<ChunkAccess> cache;
 	private final StructureFeatureManager structFeat;
 	Long2ObjectOpenHashMap<ChunkAccess> chunkMap = new Long2ObjectOpenHashMap<ChunkAccess>();
-	private ChunkPos overrideCenterPos = null;
-	
-	public void setOverrideCenter(ChunkPos pos) {overrideCenterPos = pos;}
-	@Override
-	public ChunkPos getCenter() {
-		return overrideCenterPos==null ? super.getCenter() : overrideCenterPos;
-	}
 
 	public LightedWorldGenRegion(ServerLevel serverLevel, WorldGenLevelLightEngine lightEngine,
 			StructureFeatureManager structFeat, List<ChunkAccess> list, ChunkStatus chunkStatus, int i,
@@ -69,16 +62,23 @@ public class LightedWorldGenRegion extends WorldGenRegion {
         int i = SectionPos.blockToSectionCoord(blockPos.getX());
         int j = SectionPos.blockToSectionCoord(blockPos.getZ());
         ChunkPos chunkPos = this.getCenter();
+        ChunkAccess center = this.getChunk(chunkPos.x, chunkPos.z);
         int k = Math.abs(chunkPos.x - i);
         int l = Math.abs(chunkPos.z - j);
         if (k > this.writeRadius || l > this.writeRadius) {
             return false;
         }
+        if (center.isUpgrading()) {
+            LevelHeightAccessor levelHeightAccessor = center.getHeightAccessorForGeneration();
+            if (blockPos.getY() < levelHeightAccessor.getMinBuildHeight() || blockPos.getY() >= levelHeightAccessor.getMaxBuildHeight()) {
+                return false;
+            }
+        }
         return true;
     }
     
 	@Override
-	public Stream<? extends StructureStart<?>> startsForFeature(SectionPos sectionPos,
+	public List<? extends StructureStart<?>> startsForFeature(SectionPos sectionPos,
 			StructureFeature<?> structureFeature) {
 		return structFeat.startsForFeature(sectionPos, structureFeature);
 	}
@@ -159,7 +159,7 @@ public class LightedWorldGenRegion extends WorldGenRegion {
 	public ChunkAccess getChunk(int i, int j, ChunkStatus chunkStatus, boolean bl) {
 		ChunkAccess chunk = getChunkAccess(i, j, chunkStatus, bl);
 		if (chunk instanceof LevelChunk) {
-			chunk = new ImposterProtoChunk((LevelChunk) chunk);
+			chunk = new ImposterProtoChunk((LevelChunk) chunk, true);
 		}
 		return chunk;
 	}

common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/WorldGenLevelLightEngine.java

@@ -125,10 +125,9 @@ public class WorldGenLevelLightEngine extends LevelLightEngine {
         LevelChunkSection[] levelChunkSections = chunkAccess.getSections();
         for (int i = 0; i < chunkAccess.getSectionsCount(); ++i) {
             LevelChunkSection levelChunkSection = levelChunkSections[i];
-			if (!LevelChunkSection.isEmpty(levelChunkSection)) {
-	            int j = this.levelHeightAccessor.getSectionYFromSectionIndex(i);
-				updateSectionStatus(SectionPos.of(chunkPos, j), false);
-			}
+            if (levelChunkSection.hasOnlyAir()) continue;
+            int j = this.levelHeightAccessor.getSectionYFromSectionIndex(i);
+            updateSectionStatus(SectionPos.of(chunkPos, j), false);
         }
         enableLightSources(chunkPos, true);
         if (needLightBlockUpdate) {

common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/mimicObject/WorldGenStructFeatManager.java

@@ -1,7 +1,13 @@
 package com.seibel.lod.common.wrappers.worldGeneration.mimicObject;
 
+import java.util.List;
 import java.util.stream.Stream;
 
+import com.google.common.collect.ImmutableList;
+
+import it.unimi.dsi.fastutil.longs.LongIterator;
+import it.unimi.dsi.fastutil.longs.LongSet;
+import net.minecraft.core.BlockPos;
 import net.minecraft.core.SectionPos;
 import net.minecraft.server.level.WorldGenRegion;
 import net.minecraft.world.level.ChunkPos;
@@ -12,14 +18,16 @@ import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.levelgen.WorldGenSettings;
 import net.minecraft.world.level.levelgen.feature.StructureFeature;
+import net.minecraft.world.level.levelgen.structure.StructureCheck;
 import net.minecraft.world.level.levelgen.structure.StructureStart;
 
 public class WorldGenStructFeatManager extends StructureFeatureManager {
 	WorldGenLevel genLevel;
 	WorldGenSettings worldGenSettings;
+	StructureCheck structureCheck;
 	public WorldGenStructFeatManager(LevelAccessor levelAccessor, WorldGenSettings worldGenSettings,
-			WorldGenLevel genLevel) {
-		super(levelAccessor, worldGenSettings);
+			WorldGenLevel genLevel, StructureCheck structureCheck) {
+		super(levelAccessor, worldGenSettings, structureCheck);
 		this.genLevel = genLevel;
 		this.worldGenSettings = worldGenSettings;
 	}
@@ -32,24 +40,40 @@ public class WorldGenStructFeatManager extends StructureFeatureManager {
 	public WorldGenStructFeatManager forWorldGenRegion(WorldGenRegion worldGenRegion) {
 		if (worldGenRegion == genLevel)
 			return this;
-		return new WorldGenStructFeatManager(worldGenRegion, worldGenSettings, worldGenRegion);
+		return new WorldGenStructFeatManager(worldGenRegion, worldGenSettings, worldGenRegion, structureCheck);
 	}
 
 	@Override
-	public Stream<? extends StructureStart<?>> startsForFeature(SectionPos sectionPos2,
+    public boolean hasAnyStructureAt(BlockPos blockPos) {
+        SectionPos sectionPos = SectionPos.of(blockPos);
+		ChunkAccess chunk = genLevel.getChunk(sectionPos.x(), sectionPos.z(), ChunkStatus.STRUCTURE_REFERENCES,
+				false);
+		if (chunk == null) return false;
+        return chunk.hasAnyStructureReferences();
+    }
+    
+	@Override
+    @SuppressWarnings({ "rawtypes", "unchecked" })
+	public List<? extends StructureStart<?>> startsForFeature(SectionPos sectionPos,
 			StructureFeature<?> structureFeature) {
 		if (genLevel == null)
-			return Stream.empty();
-		ChunkAccess chunk = genLevel.getChunk(sectionPos2.x(), sectionPos2.z(), ChunkStatus.STRUCTURE_REFERENCES,
+			return List.of();
+		ChunkAccess chunk = genLevel.getChunk(sectionPos.x(), sectionPos.z(), ChunkStatus.STRUCTURE_REFERENCES,
 				false);
 		if (chunk == null)
-			return Stream.empty();
-		return chunk.getReferencesForFeature(structureFeature).stream().map(pos -> {
-			SectionPos sectPos = SectionPos.of(ChunkPos.getX(pos), 0, ChunkPos.getZ(pos));
-			ChunkAccess startChunk = genLevel.getChunk(sectPos.x(), sectPos.z(), ChunkStatus.STRUCTURE_STARTS, false);
-			if (startChunk == null)
-				return null;
-			return this.getStartForFeature(sectPos, structureFeature, startChunk);
-		}).filter(structureStart -> structureStart != null && structureStart.isValid());
+			return List.of();
+		LongSet longSet = chunk.getReferencesForFeature(structureFeature);
+			ImmutableList.Builder builder = ImmutableList.builder();
+	        LongIterator longIterator = longSet.iterator();
+	        while (longIterator.hasNext()) {
+	            long l = (Long)longIterator.next();
+	            SectionPos sectPos = SectionPos.of(new ChunkPos(l), genLevel.getMinSection());
+	            ChunkAccess startChunk = genLevel.getChunk(sectPos.x(), sectPos.z(), ChunkStatus.STRUCTURE_STARTS, false);
+	            if (startChunk == null) continue;
+	            StructureStart<?> structureStart = this.getStartForFeature(sectPos, structureFeature, startChunk);
+	            if (structureStart == null || !structureStart.isValid()) continue;
+	            builder.add(structureStart);
+	        }
+	        return builder.build();
 	}
 }

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

@@ -3,43 +3,53 @@ package com.seibel.lod.common.wrappers.worldGeneration.step;
 import java.util.ArrayList;
 import java.util.List;
 
-import com.seibel.lod.common.wrappers.worldGeneration.ThreadedParameters;
 import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment;
+import com.seibel.lod.common.wrappers.worldGeneration.ThreadedParameters;
 
+import net.minecraft.core.Registry;
 import net.minecraft.server.level.WorldGenRegion;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.chunk.ChunkAccess;
+import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.ProtoChunk;
+import net.minecraft.world.level.levelgen.DebugLevelSource;
+import net.minecraft.world.level.levelgen.FlatLevelSource;
+import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator;
+import net.minecraft.world.level.levelgen.blending.Blender;
 
 public final class StepBiomes {
 	/**
 	 * 
 	 */
-	private final BatchGenerationEnvironment envionment;
+	private final BatchGenerationEnvironment environment;
 
 	/**
-	 * @param worldGenerationEnvironment
+	 * @param batchGenerationEnvironment
 	 */
-	public StepBiomes(BatchGenerationEnvironment worldGenerationEnvironment) {
-		envionment = worldGenerationEnvironment;
+	public StepBiomes(BatchGenerationEnvironment batchGenerationEnvironment)
+	{
+		environment = batchGenerationEnvironment;
 	}
 
 	public final ChunkStatus STATUS = ChunkStatus.BIOMES;
-
-	public void generateGroup(ThreadedParameters tParams, WorldGenRegion worldGenRegion, List<ChunkAccess> chunks) {
+	
+	public void generateGroup(ThreadedParameters tParams, WorldGenRegion worldGenRegion,
+			List<ChunkAccess> chunks) {
 
 		ArrayList<ChunkAccess> chunksToDo = new ArrayList<ChunkAccess>();
-
+		
 		for (ChunkAccess chunk : chunks) {
-			if (chunk.getStatus().isOrAfter(STATUS))
-				continue;
+			if (chunk.getStatus().isOrAfter(STATUS)) continue;
 			((ProtoChunk) chunk).setStatus(STATUS);
 			chunksToDo.add(chunk);
 		}
-
+		
 		for (ChunkAccess chunk : chunksToDo) {
 			// System.out.println("StepBiomes: "+chunk.getPos());
-			envionment.params.generator.createBiomes(envionment.params.biomes, chunk);
+			chunk = environment.joinSync(environment.params.generator.createBiomes(environment.params.biomes, Runnable::run, Blender.of(worldGenRegion),
+					tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk));
 		}
 	}
 }

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

@@ -2,49 +2,59 @@ package com.seibel.lod.common.wrappers.worldGeneration.step;
 
 import java.util.ArrayList;
 
-import com.seibel.lod.common.wrappers.worldGeneration.ThreadedParameters;
-import com.seibel.lod.common.wrappers.worldGeneration.mimicObject.LightedWorldGenRegion;
 import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment;
+import com.seibel.lod.common.wrappers.worldGeneration.ThreadedParameters;
 import com.seibel.lod.core.util.GridList;
 
 import net.minecraft.ReportedException;
+import net.minecraft.server.level.WorldGenRegion;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.ProtoChunk;
+import net.minecraft.world.level.levelgen.blending.Blender;
 
 public final class StepFeatures {
 	/**
 	 * 
 	 */
-	private final BatchGenerationEnvironment envionment;
+	private final BatchGenerationEnvironment environment;
 
 	/**
-	 * @param worldGenerationEnvironment
+	 * @param batchGenerationEnvironment
 	 */
-	public StepFeatures(BatchGenerationEnvironment worldGenerationEnvironment) {
-		envionment = worldGenerationEnvironment;
+	public StepFeatures(BatchGenerationEnvironment batchGenerationEnvironment)
+	{
+		environment = batchGenerationEnvironment;
 	}
 
 	public final ChunkStatus STATUS = ChunkStatus.FEATURES;
 
-	public void generateGroup(ThreadedParameters tParams, LightedWorldGenRegion worldGenRegion, GridList<ChunkAccess> chunks) {
+	public void generateGroup(ThreadedParameters tParams, WorldGenRegion worldGenRegion,
+			GridList<ChunkAccess> chunks) {
 		ArrayList<ChunkAccess> chunksToDo = new ArrayList<ChunkAccess>();
-
+		
 		for (ChunkAccess chunk : chunks) {
-			if (chunk.getStatus().isOrAfter(STATUS))
-				continue;
+			if (chunk.getStatus().isOrAfter(STATUS)) continue;
 			((ProtoChunk) chunk).setStatus(STATUS);
 			chunksToDo.add(chunk);
 		}
-
+		
 		for (ChunkAccess chunk : chunksToDo) {
 			try {
-				worldGenRegion.setOverrideCenter(chunk.getPos());
-				envionment.params.generator.applyBiomeDecoration(worldGenRegion, tParams.structFeat);
+				environment.params.generator.applyBiomeDecoration(worldGenRegion, chunk,
+						tParams.structFeat.forWorldGenRegion(worldGenRegion));
+				Blender.generateBorderTicks(worldGenRegion, chunk);
 			} catch (ReportedException e) {
 				e.printStackTrace();
+				// FIXME: Features concurrent modification issue. Something about cocobeans just
+				// aren't happy
+				// For now just retry.
 			}
-		}
-		worldGenRegion.setOverrideCenter(null);
+		}/*
+		for (ChunkAccess chunk : chunks) {
+			Heightmap.primeHeightmaps(chunk,
+					EnumSet.of(Heightmap.Types.MOTION_BLOCKING, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES,
+							Heightmap.Types.OCEAN_FLOOR, Heightmap.Types.WORLD_SURFACE));
+		}*/
 	}
 }

common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/step/StepLight.java

@@ -52,6 +52,7 @@ public final class StepLight {
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
+			if (chunk instanceof LevelChunk) ((LevelChunk)chunk).setClientLightReady(true);
 			chunk.setLightCorrect(true);
 		}
 		lightEngine.runUpdates(Integer.MAX_VALUE, true, true);

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

@@ -9,9 +9,9 @@ import com.google.common.collect.Sets;
 import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment;
 import com.seibel.lod.common.wrappers.worldGeneration.ThreadedParameters;
 
-import net.minecraft.core.QuartPos;
 import net.minecraft.server.level.WorldGenRegion;
 import net.minecraft.util.Mth;
+import net.minecraft.world.level.LevelHeightAccessor;
 import net.minecraft.world.level.StructureFeatureManager;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ChunkStatus;
@@ -19,6 +19,7 @@ import net.minecraft.world.level.chunk.LevelChunkSection;
 import net.minecraft.world.level.chunk.ProtoChunk;
 import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator;
 import net.minecraft.world.level.levelgen.NoiseSettings;
+import net.minecraft.world.level.levelgen.blending.Blender;
 
 public final class StepNoise {
 	/**
@@ -34,39 +35,7 @@ public final class StepNoise {
 		environment = batchGenerationEnvironment;
 	}
 	
-	private static <T> T joinSync(CompletableFuture<T> f) {
-		if (!f.isDone()) throw new RuntimeException("The future is concurrent!");
-		return f.join();
-	}
 	public final ChunkStatus STATUS = ChunkStatus.NOISE;
-
-    private ChunkAccess NoiseBased$fillFromNoise(NoiseBasedChunkGenerator generator, StructureFeatureManager structureFeatureManager, ChunkAccess chunkAccess) {
-        NoiseSettings noiseSettings = generator.settings.get().noiseSettings();
-        int i = Math.max(noiseSettings.minY(), chunkAccess.getMinBuildHeight());
-        int j = Math.min(noiseSettings.minY() + noiseSettings.height(), chunkAccess.getMaxBuildHeight());
-        int cellHeight = QuartPos.toBlock(noiseSettings.noiseSizeVertical());
-        int k = Mth.intFloorDiv(i, cellHeight);
-        int l = Mth.intFloorDiv(j - i, cellHeight);
-        if (l <= 0) {
-            return chunkAccess;
-        }
-        int m = chunkAccess.getSectionIndex(l * cellHeight - 1 + i);
-        int n = chunkAccess.getSectionIndex(i);
-        HashSet<LevelChunkSection> set = Sets.newHashSet();
-        try {
-	        for (int o = m; o >= n; --o) {
-	            LevelChunkSection levelChunkSection = chunkAccess.getOrCreateSection(o);
-	            levelChunkSection.acquire();
-	            set.add(levelChunkSection);
-	        }
-	        chunkAccess = generator.doFill(structureFeatureManager, chunkAccess, k, l);
-	        return chunkAccess;
-        } finally {
-	        for (LevelChunkSection levelChunkSection : set) {
-	            levelChunkSection.release();
-	        };
-        }
-    }
     
 	public void generateGroup(ThreadedParameters tParams, WorldGenRegion worldGenRegion,
 			List<ChunkAccess> chunks) {
@@ -81,13 +50,8 @@ public final class StepNoise {
 		
 		for (ChunkAccess chunk : chunksToDo) {
 			// System.out.println("StepNoise: "+chunk.getPos());
-			if (environment.params.generator instanceof NoiseBasedChunkGenerator) {
-				chunk = NoiseBased$fillFromNoise((NoiseBasedChunkGenerator)environment.params.generator,
-						tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk);
-			} else {
-				chunk = joinSync(environment.params.generator.fillFromNoise(Runnable::run, 
+			chunk = environment.joinSync(environment.params.generator.fillFromNoise(Runnable::run, Blender.of(worldGenRegion),
 						tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk));
-			}
 		}
 	}
 }

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

@@ -35,44 +35,6 @@ public final class StepStructureReference {
 
 	public final ChunkStatus STATUS = ChunkStatus.STRUCTURE_REFERENCES;
 
-	private void createReferences(WorldGenRegion worldGenLevel, StructureFeatureManager structureFeatureManager,
-			ChunkAccess chunkAccess) {
-		ChunkPos chunkPos = chunkAccess.getPos();
-		int j = chunkPos.x;
-		int k = chunkPos.z;
-		int l = chunkPos.getMinBlockX();
-		int m = chunkPos.getMinBlockZ();
-
-		SectionPos sectionPos = SectionPos.bottomOf(chunkAccess);
-
-		for (int n = j - 8; n <= j + 8; n++) {
-			for (int o = k - 8; o <= k + 8; o++) {
-				if (!worldGenLevel.hasChunk(n, o))
-					continue;
-				long p = ChunkPos.asLong(n, o);
-				for (StructureStart<?> structureStart : worldGenLevel.getChunk(n, o).getAllStarts().values()) {
-					try {
-						if (structureStart.isValid()
-								&& structureStart.getBoundingBox().intersects(l, m, l + 15, m + 15)) {
-							structureFeatureManager.addReferenceForFeature(sectionPos, structureStart.getFeature(),
-									p, chunkAccess);
-						}
-					} catch (Exception exception) {
-						CrashReport crashReport = CrashReport.forThrowable(exception,
-								"Generating structure reference");
-						CrashReportCategory crashReportCategory = crashReport.addCategory("Structure");
-						crashReportCategory.setDetail("Id",
-								() -> Registry.STRUCTURE_FEATURE.getKey(structureStart.getFeature()).toString());
-						crashReportCategory.setDetail("Name", () -> structureStart.getFeature().getFeatureName());
-						crashReportCategory.setDetail("Class",
-								() -> structureStart.getFeature().getClass().getCanonicalName());
-						throw new ReportedException(crashReport);
-					}
-				}
-			}
-		}
-	}
-
 	public void generateGroup(ThreadedParameters tParams, WorldGenRegion worldGenRegion,
 			List<ChunkAccess> chunks) {
 
@@ -86,7 +48,7 @@ public final class StepStructureReference {
 		
 		for (ChunkAccess chunk : chunksToDo) {
 			// System.out.println("StepStructureReference: "+chunk.getPos());
-			createReferences(worldGenRegion, tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk);
+			environment.params.generator.createReferences(worldGenRegion, tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk);
 		}
 	}
 }

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

@@ -53,6 +53,14 @@ public final class StepStructureStart {
 				// System.out.println("StepStructureStart: "+chunk.getPos());
 				environment.params.generator.createStructures(environment.params.registry, tParams.structFeat, chunk, environment.params.structures,
 						environment.params.worldSeed);
+				try {
+					tParams.structCheck.onStructureLoad(chunk.getPos(), chunk.getAllStarts());
+				} catch (ArrayIndexOutOfBoundsException e) {
+					// There's a rare issue with StructStart where it throws ArrayIndexOutOfBounds
+					// This means the structFeat is corrupted (For some reason) and I need to reset it.
+					// TODO: Figure out in the future why this happens even though I am using new structFeat
+					throw new StepStructureStart.StructStartCorruptedException(e);
+				}
 			}
 		}
 	}

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

@@ -39,7 +39,8 @@ public final class StepSurface {
 		
 		for (ChunkAccess chunk : chunksToDo) {
 			// System.out.println("StepSurface: "+chunk.getPos());
-			environment.params.generator.buildSurfaceAndBedrock(worldGenRegion, chunk);
+			environment.params.generator.buildSurface(worldGenRegion, tParams.structFeat.forWorldGenRegion(worldGenRegion),
+					chunk);
 		}
 	}
 }

common/src/main/resources/lod.accesswidener

@@ -8,12 +8,9 @@ accessible field com/mojang/blaze3d/vertex/VertexBuffer indexCount I
 accessible field com/mojang/blaze3d/vertex/VertexBuffer vertextBufferId I
 accessible method net/minecraft/client/renderer/GameRenderer getFov (Lnet/minecraft/client/Camera;FZ)D
 
-# pre-render setup
-accessible field net/minecraft/client/renderer/LevelRenderer renderChunks Lit/unimi/dsi/fastutil/objects/ObjectArrayList;
-accessible class net/minecraft/client/renderer/LevelRenderer$RenderChunkInfo
-accessible field net/minecraft/client/renderer/LevelRenderer$RenderChunkInfo chunk Lnet/minecraft/client/renderer/chunk/ChunkRenderDispatcher$RenderChunk;
-
 # used for grabbing vanilla rendered chunks
+accessible field net/minecraft/client/renderer/LevelRenderer renderChunkStorage Ljava/util/concurrent/atomic/AtomicReference;
+accessible class net/minecraft/client/renderer/LevelRenderer$RenderChunkStorage
 accessible class net/minecraft/client/renderer/LevelRenderer$RenderChunkInfo
 accessible field net/minecraft/client/renderer/LevelRenderer$RenderChunkInfo chunk Lnet/minecraft/client/renderer/chunk/ChunkRenderDispatcher$RenderChunk;
 
@@ -26,24 +23,25 @@ accessible field net/minecraft/world/level/lighting/LevelLightEngine skyEngine L
 accessible method net/minecraft/world/level/levelgen/Heightmap setHeight (III)V
 accessible field net/minecraft/world/level/biome/Biome generationSettings Lnet/minecraft/world/level/biome/BiomeGenerationSettings;
 accessible field net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator settings Ljava/util/function/Supplier;
-accessible method net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator doFill (Lnet/minecraft/world/level/StructureFeatureManager;Lnet/minecraft/world/level/chunk/ChunkAccess;II)Lnet/minecraft/world/level/chunk/ChunkAccess;
-
+accessible method net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator doFill (Lnet/minecraft/world/level/levelgen/blending/Blender;Lnet/minecraft/world/level/StructureFeatureManager;Lnet/minecraft/world/level/chunk/ChunkAccess;II)Lnet/minecraft/world/level/chunk/ChunkAccess;
+accessible method net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator doCreateBiomes (Lnet/minecraft/core/Registry;Lnet/minecraft/world/level/levelgen/blending/Blender;Lnet/minecraft/world/level/StructureFeatureManager;Lnet/minecraft/world/level/chunk/ChunkAccess;)V
 accessible method net/minecraft/world/level/lighting/LayerLightEngine queueSectionData (JLnet/minecraft/world/level/chunk/DataLayer;Z)V
-accessible field net/minecraft/world/level/chunk/ChunkGenerator biomeSource Lnet/minecraft/world/level/biome/BiomeSource;
 
 # lod generation from save file
 accessible field net/minecraft/server/level/ChunkMap mainThreadExecutor Lnet/minecraft/util/thread/BlockableEventLoop;
 accessible method net/minecraft/server/level/ChunkMap readChunk (Lnet/minecraft/world/level/ChunkPos;)Lnet/minecraft/nbt/CompoundTag;
 
+
 # grabbing textures
 accessible field net/minecraft/client/renderer/texture/TextureAtlasSprite animatedTexture Lnet/minecraft/client/renderer/texture/TextureAtlasSprite$AnimatedTexture;
 accessible field net/minecraft/client/renderer/texture/TextureAtlasSprite width I
 accessible field net/minecraft/client/renderer/texture/TextureAtlasSprite height I
 accessible field net/minecraft/client/renderer/texture/TextureAtlasSprite mainImage [Lcom/mojang/blaze3d/platform/NativeImage;
+accessible class net/minecraft/client/renderer/texture/TextureAtlasSprite$AnimatedTexture
 accessible method net/minecraft/client/renderer/texture/TextureAtlasSprite$AnimatedTexture getFrameX (I)I
 accessible method net/minecraft/client/renderer/texture/TextureAtlasSprite$AnimatedTexture getFrameY (I)I
 extendable class com/mojang/math/Matrix4f
 
 # hacky stuff
-accessible field net/minecraft/world/level/chunk/PalettedContainer lock Ljava/util/concurrent/Semaphore;
-mutable field net/minecraft/world/level/chunk/PalettedContainer lock Ljava/util/concurrent/Semaphore;
+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

@@ -1,5 +1,5 @@
 plugins {
-    id "com.github.johnrengelman.shadow" version "7.0.0"
+    id "com.github.johnrengelman.shadow" version "7.1.0"
 }
 
 version = rootProject.mod_version+"-"+rootProject.minecraft_version+"-"+new Date().format("yyyy_MM_dd_HH_mm")
@@ -24,6 +24,12 @@ repositories {
     maven { url "https://maven.terraformersmc.com/" }
 }
 
+def addMod(path, enabled) {
+    if (enabled == "2")
+        dependencies { modImplementation(path) }
+    else if (enabled == "1")
+        dependencies { modCompileOnly(path) }
+}
 
 dependencies {
     // Fabric loader
@@ -37,15 +43,21 @@ dependencies {
         exclude(group: "net.fabricmc.fabric-api")
     }
 
-    // Sodium
-    modImplementation "curse.maven:sodium-394468:${rootProject.sodium_version}"
-    implementation "org.joml:joml:1.10.2"
+    // Starlight
+    addMod("curse.maven:starlight-521783:${rootProject.starlight_version_fabric}", rootProject.enable_starlight)
 
-    // Lithium
-//    modImplementation "maven.modrinth:lithium:${rootProject.lithium_version}"
+    // Sodium
+    addMod("curse.maven:sodium-394468:${rootProject.sodium_version}", rootProject.enable_sodium)
+    implementation "org.joml:joml:1.10.2"
+	
+	// Lithium
+    addMod("maven.modrinth:lithium:${rootProject.lithium_version}", rootProject.enable_lithium)
 
     // Iris
-//    modImplementation "maven.modrinth:iris:${rootProject.iris_version}"
+    addMod("maven.modrinth:iris:${rootProject.iris_version}", rootProject.enable_iris)
+
+    // BCLib
+    addMod("com.github.paulevsGitch:BCLib:${rootProject.bclib_version}", rootProject.enable_bclib)
 
     // Immersive Portals
     /*
@@ -61,7 +73,7 @@ dependencies {
         exclude(group: "net.fabricmc.fabric-api")
         transitive(false)
     }
-     */
+    */
 
 
 
@@ -105,35 +117,8 @@ runClient {
     finalizedBy(deleteResources)
 }
 
-// Put stuff from gradle.properties into the mod info stuff
-def resourceTargets = ["fabric.mod.json"]
-def intoTargets = ["$buildDir/resources/main/"]
-def replaceProperties = [
-        version: mod_version,
-        mod_name: mod_name,
-        authors: mod_authors,
-        description: mod_description
-]
-
 processResources {
     dependsOn(copyAccessWidener)
-    inputs.properties replaceProperties
-    replaceProperties.put 'project', project
-    filesMatching(resourceTargets) {
-        expand replaceProperties
-    }
-
-    intoTargets.each { target ->
-        if (file(target).exists()) {
-            copy {
-                from(sourceSets.main.resources) {
-                    include resourceTargets
-                    expand replaceProperties
-                }
-                into target
-            }
-        }
-    }
 }
 
 shadowJar {

fabric/src/main/java/com/seibel/lod/fabric/ClientProxy.java

@@ -30,10 +30,11 @@ import com.seibel.lod.core.util.SingletonHandler;
 import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper;
 import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
 
-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.keybinding.v1.KeyBindingHelper;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerWorldEvents;
+import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.MinecraftServer;
@@ -42,13 +43,14 @@ import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.chunk.LevelChunk;
 
 import java.util.HashSet;
+import java.util.List;
 
 import org.lwjgl.glfw.GLFW;
 
 /**
  * This handles all events sent to the client,
  * and is the starting point for most of the mod.
- *
+ * 
  * @author coolGi2007
  * @author Ran
  * @version 11-23-2021
@@ -65,7 +67,7 @@ public class ClientProxy
 	 */
 	public void registerEvents() {
 		// TODO: Fix this if it's wrong
-
+		
 		/* Registor the mod accessor*/
 
 		/* World Events */
@@ -74,12 +76,12 @@ public class ClientProxy
 
 		/* World Events */
 		//ServerChunkEvents.CHUNK_LOAD.register(this::chunkLoadEvent);
-		ClientChunkEvents.CHUNK_LOAD.register(this::chunkLoadEvent);
+		//ClientChunkEvents.CHUNK_LOAD.register(this::chunkLoadEvent);
 
 		/* World Events */
 		ServerWorldEvents.LOAD.register((server, level) -> this.worldLoadEvent(level));
 		ServerWorldEvents.UNLOAD.register((server, level) -> this.worldUnloadEvent(level));
-
+		
 		/* The Client World Events are in the mixins
 		Client world load event is in MixinClientLevel
 		Client world unload event is in MixinMinecraft */
@@ -107,7 +109,7 @@ public class ClientProxy
 	{
 		eventApi.worldSaveEvent();
 	}
-
+	
 	/** This is also called when a new dimension loads */
 	public void worldLoadEvent(Level level)
 	{
@@ -150,8 +152,8 @@ public class ClientProxy
 		// recreate the LOD where the blocks were changed
 		eventApi.blockChangeEvent(chunk, dimType);
 	}
-
-	private static final int[] KEY_TO_CHECK_FOR = {GLFW.GLFW_KEY_F6, GLFW.GLFW_KEY_F8};
+	
+	private static final List<Integer> KEY_TO_CHECK_FOR = List.of(GLFW.GLFW_KEY_F6, GLFW.GLFW_KEY_F8);
 	
 	HashSet<Integer> previousKeyDown = new HashSet<Integer>();
 	
@@ -164,7 +166,7 @@ public class ClientProxy
 			// Note: Minecraft's InputConstants is same as GLFW Key values
 			//TODO: Use mixin to hook directly into the GLFW Keyboard event in minecraft KeyboardHandler
 			// Check all keys we need
-			for (int i = GLFW.GLFW_KEY_A; i <= GLFW.GLFW_KEY_Z; i++) {
+			for (int i = InputConstants.KEY_A; i <= InputConstants.KEY_Z; i++) {
 				if (InputConstants.isKeyDown(Minecraft.getInstance().getWindow().getWindow(), i)) {
 					currectKeyDown.add(i);
 				}

fabric/src/main/java/com/seibel/lod/fabric/Main.java

@@ -27,9 +27,11 @@ import com.seibel.lod.core.util.SingletonHandler;
 import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModChecker;
 import com.seibel.lod.core.wrapperInterfaces.modAccessor.IOptifineAccessor;
 import com.seibel.lod.core.wrapperInterfaces.modAccessor.ISodiumAccessor;
+import com.seibel.lod.core.wrapperInterfaces.modAccessor.IStarlightAccessor;
 import com.seibel.lod.fabric.wrappers.modAccessor.ModChecker;
 import com.seibel.lod.fabric.wrappers.modAccessor.OptifineAccessor;
 import com.seibel.lod.fabric.wrappers.modAccessor.SodiumAccessor;
+import com.seibel.lod.fabric.wrappers.modAccessor.StarlightAccessor;
 import com.seibel.lod.fabric.wrappers.DependencySetup;
 
 import net.fabricmc.api.ClientModInitializer;
@@ -38,14 +40,14 @@ import net.fabricmc.api.ClientModInitializer;
  * Initialize and setup the Mod. <br>
  * If you are looking for the real start of the mod
  * check out the ClientProxy.
- *
+ * 
  * @author coolGi2007
  * @author Ran
  * @version 12-1-2021
  */
 public class Main implements ClientModInitializer
 {
-	// This is a client mod, so it should implement ClientModInitializer and in fabric.mod.json it should have "environment": "client"
+	// This is a client mod so it should implement ClientModInitializer and in fabric.mod.json it should have "environment": "client"
 	// Once it works on servers change the implement to ModInitializer and in fabric.mod.json it should be "environment": "*"
 
 	public static ClientProxy client_proxy;
@@ -72,6 +74,9 @@ public class Main implements ClientModInitializer
 		if (SingletonHandler.get(IModChecker.class).isModLoaded("sodium")) {
 			ModAccessorApi.bind(ISodiumAccessor.class, new SodiumAccessor());
 		}
+		if (SingletonHandler.get(IModChecker.class).isModLoaded("starlight")) {
+			ModAccessorApi.bind(IStarlightAccessor.class, new StarlightAccessor());
+		}
 		if (SingletonHandler.get(IModChecker.class).isModLoaded("optifine")) {
 			ModAccessorApi.bind(IOptifineAccessor.class, new OptifineAccessor());
 		}

fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinChunkGenerator.java

@@ -1,29 +0,0 @@
-package com.seibel.lod.fabric.mixins;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.server.level.WorldGenRegion;
-import net.minecraft.world.level.StructureFeatureManager;
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.levelgen.WorldgenRandom;
-
-@Mixin(ChunkGenerator.class)
-public class MixinChunkGenerator {
-	@Redirect(method = "applyBiomeDecoration", at = @At(
-			value = "INVOKE",
-			target = "Lnet/minecraft/world/level/biome/Biome;generate(Lnet/minecraft/world/level/StructureFeatureManager;"
-					+ "Lnet/minecraft/world/level/chunk/ChunkGenerator;Lnet/minecraft/server/level/WorldGenRegion;J"
-					+ "Lnet/minecraft/world/level/levelgen/WorldgenRandom;Lnet/minecraft/core/BlockPos;)V"
-			
-	))
-	private void wrapBiomeGenerateCall(Biome biome, StructureFeatureManager structFeatManager, ChunkGenerator generator,
-			WorldGenRegion genRegion, long l, WorldgenRandom random, BlockPos pos) {
-		synchronized((ChunkGenerator)(Object)this) {
-			biome.generate(structFeatManager, (ChunkGenerator)(Object)this, genRegion, l, random, pos);
-		}
-	}
-}

fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinFogRenderer.java

@@ -19,8 +19,8 @@ import net.minecraft.world.level.material.FogType;
 
 @Mixin(FogRenderer.class)
 public class MixinFogRenderer {
-    private static final ILodConfigWrapperSingleton CONFIG = SingletonHandler.get(ILodConfigWrapperSingleton.class);
-
+	private static final ILodConfigWrapperSingleton CONFIG = SingletonHandler.get(ILodConfigWrapperSingleton.class);
+	
 	// Using this instead of Float.MAX_VALUE because Sodium don't like it.
 	private static final float A_REALLY_REALLY_BIG_VALUE = 420694206942069.F;
 	private static final float A_EVEN_LARGER_VALUE = 42069420694206942069.F;

fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinOptionsScreen.java

@@ -22,7 +22,7 @@ import java.util.Objects;
  *
  * @author coolGi2007
  * @version 12-02-2021
- */
+*/
 @Mixin(OptionsScreen.class)
 public class MixinOptionsScreen extends Screen {
     // Get the texture for the button
@@ -35,18 +35,18 @@ public class MixinOptionsScreen extends Screen {
     private void lodconfig$init(CallbackInfo ci) {
         if (SingletonHandler.get(ILodConfigWrapperSingleton.class).client().getOptionsButton())
             this.addRenderableWidget(new TexturedButtonWidget(
-                    // Where the button is on the screen
-                    this.width / 2 - 180, this.height / 6 - 12,
-                    // Width and height of the button
-                    20, 20,
-                    // Offset
-                    0, 0,
-                    // Some textuary stuff
-                    20, ICON_TEXTURE, 20, 40,
-                    // Create the button and tell it where to go
-                    // For now it goes to the client option by default
-                    (buttonWidget) -> Objects.requireNonNull(minecraft).setScreen(ConfigGui.getScreen(this, "client")),
-                    // Add a title to the screen
-                    new TranslatableComponent("text.autoconfig." + ModInfo.ID + ".title")));
+                // Where the button is on the screen
+                this.width / 2 - 180, this.height / 6 - 12,
+                // Width and height of the button
+                20, 20,
+                // Offset
+                0, 0,
+                // Some textuary stuff
+                20, ICON_TEXTURE, 20, 40,
+                // Create the button and tell it where to go
+                // For now it goes to the client option by default
+                (buttonWidget) -> Objects.requireNonNull(minecraft).setScreen(ConfigGui.getScreen(this, "client")),
+                // Add a title to the screen
+                new TranslatableComponent("text.autoconfig." + ModInfo.ID + ".title")));
     }
 }

fabric/src/main/java/com/seibel/lod/fabric/mixins/MixinUtilBackgroudThread.java

@@ -0,0 +1,52 @@
+package com.seibel.lod.fabric.mixins;
+
+import java.util.concurrent.ExecutorService;
+import java.util.function.Supplier;
+
+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.CallbackInfoReturnable;
+
+import com.seibel.lod.common.wrappers.DependencySetupDoneCheck;
+import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment;
+import com.seibel.lod.core.api.ClientApi;
+import com.seibel.lod.core.util.DummyRunExecutorService;
+
+import net.minecraft.Util;
+
+@Mixin(Util.class)
+public class MixinUtilBackgroudThread
+{
+	
+	@Inject(method = "wrapThreadWithTaskName(Ljava/lang/String;Ljava/lang/Runnable;)Ljava/lang/Runnable;",
+			at = @At("HEAD"), cancellable = true)
+	private static void overrideUtil$wrapThreadWithTaskName(String string, Runnable r, CallbackInfoReturnable<Runnable> ci)
+	{
+		if (DependencySetupDoneCheck.isDone && BatchGenerationEnvironment.isCurrentThreadDistantGeneratorThread())
+		{
+			//ClientApi.LOGGER.info("util wrapThreadWithTaskName(Runnable) triggered");
+			ci.setReturnValue(r);
+		}
+	}
+	@Inject(method = "wrapThreadWithTaskName(Ljava/lang/String;Ljava/util/function/Supplier;)Ljava/util/function/Supplier;",
+			at = @At("HEAD"), cancellable = true)
+	private static void overrideUtil$wrapThreadWithTaskNameForSupplier(String string, Supplier<?> r, CallbackInfoReturnable<Supplier<?>> ci)
+	{
+		if (DependencySetupDoneCheck.isDone && BatchGenerationEnvironment.isCurrentThreadDistantGeneratorThread())
+		{
+			//ClientApi.LOGGER.info("util wrapThreadWithTaskName(Supplier) triggered");
+			ci.setReturnValue(r);
+		}
+	}
+	
+	@Inject(method = "backgroundExecutor", at = @At("HEAD"), cancellable = true)
+	private static void overrideUtil$backgroundExecutor(CallbackInfoReturnable<ExecutorService> ci)
+	{
+		if (DependencySetupDoneCheck.isDone && BatchGenerationEnvironment.isCurrentThreadDistantGeneratorThread())
+		{
+			//ClientApi.LOGGER.info("util backgroundExecutor triggered");
+			ci.setReturnValue(new DummyRunExecutorService());
+		}
+	}
+}

fabric/src/main/java/com/seibel/lod/fabric/mixins/events/MixinBlockUpdate.java

@@ -18,11 +18,10 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
  */
 @Mixin(ClientboundBlockUpdatePacket.class)
 public abstract class MixinBlockUpdate {
-    @Shadow
-    public abstract BlockPos getPos();
+    @Shadow public abstract BlockPos getPos();
 
     @Inject(method = "handle(Lnet/minecraft/network/protocol/game/ClientGamePacketListener;)V", at = @At("TAIL"))
     private void onBlockUpdate(ClientGamePacketListener clientGamePacketListener, CallbackInfo ci) {
         Main.client_proxy.blockChangeEvent(Minecraft.getInstance().player.clientLevel, this.getPos());
     }
-}
+}

fabric/src/main/java/com/seibel/lod/fabric/mixins/events/MixinClientLevel.java

@@ -5,8 +5,7 @@ import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.multiplayer.ClientPacketListener;
 import net.minecraft.client.renderer.LevelRenderer;
 import net.minecraft.resources.ResourceKey;
-import net.minecraft.util.profiling.ProfilerFiller;
-import net.minecraft.world.level.Level;
+import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.world.level.dimension.DimensionType;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -22,7 +21,14 @@ import java.util.function.Supplier;
 @Mixin(ClientLevel.class)
 public class MixinClientLevel {
     @Inject(method = "<init>", at = @At("TAIL"))
-    private void loadWorldEvent(ClientPacketListener clientPacketListener, ClientLevel.ClientLevelData clientLevelData, ResourceKey<Level> resourceKey, DimensionType dimensionType, int i, Supplier<ProfilerFiller> supplier, LevelRenderer levelRenderer, boolean bl, long l, CallbackInfo ci) {
+    private void loadWorldEvent(ClientPacketListener clientPacketListener, ClientLevel.ClientLevelData clientLevelData, ResourceKey resourceKey, DimensionType dimensionType, int i, int j, Supplier supplier, LevelRenderer levelRenderer, boolean bl, long l, CallbackInfo ci) {
         Main.client_proxy.worldLoadEvent((ClientLevel) (Object) this);
     }
+    @Inject(method = "setLightReady", at = @At("HEAD"))
+    private void onChunkLightReady(int x, int z, CallbackInfo ci) {
+    	ClientLevel l = (ClientLevel) (Object) this;
+    	LevelChunk chunk = l.getChunkSource().getChunk(x, z, false);
+    	if (chunk!=null && !chunk.isClientLightReady())
+    		Main.client_proxy.chunkLoadEvent(l, chunk);
+    }
 }

fabric/src/main/java/com/seibel/lod/fabric/mixins/unsafe/MixinThreadingDectector.java

@@ -1,8 +1,9 @@
 package com.seibel.lod.fabric.mixins.unsafe;
 
-import net.minecraft.world.level.chunk.PalettedContainer;
+import net.minecraft.util.ThreadingDetector;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Mutable;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -10,14 +11,12 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import java.util.concurrent.Semaphore;
 
 /**
- * NOTE: THIS IS NOT A FIX TO THE PROBLEM.
- * TODO: Do/Find an actual fix to this
- *
- * @author Ran
+ * Why does this exist? But okay! (Will be probably removed when the experimental generator is done)
  */
-@Mixin(PalettedContainer.class)
-public class MixinPalettedContainer {
+@Mixin(ThreadingDetector.class)
+public class MixinThreadingDectector {
     @Mutable
+    @Shadow
     private Semaphore lock;
 
     @Inject(method = "<init>", at = @At("RETURN"))

fabric/src/main/java/com/seibel/lod/fabric/wrappers/DependencySetup.java

@@ -1,5 +1,7 @@
 package com.seibel.lod.fabric.wrappers;
 
+import com.seibel.lod.common.LodCommonMain;
+import com.seibel.lod.common.wrappers.config.NewLodConfigWrapperSingleton;
 import com.seibel.lod.core.util.SingletonHandler;
 import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
 import com.seibel.lod.common.wrappers.config.LodConfigWrapperSingleton;
@@ -18,6 +20,9 @@ public class DependencySetup
 {
 	public static void createInitialBindings()
 	{
-		SingletonHandler.bind(ILodConfigWrapperSingleton.class, LodConfigWrapperSingleton.INSTANCE);
+		if (!LodCommonMain.IsNewConfig)
+			SingletonHandler.bind(ILodConfigWrapperSingleton.class, LodConfigWrapperSingleton.INSTANCE);
+		else
+			SingletonHandler.bind(ILodConfigWrapperSingleton.class, NewLodConfigWrapperSingleton.INSTANCE);
 	}
 }

fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/ModChecker.java

@@ -1,4 +1,3 @@
-
 package com.seibel.lod.fabric.wrappers.modAccessor;
 
 import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModChecker;

fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/OptifineAccessor.java

@@ -8,17 +8,17 @@ import com.seibel.lod.core.wrapperInterfaces.modAccessor.IOptifineAccessor;
 public class OptifineAccessor implements IOptifineAccessor
 {
 
-    @Override
-    public String getModName()
-    {
-        return "Optifine-Fabric-1.18.X";
-    }
-
-    @Override
-    public HashSet<AbstractChunkPosWrapper> getNormalRenderedChunks()
-    {
-        // TODO: Impl proper methods here
-        return null;
-    }
+	@Override
+	public String getModName()
+	{
+		return "Optifine-Fabric-1.18.X";
+	}
 
+	@Override
+	public HashSet<AbstractChunkPosWrapper> getNormalRenderedChunks()
+	{
+		// TODO: Impl proper methods here
+		return null;
+	}
+	
 }

fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/SodiumAccessor.java

@@ -4,33 +4,39 @@ import java.util.HashSet;
 import java.util.stream.Collectors;
 
 import com.seibel.lod.core.util.SingletonHandler;
+import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory;
 import com.seibel.lod.core.wrapperInterfaces.chunk.AbstractChunkPosWrapper;
-import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
 import com.seibel.lod.core.wrapperInterfaces.modAccessor.ISodiumAccessor;
 
-
 import me.jellysquid.mods.sodium.client.render.SodiumWorldRenderer;
 import net.minecraft.client.Minecraft;
 import net.minecraft.world.level.LevelHeightAccessor;
 
 public class SodiumAccessor implements ISodiumAccessor {
-	private final IMinecraftRenderWrapper MC_RENDER = SingletonHandler.get(IMinecraftRenderWrapper.class);
+	IWrapperFactory factory = SingletonHandler.get(IWrapperFactory.class);
 
-    @Override
-    public String getModName() {
-    	return "Sodium-Fabric-1.17.1";
+	@Override
+	public String getModName() {
+		return "Sodium-Fabric-1.18.X";
 	}
 
 	@Override
 	public HashSet<AbstractChunkPosWrapper> getNormalRenderedChunks() {
 		SodiumWorldRenderer renderer = SodiumWorldRenderer.instance();
-		LevelHeightAccessor height = Minecraft.getInstance().level;
-		
-		// TODO: Maybe use a mixin to make this more efficient
-		return MC_RENDER.getMaximumRenderedChunks().stream().filter((AbstractChunkPosWrapper chunk) -> {
-			return (renderer.isBoxVisible(
-					chunk.getMinBlockX()+1, height.getMinBuildHeight()+1, chunk.getMinBlockZ()+1,
-					chunk.getMinBlockX()+15, height.getMaxBuildHeight()-1, chunk.getMinBlockZ()+15));
-		}).collect(Collectors.toCollection(HashSet::new));
+		LevelHeightAccessor height =  Minecraft.getInstance().level; 
+		// 0b11 = Lighted chunk & loaded chunk
+		return renderer.getChunkTracker().getChunks(0b00).filter(
+			(long l) -> {
+				return true;
+				//for (int i = height.getMinSection(); i<height.getMaxSection(); i++) {
+				//	SectionPos p = SectionPos.of(new ChunkPos(l), i);
+				//	if (renderer.isBoxVisible(p.minBlockX()+1, p.minBlockY()+1, p.minBlockZ()+1,
+				//			p.maxBlockX()-1, p.maxBlockY()-1, p.maxBlockZ()-1)) return true;
+				//}
+				//return false;
+			}).mapToObj((long l) -> {
+				return (AbstractChunkPosWrapper)factory.createChunkPos(l);
+			}).collect(Collectors.toCollection(HashSet::new));
 	}
+
 }

fabric/src/main/java/com/seibel/lod/fabric/wrappers/modAccessor/StarlightAccessor.java

@@ -0,0 +1,16 @@
+package com.seibel.lod.fabric.wrappers.modAccessor;
+
+import com.seibel.lod.core.wrapperInterfaces.modAccessor.IStarlightAccessor;
+
+
+public class StarlightAccessor implements IStarlightAccessor {
+
+	@Override
+	public String getModName() {
+		return "Starlight-Fabric-1.18.X";
+	}
+	
+	public StarlightAccessor() {
+		
+	}
+}

fabric/src/main/resources/LICENSE-MinecraftForge.txt

@@ -455,4 +455,4 @@ FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
 SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
 DAMAGES.
 
-                     END OF TERMS AND CONDITIONS
+                     END OF TERMS AND CONDITIONS

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

@@ -2,17 +2,17 @@
   "required": true,
   "minVersion": "0.8",
   "package": "com.seibel.lod.fabric.mixins",
-  "compatibilityLevel": "JAVA_16",
+  "compatibilityLevel": "JAVA_17",
   "mixins": [
-    "events.MixinServerLevel",
-    "unsafe.MixinPalettedContainer"
+    "unsafe.MixinThreadingDectector",
+    "MixinUtilBackgroudThread",
+    "events.MixinServerLevel"
   ],
   "client": [
     "MixinMinecraft",
     "MixinOptionsScreen",
     "MixinWorldRenderer",
     "MixinFogRenderer",
-    "MixinChunkGenerator",
     "events.MixinClientLevel",
     "events.MixinMinecraft",
     "events.MixinBlockUpdate"
@@ -21,4 +21,4 @@
   "injectors": {
     "defaultRequire": 1
   }
-}
+}

fabric/src/main/resources/fabric.mod.json

@@ -8,9 +8,9 @@
   "authors": ["${authors}"],
 
   "contact": {
-    "homepage": "https://www.curseforge.com/minecraft/mc-mods/distant-horizons",
-    "sources": "https://gitlab.com/jeseibel/minecraft-lod-mod/",
-    "issues": "https://gitlab.com/jeseibel/minecraft-lod-mod/-/issues"
+    "homepage": "${homepage}",
+    "sources": "${source}",
+    "issues": "${issues}"
   },
 
   "license": "CC0-1.0",
@@ -34,8 +34,8 @@
   "depends": {
     "fabricloader": "*",
     "fabric": "*",
-    "minecraft": "1.17.x",
-    "java": ">=16"
+    "minecraft": "1.18.x",
+    "java": ">=17"
   },
   "suggests": {
     "another-mod": "*"

forge/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "com.github.johnrengelman.shadow" version "7.0.0"
+    id "com.github.johnrengelman.shadow" version "7.1.0"
 }
 
 version = rootProject.mod_version+"-"+rootProject.minecraft_version+"-"+new Date().format("yyyy_MM_dd_HH_mm")
@@ -25,22 +25,31 @@ configurations {
     developmentForge.extendsFrom common
 }
 
+def addMod(path, enabled) {
+    if (enabled == "2")
+        dependencies { modImplementation(path) }
+    else if (enabled == "1")
+        dependencies { modCompileOnly(path) }
+}
+
 dependencies {
     // Forge loader
     forge "net.minecraftforge:forge:${rootProject.minecraft_version}-${rootProject.forge_version}"
 
+    // Starlight
+    addMod("curse.maven:starlight-forge-526854:${rootProject.starlight_version_forge}", rootProject.enable_starlight_forge)
+    annotationProcessor "org.spongepowered:mixin:0.8.4:processor"
+
     common(project(path: ":common", configuration: "namedElements")) { transitive false }
     shadowMe(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
 
-    // Starlight
-//    modImplementation("curse.maven:starlight-forge-526854:${rootProject.starlight_version_forge}")
-
 //    forgeDependencies(project(":core")) { transitive false }
 
 
     // Toml
     shadowMe("com.electronwill.night-config:toml:${rootProject.toml_version}") {}
 
+    // Compression
     forgeDependencies('org.tukaani:xz:1.9')
     forgeDependencies('org.apache.commons:commons-compress:1.21')
     shadowMe 'org.tukaani:xz:1.9'
@@ -57,36 +66,9 @@ task copyCommonResources(type: Copy) {
     into file("build/resources/main")
 }
 
-// Put stuff from gradle.properties into the mod info stuff
-def resourceTargets = ["META-INF/mods.toml"]
-def intoTargets = ["$buildDir/resources/main/"]
-def replaceProperties = [
-        version: mod_version,
-        mod_name: mod_name,
-        authors: mod_authors,
-        description: mod_description
-]
-
 processResources {
     dependsOn(copyCoreResources)
     dependsOn(copyCommonResources)
-    inputs.properties replaceProperties
-    replaceProperties.put 'project', project
-    filesMatching(resourceTargets) {
-        expand replaceProperties
-    }
-
-    intoTargets.each { target ->
-        if (file(target).exists()) {
-            copy {
-                from(sourceSets.main.resources) {
-                    include resourceTargets
-                    expand replaceProperties
-                }
-                into target
-            }
-        }
-    }
 }
 
 shadowJar {

forge/src/main/java/com/seibel/lod/forge/ForgeClientProxy.java

@@ -40,7 +40,7 @@ import net.minecraftforge.eventbus.api.SubscribeEvent;
 /**
  * This handles all events sent to the client,
  * and is the starting point for most of the mod.
- *
+ * 
  * @author James_Seibel
  * @version 11-12-2021
  */
@@ -48,28 +48,28 @@ public class ForgeClientProxy
 {
 	private final EventApi eventApi = EventApi.INSTANCE;
 	private final ClientApi clientApi = ClientApi.INSTANCE;
-
-
-
+	
+	
+	
 	@SubscribeEvent
 	public void serverTickEvent(TickEvent.ServerTickEvent event)
 	{
 		if (event.phase != TickEvent.Phase.START) return;
 		eventApi.serverTickEvent();
 	}
-
+	
 	@SubscribeEvent
 	public void chunkLoadEvent(ChunkEvent.Load event)
 	{
 		clientApi.clientChunkLoadEvent(new ChunkWrapper(event.getChunk(), event.getWorld()), WorldWrapper.getWorldWrapper(event.getWorld()));
 	}
-
+	
 	@SubscribeEvent
 	public void worldSaveEvent(WorldEvent.Save event)
 	{
 		eventApi.worldSaveEvent();
 	}
-
+	
 	/** This is also called when a new dimension loads */
 	@SubscribeEvent
 	public void worldLoadEvent(WorldEvent.Load event)
@@ -78,13 +78,13 @@ public class ForgeClientProxy
 			eventApi.worldLoadEvent(WorldWrapper.getWorldWrapper(event.getWorld()));
 		}
 	}
-
+	
 	@SubscribeEvent
 	public void worldUnloadEvent(WorldEvent.Unload event)
 	{
 		eventApi.worldUnloadEvent(WorldWrapper.getWorldWrapper(event.getWorld()));
 	}
-
+	
 	@SubscribeEvent
 	public void blockChangeEvent(BlockEvent event)
 	{
@@ -97,12 +97,12 @@ public class ForgeClientProxy
 		{
 			IChunkWrapper chunk = new ChunkWrapper(event.getWorld().getChunk(event.getPos()), event.getWorld());
 			DimensionTypeWrapper dimType = DimensionTypeWrapper.getDimensionTypeWrapper(event.getWorld().dimensionType());
-
+			
 			// recreate the LOD where the blocks were changed
 			eventApi.blockChangeEvent(chunk, dimType);
 		}
 	}
-
+	
 	@SubscribeEvent
 	public void onKeyInput(InputEvent.KeyInputEvent event)
 	{
@@ -110,5 +110,7 @@ public class ForgeClientProxy
 		if (event.getAction() != GLFW.GLFW_PRESS) return;
 		clientApi.keyPressedEvent(event.getKey());
 	}
-
+	
+	
+	
 }

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

@@ -34,20 +34,22 @@ import com.seibel.lod.forge.wrappers.ForgeDependencySetup;
 
 import com.seibel.lod.forge.wrappers.modAccessor.ModChecker;
 import com.seibel.lod.forge.wrappers.modAccessor.OptifineAccessor;
+
 import net.minecraft.client.renderer.block.model.BakedQuad;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraftforge.client.model.data.ModelDataMap;
+import net.minecraftforge.client.ConfigGuiHandler;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.fml.ModList;
 import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import net.minecraftforge.fml.loading.FMLLoader;
-import net.minecraftforge.fmlclient.ConfigGuiHandler;
+import net.minecraftforge.forgespi.language.IModInfo;
 
 import java.util.List;
 import java.util.Random;
@@ -56,7 +58,7 @@ import java.util.Random;
  * Initialize and setup the Mod. <br>
  * If you are looking for the real start of the mod
  * check out the ClientProxy.
- *
+ * 
  * @author James Seibel
  * @version 11-21-2021
  */
@@ -64,7 +66,7 @@ import java.util.Random;
 public class ForgeMain implements LodForgeMethodCaller
 {
 	public static ForgeClientProxy forgeClientProxy;
-
+	
 	private void init(final FMLCommonSetupEvent event)
 	{
 		// make sure the dependencies are set up before the mod needs them
@@ -78,18 +80,18 @@ public class ForgeMain implements LodForgeMethodCaller
 			ModAccessorApi.bind(IOptifineAccessor.class, new OptifineAccessor());
 		}
 	}
-
-
+	
+	
 	public ForgeMain()
 	{
 		// Register the methods
 		FMLJavaModLoadingContext.get().getModEventBus().addListener(this::init);
 		FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onClientStart);
-
+		
 		// Register ourselves for server and other game events we are interested in
 		MinecraftForge.EVENT_BUS.register(this);
 	}
-
+	
 	private void onClientStart(final FMLClientSetupEvent event)
 	{
 		ModLoadingContext.get().registerExtensionPoint(ConfigGuiHandler.ConfigGuiFactory.class,
@@ -98,15 +100,9 @@ public class ForgeMain implements LodForgeMethodCaller
 		MinecraftForge.EVENT_BUS.register(forgeClientProxy);
 	}
 
-	private ModelDataMap dataMap = new ModelDataMap.Builder().build();
+	private final ModelDataMap dataMap = new ModelDataMap.Builder().build();
 	@Override
 	public List<BakedQuad> getQuads(MinecraftWrapper mc, Block block, BlockState blockState, Direction direction, Random random) {
 		return mc.getModelManager().getBlockModelShaper().getBlockModel(block.defaultBlockState()).getQuads(blockState, direction, random, dataMap);
 	}
-
-
-	@Override
-	public int getPixelRGBA(TextureAtlasSprite sprite, int frameIndex, int x, int y) {
-		return sprite.getPixelRGBA(frameIndex, x, y);
-	}
 }

forge/src/main/java/com/seibel/lod/forge/mixins/MixinChunkGenerator.java

@@ -1,29 +0,0 @@
-package com.seibel.lod.forge.mixins;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.server.level.WorldGenRegion;
-import net.minecraft.world.level.StructureFeatureManager;
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.levelgen.WorldgenRandom;
-
-@Mixin(ChunkGenerator.class)
-public class MixinChunkGenerator {
-	@Redirect(method = "applyBiomeDecoration", at = @At(
-			value = "INVOKE",
-			target = "Lnet/minecraft/world/level/biome/Biome;generate(Lnet/minecraft/world/level/StructureFeatureManager;"
-					+ "Lnet/minecraft/world/level/chunk/ChunkGenerator;Lnet/minecraft/server/level/WorldGenRegion;J"
-					+ "Lnet/minecraft/world/level/levelgen/WorldgenRandom;Lnet/minecraft/core/BlockPos;)V"
-			
-	))
-	private void wrapBiomeGenerateCall(Biome biome, StructureFeatureManager structFeatManager, ChunkGenerator generator,
-			WorldGenRegion genRegion, long l, WorldgenRandom random, BlockPos pos) {
-		synchronized((ChunkGenerator)(Object)this) {
-			biome.generate(structFeatManager, (ChunkGenerator)(Object)this, genRegion, l, random, pos);
-		}
-	}
-}

forge/src/main/java/com/seibel/lod/forge/mixins/MixinFogRenderer.java

@@ -19,21 +19,22 @@ import net.minecraft.world.level.material.FogType;
 
 @Mixin(FogRenderer.class)
 public class MixinFogRenderer {
-	// Using this instead of Float.MAX_VALUE because Sodium don't like it. (And just in case it's here also for forge)
+	
+	// Using this instead of Float.MAX_VALUE because Sodium don't like it. (and copy paste in case someone in forge don't like it)
 	private static final float A_REALLY_REALLY_BIG_VALUE = 420694206942069.F;
 	private static final float A_EVEN_LARGER_VALUE = 42069420694206942069.F;
 	
 	@Inject(at = @At("RETURN"),
-		method = "setupFog(Lnet/minecraft/client/Camera;Lnet/minecraft/client/renderer/FogRenderer$FogMode;FZF)V",
-		remap = false) // Due to this being a forge added method
-	private static void disableSetupFog(Camera camera, FogMode fogMode, float f, boolean bl, float tick, CallbackInfo callback) {
-	    ILodConfigWrapperSingleton CONFIG;
-	    try {
-	    	CONFIG = SingletonHandler.get(ILodConfigWrapperSingleton.class);
-	    } catch (NullPointerException e) {
-	    	return; // Happens on forge not loading the mod before this.
-	    }
-		FogType fogTypes = camera.getFluidInCamera();
+			method = "setupFog(Lnet/minecraft/client/Camera;Lnet/minecraft/client/renderer/FogRenderer$FogMode;FZF)V", 
+			remap = false) // Remap = false due to this being added by forge.
+	private static void disableSetupFog(Camera camera, FogMode fogMode, float f, boolean bl, float partTick, CallbackInfo callback) {
+		ILodConfigWrapperSingleton CONFIG;
+		try {
+			CONFIG = SingletonHandler.get(ILodConfigWrapperSingleton.class);
+		} catch (NullPointerException e) {
+			return; // May happen due to forge for some reason haven't inited out thingy yet.
+		}
+	    FogType fogTypes = camera.getFluidInCamera();
 	    Entity entity = camera.getEntity();
 	    boolean isUnderWater = (entity instanceof LivingEntity) && ((LivingEntity)entity).hasEffect(MobEffects.BLINDNESS);
 	    if (!isUnderWater) {

forge/src/main/java/com/seibel/lod/forge/mixins/MixinUtilBackgroudThread.java

@@ -0,0 +1,55 @@
+package com.seibel.lod.forge.mixins;
+
+import java.util.concurrent.ExecutorService;
+import java.util.function.Supplier;
+
+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.CallbackInfoReturnable;
+
+import com.seibel.lod.common.wrappers.DependencySetupDoneCheck;
+import com.seibel.lod.core.util.DummyRunExecutorService;
+
+import net.minecraft.Util;
+
+@Mixin(Util.class)
+public class MixinUtilBackgroudThread
+{
+	
+	private static boolean shouldApplyOverride() {
+		return DependencySetupDoneCheck.getIsCurrentThreadDistantGeneratorThread.get();
+	}
+	
+	
+	@Inject(method = "wrapThreadWithTaskName(Ljava/lang/String;Ljava/lang/Runnable;)Ljava/lang/Runnable;",
+			at = @At("HEAD"), cancellable = true)
+	private static void overrideUtil$wrapThreadWithTaskName(String string, Runnable r, CallbackInfoReturnable<Runnable> ci)
+	{
+		if (DependencySetupDoneCheck.isDone && shouldApplyOverride())
+		{
+			//ClientApi.LOGGER.info("util wrapThreadWithTaskName(Runnable) triggered");
+			ci.setReturnValue(r);
+		}
+	}
+	@Inject(method = "wrapThreadWithTaskName(Ljava/lang/String;Ljava/util/function/Supplier;)Ljava/util/function/Supplier;",
+			at = @At("HEAD"), cancellable = true)
+	private static void overrideUtil$wrapThreadWithTaskNameForSupplier(String string, Supplier<?> r, CallbackInfoReturnable<Supplier<?>> ci)
+	{
+		if (DependencySetupDoneCheck.isDone && shouldApplyOverride())
+		{
+			//ClientApi.LOGGER.info("util wrapThreadWithTaskName(Supplier) triggered");
+			ci.setReturnValue(r);
+		}
+	}
+	
+	@Inject(method = "backgroundExecutor", at = @At("HEAD"), cancellable = true)
+	private static void overrideUtil$backgroundExecutor(CallbackInfoReturnable<ExecutorService> ci)
+	{
+		if (DependencySetupDoneCheck.isDone && shouldApplyOverride())
+		{
+			//ClientApi.LOGGER.info("util backgroundExecutor triggered");
+			ci.setReturnValue(new DummyRunExecutorService());
+		}
+	}
+}

forge/src/main/java/com/seibel/lod/forge/mixins/unsafe/MixinThreadingDectector.java

@@ -0,0 +1,26 @@
+package com.seibel.lod.forge.mixins.unsafe;
+
+import net.minecraft.util.ThreadingDetector;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Mutable;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.concurrent.Semaphore;
+
+/**
+ * Why does this exist? But okay! (Will be probably removed when the experimental generator is done)
+ */
+@Mixin(ThreadingDetector.class)
+public class MixinThreadingDectector {
+    @Mutable
+    @Shadow
+    private Semaphore lock;
+
+    @Inject(method = "<init>", at = @At("RETURN"))
+    private void setSemaphore(CallbackInfo ci) {
+        this.lock = new Semaphore(2);
+    }
+}

forge/src/main/java/com/seibel/lod/forge/wrappers/ForgeDependencySetup.java

@@ -1,11 +1,13 @@
 package com.seibel.lod.forge.wrappers;
 
+import com.seibel.lod.common.LodCommonMain;
 import com.seibel.lod.common.wrappers.config.LodConfigWrapperSingleton;
+import com.seibel.lod.common.wrappers.config.NewLodConfigWrapperSingleton;
 import com.seibel.lod.core.util.SingletonHandler;
 import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
 
 /**
- * Binds all necessary dependencies, so we
+ * Binds all necessary dependencies so we
  * can access them in Core. <br>
  * This needs to be called before any Core classes
  * are loaded.
@@ -18,6 +20,9 @@ public class ForgeDependencySetup
 {
 	public static void createInitialBindings()
 	{
-		SingletonHandler.bind(ILodConfigWrapperSingleton.class, LodConfigWrapperSingleton.INSTANCE);
+		if (!LodCommonMain.IsNewConfig)
+			SingletonHandler.bind(ILodConfigWrapperSingleton.class, LodConfigWrapperSingleton.INSTANCE);
+		else
+			SingletonHandler.bind(ILodConfigWrapperSingleton.class, NewLodConfigWrapperSingleton.INSTANCE);
 	}
 }

forge/src/main/java/com/seibel/lod/forge/wrappers/modAccessor/ModChecker.java

@@ -10,4 +10,4 @@ public class ModChecker implements IModChecker {
     public boolean isModLoaded(String modid) {
         return ModList.get().isLoaded(modid);
     }
-}
+}

forge/src/main/java/com/seibel/lod/forge/wrappers/modAccessor/OptifineAccessor.java

@@ -8,17 +8,17 @@ import com.seibel.lod.core.wrapperInterfaces.modAccessor.IOptifineAccessor;
 public class OptifineAccessor implements IOptifineAccessor
 {
 
-    @Override
-    public String getModName()
-    {
-        return "Optifine-Forge-1.18.X";
-    }
-
-    @Override
-    public HashSet<AbstractChunkPosWrapper> getNormalRenderedChunks()
-    {
-        // TODO: Impl proper methods here
-        return null;
-    }
+	@Override
+	public String getModName()
+	{
+		return "Optifine-Forge-1.18.X";
+	}
 
+	@Override
+	public HashSet<AbstractChunkPosWrapper> getNormalRenderedChunks()
+	{
+		// TODO: Impl proper methods here
+		return null;
+	}
+	
 }

forge/src/main/resources/META-INF/mods.toml

@@ -1,22 +1,21 @@
 
 modLoader="javafml" #//mandatory
-loaderVersion="[36,)" # // mandatory. This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
+loaderVersion="[37,40)" # // mandatory. This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
 license="GNU GPLv3"
-issueTrackerURL="https://gitlab.com/jeseibel/minecraft-lod-mod/-/issues"
+issueTrackerURL="${issues}"
 
 
 [[mods]] #//mandatory
 	modId="lod" #//mandatory
 	version= "${version}" #//mandatory, gets the version number from jar populated by the build.gradle script
 	displayName="${mod_name}" #//mandatory
+	authors="${authors}"
 	#//updateJSONURL="https://change.me.example.invalid/updates.json" # A URL to query for updates for this mod. See the JSON update specification https://mcforge.readthedocs.io/en/latest/gettingstarted/autoupdate/
-	displayURL="https://www.curseforge.com/minecraft/mc-mods/distant-horizons"
+	displayURL="${homepage}"
+	description= "${description}" #//mandatory. The description text for the mod
 	logoFile="logo.png"
 	catalogueImageIcon="icon.png"
 	credits="Massive thanks to: Leonardo, Cola, Ran, and CoolGi. For their hard work to bring Distant Horizons to where it is today. - James"
-	authors="${authors}"
-	#//mandatory. The description text for the mod
-	description= ''' ${description} '''
 	#// if not set defaults to "false"
 	clientSideOnly="true"
 	#// if not set defaults to "BOTH"

forge/src/main/resources/lod.mixins.json

@@ -2,9 +2,9 @@
 	"required": true,
 	"minVersion": "0.8",
 	"package": "com.seibel.lod.forge.mixins",
-	"compatibilityLevel": "JAVA_16",
+	"compatibilityLevel": "JAVA_17",
 	"mixins": [
-    	"MixinChunkGenerator"
+		"MixinUtilBackgroudThread"
 	],
 	"client": [
 		"MixinOptionsScreen",

gradle.properties

@@ -1,9 +1,9 @@
 org.gradle.jvmargs=-Xmx2048M
 
-minecraft_version=1.17.1
+minecraft_version=1.18.1
 
 archives_base_name=DistantHorizons
-mod_version=1.6.0a
+mod_version=1.6.2a
 maven_group=com.seibel.lod
 toml_version=3.6.4
 
@@ -12,19 +12,38 @@ mod_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.
 mod_authors=James Seibel, Leonardo Amato, Cola, coolGi2007, Ran, Leetom
 mod_homepage=https://www.curseforge.com/minecraft/mc-mods/distant-horizons
+mod_source=https://gitlab.com/jeseibel/minecraft-lod-mod/
+mod_issues=https://gitlab.com/jeseibel/minecraft-lod-mod/-/issues
 
 # Fabric loader
-fabric_loader_version=0.12.6
-fabric_api_version=0.37.1+1.17
-    # Fabric mods
-    modmenu_version=2.0.14
-    starlight_version_fabric=3442770
-    lithium_version=mc1.17.1-0.7.5
-    sodium_version=3605275
-    iris_version=1.17.x-v1.1.4
-    immersive_portals_version = 0.14-1.17
+fabric_loader_version=0.13.1
+fabric_api_version=0.46.4+1.18
+    # Fabric mod versions
+    modmenu_version=3.0.0
+    starlight_version_fabric=3554912
+    lithium_version=mc1.18.1-0.7.7
+    sodium_version=3605309
+    iris_version=1.18.x-v1.1.4
+    bclib_version=1.2.5
+    immersive_portals_version = v1.0.4-1.18
+
+    # 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_sodium=1
+    enable_lithium=0
+    enable_iris=0
+    enable_bclib=0
 
 # Forge loader
-forge_version=37.1.1
-    # Forge mods
-    starlight_version_forge=3457784
+forge_version=39.0.76
+    # Forge mod versions
+    starlight_version_forge=3559934
+
+    # Forge mod run
+    # 0 = Dont 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

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists