I accidently removed the "a"

Detail cause: I only override the getChunk(x,y,status,bool) and not its
sub set like getChunk(x,y), getChunk(x,y,status) because... Programmer
is always lazy. Aren't they?

.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

@@ -1,11 +1,4 @@
-# THIS VERSION IS NO LONGER MAINTAINED! ALL DEVELOPMENT HAVE BEEN MOVED OVER TO THE MAIN BRANCH
-
-# <img src="https://gitlab.com/jeseibel/distant-horizons-core/-/raw/main/_logo%20files/LOD%20logo%20flat%20-%20with%20boarder.png" width="32"> Distant Horizons
-
-> A mod that adds a Level of Detail System to Minecraft
-
-
-# What is Distant Horizons?
+# Distant Horizons
 
 This mod adds a Level Of Detail (LOD) system to Minecraft.\
 This implementation renders simplified chunks outside the normal render distance\
@@ -17,52 +10,52 @@ 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: 36.2.28\
-Fabric version: 0.13.2\
-Fabric API version: 0.42.0+1.16
+Forge version: 39.0.5 and 38.0.14\
+Fabric version: 0.12.12\
+Fabric API version: 0.44.0+1.18
 
-Modmenu version: 1.16.22
+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.16.5-36.1.0 and fabric version 1.16.5-0.12.3)
+(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
 
 **Using GUI**
 1. Open a command line in the project folder
 2. Run the command: `./gradlew build`
-5. Then run command: `./gradlew mergeJars`
-6. The compiled jar file will be in the folder `Merged`
+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.16.5_architectury --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`
-5. `./gradlew mergeJars`
-6. The compiled jar file will be in the folder `Merged`
+3. `./gradlew assemble` or `./gradlew build`
+4. The build should be in `fabric/build/libs/` and `forge/build/libs/`
 
 
 ## Other commands
@@ -83,8 +76,7 @@ Source code uses Mojang mappings.
 Build only Fabric: `./gradlew fabric:assemble` or `./gradlew fabric:build`\
 Build only Forge: `./gradlew fabric:assemble` or `./gradlew forge:build`\
 Run the Fabric client (for debugging): `./gradlew fabric:runClient`\
-Run the Forge client (**THIS DOST WORK** due to a bug with architectury): `./gradlew forge:runClient`\
-To use a custom version of Java use `-D` then the path for Java
+Run the Forge client (for debugging): `./gradlew forge:runClient`
 
 ## Open Source Acknowledgements
 
@@ -92,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

@@ -50,17 +50,9 @@ subprojects { p ->
             shadowMe(project(":core")) { transitive false }
         }
     }
-
-    jar {
-        manifest {
-            attributes 'Implementation-Title': rootProject.archives_base_name,
-                    'Implementation-Version': rootProject.mod_version,
-                    'Main-Class': 'com.seibel.lod.core.JarMain'
-        }
-    }
 }
 
-allprojects {
+allprojects { p ->
     apply plugin: "java"
     apply plugin: "architectury-plugin"
     apply plugin: "maven-publish"
@@ -106,6 +98,7 @@ 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
@@ -115,9 +108,7 @@ allprojects {
                 mod_name: mod_name,
                 authors: mod_authors,
                 description: mod_description,
-                homepage: mod_homepage,
-                source: mod_source,
-                issues: mod_issues
+                homepage: mod_homepage
         ]   // 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
@@ -139,19 +130,20 @@ allprojects {
         }
     }
 
-    tasks.withType(JavaCompile) {
-        options.encoding = "UTF-8"
 
-        // The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too
-        // JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used.
-        // We'll use that if it's available, but otherwise we'll use the older option.
-        def targetVersion = 8
-        if (JavaVersion.current().isJava9Compatible()) {
-            options.release = targetVersion
+    tasks.withType(JavaCompile) {
+        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/Config.java

@@ -27,8 +27,6 @@ import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
 import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IAdvanced.*;
 import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IGraphics.*;
 import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IWorldGenerator;
-import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IMultiplayer;
-import net.minecraft.client.renderer.DimensionSpecialEffects;
 
 /**
  * This handles any configuration the user has access to.
@@ -74,9 +72,6 @@ public class Config extends ConfigGui
 		@ConfigAnnotations.ScreenEntry
 		public static WorldGenerator worldGenerator;
 
-		@ConfigAnnotations.ScreenEntry
-		public static Multiplayer multiplayer;
-
 		@ConfigAnnotations.ScreenEntry
 		public static Advanced advanced;
 
@@ -150,7 +145,7 @@ public class Config extends ConfigGui
 				public static boolean disableVanillaFog = IFogQuality.DISABLE_VANILLA_FOG_DEFAULT;
 			}
 
-
+			
 			public static class AdvancedGraphics
 			{
 				@ConfigAnnotations.FileComment
@@ -185,16 +180,16 @@ public class Config extends ConfigGui
 			@ConfigAnnotations.Entry
 			public static boolean enableDistantGeneration = IWorldGenerator.ENABLE_DISTANT_GENERATION_DEFAULT;
 
-			//			@ConfigAnnotations.FileComment
+//			@ConfigAnnotations.FileComment
 //			public static String _distanceGenerationMode = IWorldGenerator.getDistanceGenerationModeDesc();
 			@ConfigAnnotations.Entry
 			public static DistanceGenerationMode distanceGenerationMode = IWorldGenerator.DISTANCE_GENERATION_MODE_DEFAULT;
-
+			
 			@ConfigAnnotations.FileComment
 			public static String _lightGenerationMode = IWorldGenerator.LIGHT_GENERATION_MODE_DESC;
 			@ConfigAnnotations.Entry
 			public static LightGenerationMode lightGenerationMode = IWorldGenerator.LIGHT_GENERATION_MODE_DEFAULT;
-
+			
 			@ConfigAnnotations.FileComment
 			public static String _generationPriority = IWorldGenerator.GENERATION_PRIORITY_DESC;
 			@ConfigAnnotations.Entry
@@ -203,23 +198,17 @@ public class Config extends ConfigGui
 			/*
 			@ConfigAnnotations.FileComment
 			public static String _allowUnstableFeatureGeneration = IWorldGenerator.ALLOW_UNSTABLE_FEATURE_GENERATION_DESC;
+			// FIXME: Temperary override. In 1.18, the newer Unstable gnerator is more usable
 			@ConfigAnnotations.Entry
-			public static boolean allowUnstableFeatureGeneration = IWorldGenerator.ALLOW_UNSTABLE_FEATURE_GENERATION_DEFAULT;
+			public static boolean allowUnstableFeatureGeneration = true;//IWorldGenerator.ALLOW_UNSTABLE_FEATURE_GENERATION_DEFAULT;
 			*/
-
+			
 			@ConfigAnnotations.FileComment
 			public static String _blocksToAvoid = IWorldGenerator.BLOCKS_TO_AVOID_DESC;
 			@ConfigAnnotations.Entry
 			public static BlocksToAvoid blocksToAvoid = IWorldGenerator.BLOCKS_TO_AVOID_DEFAULT;
 		}
 
-		public static class Multiplayer {
-			@ConfigAnnotations.FileComment
-			public static String _serverFolderNameMode = IMultiplayer.SERVER_FOLDER_NAME_MODE_DESC;
-			@ConfigAnnotations.Entry
-			public static ServerFolderNameMode serverFolderNameMode = IMultiplayer.SERVER_FOLDER_NAME_MODE_DEFAULT;
-		}
-
 		public static class Advanced
 		{
 			@ConfigAnnotations.ScreenEntry

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

@@ -4,7 +4,6 @@ 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.ModInfo;
 
 /**
  * This is the common main class
@@ -26,6 +25,7 @@ public class LodCommonMain {
         DependencySetup.createInitialBindings();
     }
 
+
     public static void initConfig() {
         ConfigGui.init(Config.class);
     }

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

@@ -1,6 +1,6 @@
 package com.seibel.lod.common.forge;
 
-import com.seibel.lod.common.wrappers.minecraft.MinecraftClientWrapper;
+import com.seibel.lod.common.wrappers.minecraft.MinecraftWrapper;
 import net.minecraft.client.renderer.block.model.BakedQuad;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.Block;
@@ -15,5 +15,5 @@ import java.util.Random;
  * @author Ran
  */
 public interface LodForgeMethodCaller {
-    List<BakedQuad> getQuads(MinecraftClientWrapper mc, Block block, BlockState blockState, Direction direction, Random random);
+    List<BakedQuad> getQuads(MinecraftWrapper mc, Block block, BlockState blockState, Direction direction, Random random);
 }

common/src/main/java/com/seibel/lod/common/networking/Networking.java

@@ -1,11 +1,8 @@
 package com.seibel.lod.common.networking;
 
-import com.seibel.lod.common.LodCommonMain;
 import io.netty.buffer.Unpooled;
 import net.minecraft.network.FriendlyByteBuf;
 
-import java.nio.charset.StandardCharsets;
-
 /**
  * This class holds most of the networking code for the mod.
  * @author Ran

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

@@ -1,13 +1,15 @@
 package com.seibel.lod.common.wrappers;
 
 import com.seibel.lod.common.LodCommonMain;
+import com.seibel.lod.common.wrappers.block.BlockColorSingletonWrapper;
 import com.seibel.lod.common.wrappers.minecraft.MinecraftRenderWrapper;
-import com.seibel.lod.common.wrappers.minecraft.MinecraftClientWrapper;
+import com.seibel.lod.common.wrappers.minecraft.MinecraftWrapper;
 import com.seibel.lod.core.handlers.IReflectionHandler;
 import com.seibel.lod.core.handlers.ReflectionHandler;
-import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
+import com.seibel.lod.core.util.SingletonHandler;
 import com.seibel.lod.core.wrapperInterfaces.IVersionConstants;
 import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory;
+import com.seibel.lod.core.wrapperInterfaces.block.IBlockColorSingletonWrapper;
 import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
 import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftWrapper;
 
@@ -23,14 +25,14 @@ import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftWrapper;
  */
 public class DependencySetup {
     public static void createInitialBindings() {
-        SingletonHandler.bind(IVersionConstants.class, VersionConstants.INSTANCE);
+        SingletonHandler.bind(IBlockColorSingletonWrapper.class, BlockColorSingletonWrapper.INSTANCE);
         if (!LodCommonMain.serverSided) {
-            SingletonHandler.bind(IMinecraftWrapper.class, MinecraftClientWrapper.INSTANCE);
+            SingletonHandler.bind(IMinecraftWrapper.class, MinecraftWrapper.INSTANCE);
             SingletonHandler.bind(IMinecraftRenderWrapper.class, MinecraftRenderWrapper.INSTANCE);
-            SingletonHandler.bind(IReflectionHandler.class, ReflectionHandler.createSingleton(MinecraftClientWrapper.INSTANCE.getOptions().getClass().getDeclaredFields(), MinecraftClientWrapper.INSTANCE.getOptions()));
-            SingletonHandler.bind(IVersionConstants.class, VersionConstants.INSTANCE);
+            SingletonHandler.bind(IReflectionHandler.class, ReflectionHandler.createSingleton(MinecraftWrapper.INSTANCE.getOptions().getClass().getDeclaredFields(), MinecraftWrapper.INSTANCE.getOptions()));
         }
+        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

@@ -1,7 +0,0 @@
-package com.seibel.lod.common.wrappers;
-
-public class DependencySetupDoneCheck
-{
-	public static boolean isDone = false;
-	
-}

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

@@ -46,17 +46,9 @@ public class McObjectConverter
         return matrix;
     }
 
-    static final Direction[] directions;
-    static {
-        LodDirection[] lodDirs = LodDirection.values();
-        directions = new Direction[lodDirs.length];
-        for (LodDirection lodDir : lodDirs) {
-            directions[lodDir.ordinal()] = Direction.byName(lodDir.name());
-        }
-    }
 
     public static Direction Convert(LodDirection lodDirection)
     {
-        return directions[lodDirection.ordinal()];
+        return Direction.byName(lodDirection.name());
     }
 }

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,54 +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;
 	}
-
-    @Override
-    public boolean isVanillaRenderedChunkSquare() {
-        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/BlockColorSingletonWrapper.java

@@ -0,0 +1,46 @@
+/*
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020  James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.lod.common.wrappers.block;
+
+import com.seibel.lod.core.wrapperInterfaces.block.IBlockColorSingletonWrapper;
+import com.seibel.lod.core.wrapperInterfaces.block.IBlockColorWrapper;
+
+import net.minecraft.world.level.block.Blocks;
+
+
+/**
+ * Contains methods that would have been static in BlockColorWrapper.
+ * Since interfaces can't create/implement static methods we have
+ * to split the object up in two.
+ *
+ * @author James Seibel
+ * @version 11-17-2021
+ */
+public class BlockColorSingletonWrapper implements IBlockColorSingletonWrapper
+{
+    public static final BlockColorSingletonWrapper INSTANCE = new BlockColorSingletonWrapper();
+
+    @Override
+    public IBlockColorWrapper getWaterColor()
+    {
+        return BlockColorWrapper.getBlockColorWrapper(Blocks.WATER);
+    }
+}
+

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

@@ -0,0 +1,323 @@
+package com.seibel.lod.common.wrappers.block;
+
+import java.util.List;
+import java.util.Objects;
+import java.util.Random;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import com.seibel.lod.common.wrappers.minecraft.MinecraftWrapper;
+import com.seibel.lod.core.util.ColorUtil;
+import com.seibel.lod.core.wrapperInterfaces.block.AbstractBlockPosWrapper;
+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.state.BlockState;
+
+
+/**
+ * @author James Seibel
+ * @version 11-21-2021
+ */
+public class BlockColorWrapper implements IBlockColorWrapper
+{
+    //set of block which require tint
+    public static final ConcurrentMap<Block, BlockColorWrapper> blockColorWrapperMap = new ConcurrentHashMap<>();
+    //    public static final ModelDataMap dataMap = new ModelDataMap.Builder().build();
+    public static final AbstractBlockPosWrapper blockPos = new BlockPosWrapper(0, 0, 0);
+    public static final Random random = new Random(0);
+    //public static BlockColourWrapper WATER_COLOR = getBlockColorWrapper(Blocks.WATER);
+    public static final Direction[] directions = new Direction[] { Direction.UP, Direction.EAST, Direction.SOUTH, Direction.WEST, Direction.NORTH, Direction.DOWN };
+
+    private final Block block;
+    private int color;
+    private boolean isColored;
+    private boolean toTint;
+    private boolean foliageTint;
+    private boolean grassTint;
+    private boolean waterTint;
+
+
+    /**Constructor only require for the block instance we are wrapping**/
+    public BlockColorWrapper(Block block)
+    {
+        this.block = block;
+        this.color = 0;
+        this.isColored = true;
+        this.toTint = false;
+        this.foliageTint = false;
+        this.grassTint = false;
+        this.waterTint = false;
+        setupColorAndTint();
+		/*StringBuilder s = new StringBuilder();
+		s.append(block + "\n"
+								   + Integer.toHexString(
+				Minecraft.getInstance().getBlockColors().createDefault().getColor(
+						block.defaultBlockState(),
+						(World) MinecraftWrapper.INSTANCE.getWrappedServerLevel().getLevel(),
+						blockPosWrapper.getBlockPos())) + "\n"
+		);
+		for(Property x : Minecraft.getInstance().getBlockColors().getColoringProperties(block))
+			s.append(x.getName() + " " + x.getPossibleValues() + '\n');
+		System.out.println(s);*/
+        //System.out.println(block + " color " + Integer.toHexString(color) + " to tint " + toTint + " folliageTint " + folliageTint + " grassTint " + grassTint + " waterTint " + waterTint);
+    }
+
+
+    /**
+     * this return a wrapper of the block in input
+     * @param block object of the block to wrap
+     */
+    public static IBlockColorWrapper getBlockColorWrapper(Block block)
+    {
+        //first we check if the block has already been wrapped
+    	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
+        colorWrapper = new BlockColorWrapper(block);
+        BlockColorWrapper colorWrapperCAS = blockColorWrapperMap.putIfAbsent(block, colorWrapper);
+        //we return the newly created wrapper
+        return colorWrapperCAS==null ? colorWrapper : colorWrapperCAS;
+    }
+
+    /**
+     * Generate the color of the given block from its texture
+     * and store it for later use.
+     */
+    private void setupColorAndTint()
+    {
+        BlockState blockState = block.defaultBlockState();
+        //BlockPosWrapper blockPosWrapper = new BlockPosWrapper();
+        MinecraftWrapper mc = MinecraftWrapper.INSTANCE;
+        TextureAtlasSprite texture;
+        List<BakedQuad> quads = null;
+
+        //boolean isTinted = false;
+        //int listSize = 0;
+
+        // first step is to check if this block has a tinted face
+        //for (Direction direction : directions)
+        //{
+        //    quads = mc.getModelManager().getBlockModelShaper().getBlockModel(block.defaultBlockState()).getQuads(blockState, direction, random);
+        //    listSize = Math.max(listSize, quads.size());
+        //    for (BakedQuad bakedQuad : quads)
+        //    {
+        //        isTinted |= bakedQuad.isTinted();
+        //    }
+        //}
+
+        //if it contains a tinted face then we store this block in the toTint set
+        //if (isTinted)
+        //    this.toTint = true;
+
+        //now we get the first non-empty face
+        for (Direction direction : directions)
+        {
+            quads = mc.getModelManager().getBlockModelShaper().getBlockModel(block.defaultBlockState()).getQuads(blockState, direction, random);
+            if (!quads.isEmpty())
+                break;
+        }
+
+        //the quads list is not empty we extract the first one
+        if (!quads.isEmpty())
+        {
+            isColored = true;
+            texture = quads.get(0).getSprite();
+        }
+        else
+        {
+            isColored = true;
+            texture = mc.getModelManager().getBlockModelShaper().getParticleIcon(block.defaultBlockState());
+        }
+
+        int count = 0;
+        int alpha = 0;
+        int red = 0;
+        int green = 0;
+        int blue = 0;
+        int numberOfGreyPixel = 0;
+        int tempColor;
+        int colorMultiplier;
+
+        // generate the block's color
+//        for (int frameIndex = 0; frameIndex < texture.getFrameCount(); frameIndex++)
+        boolean lookForTint = grassInstance() || leavesInstance() || waterIstance();
+    
+        int frameIndex = 0; // TODO
+        {
+            // textures normally use u and v instead of x and y
+            for (int u = 0; u < texture.getWidth(); u++)
+            {
+                for (int v = 0; v < texture.getHeight(); v++)
+                {
+                    tempColor = TextureAtlasSpriteWrapper.getPixelRGBA(texture, frameIndex, u, v);
+
+                    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));
+                        boolean isGray = colorMax < colorMin;
+                        if (isGray)
+                            numberOfGreyPixel++;
+                    }
+
+
+                    // for flowers, weight their non-green color higher
+                    if (block instanceof FlowerBlock && (!(ColorUtil.getGreen(tempColor) > (ColorUtil.getBlue(tempColor) + 30)) || !(ColorUtil.getGreen(tempColor) > (ColorUtil.getRed(tempColor) + 30))))
+                        colorMultiplier = 5;
+                    else
+                        colorMultiplier = 1;
+
+
+                    // 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;
+                }
+            }
+        }
+
+
+        if (count == 0)
+            // this block is entirely transparent
+            tempColor = 0;
+        else
+        {
+            // determine the average color
+            alpha /= count;
+            red /= count;
+            green /= count;
+            blue /= count;
+            tempColor = ColorUtil.rgbToInt(alpha, red, green, blue);
+        }
+
+        // determine if this block should use the biome color tint
+        if (lookForTint && (float) numberOfGreyPixel / count > 0.75f)
+            this.toTint = true;
+
+        // we check which kind of tint we need to apply
+        this.grassTint = grassInstance() && toTint;
+
+        this.foliageTint = leavesInstance() && toTint;
+
+        this.waterTint = waterIstance() && toTint;
+        
+        //hardcoded leaves
+        if (block == Blocks.SPRUCE_LEAVES)
+            color = ColorUtil.multiplyRGBcolors(tempColor, 0xFF619961);
+        else if (block == Blocks.BIRCH_LEAVES)
+            color = ColorUtil.multiplyRGBcolors(tempColor, 0xFF80A755);
+        else
+            color = tempColor;
+    }
+
+    /** determine if the given block should use the biome's grass color */
+    private boolean grassInstance()
+    {
+        return block instanceof GrassBlock
+                || block instanceof BushBlock
+//                || block instanceof IGrowable
+//                || block instanceof AbstractPlantBlock
+//                || block instanceof AbstractTopPlantBlock
+                || block instanceof TallGrassBlock;
+    }
+
+    /** determine if the given block should use the biome's foliage color */
+    private boolean leavesInstance()
+    {
+        return (block instanceof LeavesBlock && block != Blocks.SPRUCE_LEAVES && block != Blocks.BIRCH_LEAVES/* && block != Blocks.AZALEA_LEAVES && block != Blocks.FLOWERING_AZALEA_LEAVES*/)
+                || block == Blocks.VINE
+                || block == Blocks.SUGAR_CANE;
+    }
+
+    /** determine if the given block should use the biome's foliage color */
+    private boolean waterIstance()
+    {
+        return block == Blocks.WATER;
+    }
+
+    @Override
+    public String getName(){
+        return block.getName().toString();
+    }
+
+//--------------//
+//Colors getters//
+//--------------//
+
+    @Override
+    public boolean hasColor()
+    {
+        return isColored;
+    }
+
+    @Override
+    public int getColor()
+    {
+        return color;
+    }
+
+//------------//
+//Tint getters//
+//------------//
+
+
+    @Override
+    public boolean hasTint()
+    {
+        return toTint;
+    }
+
+    @Override
+    public boolean hasGrassTint()
+    {
+        return grassTint;
+    }
+
+    @Override
+    public boolean hasFolliageTint()
+    {
+        return foliageTint;
+    }
+
+    @Override
+    public boolean hasWaterTint()
+    {
+        return waterTint;
+    }
+
+
+
+
+    @Override public boolean equals(Object o)
+    {
+        if (this == o)
+            return true;
+        if (!(o instanceof BlockColorWrapper))
+            return false;
+        BlockColorWrapper that = (BlockColorWrapper) o;
+        return Objects.equals(block, that.block);
+    }
+
+    @Override public int hashCode()
+    {
+        return Objects.hash(block);
+    }
+}

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

@@ -1,286 +0,0 @@
-package com.seibel.lod.common.wrappers.block;
-
-import java.util.List;
-import java.util.Random;
-import java.util.concurrent.ConcurrentHashMap;
-
-import com.seibel.lod.core.api.ApiShared;
-import com.seibel.lod.core.util.ColorUtil;
-import com.seibel.lod.core.wrapperInterfaces.block.BlockDetail;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.color.block.BlockColors;
-import net.minecraft.client.renderer.block.model.BakedQuad;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.world.level.LevelReader;
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.FlowerBlock;
-import net.minecraft.world.level.block.LeavesBlock;
-import net.minecraft.world.level.block.LiquidBlock;
-import net.minecraft.world.level.block.RenderShape;
-import net.minecraft.world.level.block.RotatedPillarBlock;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.material.FluidState;
-import net.minecraft.world.phys.AABB;
-import net.minecraft.world.phys.shapes.VoxelShape;
-
-public class BlockDetailMap
-{
-    public static final int FLOWER_COLOR_SCALE = 5;
-
-    public static final Random random = new Random(0);
-
-    //TODO: Perhaps make this not just use the first frame?
-    //FIXME: Stuff is wrong.
-    private static int calculateColorFromTexture(TextureAtlasSprite texture, boolean useFlowerScaling, boolean useFastLeaf) {
-
-        int count = 0;
-        double alpha = 0;
-        double red = 0;
-        double green = 0;
-        double blue = 0;
-        int tempColor;
-
-        {
-            // textures normally use u and v instead of x and y
-            for (int u = 0; u < texture.getWidth(); u++)
-            {
-                for (int v = 0; v < texture.getHeight(); v++)
-                {
-                    //note: Minecraft color format is: 0xAA BB GG RR
-                    //________ DH mod color format is: 0xAA RR GG BB
-                    //OpenGL RGBA format native order: 0xRR GG BB AA
-                    //_ OpenGL RGBA format Java Order: 0xAA BB GG RR
-                    tempColor = TextureAtlasSpriteWrapper.getPixelRGBA(texture, 0, u, v);
-
-                    double r = ((tempColor & 0x000000FF)      )/255.;
-                    double g = ((tempColor & 0x0000FF00) >>> 8)/255.;
-                    double b = ((tempColor & 0x00FF0000) >>> 16)/255.;
-                    double a = ((tempColor & 0xFF000000) >>> 24)/255.;
-                    int scale = 1;
-
-                    if (useFastLeaf) {
-                        r *= a;
-                        g *= a;
-                        b *= a;
-                        a = 1.;
-                    } else if (a==0.) {
-                        continue;
-                    } else if (useFlowerScaling && (g+0.1<b || g+0.1<r)) {
-                        scale = FLOWER_COLOR_SCALE;
-                    }
-
-                    count += scale;
-                    alpha += a*a*scale;
-                    red += r*r*scale;
-                    green += g*g*scale;
-                    blue += b*b*scale;
-                }
-            }
-        }
-
-        if (count == 0)
-            // this block is entirely transparent
-            tempColor = ColorUtil.rgbToInt(255,255,0,255);
-        else
-        {
-            // determine the average color
-            tempColor = ColorUtil.rgbToInt(
-                    (int) (Math.sqrt(alpha/count)*255.),
-                    (int) (Math.sqrt(red / count)*255.),
-                    (int) (Math.sqrt(green / count)*255.),
-                    (int) (Math.sqrt(blue / count)*255.));
-        }
-        // TODO: Remove this when transparency is added!
-        double colorAlpha = ColorUtil.getAlpha(tempColor)/255.;
-        tempColor = ColorUtil.rgbToInt(
-                ColorUtil.getAlpha(tempColor),
-                (int)(ColorUtil.getRed(tempColor) * colorAlpha),
-                (int)(ColorUtil.getGreen(tempColor) * colorAlpha),
-                (int)(ColorUtil.getBlue(tempColor) * colorAlpha)
-        );
-
-        return tempColor;
-    }
-
-
-    static class BlockDetailCache {
-        static BlockDetailCache NULL_BLOCK_DETAIL = new BlockDetailCache();
-
-        private static final Block[] BLOCK_TO_AVOID = {Blocks.AIR, Blocks.CAVE_AIR, Blocks.BARRIER};
-
-        private static final Direction[] DIRECTION_ORDER = {Direction.UP, Direction.NORTH, Direction.EAST, Direction.WEST, Direction.SOUTH, Direction.DOWN};
-
-        ConcurrentHashMap<Biome, BlockDetail> biomeDetailMap = null;
-        BlockDetail blockDetail;
-        BlockDetail defaultTintedDetail = null;
-        boolean requireResolving;
-        @SuppressWarnings("unused")
-        boolean requireShade; //TODO: Add back using this in renderer
-        @SuppressWarnings("unused")
-        boolean scaleFlowerColor; //FIXME: Do I need to scale the tint color???
-        int tintIndex;
-
-        static boolean isBlockToBeAvoid(Block b) {
-            for (Block bta : BLOCK_TO_AVOID)
-                if (bta==b) return true;
-            return false;
-        }
-
-        static boolean hasNoCollision(BlockState bs, BlockPos pos, LevelReader getter) {
-            if (!bs.getFluidState().isEmpty() || bs.getBlock() instanceof LiquidBlock) // Is blockState a fluid?
-                return false;
-            if (bs.getCollisionShape(getter, pos).isEmpty())
-                return true;
-            return false;
-        }
-        static boolean hasOnlyNonFullFace(BlockState bs, BlockPos pos, LevelReader getter) {
-            if (!bs.getFluidState().isEmpty() || bs.getBlock() instanceof LiquidBlock) // Is blockState a fluid?
-                return false;
-            VoxelShape voxelShape = bs.getShape(getter, pos);
-            if (voxelShape.isEmpty()) return true;
-            AABB bbox = voxelShape.bounds();
-            double xWidth = (bbox.maxX - bbox.minX);
-            double yWidth = (bbox.maxY - bbox.minY);
-            double zWidth = (bbox.maxZ - bbox.minZ);
-            return xWidth < 1 && zWidth < 1 && yWidth < 1;
-        }
-
-        static BlockDetailCache make(BlockState bs, BlockPos pos, LevelReader getter) {
-            boolean noCol, nonFull, canOcclude;
-            if(!bs.getFluidState().isEmpty()) {
-                bs = bs.getFluidState().createLegacyBlock();
-                FluidState fs = bs.getFluidState();
-                fs.getType();
-                noCol = false;
-                nonFull = false;
-                canOcclude = false;
-                BlockDetailCache result = new BlockDetailCache(fs);
-                //ApiShared.LOGGER.info(fs.toString()+" = ["+result+"]");
-                return result;
-            } else {
-                if (bs.getRenderShape() != RenderShape.MODEL) return NULL_BLOCK_DETAIL;
-                if (isBlockToBeAvoid(bs.getBlock())) return NULL_BLOCK_DETAIL;
-                //BlocksToAvoid toAvoid = CONFIG.client().worldGenerator().getBlocksToAvoid();
-                noCol = hasNoCollision(bs, pos, getter);
-                nonFull = hasOnlyNonFullFace(bs, pos, getter);
-                canOcclude = bs.canOcclude();
-                List<BakedQuad> quads = null;
-                for (Direction direction : DIRECTION_ORDER)
-                {
-                    quads = Minecraft.getInstance().getModelManager().getBlockModelShaper().getBlockModel(bs).getQuads(bs, direction, random);
-                    if (!quads.isEmpty() && !(bs.getBlock() instanceof RotatedPillarBlock && direction == Direction.UP))
-                        break;
-                };
-                if (quads == null || quads.isEmpty()) return NULL_BLOCK_DETAIL;
-                BlockDetailCache result = new BlockDetailCache(canOcclude, noCol, nonFull, quads.get(0),
-                        bs.getBlock() instanceof FlowerBlock, bs.getBlock() instanceof LeavesBlock);
-                // ApiShared.LOGGER.info(bs.toString()+" = ["+result+"]");
-                return result;
-            }
-        }
-
-        BlockDetailCache(boolean isFullBlock, boolean noCol, boolean nonFull, BakedQuad quad, boolean useFlowerScaling, boolean useFastLeaf) {
-            requireResolving = quad.isTinted();
-            requireShade = quad.isShade();
-            tintIndex = quad.getTintIndex();
-            scaleFlowerColor = useFlowerScaling;
-            blockDetail = new BlockDetail(calculateColorFromTexture(quad.sprite, useFlowerScaling, useFastLeaf), isFullBlock, noCol, nonFull);
-            if (quad.isTinted()) biomeDetailMap = new ConcurrentHashMap<Biome, BlockDetail>();
-        }
-
-        BlockDetailCache(FluidState fluid) {
-            requireResolving = true; // TODO: Maybe in the future recheck that there really is no way to see if a fluid needs tinting
-            requireShade = false;
-            tintIndex = 0; // Vanilla doesn't use this index currently. (Checked at 1.18.X, See BlockColors.class)
-            scaleFlowerColor = false;
-            TextureAtlasSprite text = Minecraft.getInstance().getModelManager().getBlockModelShaper().getBlockModel(fluid.createLegacyBlock()).getParticleIcon();
-            blockDetail = new BlockDetail(calculateColorFromTexture(text, false, false), true, false, false);
-            biomeDetailMap = new ConcurrentHashMap<Biome, BlockDetail>();
-        }
-
-        private BlockDetailCache()
-        {
-            //DUMMY CREATOR
-        }
-
-        BlockDetail getResolvedBlockDetail(BlockState bs, int x, int y, int z, LevelReader getter) {
-            if (!requireResolving) return blockDetail;
-            BlockPos pos = new BlockPos(x,y,z);
-            Biome biome = getter.getBiome(pos);
-            BlockDetail tintDetail = biomeDetailMap.get(biome);
-            if (tintDetail == null) {
-                if (!bs.getFluidState().isEmpty()) bs = bs.getFluidState().createLegacyBlock();
-                BlockColors bc = Minecraft.getInstance().getBlockColors();
-                int tintColor = bc.getColor(bs, getter, pos, tintIndex);
-                tintColor = ColorUtil.multiplyARGBwithRGB(blockDetail.color, tintColor);
-                tintDetail = new BlockDetail(tintColor, blockDetail.isFullBlock,
-                        blockDetail.hasNoCollision, blockDetail.hasOnlyNonFullFace);
-                BlockDetail tintDetailCAS = biomeDetailMap.putIfAbsent(biome, tintDetail);
-                if (tintDetailCAS != null) tintDetail = tintDetailCAS;
-            }
-            return tintDetail;
-        }
-
-        // Note: this one won't resolve biome based or pos based colors. (Kinda like GUI block icons)
-        BlockDetail getResolvedBlockDetail(BlockState bs) {
-            if (!requireResolving) return blockDetail;
-            if (defaultTintedDetail != null) return defaultTintedDetail;
-
-            BlockColors bc = Minecraft.getInstance().getBlockColors();
-            if (!bs.getFluidState().isEmpty()) bs = bs.getFluidState().createLegacyBlock();
-            int tintColor = bc.getColor(bs, null, null, tintIndex);
-            if (tintColor == -1) {
-                defaultTintedDetail = blockDetail;
-            }
-            else {
-                defaultTintedDetail = new BlockDetail(ColorUtil.multiplyARGBwithRGB(blockDetail.color, tintColor),
-                        blockDetail.isFullBlock, blockDetail.hasNoCollision, blockDetail.hasOnlyNonFullFace);
-            }
-            return defaultTintedDetail;
-        }
-
-        @Override
-        public String toString() {
-            return "[BlockDetail: "+blockDetail+", RequireResolving: "+requireResolving+", requireShade: "+requireShade+", scaleFlowerColor: "+scaleFlowerColor+"]";
-        }
-
-    }
-
-
-
-    private static ConcurrentHashMap<BlockState, BlockDetailCache> map = new ConcurrentHashMap<BlockState, BlockDetailCache>();
-
-    private BlockDetailMap() {}
-
-    private static BlockDetailCache getOrMakeBlockDetailCache(BlockState bs, BlockPos pos, LevelReader getter) {
-        BlockDetailCache cache = map.get(bs);
-        if (cache != null) return cache;
-        if (bs.getFluidState().isEmpty()) {
-            cache = BlockDetailCache.make(bs, pos, getter);
-        } else {
-            cache = BlockDetailCache.make(bs.getFluidState().createLegacyBlock(), pos, getter);
-        }
-        BlockDetailCache cacheCAS = map.putIfAbsent(bs, cache);
-        return cacheCAS==null ? cache : cacheCAS;
-    }
-
-
-    // Return null means skip the block
-    public static BlockDetail getBlockDetail(BlockState bs) {
-        BlockDetailCache cache = getOrMakeBlockDetailCache(bs, new BlockPos(0, 0, 0), null);
-        if (cache == BlockDetailCache.NULL_BLOCK_DETAIL) return null;
-        return cache.getResolvedBlockDetail(bs);
-    }
-
-    // Return null means skip the block
-    public static BlockDetail getBlockDetailWithCompleteTint(BlockState bs, int x, int y, int z, LevelReader tintGetter) {
-        BlockDetailCache cache = getOrMakeBlockDetailCache(bs, new BlockPos(x,y,z), tintGetter);
-        if (cache == BlockDetailCache.NULL_BLOCK_DETAIL) return null;
-        return cache.getResolvedBlockDetail(bs, x, y, z, tintGetter);
-    }
-}

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

@@ -0,0 +1,157 @@
+
+package com.seibel.lod.common.wrappers.block;
+
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+
+import com.seibel.lod.core.wrapperInterfaces.block.IBlockShapeWrapper;
+import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper;
+import com.seibel.lod.common.wrappers.chunk.ChunkWrapper;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.chunk.ChunkAccess;
+import net.minecraft.world.phys.AABB;
+import net.minecraft.world.phys.shapes.VoxelShape;
+
+
+/**
+ * @author James Seibel
+ * @version 11-21-2021
+ */
+public class BlockShapeWrapper implements IBlockShapeWrapper
+{
+    //set of block which require tint
+    public static final ConcurrentMap<Block, BlockShapeWrapper> blockShapeWrapperMap = new ConcurrentHashMap<>();
+    public static BlockShapeWrapper WATER_SHAPE = new BlockShapeWrapper();
+
+    private final Block block;
+    private final boolean toAvoid;
+    private boolean nonFull;
+    private boolean noCollision;
+
+    /**Constructor only require for the block instance we are wrapping**/
+    public BlockShapeWrapper(Block block, IChunkWrapper chunkWrapper, int x, int y, int z)
+    {
+        this.block = block;
+        this.nonFull = false;
+        this.noCollision = false;
+        this.toAvoid = ofBlockToAvoid();
+        setupShapes(chunkWrapper, x, y, z);
+        //System.out.println(block + " non full " + nonFull + " no collision " + noCollision + " to avoid " + toAvoid);
+    }
+
+    private BlockShapeWrapper()
+    {
+        this.block = Blocks.WATER;
+        this.nonFull = false;
+        this.noCollision = false;
+        this.toAvoid = false;
+    }
+
+    /**
+     * this return a wrapper of the block in input
+     * @param block Block object to wrap
+     */
+    static public BlockShapeWrapper getBlockShapeWrapper(Block block, ChunkWrapper chunkWrapper, int x, int y, int z)
+    {
+        //first we check if the block has already been wrapped
+    	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
+        blockWrapper = new BlockShapeWrapper(block, chunkWrapper, x, y, z);
+        BlockShapeWrapper blockWrapperCAS = blockShapeWrapperMap.putIfAbsent(block, blockWrapper);
+        //we return the newly created wrapper
+        return blockWrapperCAS==null ? blockWrapper : blockWrapperCAS;
+    }
+
+    private void setupShapes(IChunkWrapper chunkWrapper, int x, int y, int z)
+    {
+        ChunkAccess chunk = ((ChunkWrapper) chunkWrapper).getChunk();
+        BlockPos blockPos = new BlockPos(x, y, z);
+        boolean noCollisionSetted = false;
+        boolean nonFullSetted = false;
+        if (!block.defaultBlockState().getFluidState().isEmpty())// || block instanceof SixWayBlock)
+        {
+            noCollisionSetted = true;
+            nonFullSetted = true;
+            noCollision = false;
+            nonFull = false;
+        }
+        if (!nonFullSetted)
+        {
+            VoxelShape voxelShape = block.defaultBlockState().getShape(chunk, blockPos);
+
+            if (!voxelShape.isEmpty())
+            {
+                AABB bbox = voxelShape.bounds();
+                double xWidth = (bbox.maxX - bbox.minX);
+                double yWidth = (bbox.maxY - bbox.minY);
+                double zWidth = (bbox.maxZ - bbox.minZ);
+                nonFull = xWidth < 1 && zWidth < 1 && yWidth < 1;
+            }
+            else
+            {
+                nonFull = false;
+            }
+        }
+
+        if (!noCollisionSetted)
+        {
+            VoxelShape collisionShape = block.defaultBlockState().getCollisionShape(chunk, blockPos);
+            noCollision = collisionShape.isEmpty();
+        }
+    }
+
+    @Override
+    public boolean ofBlockToAvoid()
+    {
+        return block.equals(Blocks.AIR)
+                || block.equals(Blocks.CAVE_AIR)
+                || block.equals(Blocks.BARRIER);
+    }
+//-----------------//
+//Avoidance getters//
+//-----------------//
+
+
+    @Override
+    public boolean isNonFull()
+    {
+        return nonFull;
+    }
+
+    @Override
+    public boolean hasNoCollision()
+    {
+        return noCollision;
+    }
+
+    @Override
+    public boolean isToAvoid()
+    {
+        return toAvoid;
+    }
+
+
+
+
+    @Override public boolean equals(Object o)
+    {
+        if (this == o)
+            return true;
+        if (!(o instanceof BlockShapeWrapper))
+            return false;
+        BlockShapeWrapper that = (BlockShapeWrapper) o;
+        return Objects.equals(block, that.block);
+    }
+
+    @Override public int hashCode()
+    {
+        return Objects.hash(block);
+    }
+}

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

@@ -18,7 +18,11 @@ public class TextureAtlasSpriteWrapper {
      * The code has been modified to use TextureAtlasSprite
      */
     public static int getPixelRGBA(TextureAtlasSprite sprite, int frameIndex, int x, int y) {
-    	// Require access widener
-        return sprite.mainImage[0].getPixelRGBA(x + sprite.framesX[frameIndex] * sprite.getWidth(), y + sprite.framesY[frameIndex] * sprite.getHeight());
+        if (sprite.animatedTexture != null) {
+            x += sprite.animatedTexture.getFrameX(frameIndex) * sprite.width;
+            y += sprite.animatedTexture.getFrameY(frameIndex) * sprite.height;
+        }
+
+        return sprite.mainImage[0].getPixelRGBA(x, y);
     }
 }

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()
     {
@@ -44,12 +44,12 @@ 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);
     }
 
+
     public ChunkPosWrapper(ChunkPos pos)
     {
         this.chunkPos = pos;
@@ -85,29 +85,29 @@ public class ChunkPosWrapper extends AbstractChunkPosWrapper
     @Override
     public int getRegionX()
     {
-        return LevelPosUtil.convert(LodUtil.CHUNK_DETAIL_LEVEL, chunkPos.x, LodUtil.REGION_DETAIL_LEVEL);
+    	return LevelPosUtil.convert(LodUtil.CHUNK_DETAIL_LEVEL, chunkPos.x, LodUtil.REGION_DETAIL_LEVEL);
     }
 
     @Override
     public int getRegionZ()
     {
-        return LevelPosUtil.convert(LodUtil.CHUNK_DETAIL_LEVEL, chunkPos.z, LodUtil.REGION_DETAIL_LEVEL);
+    	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;
         }
@@ -129,9 +129,8 @@ public class ChunkPosWrapper extends AbstractChunkPosWrapper
     public AbstractBlockPosWrapper getWorldPosition()
     {
         // the parameter here is the y position
-        BlockPos blockPos = chunkPos.getWorldPosition();
+        BlockPos blockPos = chunkPos.getMiddleBlockPosition(0);
         return new BlockPosWrapper(blockPos.getX(), blockPos.getY(), blockPos.getZ());
     }
 
-
 }

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

@@ -1,26 +1,30 @@
 package com.seibel.lod.common.wrappers.chunk;
 
-import com.seibel.lod.common.wrappers.worldGeneration.mimicObject.LightedWorldGenRegion;
 import com.seibel.lod.core.util.LevelPosUtil;
 import com.seibel.lod.core.util.LodUtil;
-import com.seibel.lod.core.wrapperInterfaces.block.BlockDetail;
+import com.seibel.lod.core.wrapperInterfaces.block.IBlockColorWrapper;
+import com.seibel.lod.core.wrapperInterfaces.block.IBlockShapeWrapper;
 import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper;
 import com.seibel.lod.core.wrapperInterfaces.world.IBiomeWrapper;
 import com.seibel.lod.common.wrappers.WrapperUtil;
-import com.seibel.lod.common.wrappers.block.BlockDetailMap;
+import com.seibel.lod.common.wrappers.block.BlockColorWrapper;
+import com.seibel.lod.common.wrappers.block.BlockShapeWrapper;
 import com.seibel.lod.common.wrappers.world.BiomeWrapper;
 
 import net.minecraft.core.BlockPos;
+import net.minecraft.core.QuartPos;
 import net.minecraft.world.level.BlockAndTintGetter;
-import net.minecraft.world.level.LevelReader;
 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;
 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.ChunkStatus;
+import net.minecraft.world.level.chunk.LevelChunk;
+import net.minecraft.world.level.chunk.LevelChunkSection;
 import net.minecraft.world.level.levelgen.Heightmap;
 
 /**
@@ -30,24 +34,24 @@ import net.minecraft.world.level.levelgen.Heightmap;
  */
 public class ChunkWrapper implements IChunkWrapper
 {
-    private ChunkAccess chunk;
-    private LevelReader lightSource;
+    private final ChunkAccess chunk;
+    private final BlockAndTintGetter lightSource;
 
     @Override
     public int getHeight(){
-        return 255;
+        return chunk.getHeight();
     }
 
-    @Override
-    public int getMinBuildHeight()
-    {
-        return 0;
-    }
-    @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)
@@ -58,14 +62,24 @@ public class ChunkWrapper implements IChunkWrapper
     @Override
     public IBiomeWrapper getBiome(int x, int y, int z)
     {
-        return BiomeWrapper.getBiomeWrapper(chunk.getBiomes().getNoiseBiome(
-                x >> 2, y >> 2, z >> 2));
+        return BiomeWrapper.getBiomeWrapper(chunk.getNoiseBiome(
+        		QuartPos.fromBlock(x), QuartPos.fromBlock(y), QuartPos.fromBlock(z)));
     }
 
     @Override
-    public BlockDetail getBlockDetail(int x, int y, int z) {
-        BlockState blockState = chunk.getBlockState(new BlockPos(x, y, z));
-        return BlockDetailMap.getBlockDetailWithCompleteTint(blockState, x, y, z, lightSource);
+    public IBlockColorWrapper getBlockColorWrapper(int x, int y, int z)
+    {
+        BlockState blockState = chunk.getBlockState(new BlockPos(x,y,z));
+        Block block = blockState.getBlock();
+        return BlockColorWrapper.getBlockColorWrapper(block);
+    }
+
+    @Override
+    public IBlockShapeWrapper getBlockShapeWrapper(int x, int y, int z)
+    {
+        BlockState blockState = chunk.getBlockState(new BlockPos(x,y,z));
+        Block block = blockState.getBlock();
+        return BlockShapeWrapper.getBlockShapeWrapper(block, this, x, y, z);
     }
 
     @Deprecated
@@ -74,7 +88,8 @@ public class ChunkWrapper implements IChunkWrapper
         this.chunk = chunk;
         this.lightSource = null;
     }
-    public ChunkWrapper(ChunkAccess chunk, LevelReader lightSource) {
+    public ChunkWrapper(ChunkAccess chunk, BlockAndTintGetter lightSource)
+    {
         this.chunk = chunk;
         this.lightSource = lightSource;
     }
@@ -95,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
@@ -124,10 +139,19 @@ public class ChunkWrapper implements IChunkWrapper
     public int getMinZ() {
         return chunk.getPos().getMinBlockZ();
     }
+    
+    @Override
+    public long getLongChunkPos() {
+    	return chunk.getPos().toLong();
+    }
 
     @Override
     public boolean isLightCorrect(){
-        return true;//chunk.isLightCorrect();
+    	//return true;
+    	if (chunk instanceof LevelChunk) {
+    		return ((LevelChunk) chunk).isClientLightReady();
+    	}
+        return chunk.isLightCorrect();
     }
 
     public boolean isWaterLogged(int x, int y, int z)
@@ -145,33 +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;
-        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 long getLongChunkPos() {
-		return chunk.getPos().toLong();
+	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 boolean doesNearbyChunksExist() {
-        if (lightSource instanceof LightedWorldGenRegion) return true;
-        for (int dx = -1; dx <= 1; dx++) {
-            for (int dz = -1; dz <= 1; dz++) {
-                if (dx == 0 && dz == 0) continue;
-                if (lightSource.getChunk(dx + getChunkPosX(), dz + getChunkPosZ(), ChunkStatus.BIOMES, false) == null)
-                    return false;
-            }
-        }
-        return true;
-    }
 }

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

@@ -3,7 +3,6 @@ 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.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IMultiplayer;
 import com.seibel.lod.common.Config;
 
 /**
@@ -29,7 +28,6 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 	{
 		public final IGraphics graphics;
 		public final IWorldGenerator worldGenerator;
-		public final IMultiplayer multiplayer;
 		public final IAdvanced advanced;
 
 
@@ -45,11 +43,6 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 			return worldGenerator;
 		}
 
-		@Override
-		public IMultiplayer multiplayer() {
-			return multiplayer;
-		}
-
 		@Override
 		public IAdvanced advanced()
 		{
@@ -77,7 +70,6 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 		{
 			graphics = new Graphics();
 			worldGenerator = new WorldGenerator();
-			multiplayer = new Multiplayer();
 			advanced = new Advanced();
 		}
 
@@ -185,7 +177,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 					ConfigGui.editSingleOption.getEntry("client.graphics.quality.horizontalQuality").value = newHorizontalQuality;
 					ConfigGui.editSingleOption.saveOption("client.graphics.quality.horizontalQuality");
 				}
-
+				
 				@Override
 				public DropoffQuality getDropoffQuality() {
 					return Config.Client.Graphics.Quality.dropoffQuality;
@@ -293,7 +285,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 					ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.backsideCullingRange").value = newBacksideCullingRange;
 					ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.backsideCullingRange");
 				}*/
-
+				
 				@Override
 				public boolean getUseExtendedNearClipPlane()
 				{
@@ -341,6 +333,20 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				ConfigGui.editSingleOption.saveOption("client.worldGenerator.distanceGenerationMode");
 			}
 
+			/*
+			@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()
 			{
@@ -355,7 +361,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 			@Override
 			public boolean getEnableDistantGeneration()
 			{
-				return (boolean) ConfigGui.editSingleOption.getEntry("client.worldGenerator.enableDistantGeneration").value;
+				return Config.Client.WorldGenerator.enableDistantGeneration;
 			}
 			@Override
 			public void setEnableDistantGeneration(boolean newEnableDistantGeneration)
@@ -378,27 +384,6 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 
 
 
-		//=====================//
-		// Multiplayer Configs //
-		//=====================//
-		public static class Multiplayer implements IMultiplayer
-		{
-			@Override
-			public ServerFolderNameMode getServerFolderNameMode()
-			{
-				return Config.Client.Multiplayer.serverFolderNameMode;
-			}
-			@Override
-			public void setServerFolderNameMode(ServerFolderNameMode newServerFolderNameMode)
-			{
-				ConfigGui.editSingleOption.getEntry("client.multiplayer.serverFolderNameMode").value = newServerFolderNameMode;
-				ConfigGui.editSingleOption.saveOption("client.multiplayer.serverFolderNameMode");
-			}
-
-
-		}
-
-
 
 		//============================//
 		// AdvancedModOptions Configs //

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

@@ -2,9 +2,8 @@ package com.seibel.lod.common.wrappers.config;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
-
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.ImageButton;
+import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 
@@ -12,9 +11,9 @@ import net.minecraft.resources.ResourceLocation;
  * Creates a button with a texture on it
  */
 public class TexturedButtonWidget extends ImageButton {
-//    public TexturedButtonWidget(int x, int y, int width, int height, int u, int v, ResourceLocation texture, OnPress pressAction) {
-//        super(x, y, width, height, u, v, texture, pressAction);
-//    }
+    public TexturedButtonWidget(int x, int y, int width, int height, int u, int v, ResourceLocation texture, OnPress pressAction) {
+        super(x, y, width, height, u, v, texture, pressAction);
+    }
     public TexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, ResourceLocation texture, int textureWidth, int textureHeight, OnPress pressAction) {
         super(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, pressAction);
     }
@@ -27,20 +26,18 @@ public class TexturedButtonWidget extends ImageButton {
         super(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, pressAction, tooltipSupplier, text);
     }
 
-	@Override
-	public void renderButton(PoseStack matrices, int mouseX, int mouseY, float delta) {
+    @Override
+    public void renderButton(PoseStack matrices, int mouseX, int mouseY, float delta) {
+        RenderSystem.setShader(GameRenderer::getPositionTexShader);
+        RenderSystem.setShaderTexture(0, WIDGETS_LOCATION);
+        RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, this.alpha);
+        int i = this.getYImage(this.isHovered);
+        RenderSystem.enableBlend();
+        RenderSystem.defaultBlendFunc();
+        RenderSystem.enableDepthTest();
+        this.blit(matrices, this.x, this.y, 0, 46 + i * 20, this.width / 2, this.height);
+        this.blit(matrices, this.x + this.width / 2, this.y, 200 - this.width / 2, 46 + i * 20, this.width / 2, this.height);
 
-		Minecraft.getInstance().getTextureManager().bind(WIDGETS_LOCATION);
-		RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, this.alpha);
-		int i = getYImage(isHovered());
-
-		RenderSystem.enableBlend();
-		RenderSystem.defaultBlendFunc();
-		RenderSystem.enableDepthTest();
-		this.blit(matrices, this.x, this.y, 0, 46 + i * 20, this.width / 2, this.height);
-		this.blit(matrices, this.x + this.width / 2, this.y, 200 - this.width / 2, 46 + i * 20, this.width / 2,
-				this.height);
-
-		super.renderButton(matrices, mouseX, mouseY, delta);
-	}
+        super.renderButton(matrices, mouseX, mouseY, delta);
+    }
 }

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

@@ -2,46 +2,44 @@ 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.seibel.lod.common.wrappers.WrapperFactory;
+import com.mojang.blaze3d.systems.RenderSystem;
 import com.seibel.lod.common.wrappers.misc.LightMapWrapper;
-import com.seibel.lod.core.api.ApiShared;
-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.handlers.dependencyInjection.ModAccessorHandler;
-import com.seibel.lod.core.handlers.dependencyInjection.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 com.seibel.lod.core.wrapperInterfaces.modAccessor.ISodiumAccessor;
-import it.unimi.dsi.fastutil.objects.ObjectList;
+import com.seibel.lod.core.util.SingletonHandler;
+
 import net.minecraft.client.renderer.LightTexture;
-import net.minecraft.world.phys.AABB;
-import org.lwjgl.opengl.GL15;
 
 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;
 import com.seibel.lod.common.wrappers.block.BlockPosWrapper;
 
 import net.minecraft.client.Camera;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.FogRenderer;
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.renderer.LevelRenderer;
 import net.minecraft.core.BlockPos;
-import net.minecraft.tags.FluidTags;
 import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.material.FogType;
+import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
 
 
@@ -50,7 +48,7 @@ import net.minecraft.world.phys.Vec3;
  * related to rendering in Minecraft.
  *
  * @author James Seibel
- * @version 12-14-2021
+ * @version 12-12-2021
  */
 public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 {
@@ -60,8 +58,6 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
     private static final GameRenderer GAME_RENDERER = MC.gameRenderer;
     private static final WrapperFactory FACTORY = WrapperFactory.INSTANCE;
 
-
-
     @Override
     public Vec3f getLookAtVector()
     {
@@ -96,7 +92,7 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
     @Override
     public Mat4f getDefaultProjectionMatrix(float partialTicks)
     {
-        return McObjectConverter.Convert(GAME_RENDERER.getProjectionMatrix(GAME_RENDERER.getMainCamera(), partialTicks, true));
+        return McObjectConverter.Convert(GAME_RENDERER.getProjectionMatrix(GAME_RENDERER.getFov(GAME_RENDERER.getMainCamera(), partialTicks, true)));
     }
 
     @Override
@@ -106,9 +102,9 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
     }
 
     @Override
-    public Color getFogColor(float partialTick) {
-        float[] colorValues = new float[4];
-        GL15.glGetFloatv(GL15.GL_FOG_COLOR, colorValues);
+    public Color getFogColor(float 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]);
     }
     // getSpecialFogColor() is the same as getFogColor()
@@ -151,45 +147,60 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
      * is going to render this frame. <br><br>
      * <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;
+		}
+	
+		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)));
+	}
+    
     @Override
-    public HashSet<AbstractChunkPosWrapper> getVanillaRenderedChunks()
-    {
-        ISodiumAccessor sodium = ModAccessorHandler.get(ISodiumAccessor.class);
-        if (sodium != null)
-        {
-            return sodium.getNormalRenderedChunks();
-        }
-        IOptifineAccessor optifine = ModAccessorHandler.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;
-		        ObjectList<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)));
-			} catch (LinkageError e) {
-				try {
-					MinecraftClientWrapper.INSTANCE.sendChatMessage(
-							"\u00A7e\u00A7l\u00A7uWARNING: Distant Horizons: getVanillaRenderedChunks method failed."
-							+ " Using Backup Method.");
-					MinecraftClientWrapper.INSTANCE.sendChatMessage(
-							"\u00A7eOverdraw prevention will be worse than normal.");
-				} catch (Exception e2) {}
-				ApiShared.LOGGER.error("getVanillaRenderedChunks Error: {}", e);
-				usingBackupGetVanillaRenderedChunks = true;
+	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 getMaximumRenderedChunks();
-    }
+		
+		return renderedPos;	
+	}
+	
+
 
     @Override
     public int[] getLightmapPixels()
@@ -203,7 +214,7 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
         int lightMapHeight = getLightmapTextureHeight();
         int lightMapWidth = getLightmapTextureWidth();
 
-        int pixels[] = new int[lightMapWidth * lightMapHeight];
+        int[] pixels = new int[lightMapWidth * lightMapHeight];
         for (int u = 0; u < lightMapWidth; u++)
         {
             for (int v = 0; v < lightMapWidth; v++)
@@ -228,7 +239,6 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
                         ((c.getBlue() & 0xFF)) | // red
                         ((c.getAlpha() & 0xFF) << 24); // alpha
 
-                        
                 // 2D array stored in a 1D array.
                 // Thank you Tim from College ;)
                 pixels[u * lightMapWidth + v] = col;
@@ -290,21 +300,16 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 
         return glFormat;
     }
-
+    
     @Override
     public boolean isFogStateSpecial() {
-    	Camera camera = GAME_RENDERER.getMainCamera();
-		FogType fogType = camera.getFluidInCamera();
-	    Entity entity = camera.getEntity();
-	    boolean enableFog = (entity instanceof LivingEntity) && ((LivingEntity)entity).hasEffect(MobEffects.BLINDNESS);
-	    enableFog |= fogType.equals(FogType.WATER);
-	    enableFog |= fogType.equals(FogType.LAVA);
-	    enableFog |= fogType.equals(FogType.POWDER_SNOW);
-        return enableFog;
+	    Entity entity = GAME_RENDERER.getMainCamera().getEntity();
+	    boolean isBlind = (entity instanceof LivingEntity) && ((LivingEntity)entity).hasEffect(MobEffects.BLINDNESS);
+    	return GAME_RENDERER.getMainCamera().getFluidInCamera() != FogType.NONE || isBlind;
     }
 
-    @Override
+	@Override
 	public boolean tryDisableVanillaFog() {
-		return true; // Handled via the MixinFogRenderer at fabric and forge
+		return true; // Handled via MixinFogRenderer in both forge and fabric
 	}
 }

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

@@ -26,11 +26,10 @@ import java.util.ArrayList;
 import com.mojang.blaze3d.platform.NativeImage;
 import com.mojang.blaze3d.platform.Window;
 import com.seibel.lod.core.ModInfo;
-import com.seibel.lod.core.api.ApiShared;
 import com.seibel.lod.core.api.ClientApi;
 import com.seibel.lod.core.enums.LodDirection;
 import com.seibel.lod.core.util.LodUtil;
-import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
+import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftWrapper;
 import com.seibel.lod.core.wrapperInterfaces.minecraft.IProfilerWrapper;
 import com.seibel.lod.core.wrapperInterfaces.misc.ILightMapWrapper;
 import com.seibel.lod.core.wrapperInterfaces.world.IDimensionTypeWrapper;
@@ -70,9 +69,9 @@ import org.jetbrains.annotations.Nullable;
  * @author James Seibel
  * @version 9-16-2021
  */
-public class MinecraftClientWrapper implements IMinecraftClientWrapper
+public class MinecraftWrapper implements IMinecraftWrapper
 {
-    public static final MinecraftClientWrapper INSTANCE = new MinecraftClientWrapper();
+    public static final MinecraftWrapper INSTANCE = new MinecraftWrapper();
 
     public final Minecraft mc = Minecraft.getInstance();
 
@@ -85,7 +84,7 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper
     private ProfilerWrapper profilerWrapper;
 
 
-    private MinecraftClientWrapper()
+    private MinecraftWrapper()
     {
 
     }
@@ -241,7 +240,8 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper
     @Override
     public ChunkPosWrapper getPlayerChunkPos()
     {
-        return new ChunkPosWrapper(getPlayer().chunkPosition().x, getPlayer().chunkPosition().z);
+        ChunkPos playerPos = getPlayer().chunkPosition();
+        return new ChunkPosWrapper(playerPos.x, playerPos.z);
     }
 
     public Options getOptions()
@@ -418,7 +418,7 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper
     @Override
     public void crashMinecraft(String errorMessage, Throwable exception)
     {
-        ApiShared.LOGGER.error(ModInfo.READABLE_NAME + " had the following error: [" + errorMessage + "]. Crashing Minecraft...");
+        ClientApi.LOGGER.error(ModInfo.READABLE_NAME + " had the following error: [" + errorMessage + "]. Crashing Minecraft...");
         CrashReport report = new CrashReport(errorMessage, exception);
         Minecraft.crash(report);
     }

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

@@ -23,13 +23,11 @@ import java.io.File;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import com.seibel.lod.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.lod.core.enums.WorldType;
-import com.seibel.lod.core.wrapperInterfaces.block.AbstractBlockPosWrapper;
 import com.seibel.lod.core.wrapperInterfaces.chunk.AbstractChunkPosWrapper;
-import com.seibel.lod.core.wrapperInterfaces.world.IBiomeWrapper;
+import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper;
 import com.seibel.lod.core.wrapperInterfaces.world.IWorldWrapper;
-import com.seibel.lod.common.wrappers.block.BlockPosWrapper;
+import com.seibel.lod.common.wrappers.chunk.ChunkWrapper;
 
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.core.BlockPos;
@@ -39,6 +37,7 @@ import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.LightLayer;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ChunkStatus;
+
 import org.jetbrains.annotations.Nullable;
 
 /**
@@ -129,12 +128,24 @@ public class WorldWrapper implements IWorldWrapper
         return world.dimensionType().hasSkyLight();
     }
 
+    @Override
+    public boolean isEmpty()
+    {
+        return world == null;
+    }
+
     @Override
     public int getHeight()
     {
         return world.getHeight();
     }
 
+    @Override
+    public short getMinHeight()
+    {
+        return (short) world.getMinBuildHeight();
+    }
+    
     /** @throws UnsupportedOperationException if the WorldWrapper isn't for a ServerWorld */
     @Override
     public File getSaveFolder() throws UnsupportedOperationException
@@ -162,11 +173,13 @@ public class WorldWrapper implements IWorldWrapper
         // TODO this is depreciated, what should we use instead?
         return world.getSeaLevel();
     }
-
+    
     @Override
-    public ChunkWrapper 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

@@ -19,23 +19,25 @@
 
 package com.seibel.lod.common.wrappers.worldGeneration;
 
-import com.seibel.lod.core.api.ApiShared;
 import com.seibel.lod.core.api.ClientApi;
 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.enums.config.LightGenerationMode;
 import com.seibel.lod.core.objects.lod.LodDimension;
 import com.seibel.lod.core.util.GridList;
 import com.seibel.lod.core.util.LodThreadFactory;
-import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
+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.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedList;
+import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -58,14 +60,11 @@ 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;
 
@@ -83,14 +82,15 @@ Feature Step:            0.389072425s
 Lod Generation:          0.269023348s
 */
 
-public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnvionmentWrapper {
+public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnvionmentWrapper
+{
 	public static final boolean ENABLE_PERF_LOGGING = false;
 	public static final boolean ENABLE_EVENT_LOGGING = false;
 	public static final boolean ENABLE_LOAD_EVENT_LOGGING = false;
-	public static final boolean DISABLE_LOADING_SAVES = false;
-	// TODO: Make actual proper support for StarLight
-
-	public static class PrefEvent {
+	//TODO: Make actual proper support for StarLight
+	
+	public static class PrefEvent
+	{
 		long beginNano = 0;
 		long emptyNano = 0;
 		long structStartNano = 0;
@@ -102,20 +102,27 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 		long featureNano = 0;
 		long lightNano = 0;
 		long endNano = 0;
-
+		
 		@Override
-		public String toString() {
-			return "beginNano: " + beginNano + ",\n" + "emptyNano: " + emptyNano + ",\n" + "structStartNano: "
-					+ structStartNano + ",\n" + "structRefNano: " + structRefNano + ",\n" + "biomeNano: " + biomeNano
-					+ ",\n" + "noiseNano: " + noiseNano + ",\n" + "surfaceNano: " + surfaceNano + ",\n" + "carverNano: "
-					+ carverNano + ",\n" + "featureNano: " + featureNano + ",\n" + "lightNano: " + lightNano + ",\n"
-					+ "endNano: " + endNano + "\n";
+		public String toString()
+		{
+			return "beginNano: " + beginNano + ",\n" +
+					"emptyNano: " + emptyNano + ",\n" +
+					"structStartNano: " + structStartNano + ",\n" +
+					"structRefNano: " + structRefNano + ",\n" +
+					"biomeNano: " + biomeNano + ",\n" +
+					"noiseNano: " + noiseNano + ",\n" +
+					"surfaceNano: " + surfaceNano + ",\n" +
+					"carverNano: " + carverNano + ",\n" +
+					"featureNano: " + featureNano + ",\n" +
+					"lightNano: " + lightNano + ",\n" +
+					"endNano: " + endNano + "\n";
 		}
 	}
-
-	public static class PerfCalculator {
-		public static final int SIZE = 10;
-		private int dataCount = 0;
+	
+	public static class PerfCalculator
+	{
+		public static final int SIZE = 50;
 		Rolling totalTime = new Rolling(SIZE);
 		Rolling emptyTime = new Rolling(SIZE);
 		Rolling structStartTime = new Rolling(SIZE);
@@ -127,56 +134,65 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 		Rolling featureTime = new Rolling(SIZE);
 		Rolling lightTime = new Rolling(SIZE);
 		Rolling lodTime = new Rolling(SIZE);
-
-		public void recordEvent(PrefEvent e) {
-			dataCount++;
+		
+		public void recordEvent(PrefEvent e)
+		{
 			long preTime = e.beginNano;
 			totalTime.add(e.endNano - preTime);
-			if (e.emptyNano != 0) {
+			if (e.emptyNano != 0)
+			{
 				emptyTime.add(e.emptyNano - preTime);
 				preTime = e.emptyNano;
 			}
-			if (e.structStartNano != 0) {
+			if (e.structStartNano != 0)
+			{
 				structStartTime.add(e.structStartNano - preTime);
 				preTime = e.structStartNano;
 			}
-			if (e.structRefNano != 0) {
+			if (e.structRefNano != 0)
+			{
 				structRefTime.add(e.structRefNano - preTime);
 				preTime = e.structRefNano;
 			}
-			if (e.biomeNano != 0) {
+			if (e.biomeNano != 0)
+			{
 				biomeTime.add(e.biomeNano - preTime);
 				preTime = e.biomeNano;
 			}
-			if (e.noiseNano != 0) {
+			if (e.noiseNano != 0)
+			{
 				noiseTime.add(e.noiseNano - preTime);
 				preTime = e.noiseNano;
 			}
-			if (e.surfaceNano != 0) {
+			if (e.surfaceNano != 0)
+			{
 				surfaceTime.add(e.surfaceNano - preTime);
 				preTime = e.surfaceNano;
 			}
-			if (e.carverNano != 0) {
+			if (e.carverNano != 0)
+			{
 				carverTime.add(e.carverNano - preTime);
 				preTime = e.carverNano;
 			}
-			if (e.featureNano != 0) {
+			if (e.featureNano != 0)
+			{
 				featureTime.add(e.featureNano - preTime);
 				preTime = e.featureNano;
 			}
-			if (e.lightNano != 0) {
+			if (e.lightNano != 0)
+			{
 				lightTime.add(e.lightNano - preTime);
 				preTime = e.lightNano;
 			}
-			if (e.endNano != 0) {
+			if (e.endNano != 0)
+			{
 				lodTime.add(e.endNano - preTime);
 				preTime = e.endNano;
 			}
 		}
-
-		public String toString() {
-			if (dataCount < SIZE)
-				return "Pref Calculator collecting samples...";
+		
+		public String toString()
+		{
 			return "Total: " + Duration.ofNanos((long) totalTime.getAverage()) + ", Empty/LoadChunk: "
 					+ Duration.ofNanos((long) emptyTime.getAverage()) + ", StructStart: "
 					+ Duration.ofNanos((long) structStartTime.getAverage()) + ", StructRef: "
@@ -190,56 +206,41 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 					+ Duration.ofNanos((long) lodTime.getAverage());
 		}
 	}
-
-	public static final int TIMEOUT_SECONDS = 60;
-
-	// =================Generation Step===================
-
+	
+	public static final int TIMEOUT_SECONDS = 30;
+	
+	//=================Generation Step===================
+	
 	public final LinkedList<GenerationEvent> events = new LinkedList<GenerationEvent>();
 	public final GlobalParameters params;
 	public final StepStructureStart stepStructureStart = new StepStructureStart(this);
-	public final StepStructureReference stepStructureReference = new StepStructureReference();
+	public final StepStructureReference stepStructureReference = new StepStructureReference(this);
 	public final StepBiomes stepBiomes = new StepBiomes(this);
 	public final StepNoise stepNoise = new StepNoise(this);
 	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;
-	static private 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;
-
+	private static final ILodConfigWrapperSingleton CONFIG = SingletonHandler.get(ILodConfigWrapperSingleton.class);
+	
 	public static final LodThreadFactory threadFactory = new LodThreadFactory("Gen-Worker-Thread", Thread.MIN_PRIORITY);
-
+	
 	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.");
-			ApiShared.LOGGER.error("Unsafe Threading in Chunk Generator: ", new RuntimeException("Concurrent future"));
-			unsafeThreadingRecorded = true;
-		}
-		return f.join();
-	}
-
-	@Override
-	public void resizeThreadPool(int newThreadCount) {
+	
+	public void resizeThreadPool(int newThreadCount)
+	{
 		executors = Executors.newFixedThreadPool(newThreadCount,
 				new LodThreadFactory("Gen-Worker-Thread", Thread.MIN_PRIORITY));
 	}
-
-	@Override
-	public boolean tryAddPoint(int px, int pz, int range, Steps target, boolean genAllDetails) {
+	
+	public boolean tryAddPoint(int px, int pz, int range, Steps target, boolean genAllDetails)
+	{
 		int boxSize = range * 2 + 1;
 		int x = Math.floorDiv(px, boxSize) * boxSize + range;
 		int z = Math.floorDiv(pz, boxSize) * boxSize + range;
-
-		for (GenerationEvent event : events) {
+		
+		for (GenerationEvent event : events)
+		{
 			if (event.tooClose(x, z, range))
 				return false;
 		}
@@ -247,142 +248,154 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 		events.add(new GenerationEvent(new ChunkPos(x, z), range, this, target, genAllDetails));
 		return true;
 	}
-
-	@Override
-	public void updateAllFutures() {
-		if (unknownExceptionCount > 0) {
-			if (System.nanoTime() - lastExceptionTriggerTime >= EXCEPTION_TIMER_RESET_TIME) {
-				unknownExceptionCount = 0;
-			}
-		}
+	
+	public void updateAllFutures()
+	{
 		// Update all current out standing jobs
 		Iterator<GenerationEvent> iter = events.iterator();
-		while (iter.hasNext()) {
+		while (iter.hasNext())
+		{
 			GenerationEvent event = iter.next();
-			if (event.isCompleted()) {
-				try {
+			if (event.isCompleted())
+			{
+				try
+				{
 					event.join();
-				} catch (Throwable e) {
-					ApiShared.LOGGER.error("Batching World Generator: Event {} gotten an exception", event);
-					ApiShared.LOGGER.error("Exception: ", e);
-					unknownExceptionCount++;
-					lastExceptionTriggerTime = System.nanoTime();
-				} finally {
+				}
+				catch (Throwable e)
+				{
+					e.printStackTrace();
+					while (e.getCause() != null)
+					{
+						e = e.getCause();
+						e.printStackTrace();
+					}
+				}
+				finally
+				{
 					iter.remove();
 				}
-			} else if (event.hasTimeout(TIMEOUT_SECONDS, TimeUnit.SECONDS)) {
-				ApiShared.LOGGER.error("Batching World Generator: " + event + " timed out and terminated!");
-				ApiShared.LOGGER.info("Dump PrefEvent: " + event.pEvent);
-				try {
+			}
+			else if (event.hasTimeout(TIMEOUT_SECONDS, TimeUnit.SECONDS))
+			{
+				ClientApi.LOGGER.error("Batching World Generator: " + event + " timed out and terminated!");
+				ClientApi.LOGGER.info("Dump PrefEvent: " + event.pEvent);
+				try
+				{
 					if (!event.terminate())
-						ApiShared.LOGGER.error("Failed to terminate the stuck generation event!");
-				} finally {
+						ClientApi.LOGGER.error("Failed to terminate the stuck generation event!");
+				}
+				finally
+				{
 					iter.remove();
 				}
 			}
 		}
-		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) {}
-			ApiShared.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) {
+	
+	public BatchGenerationEnvironment(IWorldWrapper serverlevel, LodBuilder lodBuilder, LodDimension lodDim)
+	{
 		super(serverlevel, lodBuilder, lodDim);
-		ApiShared.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.");
-			ApiShared.LOGGER.warn("Unknown Chunk Generator detected: {}", generator.getClass());
-		}
+		ClientApi.LOGGER.info("================WORLD_GEN_STEP_INITING=============");
 		params = new GlobalParameters((ServerLevel) ((WorldWrapper) serverlevel).getWorld(), lodBuilder, lodDim);
 	}
-
-	@SuppressWarnings("resource")
-	private static ChunkAccess loadOrMakeChunk(ChunkPos chunkPos, ServerLevel level, LevelLightEngine lightEngine) {
-		if (DISABLE_LOADING_SAVES) {
-			return new ProtoChunk(chunkPos, UpgradeData.EMPTY);
-		}
-		CompoundTag chunkData = null;
-		try {
-			chunkData = level.getChunkSource().chunkMap.readChunk(chunkPos);
-		} catch (Exception e) {
-			ApiShared.LOGGER.error("DistantHorizons: Couldn't load chunk {}", chunkPos, e);
-		}
-		if (chunkData == null) {
-			return new ProtoChunk(chunkPos, UpgradeData.EMPTY);
-		} else {
-			try {
-				return ChunkLoader.read(level, lightEngine, chunkPos, chunkData);
-			} catch (Exception e) {
-				ApiShared.LOGGER.error("DistantHorizons: Couldn't load chunk {}", chunkPos, e);
-				return new ProtoChunk(chunkPos, UpgradeData.EMPTY);
-			}
-		}
-
+	
+	public void startLoadingAllRegionsFromFile(LodDimension lodDim)
+	{
+		ServerLevel level = params.level;
+		level.getChunkSource();
+		
 	}
-
-	void generateLodFromList(GenerationEvent e) {
+	
+	@SuppressWarnings("resource")
+	public static ChunkAccess loadOrMakeChunk(ChunkPos chunkPos, ServerLevel level, LevelLightEngine lightEngine)
+	{
+		CompoundTag chunkData = null;
+		try
+		{
+			chunkData = level.getChunkSource().chunkMap.readChunk(chunkPos);
+		}
+		catch (IOException e)
+		{
+			ClientApi.LOGGER.error("DistantHorizons: Couldn't load chunk {}", chunkPos, e);
+		}
+		if (chunkData == null)
+		{
+			return new ProtoChunk(chunkPos, UpgradeData.EMPTY, level, level.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY), null);
+		}
+		else
+		{
+			return ChunkLoader.read(level, lightEngine, chunkPos, chunkData);
+		}
+		
+	}
+	
+	public void generateLodFromList(GenerationEvent e)
+	{
 		if (ENABLE_EVENT_LOGGING)
-			ApiShared.LOGGER.info("Lod Generate Event: " + e.pos);
+			ClientApi.LOGGER.info("Lod Generate Event: " + e.pos);
 		e.pEvent.beginNano = System.nanoTime();
 		GridList<ChunkAccess> referencedChunks;
 		DistanceGenerationMode generationMode;
 		LightedWorldGenRegion region;
 		WorldGenLevelLightEngine lightEngine;
 		LightGetterAdaptor adaptor;
-
-		try {
+		
+		try
+		{
 			adaptor = new LightGetterAdaptor(params.level);
 			lightEngine = new WorldGenLevelLightEngine(adaptor);
-
+			
 			int cx = e.pos.x;
 			int cy = e.pos.z;
 			int rangeEmpty = e.range + 1;
 			GridList<ChunkAccess> chunks = new GridList<ChunkAccess>(rangeEmpty);
-
+			
 			@SuppressWarnings("resource")
-			EmptyChunkGenerator generator = (int x, int z) -> {
+			EmptyChunkGenerator generator = (int x, int z) ->
+			{
 				ChunkPos chunkPos = new ChunkPos(x, z);
 				ChunkAccess target = null;
-				try {
+				try
+				{
 					target = loadOrMakeChunk(chunkPos, params.level, lightEngine);
-				} catch (RuntimeException e2) {
+				}
+				catch (RuntimeException e2)
+				{
 					// Continue...
+					e2.printStackTrace();
 				}
 				if (target == null)
-					target = new ProtoChunk(chunkPos, UpgradeData.EMPTY);
+					target = new ProtoChunk(chunkPos, UpgradeData.EMPTY, params.level,
+							params.biomes, null);
 				return target;
 			};
-
-			for (int oy = -rangeEmpty; oy <= rangeEmpty; oy++) {
-				for (int ox = -rangeEmpty; ox <= rangeEmpty; ox++) {
+			
+			for (int oy = -rangeEmpty; oy <= rangeEmpty; oy++)
+			{
+				for (int ox = -rangeEmpty; ox <= rangeEmpty; ox++)
+				{
 					ChunkAccess target = generator.generate(cx + ox, cy + oy);
 					chunks.add(target);
 				}
 			}
 			e.pEvent.emptyNano = System.nanoTime();
 			e.refreshTimeout();
-			region = new LightedWorldGenRegion(params.level, lightEngine, e.tParam.structFeat, chunks,
-					ChunkStatus.STRUCTURE_STARTS, rangeEmpty, e.lightMode, generator);
+			region = new LightedWorldGenRegion(params.level, lightEngine, e.tParam.structFeat, chunks, ChunkStatus.STRUCTURE_STARTS, rangeEmpty, e.lightMode, generator);
 			adaptor.setRegion(region);
 			e.tParam.makeStructFeat(region);
 			referencedChunks = chunks.subGrid(e.range);
 			referencedChunks = generateDirect(e, referencedChunks, e.target, region);
-
-		} catch (StructStartCorruptedException f) {
+			
+		}
+		catch (StepStructureStart.StructStartCorruptedException f)
+		{
 			e.tParam.markAsInvalid();
 			return;
 		}
-
-		switch (e.target) {
+		
+		switch (e.target)
+		{
 		case Empty:
 		case StructureStart:
 		case StructureReference:
@@ -390,7 +403,6 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 			break;
 		case Biomes:
 			generationMode = DistanceGenerationMode.BIOME_ONLY;
-			break;
 		case Noise:
 			generationMode = DistanceGenerationMode.BIOME_ONLY_SIMULATE_HEIGHT;
 			break;
@@ -407,43 +419,69 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 			return;
 		}
 		int centreIndex = referencedChunks.size() / 2;
-
-		for (int oy = -e.range; oy <= e.range; oy++) {
-			for (int ox = -e.range; ox <= e.range; ox++) {
+		
+		for (int oy = -e.range; oy <= e.range; oy++)
+		{
+			for (int ox = -e.range; ox <= e.range; ox++)
+			{
 				int targetIndex = referencedChunks.offsetOf(centreIndex, ox, oy);
 				ChunkAccess target = referencedChunks.get(targetIndex);
 				target.setLightCorrect(true);
+				if (target instanceof LevelChunk)
+					((LevelChunk) target).setClientLightReady(true);
 				boolean isFull = target.getStatus() == ChunkStatus.FULL || target instanceof LevelChunk;
-				if (isFull) {
+				boolean isPartial = target.isOldNoiseGeneration();
+				if (isFull)
+				{
 					if (ENABLE_LOAD_EVENT_LOGGING)
-						ApiShared.LOGGER.info("Detected full existing chunk at {}", target.getPos());
+						ClientApi.LOGGER.info("Detected full existing chunk at {}", target.getPos());
 					params.lodBuilder.generateLodNodeFromChunk(params.lodDim, new ChunkWrapper(target, region),
 							new LodBuilderConfig(DistanceGenerationMode.FULL), true, e.genAllDetails);
-				} else if (target.getStatus() == ChunkStatus.EMPTY && generationMode == DistanceGenerationMode.NONE) {
-					params.lodBuilder.generateLodNodeFromChunk(params.lodDim, new ChunkWrapper(target, region),
-							LodBuilderConfig.getFillVoidConfig(), true, e.genAllDetails);
-				} else {
+				}
+				else if (isPartial)
+				{
+					if (ENABLE_LOAD_EVENT_LOGGING)
+						ClientApi.LOGGER.info("Detected old existing chunk at {}", target.getPos());
 					params.lodBuilder.generateLodNodeFromChunk(params.lodDim, new ChunkWrapper(target, region),
 							new LodBuilderConfig(generationMode), true, e.genAllDetails);
 				}
-				lightEngine.retainData(target.getPos(), false);
+				else if (target.getStatus() == ChunkStatus.EMPTY && generationMode == DistanceGenerationMode.NONE)
+				{
+					params.lodBuilder.generateLodNodeFromChunk(params.lodDim, new ChunkWrapper(target, region),
+							LodBuilderConfig.getFillVoidConfig(), true, e.genAllDetails);
+				}
+				else
+				{
+					params.lodBuilder.generateLodNodeFromChunk(params.lodDim, new ChunkWrapper(target, region),
+							new LodBuilderConfig(generationMode), true, e.genAllDetails);
+				}
+				if (e.lightMode == LightGenerationMode.FANCY || isFull)
+				{
+					lightEngine.retainData(target.getPos(), false);
+				}
+				
 			}
 		}
 		e.pEvent.endNano = System.nanoTime();
 		e.refreshTimeout();
-		if (ENABLE_PERF_LOGGING) {
+		if (ENABLE_PERF_LOGGING)
+		{
 			e.tParam.perf.recordEvent(e.pEvent);
-			ApiShared.LOGGER.info(e.tParam.perf);
+			ClientApi.LOGGER.info(e.tParam.perf);
 		}
 	}
-
-	GridList<ChunkAccess> generateDirect(GenerationEvent e, GridList<ChunkAccess> subRange, Steps step,
-			LightedWorldGenRegion region) {
-		try {
-			subRange.forEach((chunk) -> {
-				if (chunk instanceof ProtoChunk) {
+	
+	public GridList<ChunkAccess> generateDirect(GenerationEvent e, GridList<ChunkAccess> subRange, Steps step,
+			LightedWorldGenRegion region)
+	{
+		try
+		{
+			subRange.forEach((chunk) ->
+			{
+				if (chunk instanceof ProtoChunk)
+				{
 					((ProtoChunk) chunk).setLightEngine(region.getLightEngine());
-					//region.getLightEngine().retainData(chunk.getPos(), true);
+					region.getLightEngine().retainData(chunk.getPos(), true);
 				}
 			});
 			if (step == Steps.Empty)
@@ -479,13 +517,17 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 			e.pEvent.featureNano = System.nanoTime();
 			e.refreshTimeout();
 			return subRange;
-		} finally {
-			switch (region.lightMode) {
+		}
+		finally
+		{
+			switch (region.lightMode)
+			{
 			case FANCY:
 				stepLight.generateGroup(region.getLightEngine(), subRange);
 				break;
 			case FAST:
-				subRange.forEach((p) -> {
+				subRange.forEach((p) ->
+				{
 					if (p instanceof ProtoChunk)
 						((ProtoChunk) p).setLightCorrect(true);
 				});
@@ -495,8 +537,9 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 			e.refreshTimeout();
 		}
 	}
-
-	public interface EmptyChunkGenerator {
+	
+	public interface EmptyChunkGenerator
+	{
 		ChunkAccess generate(int x, int z);
 	}
 
@@ -507,16 +550,14 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 
 	@Override
 	public void stop(boolean blocking) {
-		ApiShared.LOGGER.info("Batch Chunk Generator shutting down...");
+		ClientApi.LOGGER.info("Batch Chunk Generator shutting down...");
 		executors.shutdownNow();
-		if (blocking) {
-			try {
-				if (!executors.awaitTermination(10, TimeUnit.SECONDS)) {
-					ApiShared.LOGGER.error("Batch Chunk Generator shutdown failed! Ignoring child threads...");
-				}
-			} catch (InterruptedException e) {
-				ApiShared.LOGGER.error("Batch Chunk Generator shutdown failed! Ignoring child threads...", e);
+		if (blocking) try {
+			if (!executors.awaitTermination(10, TimeUnit.SECONDS)) {
+				ClientApi.LOGGER.error("Batch Chunk Generator shutdown failed! Ignoring child threads...");
 			}
+		} catch (InterruptedException e) {
+			ClientApi.LOGGER.error("Batch Chunk Generator shutdown failed! Ignoring child threads...", e);
 		}
 	}
-}
+}

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

@@ -1,3 +1,4 @@
+
 package com.seibel.lod.common.wrappers.worldGeneration;
 
 import java.util.concurrent.ExecutionException;
@@ -5,19 +6,19 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
 import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment.PrefEvent;
-import com.seibel.lod.core.api.ApiShared;
 import com.seibel.lod.core.api.ClientApi;
 import com.seibel.lod.core.enums.config.LightGenerationMode;
-import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
+import com.seibel.lod.core.util.SingletonHandler;
 import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
 import com.seibel.lod.core.wrapperInterfaces.worldGeneration.AbstractBatchGenerationEnvionmentWrapper.Steps;
 
 import net.minecraft.world.level.ChunkPos;
 
 //======================= Main Event class======================
-public final class GenerationEvent {
+public final class GenerationEvent
+{
 	static private final ILodConfigWrapperSingleton CONFIG = SingletonHandler.get(ILodConfigWrapperSingleton.class);
-
+	
 	private static int generationFutureDebugIDs = 0;
 	final ThreadedParameters tParam;
 	final ChunkPos pos;
@@ -29,8 +30,9 @@ public final class GenerationEvent {
 	final LightGenerationMode lightMode;
 	final PrefEvent pEvent = new PrefEvent();
 	final boolean genAllDetails;
-
-	public GenerationEvent(ChunkPos pos, int range, BatchGenerationEnvironment generationGroup, Steps target, boolean genAllDetails) {
+	
+	public GenerationEvent(ChunkPos pos, int range, BatchGenerationEnvironment generationGroup, Steps target, boolean genAllDetails)
+	{
 		nanotime = System.nanoTime();
 		this.pos = pos;
 		this.range = range;
@@ -38,54 +40,65 @@ public final class GenerationEvent {
 		this.target = target;
 		this.tParam = ThreadedParameters.getOrMake(generationGroup.params);
 		LightGenerationMode mode = CONFIG.client().worldGenerator().getLightGenerationMode();
-
+		
 		this.lightMode = mode;
 		this.genAllDetails = genAllDetails;
-
-		future = generationGroup.executors.submit(() -> {
+		
+		future = generationGroup.executors.submit(() ->
+		{
 			generationGroup.generateLodFromList(this);
 		});
 	}
-
-	public boolean isCompleted() {
+	
+	public boolean isCompleted()
+	{
 		return future.isDone();
 	}
-
-	public boolean hasTimeout(int duration, TimeUnit unit) {
+	
+	public boolean hasTimeout(int duration, TimeUnit unit)
+	{
 		long currentTime = System.nanoTime();
 		long delta = currentTime - nanotime;
 		return (delta > TimeUnit.NANOSECONDS.convert(duration, unit));
 	}
-
-	public boolean terminate() {
+	
+	public boolean terminate()
+	{
 		future.cancel(true);
-		ApiShared.LOGGER.info("======================DUMPING ALL THREADS FOR WORLD GEN=======================");
+		ClientApi.LOGGER.info("======================DUMPING ALL THREADS FOR WORLD GEN=======================");
 		BatchGenerationEnvironment.threadFactory.dumpAllThreadStacks();
 		return future.isCancelled();
 	}
-
-	public void join() {
-		try {
+	
+	public void join()
+	{
+		try
+		{
 			future.get();
-		} catch (InterruptedException | ExecutionException e) {
-			throw new RuntimeException(e.getCause()==null? e : e.getCause());
+		}
+		catch (InterruptedException | ExecutionException e)
+		{
+			e.printStackTrace();
 		}
 	}
-
-	public boolean tooClose(int cx, int cz, int cr) {
+	
+	public boolean tooClose(int cx, int cz, int cr)
+	{
 		int distX = Math.abs(cx - pos.x);
 		int distZ = Math.abs(cz - pos.z);
 		int minRange = cr + range + 1; // Need one to account for the center
 		minRange += 1 + 1; // Account for required empty chunks
 		return distX < minRange && distZ < minRange;
 	}
-
-	public void refreshTimeout() {
+	
+	public void refreshTimeout()
+	{
 		nanotime = System.nanoTime();
 	}
-
+	
 	@Override
-	public String toString() {
+	public String toString()
+	{
 		return id + ":" + range + "@" + pos + "(" + target + ")";
 	}
 }

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

@@ -1,3 +1,4 @@
+
 package com.seibel.lod.common.wrappers.worldGeneration;
 
 import com.mojang.datafixers.DataFixer;
@@ -10,14 +11,18 @@ 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.WorldGenSettings;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
 import net.minecraft.world.level.storage.WorldData;
 
-public final class GlobalParameters {
+public final class GlobalParameters
+{
 	public final ChunkGenerator generator;
 	public final StructureManager structures;
+	public final BiomeManager biomeManager;
 	public final WorldGenSettings worldGenSettings;
 	public final ThreadedLevelLightEngine lightEngine;
 	public final LodBuilder lodBuilder;
@@ -25,10 +30,12 @@ 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;
-
-	public GlobalParameters(ServerLevel level, LodBuilder lodBuilder, LodDimension lodDim) {
+	
+	public GlobalParameters(ServerLevel level, LodBuilder lodBuilder, LodDimension lodDim)
+	{
 		this.lodBuilder = lodBuilder;
 		this.lodDim = lodDim;
 		this.level = level;
@@ -39,10 +46,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/Rolling.java

@@ -1,29 +1,34 @@
+
 package com.seibel.lod.common.wrappers.worldGeneration;
 
 //FIXME: Move this outside the WorldGenerationStep thingy
-public class Rolling {
-
+public class Rolling
+{
+	
 	private final int size;
 	private double total = 0d;
 	private int index = 0;
 	private final double[] samples;
-
-	public Rolling(int size) {
+	
+	public Rolling(int size)
+	{
 		this.size = size;
 		samples = new double[size];
 		for (int i = 0; i < size; i++)
 			samples[i] = 0d;
 	}
-
-	public void add(double x) {
+	
+	public void add(double x)
+	{
 		total -= samples[index];
 		samples[index] = x;
 		total += x;
 		if (++index == size)
 			index = 0; // cheaper than modulus
 	}
-
-	public double getAverage() {
+	
+	public double getAverage()
+	{
 		return total / size;
 	}
 }

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

@@ -1,11 +0,0 @@
-package com.seibel.lod.common.wrappers.worldGeneration;
-
-public class StructStartCorruptedException extends RuntimeException {
-	private static final long serialVersionUID = -8987434342051563358L;
-
-	public StructStartCorruptedException(ArrayIndexOutOfBoundsException e) {
-		super("StructStartCorruptedException");
-		super.initCause(e);
-		fillInStackTrace();
-	}
-}

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

@@ -1,3 +1,4 @@
+
 package com.seibel.lod.common.wrappers.worldGeneration;
 
 import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment.PerfCalculator;
@@ -5,16 +6,19 @@ 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 {
+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();
-
-	public static ThreadedParameters getOrMake(GlobalParameters param) {
+	
+	public static ThreadedParameters getOrMake(GlobalParameters param)
+	{
 		ThreadedParameters tParam = localParam.get();
 		if (tParam != null && tParam.isValid && tParam.level == param.level)
 			return tParam;
@@ -22,17 +26,23 @@ public final class ThreadedParameters {
 		localParam.set(tParam);
 		return tParam;
 	}
-
-	public void markAsInvalid() {
+	
+	public void markAsInvalid()
+	{
 		isValid = false;
 	}
-
-	private ThreadedParameters(GlobalParameters param) {
+	
+	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) {
+	
+	public void makeStructFeat(WorldGenLevel genLevel)
+	{
 		structFeat.setGenLevel(genLevel);
 	}
 }

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

@@ -1,63 +1,72 @@
-package com.seibel.lod.common.wrappers.worldGeneration;
 
-import java.util.concurrent.ExecutionException;
+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.handlers.dependencyInjection.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.ChunkHolder;
-import net.minecraft.server.level.ServerChunkCache;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.*;
+/*     */
+/*     */ import net.minecraft.server.level.ServerLevel;
+/*     */
+/*     */
+/*     */
+/*     */
+/*     */
+/*     */
+/*     */
+/*     */
+/*     */
 
 /**
  * @author James Seibel
  * @version 11-13-2021
  */
-public class WorldGeneratorWrapper extends AbstractWorldGeneratorWrapper {
+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) {
+	
+	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) {
+	public void generateBiomesOnly(AbstractChunkPosWrapper pos, DistanceGenerationMode generationMode)
+	{
 		generate(pos.getX(), pos.getZ(), generationMode);
 	}
-
+	
 	/** takes about 10 - 20 ms */
 	@Override
-	public void generateSurface(AbstractChunkPosWrapper pos) {
+	public void generateSurface(AbstractChunkPosWrapper pos)
+	{
 		generate(pos.getX(), pos.getZ(), DistanceGenerationMode.SURFACE);
 	}
-
+	
 	/**
 	 * takes about 15 - 20 ms
-	 * <p>
 	 */
 	@Override
-	public void generateFeatures(AbstractChunkPosWrapper pos) {
+	public void generateFeatures(AbstractChunkPosWrapper pos)
+	{
 		generate(pos.getX(), pos.getZ(), DistanceGenerationMode.FEATURES);
 	}
-
+	
 	/**
 	 * Generates using MC's ServerWorld.
 	 * <p>
@@ -70,18 +79,19 @@ public class WorldGeneratorWrapper extends AbstractWorldGeneratorWrapper {
 	 * (Higher lag for generating than loading)
 	 */
 	@Override
-	public void generateFull(AbstractChunkPosWrapper pos) {
+	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();
-
+	
+	private void generate(int chunkX, int chunkZ, DistanceGenerationMode generationMode)
+	{
+		
+		// long t = System.nanoTime();
+		
 		ChunkStatus targetStatus;
-		switch (generationMode) {
-		case NONE:
-			return;
+		switch (generationMode)
+		{
 		case BIOME_ONLY:
 			targetStatus = ChunkStatus.BIOMES;
 			break;
@@ -97,48 +107,47 @@ public class WorldGeneratorWrapper extends AbstractWorldGeneratorWrapper {
 		case FULL:
 			targetStatus = ChunkStatus.FULL;
 			break;
+		case NONE:
 		default:
 			return;
 		}
-
-		// The bool=true means that we wants to generate chunk, and that the returned
-		// ChunkAccess must not be null
-
+		
+		// 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);
-
+		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.);
+		// System.out.println("LodChunkGenFull["+chunkX+","+chunkZ+"]: "+(double)(duration)/1000.);
+		
 	}
-
-	/*
-	 * TODO: Ask leetom to update chart performance/generation tests related to
+	
+	/* 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,150 +1,247 @@
 
 package com.seibel.lod.common.wrappers.worldGeneration.mimicObject;
 
-import com.seibel.lod.core.api.ApiShared;
+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.chunk.ChunkGenerator;
+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 {
-	private static final Logger LOGGER = ApiShared.LOGGER;
-
-	private static LevelChunkSection[] readSections(WorldGenLevel level, LevelLightEngine lightEngine,
-			ChunkPos chunkPos, CompoundTag tagLevel) {
-		boolean isLightOn = tagLevel.getBoolean("isLightOn");
-		ListTag listTag = tagLevel.getList("Sections", 10);
-		LevelChunkSection[] levelChunkSections = new LevelChunkSection[16];
-		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[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);
-			}
+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 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), 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"))
+		
+		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));
-
-		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));
-
-		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/LightGetterAdaptor.java

@@ -1,9 +1,10 @@
 package com.seibel.lod.common.wrappers.worldGeneration.mimicObject;
 
-import com.seibel.lod.core.handlers.dependencyInjection.ModAccessorHandler;
+import com.seibel.lod.core.api.ModAccessorApi;
 import com.seibel.lod.core.wrapperInterfaces.modAccessor.IStarlightAccessor;
 
 import net.minecraft.world.level.BlockGetter;
+import net.minecraft.world.level.LevelHeightAccessor;
 import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.LightChunkGetter;
 
@@ -14,7 +15,7 @@ public class LightGetterAdaptor implements LightChunkGetter {
 
 	public LightGetterAdaptor(BlockGetter heightAccessor) {
 		this.heightGetter = heightAccessor;
-		shouldReturnNull = ModAccessorHandler.get(IStarlightAccessor.class) != null;
+		shouldReturnNull = ModAccessorApi.get(IStarlightAccessor.class) != null;
 	}
 
 	public void setRegion(LightedWorldGenRegion region) {
@@ -33,4 +34,7 @@ public class LightGetterAdaptor implements LightChunkGetter {
 	public BlockGetter getLevel() {
 		return shouldReturnNull ? null : (genRegion != null ? genRegion : heightGetter);
 	}
+	public LevelHeightAccessor getLevelHeightAccessor() {
+		return heightGetter;
+	}
 }

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

@@ -1,9 +1,7 @@
 package com.seibel.lod.common.wrappers.worldGeneration.mimicObject;
 
 import java.util.List;
-import java.util.stream.Stream;
 
-import com.seibel.lod.core.api.ApiShared;
 import org.jetbrains.annotations.Nullable;
 
 import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment.EmptyChunkGenerator;
@@ -18,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;
@@ -42,22 +41,11 @@ 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 int getCenterX() {
-		return overrideCenterPos==null ? super.getCenterX() : overrideCenterPos.x;
-	}
-	@Override
-	public int getCenterZ() {
-		return overrideCenterPos==null ? super.getCenterZ() : overrideCenterPos.z;
-	}
 
 	public LightedWorldGenRegion(ServerLevel serverLevel, WorldGenLevelLightEngine lightEngine,
 			StructureFeatureManager structFeat, List<ChunkAccess> list, ChunkStatus chunkStatus, int i,
 			LightGenerationMode lightMode, EmptyChunkGenerator generator) {
-		super(serverLevel, list);
+		super(serverLevel, list, chunkStatus, i);
 		this.lightMode = lightMode;
 		this.firstPos = list.get(0).getPos();
 		this.generator = generator;
@@ -68,8 +56,29 @@ public class LightedWorldGenRegion extends WorldGenRegion {
 		size = Mth.floor(Math.sqrt(list.size()));
 	}
 
+	// Bypass BCLib mixin overrides.
+    @Override
+    public boolean ensureCanWrite(BlockPos blockPos) {
+        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);
 	}
@@ -150,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;
 	}
@@ -174,7 +183,7 @@ public class LightedWorldGenRegion extends WorldGenRegion {
 			}
 		}
 		if (chunkStatus != ChunkStatus.EMPTY && chunkStatus != debugTriggeredForStatus) {
-			ApiShared.LOGGER.info("WorldGen requiring " + chunkStatus
+			ClientApi.LOGGER.info("WorldGen requiring " + chunkStatus
 					+ " outside expected range detected. Force passing EMPTY chunk and seeing if it works.");
 			debugTriggeredForStatus = chunkStatus;
 		}

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

@@ -5,6 +5,7 @@ import org.jetbrains.annotations.Nullable;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.SectionPos;
 import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.LevelHeightAccessor;
 import net.minecraft.world.level.LightLayer;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.DataLayer;
@@ -16,149 +17,160 @@ import net.minecraft.world.level.lighting.SkyLightEngine;
 
 public class WorldGenLevelLightEngine extends LevelLightEngine {
 	public static final int MAX_SOURCE_LEVEL = 15;
-	public static final int LIGHT_SECTION_PADDING = 1;
-	@Nullable
-	public final BlockLightEngine blockEngine;
-	@Nullable
-	public final SkyLightEngine skyEngine;
+    public static final int LIGHT_SECTION_PADDING = 1;
+    protected final LevelHeightAccessor levelHeightAccessor;
+    @Nullable
+    public final BlockLightEngine blockEngine;
+    @Nullable
+    public final SkyLightEngine skyEngine;
 
-	public WorldGenLevelLightEngine(LightGetterAdaptor genRegion) {
-		super(genRegion, false, false);
-		this.blockEngine = new BlockLightEngine(genRegion);
-		this.skyEngine = new SkyLightEngine(genRegion);
-	}
+    public WorldGenLevelLightEngine(LightGetterAdaptor genRegion) {
+    	super(genRegion, false, false);
+        this.levelHeightAccessor = genRegion.getLevelHeightAccessor();
+        this.blockEngine = new BlockLightEngine(genRegion);
+        this.skyEngine = new SkyLightEngine(genRegion);
+    }
 
-	@Override
-	public void checkBlock(BlockPos blockPos) {
-		if (this.blockEngine != null) {
-			this.blockEngine.checkBlock(blockPos);
-		}
-		if (this.skyEngine != null) {
-			this.skyEngine.checkBlock(blockPos);
-		}
-	}
+    @Override
+    public void checkBlock(BlockPos blockPos) {
+        if (this.blockEngine != null) {
+            this.blockEngine.checkBlock(blockPos);
+        }
+        if (this.skyEngine != null) {
+            this.skyEngine.checkBlock(blockPos);
+        }
+    }
 
-	@Override
-	public void onBlockEmissionIncrease(BlockPos blockPos, int i) {
-		if (this.blockEngine != null) {
-			this.blockEngine.onBlockEmissionIncrease(blockPos, i);
-		}
-	}
+    @Override
+    public void onBlockEmissionIncrease(BlockPos blockPos, int i) {
+        if (this.blockEngine != null) {
+            this.blockEngine.onBlockEmissionIncrease(blockPos, i);
+        }
+    }
 
-	@Override
-	public boolean hasLightWork() {
-		if (this.skyEngine != null && this.skyEngine.hasLightWork()) {
-			return true;
-		}
-		return this.blockEngine != null && this.blockEngine.hasLightWork();
-	}
+    @Override
+    public boolean hasLightWork() {
+        if (this.skyEngine != null && this.skyEngine.hasLightWork()) {
+            return true;
+        }
+        return this.blockEngine != null && this.blockEngine.hasLightWork();
+    }
 
-	@Override
-	public int runUpdates(int i, boolean bl, boolean bl2) {
-		if (this.blockEngine != null && this.skyEngine != null) {
-			int j = i / 2;
-			int k = this.blockEngine.runUpdates(j, bl, bl2);
-			int l = i - j + k;
-			int m = this.skyEngine.runUpdates(l, bl, bl2);
-			if (k == 0 && m > 0) {
-				return this.blockEngine.runUpdates(m, bl, bl2);
-			}
-			return m;
-		}
-		if (this.blockEngine != null) {
-			return this.blockEngine.runUpdates(i, bl, bl2);
-		}
-		if (this.skyEngine != null) {
-			return this.skyEngine.runUpdates(i, bl, bl2);
-		}
-		return i;
-	}
+    @Override
+    public int runUpdates(int i, boolean bl, boolean bl2) {
+        if (this.blockEngine != null && this.skyEngine != null) {
+            int j = i / 2;
+            int k = this.blockEngine.runUpdates(j, bl, bl2);
+            int l = i - j + k;
+            int m = this.skyEngine.runUpdates(l, bl, bl2);
+            if (k == 0 && m > 0) {
+                return this.blockEngine.runUpdates(m, bl, bl2);
+            }
+            return m;
+        }
+        if (this.blockEngine != null) {
+            return this.blockEngine.runUpdates(i, bl, bl2);
+        }
+        if (this.skyEngine != null) {
+            return this.skyEngine.runUpdates(i, bl, bl2);
+        }
+        return i;
+    }
 
-	@Override
-	public void updateSectionStatus(SectionPos sectionPos, boolean bl) {
-		if (this.blockEngine != null) {
-			this.blockEngine.updateSectionStatus(sectionPos, bl);
-		}
-		if (this.skyEngine != null) {
-			this.skyEngine.updateSectionStatus(sectionPos, bl);
-		}
-	}
+    @Override
+    public void updateSectionStatus(SectionPos sectionPos, boolean bl) {
+        if (this.blockEngine != null) {
+            this.blockEngine.updateSectionStatus(sectionPos, bl);
+        }
+        if (this.skyEngine != null) {
+            this.skyEngine.updateSectionStatus(sectionPos, bl);
+        }
+    }
 
-	@Override
-	public void enableLightSources(ChunkPos chunkPos, boolean bl) {
-		if (this.blockEngine != null) {
-			this.blockEngine.enableLightSources(chunkPos, bl);
-		}
-		if (this.skyEngine != null) {
-			this.skyEngine.enableLightSources(chunkPos, bl);
-		}
-	}
+    @Override
+    public void enableLightSources(ChunkPos chunkPos, boolean bl) {
+        if (this.blockEngine != null) {
+            this.blockEngine.enableLightSources(chunkPos, bl);
+        }
+        if (this.skyEngine != null) {
+            this.skyEngine.enableLightSources(chunkPos, bl);
+        }
+    }
 
-	@Override
-	public LayerLightEventListener getLayerListener(LightLayer lightLayer) {
-		if (lightLayer == LightLayer.BLOCK) {
-			if (this.blockEngine == null) {
-				return LayerLightEventListener.DummyLightLayerEventListener.INSTANCE;
-			}
-			return this.blockEngine;
-		}
-		if (this.skyEngine == null) {
-			return LayerLightEventListener.DummyLightLayerEventListener.INSTANCE;
-		}
-		return this.skyEngine;
-	}
+    @Override
+    public LayerLightEventListener getLayerListener(LightLayer lightLayer) {
+        if (lightLayer == LightLayer.BLOCK) {
+            if (this.blockEngine == null) {
+                return LayerLightEventListener.DummyLightLayerEventListener.INSTANCE;
+            }
+            return this.blockEngine;
+        }
+        if (this.skyEngine == null) {
+            return LayerLightEventListener.DummyLightLayerEventListener.INSTANCE;
+        }
+        return this.skyEngine;
+    }
 
-	@Override
-	public int getRawBrightness(BlockPos blockPos, int i) {
-		int j = this.skyEngine == null ? 0 : this.skyEngine.getLightValue(blockPos) - i;
-		int k = this.blockEngine == null ? 0 : this.blockEngine.getLightValue(blockPos);
-		return Math.max(k, j);
-	}
+    @Override
+    public int getRawBrightness(BlockPos blockPos, int i) {
+        int j = this.skyEngine == null ? 0 : this.skyEngine.getLightValue(blockPos) - i;
+        int k = this.blockEngine == null ? 0 : this.blockEngine.getLightValue(blockPos);
+        return Math.max(k, j);
+    }
 
-	public void lightChunk(ChunkAccess chunkAccess, boolean needLightBlockUpdate) {
-		ChunkPos chunkPos = chunkAccess.getPos();
-		chunkAccess.setLightCorrect(false);
+    public void lightChunk(ChunkAccess chunkAccess, boolean needLightBlockUpdate) {
+    	ChunkPos chunkPos = chunkAccess.getPos();
+        chunkAccess.setLightCorrect(false);
+        
+        LevelChunkSection[] levelChunkSections = chunkAccess.getSections();
+        for (int i = 0; i < chunkAccess.getSectionsCount(); ++i) {
+            LevelChunkSection levelChunkSection = levelChunkSections[i];
+            if (levelChunkSection.hasOnlyAir()) continue;
+            int j = this.levelHeightAccessor.getSectionYFromSectionIndex(i);
+            updateSectionStatus(SectionPos.of(chunkPos, j), false);
+        }
+        enableLightSources(chunkPos, true);
+        if (needLightBlockUpdate) {
+            chunkAccess.getLights().forEach(blockPos ->
+            onBlockEmissionIncrease(blockPos, chunkAccess.getLightEmission(blockPos)));
+        }
+        
+        chunkAccess.setLightCorrect(true);
+    }
 
-		LevelChunkSection[] levelChunkSections = chunkAccess.getSections();
-		for (int i = 0; i < 16; i++) {
-			LevelChunkSection levelChunkSection = levelChunkSections[i];
-			if (!LevelChunkSection.isEmpty(levelChunkSection)) {
-				updateSectionStatus(SectionPos.of(chunkPos, i), false);
-			}
-		}
-		enableLightSources(chunkPos, true);
-		if (needLightBlockUpdate) {
-			chunkAccess.getLights()
-					.forEach(blockPos -> onBlockEmissionIncrease(blockPos, chunkAccess.getLightEmission(blockPos)));
-		}
-
-		chunkAccess.setLightCorrect(true);
-	}
-
-	@Override
-	public String getDebugData(LightLayer lightLayer, SectionPos sectionPos) {
-		throw new UnsupportedOperationException("This should never be used!");
-	}
-
-	@Override
-	public void queueSectionData(LightLayer lightLayer, SectionPos sectionPos, @Nullable DataLayer dataLayer,
-			boolean bl) {
-		if (lightLayer == LightLayer.BLOCK) {
-			if (this.blockEngine != null) {
-				this.blockEngine.queueSectionData(sectionPos.asLong(), dataLayer, bl);
-			}
-		} else if (this.skyEngine != null) {
-			this.skyEngine.queueSectionData(sectionPos.asLong(), dataLayer, bl);
-		}
-	}
-
-	@Override
-	public void retainData(ChunkPos chunkPos, boolean bl) {
-		if (this.blockEngine != null) {
-			this.blockEngine.retainData(chunkPos, bl);
-		}
-		if (this.skyEngine != null) {
-			this.skyEngine.retainData(chunkPos, bl);
-		}
-	}
+    @Override
+    public String getDebugData(LightLayer lightLayer, SectionPos sectionPos) {
+    	throw new UnsupportedOperationException("This should never be used!");
+    }
+    @Override
+    public void queueSectionData(LightLayer lightLayer, SectionPos sectionPos, @Nullable DataLayer dataLayer, boolean bl) {
+        if (lightLayer == LightLayer.BLOCK) {
+            if (this.blockEngine != null) {
+                this.blockEngine.queueSectionData(sectionPos.asLong(), dataLayer, bl);
+            }
+        } else if (this.skyEngine != null) {
+            this.skyEngine.queueSectionData(sectionPos.asLong(), dataLayer, bl);
+        }
+    }
+    @Override
+    public void retainData(ChunkPos chunkPos, boolean bl) {
+        if (this.blockEngine != null) {
+            this.blockEngine.retainData(chunkPos, bl);
+        }
+        if (this.skyEngine != null) {
+            this.skyEngine.retainData(chunkPos, bl);
+        }
+    }
+    @Override
+    public int getLightSectionCount() {
+    	throw new UnsupportedOperationException("This should never be used!");
+    }
+    @Override
+    public int getMinLightSection() {
+    	throw new UnsupportedOperationException("This should never be used!");
+    }
+    @Override
+    public int getMaxLightSection() {
+    	throw new UnsupportedOperationException("This should never be used!");
+    }
 }

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,45 +18,62 @@ 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;
 	}
 	
 	public void setGenLevel(WorldGenLevel genLevel) {
 		this.genLevel = genLevel;
-	} 
+	}
 
 	@Override
 	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,61 @@ 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.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) {
+    private ChunkAccess createBiomes(ChunkGenerator generator, Registry<Biome> registry, Blender blender, StructureFeatureManager structureFeatureManager, ChunkAccess chunkAccess) {
+        if (generator instanceof NoiseBasedChunkGenerator) {
+        	((NoiseBasedChunkGenerator) generator).doCreateBiomes(registry, blender, structureFeatureManager, chunkAccess);
+        	return chunkAccess;
+        } else {
+        	chunkAccess.fillBiomesFromNoise(generator.getBiomeSource()::getNoiseBiome, generator.climateSampler());
+        	return chunkAccess;
+        }
+    }
+    
+	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 = createBiomes(environment.params.generator, environment.params.biomes, Blender.of(worldGenRegion),
+					tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk);
 		}
 	}
 }

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

@@ -1,53 +1,60 @@
 package com.seibel.lod.common.wrappers.worldGeneration.step;
 
 import java.util.ArrayList;
-import java.util.EnumSet;
 
-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.Heightmap;
+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());
-				Heightmap.primeHeightmaps(chunk, STATUS.heightmapsAfter());
-				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

@@ -9,45 +9,46 @@ import net.minecraft.world.level.chunk.ChunkAccess;
 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.lighting.LevelLightEngine;
+import net.minecraft.world.level.lighting.LightEventListener;
 
 public final class StepLight {
 	/**
 	 * 
 	 */
-	private final BatchGenerationEnvironment envionment;
+	private final BatchGenerationEnvironment environment;
 
 	/**
-	 * @param worldGenerationEnvironment
+	 * @param batchGenerationEnvironment
 	 */
-	public StepLight(BatchGenerationEnvironment worldGenerationEnvironment) {
-		envionment = worldGenerationEnvironment;
+	public StepLight(BatchGenerationEnvironment batchGenerationEnvironment)
+	{
+		environment = batchGenerationEnvironment;
 	}
 
 	public final ChunkStatus STATUS = ChunkStatus.LIGHT;
-
-	public void generateGroup(LevelLightEngine lightEngine, GridList<ChunkAccess> chunks) {
-		// ArrayList<ChunkAccess> chunksToDo = new ArrayList<ChunkAccess>();
-
+	
+	public void generateGroup(LightEventListener lightEngine,
+			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);
 		}
-
+		
 		for (ChunkAccess chunk : chunks) {
 			boolean hasCorrectBlockLight = (chunk instanceof LevelChunk && chunk.isLightCorrect());
 			try {
 				if (lightEngine == null) {
 					// Do nothing
 				} else if (lightEngine instanceof WorldGenLevelLightEngine) {
-					((WorldGenLevelLightEngine) lightEngine).lightChunk(chunk, !hasCorrectBlockLight);
+					((WorldGenLevelLightEngine)lightEngine).lightChunk(chunk, !hasCorrectBlockLight);
 				} else if (lightEngine instanceof ThreadedLevelLightEngine) {
 					((ThreadedLevelLightEngine) lightEngine).lightChunk(chunk, !hasCorrectBlockLight).join();
 				} else {
-					assert (false);
+					assert(false);
 				}
-
+				
 			} catch (Exception e) {
 				e.printStackTrace();
 			}

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

@@ -1,45 +1,91 @@
 package com.seibel.lod.common.wrappers.worldGeneration.step;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
 
-import com.seibel.lod.common.wrappers.worldGeneration.ThreadedParameters;
+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.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;
+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 {
 	/**
 	 * 
 	 */
-	private final BatchGenerationEnvironment envionment;
+	private final BatchGenerationEnvironment environment;
 
 	/**
-	 * @param worldGenerationEnvironment
+	 * @param batchGenerationEnvironment
 	 */
-	public StepNoise(BatchGenerationEnvironment worldGenerationEnvironment) {
-		envionment = worldGenerationEnvironment;
+	public StepNoise(BatchGenerationEnvironment batchGenerationEnvironment)
+	{
+		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;
 
-	public void generateGroup(ThreadedParameters tParams, WorldGenRegion worldGenRegion, List<ChunkAccess> chunks) {
+    private ChunkAccess NoiseBased$fillFromNoise(NoiseBasedChunkGenerator generator, Blender blender, StructureFeatureManager structureFeatureManager, ChunkAccess chunkAccess) {
+        NoiseSettings noiseSettings = generator.settings.get().noiseSettings();
+        LevelHeightAccessor levelHeightAccessor = chunkAccess.getHeightAccessorForGeneration();
+        int i = Math.max(noiseSettings.minY(), levelHeightAccessor.getMinBuildHeight());
+        int j = Math.min(noiseSettings.minY() + noiseSettings.height(), levelHeightAccessor.getMaxBuildHeight());
+        int k = Mth.intFloorDiv(i, noiseSettings.getCellHeight());
+        int l = Mth.intFloorDiv(j - i, noiseSettings.getCellHeight());
+        if (l <= 0) {
+            return chunkAccess;
+        }
+        int m = chunkAccess.getSectionIndex(l * noiseSettings.getCellHeight() - 1 + i);
+        int n = chunkAccess.getSectionIndex(i);
+        HashSet<LevelChunkSection> set = Sets.newHashSet();
+        for (int o = m; o >= n; --o) {
+            LevelChunkSection levelChunkSection = chunkAccess.getSection(o);
+            levelChunkSection.acquire();
+            set.add(levelChunkSection);
+        }
+        chunkAccess = generator.doFill(blender, structureFeatureManager, chunkAccess, k, l);
+        for (LevelChunkSection levelChunkSection : set) {
+            levelChunkSection.release();
+        };
+        return chunkAccess;
+    }
+    
+	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("StepNoise: "+chunk.getPos());
-			envionment.params.generator.fillFromNoise(worldGenRegion, tParams.structFeat, chunk);
+			if (environment.params.generator instanceof NoiseBasedChunkGenerator) {
+				chunk = NoiseBased$fillFromNoise((NoiseBasedChunkGenerator)environment.params.generator,Blender.of(worldGenRegion),
+						tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk);
+			} else {
+				chunk = 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

@@ -3,8 +3,8 @@ 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.CrashReport;
 import net.minecraft.CrashReportCategory;
@@ -20,6 +20,19 @@ import net.minecraft.world.level.chunk.ProtoChunk;
 import net.minecraft.world.level.levelgen.structure.StructureStart;
 
 public final class StepStructureReference {
+	/**
+	 * 
+	 */
+	private final BatchGenerationEnvironment environment;
+
+	/**
+	 * @param batchGenerationEnvironment
+	 */
+	public StepStructureReference(BatchGenerationEnvironment batchGenerationEnvironment)
+	{
+		environment = batchGenerationEnvironment;
+	}
+
 	public final ChunkStatus STATUS = ChunkStatus.STRUCTURE_REFERENCES;
 
 	private void createReferences(WorldGenRegion worldGenLevel, StructureFeatureManager structureFeatureManager,
@@ -30,7 +43,7 @@ public final class StepStructureReference {
 		int l = chunkPos.getMinBlockX();
 		int m = chunkPos.getMinBlockZ();
 
-		SectionPos sectionPos = SectionPos.of(chunkAccess.getPos(), 0);
+		SectionPos sectionPos = SectionPos.bottomOf(chunkAccess);
 
 		for (int n = j - 8; n <= j + 8; n++) {
 			for (int o = k - 8; o <= k + 8; o++) {
@@ -41,11 +54,12 @@ public final class StepStructureReference {
 					try {
 						if (structureStart.isValid()
 								&& structureStart.getBoundingBox().intersects(l, m, l + 15, m + 15)) {
-							structureFeatureManager.addReferenceForFeature(sectionPos, structureStart.getFeature(), p,
-									chunkAccess);
+							structureFeatureManager.addReferenceForFeature(sectionPos, structureStart.getFeature(),
+									p, chunkAccess);
 						}
 					} catch (Exception exception) {
-						CrashReport crashReport = CrashReport.forThrowable(exception, "Generating structure reference");
+						CrashReport crashReport = CrashReport.forThrowable(exception,
+								"Generating structure reference");
 						CrashReportCategory crashReportCategory = crashReport.addCategory("Structure");
 						crashReportCategory.setDetail("Id",
 								() -> Registry.STRUCTURE_FEATURE.getKey(structureStart.getFeature()).toString());
@@ -59,17 +73,17 @@ public final class StepStructureReference {
 		}
 	}
 
-	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("StepStructureReference: "+chunk.getPos());
 			createReferences(worldGenRegion, tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk);

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

@@ -3,8 +3,8 @@ 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.server.level.WorldGenRegion;
 import net.minecraft.world.level.chunk.ChunkAccess;
@@ -15,33 +15,52 @@ public final class StepStructureStart {
 	/**
 	 * 
 	 */
-	private final BatchGenerationEnvironment envionment;
+	private final BatchGenerationEnvironment environment;
 
 	/**
-	 * @param worldGenerationEnvironment
+	 * @param batchGenerationEnvironment
 	 */
-	public StepStructureStart(BatchGenerationEnvironment worldGenerationEnvironment) {
-		envionment = worldGenerationEnvironment;
+	public StepStructureStart(BatchGenerationEnvironment batchGenerationEnvironment)
+	{
+		environment = batchGenerationEnvironment;
 	}
 
 	public final ChunkStatus STATUS = ChunkStatus.STRUCTURE_STARTS;
+	
+	public static class StructStartCorruptedException extends RuntimeException {
+		private static final long serialVersionUID = -8987434342051563358L;
 
-	public void generateGroup(ThreadedParameters tParams, WorldGenRegion worldGenRegion, List<ChunkAccess> chunks) {
+		public StructStartCorruptedException(ArrayIndexOutOfBoundsException e) {
+			super("StructStartCorruptedException");
+			super.initCause(e);
+			fillInStackTrace();
+		}
+	}
+
+	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);
 		}
-
-		if (envionment.params.worldGenSettings.generateFeatures()) {
+		
+		if (environment.params.worldGenSettings.generateFeatures()) {
 			for (ChunkAccess chunk : chunksToDo) {
 				// System.out.println("StepStructureStart: "+chunk.getPos());
-				envionment.params.generator.createStructures(envionment.params.registry, tParams.structFeat, chunk,
-						envionment.params.structures, envionment.params.worldSeed);
+				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

@@ -3,8 +3,8 @@ 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.server.level.WorldGenRegion;
 import net.minecraft.world.level.chunk.ChunkAccess;
@@ -15,30 +15,32 @@ public final class StepSurface {
 	/**
 	 * 
 	 */
-	private final BatchGenerationEnvironment envionment;
+	private final BatchGenerationEnvironment environment;
 
 	/**
-	 * @param worldGenerationEnvironment
+	 * @param batchGenerationEnvironment
 	 */
-	public StepSurface(BatchGenerationEnvironment worldGenerationEnvironment) {
-		envionment = worldGenerationEnvironment;
+	public StepSurface(BatchGenerationEnvironment batchGenerationEnvironment)
+	{
+		environment = batchGenerationEnvironment;
 	}
 
 	public final ChunkStatus STATUS = ChunkStatus.SURFACE;
 
-	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("StepSurface: "+chunk.getPos());
-			envionment.params.generator.buildSurfaceAndBedrock(worldGenRegion, chunk);
+			environment.params.generator.buildSurface(worldGenRegion, tParams.structFeat.forWorldGenRegion(worldGenRegion),
+					chunk);
 		}
 	}
 }

common/src/main/resources/lod.accesswidener

@@ -4,10 +4,13 @@ accessWidener v1 named
 accessible field net/minecraft/world/level/storage/DimensionDataStorage dataFolder Ljava/io/File;
 
 # used when rendering
+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
 
 # used for grabbing vanilla rendered chunks
-accessible field net/minecraft/client/renderer/LevelRenderer renderChunks Lit/unimi/dsi/fastutil/objects/ObjectList;
+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;
 
@@ -19,15 +22,26 @@ accessible field net/minecraft/world/level/lighting/LevelLightEngine skyEngine L
 # world generation
 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/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/block/model/BakedQuad sprite Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;
-accessible field net/minecraft/client/renderer/texture/TextureAtlasSprite framesX [I
-accessible field net/minecraft/client/renderer/texture/TextureAtlasSprite framesY [I
+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/util/ThreadingDetector lock Ljava/util/concurrent/Semaphore;
+mutable field net/minecraft/util/ThreadingDetector lock Ljava/util/concurrent/Semaphore;

fabric/build.gradle

@@ -1,6 +1,5 @@
 plugins {
-    id "com.github.johnrengelman.shadow" version "7.0.0"
-    id "com.modrinth.minotaur" version "1.2.1"
+    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,12 +24,6 @@ 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
@@ -44,15 +37,37 @@ dependencies {
         exclude(group: "net.fabricmc.fabric-api")
     }
 
-    // Sodium
-    addMod("curse.maven:sodium-394468:${rootProject.sodium_version}", rootProject.enable_sodium)
-    implementation "org.joml:joml:1.10.2"
+    // Starlight
+    // modImplementation "curse.maven:starlight-521783:${rootProject.starlight_version_fabric}"
 
-    // Lithium
-    addMod("maven.modrinth:lithium:${rootProject.lithium_version}", rootProject.enable_lithium)
+    // Sodium
+    modImplementation "curse.maven:sodium-394468:${rootProject.sodium_version}"
+    implementation "org.joml:joml:1.10.2"
+	
+	// Lithium
+//    modImplementation "maven.modrinth:lithium:${rootProject.lithium_version}"
 
     // Iris
-    addMod("maven.modrinth:iris:${rootProject.iris_version}", rootProject.enable_iris)
+//    modImplementation "maven.modrinth:iris:${rootProject.iris_version}"
+
+    // BCLib
+//    modImplementation "com.github.paulevsGitch:BCLib:${rootProject.bclib_version}"
+
+    // Immersive Portals
+    /*
+    modImplementation("com.github.qouteall.ImmersivePortalsMod:build:${rootProject.immersive_portals_version}") {
+        exclude(group: "net.fabricmc.fabric-api")
+        transitive(false)
+    }
+    modImplementation("com.github.qouteall.ImmersivePortalsMod:imm_ptl_core:${rootProject.immersive_portals_version}") {
+        exclude(group: "net.fabricmc.fabric-api")
+        transitive(false)
+    }
+    modImplementation("com.github.qouteall.ImmersivePortalsMod:q_misc_util:${rootProject.immersive_portals_version}") {
+        exclude(group: "net.fabricmc.fabric-api")
+        transitive(false)
+    }
+    */
 
 
 

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

@@ -26,22 +26,16 @@ import com.seibel.lod.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.lod.common.wrappers.world.DimensionTypeWrapper;
 import com.seibel.lod.common.wrappers.world.WorldWrapper;
 
-import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
+import com.seibel.lod.core.util.SingletonHandler;
 import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper;
 import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
-import com.seibel.lod.fabric.mixins.events.MixinClientLevel;
 
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientChunkEvents;
-import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
 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.ServerChunkEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerWorldEvents;
-import net.fabricmc.fabric.mixin.event.lifecycle.client.ClientChunkManagerMixin;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.multiplayer.ClientChunkCache;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.level.Level;
@@ -56,7 +50,7 @@ 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
@@ -73,6 +67,8 @@ public class ClientProxy
 	 */
 	public void registerEvents() {
 		// TODO: Fix this if it's wrong
+		
+		/* Registor the mod accessor*/
 
 		/* World Events */
 		//ServerTickEvents.START_SERVER_TICK.register(this::serverTickEvent);
@@ -80,14 +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 */
@@ -115,7 +109,7 @@ public class ClientProxy
 	{
 		eventApi.worldSaveEvent();
 	}
-
+	
 	/** This is also called when a new dimension loads */
 	public void worldLoadEvent(Level level)
 	{
@@ -158,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>();
 	
@@ -172,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

@@ -21,18 +21,18 @@ package com.seibel.lod.fabric;
 
 import com.seibel.lod.common.LodCommonMain;
 import com.seibel.lod.core.ModInfo;
-import com.seibel.lod.core.api.ApiShared;
 import com.seibel.lod.core.api.ClientApi;
-import com.seibel.lod.core.handlers.dependencyInjection.DependencyHandler;
-import com.seibel.lod.core.handlers.dependencyInjection.ModAccessorHandler;
-import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
+import com.seibel.lod.core.api.ModAccessorApi;
+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.FabricDependencySetup;
+import com.seibel.lod.fabric.wrappers.modAccessor.StarlightAccessor;
+import com.seibel.lod.fabric.wrappers.DependencySetup;
 
 import net.fabricmc.api.ClientModInitializer;
 
@@ -40,12 +40,12 @@ 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 FabricMain implements ClientModInitializer
+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"
 	// Once it works on servers change the implement to ModInitializer and in fabric.mod.json it should be "environment": "*"
@@ -64,37 +64,28 @@ public class FabricMain implements ClientModInitializer
 	public static void init() {
 		LodCommonMain.initConfig();
 		LodCommonMain.startup(null, false);
-		
-		ApiShared.LOGGER.info(ModInfo.READABLE_NAME + ", Version: " + ModInfo.VERSION);
-		
-		
-		// make sure the dependencies are set up before the mod needs them
-		FabricDependencySetup.createInitialBindings();
-		FabricDependencySetup.finishBinding();
-		
-		// mod dependencies
-		if (SingletonHandler.get(IModChecker.class).isModLoaded("sodium")) {
-			ModAccessorHandler.bind(ISodiumAccessor.class, new SodiumAccessor());
-		}
-		if (SingletonHandler.get(IModChecker.class).isModLoaded("optifine")) {
-			ModAccessorHandler.bind(IOptifineAccessor.class, new OptifineAccessor());
-		}
-		
-		ModAccessorHandler.finishBinding();
-		
-		
+		DependencySetup.createInitialBindings();
+		SingletonHandler.bind(IModChecker.class, ModChecker.INSTANCE);
+		ClientApi.LOGGER.info(ModInfo.READABLE_NAME + ", Version: " + ModInfo.VERSION);
+
 		// Check if this works
 		client_proxy = new ClientProxy();
 		client_proxy.registerEvents();
+		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());
+		}
 	}
 
 	public static void initServer() {
 		LodCommonMain.initConfig();
 		LodCommonMain.startup(null, true);
-		
-		ApiShared.LOGGER.info(ModInfo.READABLE_NAME + ", Version: " + ModInfo.VERSION);
-		
-		FabricDependencySetup.createInitialBindings();
-		FabricDependencySetup.finishBinding();
+		DependencySetup.createInitialBindings();
+		ClientApi.LOGGER.info(ModInfo.READABLE_NAME + ", Version: " + ModInfo.VERSION);
 	}
 }

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

@@ -6,42 +6,35 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.seibel.lod.core.api.ClientApi;
-import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
+import com.seibel.lod.core.util.SingletonHandler;
 import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
 
 import net.minecraft.client.Camera;
 import net.minecraft.client.renderer.FogRenderer;
 import net.minecraft.client.renderer.FogRenderer.FogMode;
-import net.minecraft.tags.FluidTags;
 import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.level.material.FluidState;
 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 = 4206942069.F;
-	private static final float A_EVEN_LARGER_VALUE = 420694206942069.F;
+	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;FZ)V")
-	private static final void disableSetupFog(Camera camera, FogMode fogMode, float f, boolean bl, CallbackInfo callback) {
-		FogType fogType = camera.getFluidInCamera();
+	private static void disableSetupFog(Camera camera, FogMode fogMode, float f, boolean bl, CallbackInfo callback) {
+	    FogType fogTypes = camera.getFluidInCamera();
 	    Entity entity = camera.getEntity();
-	    boolean enableFog = (entity instanceof LivingEntity) && ((LivingEntity)entity).hasEffect(MobEffects.BLINDNESS);
-	    enableFog |= fogType.equals(FogType.WATER);
-	    enableFog |= fogType.equals(FogType.LAVA);
-	    enableFog |= fogType.equals(FogType.POWDER_SNOW);
-	    
-	    if (!enableFog) {
-			if (fogMode == FogMode.FOG_TERRAIN && CONFIG.client().graphics().fogQuality().getDisableVanillaFog()) {
+	    boolean isUnderWater = (entity instanceof LivingEntity) && ((LivingEntity)entity).hasEffect(MobEffects.BLINDNESS);
+	    if (!isUnderWater) {
+			if (fogMode == FogMode.FOG_TERRAIN && fogTypes == FogType.NONE && CONFIG.client().graphics().fogQuality().getDisableVanillaFog()) {
 			    RenderSystem.setShaderFogStart(A_REALLY_REALLY_BIG_VALUE);
 			    RenderSystem.setShaderFogEnd(A_EVEN_LARGER_VALUE);
 			}
 	    }
 	}
-}
+}

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

@@ -1,6 +1,6 @@
 package com.seibel.lod.fabric.mixins;
 
-import com.seibel.lod.fabric.FabricMain;
+import com.seibel.lod.fabric.Main;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.main.GameConfig;
 import org.spongepowered.asm.mixin.Mixin;
@@ -16,6 +16,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 public class MixinMinecraft {
     @Inject(method = "<init>", at = @At("TAIL"))
     private void startMod(GameConfig gameConfig, CallbackInfo ci) {
-        FabricMain.init();
+        Main.init();
     }
 }

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

@@ -3,7 +3,7 @@ package com.seibel.lod.fabric.mixins;
 import com.seibel.lod.common.wrappers.config.ConfigGui;
 import com.seibel.lod.common.wrappers.config.TexturedButtonWidget;
 import com.seibel.lod.core.ModInfo;
-import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
+import com.seibel.lod.core.util.SingletonHandler;
 import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
 import net.minecraft.client.gui.screens.OptionsScreen;
 import net.minecraft.client.gui.screens.Screen;
@@ -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
@@ -34,19 +34,19 @@ public class MixinOptionsScreen extends Screen {
     @Inject(at = @At("HEAD"),method = "init")
     private void lodconfig$init(CallbackInfo ci) {
         if (SingletonHandler.get(ILodConfigWrapperSingleton.class).client().getOptionsButton())
-            this.addButton(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")));
+            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")));
     }
 }

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

@@ -20,19 +20,17 @@
 package com.seibel.lod.fabric.mixins;
 
 import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.math.Matrix4f;
 import com.seibel.lod.common.wrappers.McObjectConverter;
+import com.seibel.lod.core.api.ClientApi;
+import com.seibel.lod.core.objects.math.Mat4f;
 import net.minecraft.client.renderer.LevelRenderer;
-import org.lwjgl.opengl.GL15;
+import net.minecraft.client.renderer.RenderType;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import com.seibel.lod.core.api.ClientApi;
-import com.seibel.lod.core.objects.math.Mat4f;
-
-import net.minecraft.client.renderer.RenderType;
-
 /**
  * This class is used to mix in my rendering code
  * before Minecraft starts rendering blocks.
@@ -49,35 +47,28 @@ import net.minecraft.client.renderer.RenderType;
 @Mixin(LevelRenderer.class)
 public class MixinWorldRenderer
 {
-	// TODO: Fix clouds
 	private static float previousPartialTicks = 0;
 
+	public MixinWorldRenderer() {
+		throw new NullPointerException("Null cannot be cast to non-null type.");
+	}
 
-	@Inject(at = @At("RETURN"), method = "renderSky(Lcom/mojang/blaze3d/vertex/PoseStack;F)V")
-	private void renderSky(PoseStack matrixStackIn, float partialTicks, CallbackInfo callback)
-	{
-		// get the partial ticks since renderBlockLayer doesn't
+	@Inject(method = "renderClouds", at = @At("HEAD"), cancellable = true)
+	public void renderClouds(PoseStack poseStack, Matrix4f projectionMatrix, float tickDelta, double cameraX, double cameraY, double cameraZ, CallbackInfo ci) {
+		// get the partial ticks since renderChunkLayer doesn't
 		// have access to them
-		previousPartialTicks = partialTicks;
+		previousPartialTicks = tickDelta;
 	}
 
 	// HEAD or RETURN
-	@Inject(at = @At("HEAD"), method = "renderChunkLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDD)V")
-	private void renderChunkLayer(RenderType renderType, PoseStack matrixStackIn, double xIn, double yIn, double zIn, CallbackInfo callback)
+	@Inject(at = @At("HEAD"), method = "renderChunkLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDDLcom/mojang/math/Matrix4f;)V")
+	private void renderChunkLayer(RenderType renderType, PoseStack modelViewMatrixStack, double cameraXBlockPos, double cameraYBlockPos, double cameraZBlockPos, Matrix4f projectionMatrix, CallbackInfo callback)
 	{
 		// only render before solid blocks
 		if (renderType.equals(RenderType.solid()))
 		{
-			// get MC's current projection matrix
-			float[] mcProjMatrixRaw = new float[16];
-			GL15.glGetFloatv(GL15.GL_PROJECTION_MATRIX, mcProjMatrixRaw);
-			Mat4f mcProjectionMatrix = new Mat4f(mcProjMatrixRaw);
-			// OpenGl outputs their matrices in col,row form instead of row,col
-			// (or maybe vice versa I have no idea :P)
-			mcProjectionMatrix.transpose();
-
-
-			Mat4f mcModelViewMatrix = McObjectConverter.Convert(matrixStackIn.last().pose());
+			Mat4f mcModelViewMatrix = McObjectConverter.Convert(modelViewMatrixStack.last().pose());
+			Mat4f mcProjectionMatrix = McObjectConverter.Convert(projectionMatrix);
 
 			ClientApi.INSTANCE.renderLods(mcModelViewMatrix, mcProjectionMatrix, previousPartialTicks);
 		}

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

@@ -1,6 +1,6 @@
 package com.seibel.lod.fabric.mixins.events;
 
-import com.seibel.lod.fabric.FabricMain;
+import com.seibel.lod.fabric.Main;
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.protocol.game.ClientGamePacketListener;
@@ -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) {
-        FabricMain.client_proxy.blockChangeEvent(Minecraft.getInstance().player.clientLevel, this.getPos());
+        Main.client_proxy.blockChangeEvent(Minecraft.getInstance().player.clientLevel, this.getPos());
     }
-}
+}

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

@@ -1,12 +1,11 @@
 package com.seibel.lod.fabric.mixins.events;
 
-import com.seibel.lod.fabric.FabricMain;
+import com.seibel.lod.fabric.Main;
 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) {
-        FabricMain.client_proxy.worldLoadEvent((ClientLevel) (Object) this);
+    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/events/MixinMinecraft.java

@@ -1,10 +1,9 @@
 package com.seibel.lod.fabric.mixins.events;
 
-import com.seibel.lod.fabric.FabricMain;
+import com.seibel.lod.fabric.Main;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.server.level.ServerLevel;
 
 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
@@ -23,11 +22,11 @@ public class MixinMinecraft {
 
     @Inject(method = "setLevel", at = @At("HEAD"))
     private void unloadWorldEvent_sL(ClientLevel clientLevel, CallbackInfo ci) {
-        if (level != null) FabricMain.client_proxy.worldUnloadEvent(level);
+        if (level != null) Main.client_proxy.worldUnloadEvent(level);
     }
 
     @Inject(method = "clearLevel(Lnet/minecraft/client/gui/screens/Screen;)V", at = @At("HEAD"))
     private void unloadWorldEvent_cL(Screen screen, CallbackInfo ci) {
-        if (this.level != null) FabricMain.client_proxy.worldUnloadEvent(this.level);
+        if (this.level != null) Main.client_proxy.worldUnloadEvent(this.level);
     }
 }

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

@@ -1,6 +1,6 @@
 package com.seibel.lod.fabric.mixins.events;
 
-import com.seibel.lod.fabric.FabricMain;
+import com.seibel.lod.fabric.Main;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.util.ProgressListener;
 import org.spongepowered.asm.mixin.Mixin;
@@ -14,8 +14,13 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
  */
 @Mixin(ServerLevel.class)
 public class MixinServerLevel {
-    @Inject(method = "save", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerChunkCache;save(Z)V", shift = At.Shift.AFTER))
-    private void saveWorldEvent(ProgressListener progressListener, boolean bl, boolean bl2, CallbackInfo ci) {
-        FabricMain.client_proxy.worldSaveEvent();
+    @Inject(method = "save", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/entity/PersistentEntitySectionManager;saveAll()V", shift = At.Shift.AFTER))
+    private void saveWorldEvent_sA(ProgressListener progressListener, boolean bl, boolean bl2, CallbackInfo ci) {
+        Main.client_proxy.worldSaveEvent();
+    }
+
+    @Inject(method = "save", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/entity/PersistentEntitySectionManager;autoSave()V", shift = At.Shift.AFTER))
+    private void saveWorldEvent_aS(ProgressListener progressListener, boolean bl, boolean bl2, CallbackInfo ci) {
+        Main.client_proxy.worldSaveEvent();
     }
 }

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

@@ -1,31 +0,0 @@
-package com.seibel.lod.fabric.mixins.unsafe;
-
-import net.minecraft.world.level.chunk.PalettedContainer;
-import org.spongepowered.asm.mixin.Final;
-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;
-
-/**
- * NOTE: THIS IS NOT A FIX TO THE PROBLEM.
- * TODO: Do/Find an actual fix to this
- *
- * @author Ran
- */
-@Mixin(PalettedContainer.class)
-public class MixinPalettedContainer {
-
-    @Inject(method = "acquire", at = @At("HEAD"), cancellable = true)
-    private void acquire_skip(CallbackInfo ci) {
-    	ci.cancel();
-    }
-    @Inject(method = "release", at = @At("HEAD"), cancellable = true)
-    private void release_skip(CallbackInfo ci) {
-    	ci.cancel();
-    }
-}

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

@@ -0,0 +1,26 @@
+package com.seibel.lod.fabric.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);
+    }
+}

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

@@ -1,10 +1,7 @@
 package com.seibel.lod.fabric.wrappers;
 
-import com.seibel.lod.core.handlers.dependencyInjection.DependencyHandler;
-import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
+import com.seibel.lod.core.util.SingletonHandler;
 import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
-import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModChecker;
-import com.seibel.lod.fabric.wrappers.modAccessor.ModChecker;
 import com.seibel.lod.common.wrappers.config.LodConfigWrapperSingleton;
 
 /**
@@ -17,16 +14,10 @@ import com.seibel.lod.common.wrappers.config.LodConfigWrapperSingleton;
  * @author Ran
  * @version 12-1-2021
  */
-public class FabricDependencySetup
+public class DependencySetup
 {
 	public static void createInitialBindings()
 	{
-		SingletonHandler.bind(ILodConfigWrapperSingleton.class, LodConfigWrapperSingleton.INSTANCE);;
-		SingletonHandler.bind(IModChecker.class, ModChecker.INSTANCE);
-	}
-
-	public static void finishBinding()
-	{
-		SingletonHandler.finishBinding();
+		SingletonHandler.bind(ILodConfigWrapperSingleton.class, LodConfigWrapperSingleton.INSTANCE);
 	}
 }

fabric/src/main/java/com/seibel/lod/fabric/wrappers/config/ModMenuIntegration.java

@@ -6,9 +6,6 @@ import com.terraformersmc.modmenu.api.ModMenuApi;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * For making the config show up in modmenu
  */

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

@@ -1,4 +1,3 @@
-
 package com.seibel.lod.fabric.wrappers.modAccessor;
 
 import java.util.HashSet;
@@ -9,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 String getModName()
+	{
+		return "Optifine-Fabric-1.18.X";
+	}
 
-    @Override
-    public HashSet<AbstractChunkPosWrapper> getNormalRenderedChunks()
-    {
-        // TODO: Impl proper methods here
-        return null;
-    }
-
-}
+	@Override
+	public HashSet<AbstractChunkPosWrapper> getNormalRenderedChunks()
+	{
+		// TODO: Impl proper methods here
+		return null;
+	}
+	
+}

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

@@ -3,65 +3,40 @@ package com.seibel.lod.fabric.wrappers.modAccessor;
 import java.util.HashSet;
 import java.util.stream.Collectors;
 
-import com.seibel.lod.core.api.ClientApi;
-import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
+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.nbt.CompoundTag;
-import net.minecraft.network.protocol.Packet;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.world.phys.AABB;
+import net.minecraft.world.level.LevelHeightAccessor;
 
 public class SodiumAccessor implements ISodiumAccessor {
-	private final IMinecraftRenderWrapper MC_RENDER = SingletonHandler.get(IMinecraftRenderWrapper.class);
-	
-    @Override
-    public String getModName() {
-    	
-        return "Sodium-Fabric-1.16.5";
-    }
+	IWrapperFactory factory = SingletonHandler.get(IWrapperFactory.class);
+
+	@Override
+	public String getModName() {
+		return "Sodium-Fabric-1.18.X";
+	}
 
 	@Override
 	public HashSet<AbstractChunkPosWrapper> getNormalRenderedChunks() {
-		SodiumWorldRenderer renderer = SodiumWorldRenderer.getInstance();
-		LevelAccessor height = Minecraft.getInstance().level;
-		// TODO: Maybe use a mixin to make this more efficient
-		return MC_RENDER.getMaximumRenderedChunks().stream().filter((AbstractChunkPosWrapper chunk) -> {
-			FakeChunkEntity AABB = new FakeChunkEntity(chunk.getX(), chunk.getZ(), height.getMaxBuildHeight());
-			return (renderer.isEntityVisible(AABB));
-		}).collect(Collectors.toCollection(HashSet::new));
+		SodiumWorldRenderer renderer = SodiumWorldRenderer.instance();
+		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));
 	}
-	
-	private static class FakeChunkEntity extends Entity {
-		public int cx;
-		public int cz;
-		public int my;
-		public FakeChunkEntity(int chunkX, int chunkZ, int maxHeight) {
-			super(EntityType.AREA_EFFECT_CLOUD, null);
-			cx = chunkX;
-			cz = chunkZ;
-			my = maxHeight;
-		}
-		@Override
-		public AABB getBoundingBoxForCulling() {
-			return new AABB(cx*16+1, 1, cz*16+1,
-					cx*16+15, my-1, cz*16+15);
-		}
-		@Override
-		protected void defineSynchedData() {}
-		@Override
-		protected void readAdditionalSaveData(CompoundTag paramCompoundTag) {}
-		@Override
-		protected void addAdditionalSaveData(CompoundTag paramCompoundTag) {}
-		@Override
-		public Packet<?> getAddEntityPacket() {
-			throw new UnsupportedOperationException("This is a FAKE CHUNK ENTITY... For tricking the Sodium to check a AABB.");
-		}}
 
 }

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,11 +2,10 @@
   "required": true,
   "minVersion": "0.8",
   "package": "com.seibel.lod.fabric.mixins",
-  "compatibilityLevel": "JAVA_8",
+  "compatibilityLevel": "JAVA_17",
   "mixins": [
-    "events.MixinServerLevel",
-    "unsafe.MixinPalettedContainer",
-    "MixinChunkGenerator"
+    "unsafe.MixinThreadingDectector",
+    "events.MixinServerLevel"
   ],
   "client": [
     "MixinMinecraft",
@@ -21,4 +20,4 @@
   "injectors": {
     "defaultRequire": 1
   }
-}
+}

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

@@ -9,8 +9,8 @@
 
   "contact": {
     "homepage": "${homepage}",
-    "sources": "${source}",
-    "issues": "${issues}"
+    "sources": "https://gitlab.com/jeseibel/minecraft-lod-mod/",
+    "issues": "https://gitlab.com/jeseibel/minecraft-lod-mod/-/issues"
   },
 
   "license": "CC0-1.0",
@@ -34,8 +34,8 @@
   "depends": {
     "fabricloader": "*",
     "fabric": "*",
-    "minecraft": ["1.16.5", "1.16.4", "1.16.3", "1.16.2"],
-    "java": ">=8"
+    "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,19 +25,14 @@ 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}"
 
-    addMod("curse.maven:TerraForged-363820:${rootProject.terraforged_version}", rootProject.enable_terraforged)
-    
+    // Starlight
+//    modImplementation("curse.maven:starlight-forge-526854:${rootProject.starlight_version_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 }
 
@@ -47,6 +42,7 @@ dependencies {
     // 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'
@@ -76,7 +72,7 @@ shadowJar {
     configurations = [project.configurations.shadowMe]
     relocate 'org.tukaani', 'shaded.tukaani'
     relocate 'org.apache.commons.compress', 'shaded.apache.commons.compress'
-    relocate 'com.electronwill.nightconfig', 'shaded.electronwill.nightconfig'
+    relocate 'com.electronwill.nightconfig', 'shaded.electronwill.nightconfig'    // This is already included with forge
 
     relocate 'com.seibel.lod.common', 'forge.com.seibel.lod.common'
 

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,7 +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

@@ -22,32 +22,34 @@ package com.seibel.lod.forge;
 import com.seibel.lod.common.LodCommonMain;
 import com.seibel.lod.common.forge.LodForgeMethodCaller;
 import com.seibel.lod.common.wrappers.config.ConfigGui;
-import com.seibel.lod.common.wrappers.minecraft.MinecraftClientWrapper;
+import com.seibel.lod.common.wrappers.minecraft.MinecraftWrapper;
 import com.seibel.lod.core.ModInfo;
-import com.seibel.lod.core.api.ApiShared;
 import com.seibel.lod.core.api.ClientApi;
-import com.seibel.lod.core.handlers.dependencyInjection.ModAccessorHandler;
+import com.seibel.lod.core.api.ModAccessorApi;
 import com.seibel.lod.core.handlers.ReflectionHandler;
-import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
+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.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.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.ExtensionPoint;
+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.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,48 +66,43 @@ import java.util.Random;
 public class ForgeMain implements LodForgeMethodCaller
 {
 	public static ForgeClientProxy forgeClientProxy;
-
+	
 	private void init(final FMLCommonSetupEvent event)
 	{
-		ApiShared.LOGGER.info("Distant Horizons initializing...");
-		
+		// make sure the dependencies are set up before the mod needs them
 		LodCommonMain.initConfig();
 		LodCommonMain.startup(this, !FMLLoader.getDist().isClient());
-		
-		// make sure the dependencies are set up before the mod needs them
 		ForgeDependencySetup.createInitialBindings();
-		ForgeDependencySetup.finishBinding();
-		
-		// mod dependencies
+		ClientApi.LOGGER.info("Distant Horizons initializing...");
+		SingletonHandler.bind(IModChecker.class, ModChecker.INSTANCE);
+
 		if (ReflectionHandler.instance.optifinePresent()) {
-			ModAccessorHandler.bind(IOptifineAccessor.class, new OptifineAccessor());
+			ModAccessorApi.bind(IOptifineAccessor.class, new OptifineAccessor());
 		}
-		
-		ModAccessorHandler.finishBinding();
 	}
-
-
+	
+	
 	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(ExtensionPoint.CONFIGGUIFACTORY,
-				() -> (client, parent) -> ConfigGui.getScreen(parent, ""));
+		ModLoadingContext.get().registerExtensionPoint(ConfigGuiHandler.ConfigGuiFactory.class,
+				() -> new ConfigGuiHandler.ConfigGuiFactory((client, parent) -> ConfigGui.getScreen(parent, "")));
 		forgeClientProxy = new ForgeClientProxy();
 		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(MinecraftClientWrapper mc, Block block, BlockState blockState, Direction direction, Random random) {
+	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);
 	}
 }

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

@@ -6,8 +6,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.seibel.lod.core.api.ApiShared;
-import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
+import com.seibel.lod.core.util.SingletonHandler;
 import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
 
 import net.minecraft.client.Camera;
@@ -20,32 +19,29 @@ 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 keeping it for forge just in case)
-	private static final float A_REALLY_REALLY_BIG_VALUE = 4206942069.F;
-	private static final float A_EVEN_LARGER_VALUE = 420694206942069.F;
+	
+	// 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")
-	private static final void disableSetupFog(Camera camera, FogMode fogMode, float f, boolean bl, float ticks, CallbackInfo callback) {
+			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; // Can happen due to forge calling this before setting up the mod
-	    }
-	    ApiShared.LOGGER.debug("LOD: MixinSetupFog called!");
-		FogType fogType = camera.getFluidInCamera();
+		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);
-	    isUnderWater |= fogType.equals(FogType.WATER);
-	    isUnderWater |= fogType.equals(FogType.LAVA);
-	    
 	    if (!isUnderWater) {
-			if (fogMode == FogMode.FOG_TERRAIN && CONFIG.client().graphics().fogQuality().getDisableVanillaFog()) {
+			if (fogMode == FogMode.FOG_TERRAIN && fogTypes == FogType.NONE && CONFIG.client().graphics().fogQuality().getDisableVanillaFog()) {
 			    RenderSystem.setShaderFogStart(A_REALLY_REALLY_BIG_VALUE);
 			    RenderSystem.setShaderFogEnd(A_EVEN_LARGER_VALUE);
 			}
 	    }
 	}
-}
+}

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

@@ -3,7 +3,7 @@ package com.seibel.lod.forge.mixins;
 import com.seibel.lod.common.wrappers.config.ConfigGui;
 import com.seibel.lod.common.wrappers.config.TexturedButtonWidget;
 import com.seibel.lod.core.ModInfo;
-import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
+import com.seibel.lod.core.util.SingletonHandler;
 import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
 import net.minecraft.client.gui.screens.OptionsScreen;
 import net.minecraft.client.gui.screens.Screen;
@@ -34,7 +34,7 @@ public class MixinOptionsScreen extends Screen {
     @Inject(at = @At("HEAD"),method = "init")
     private void lodconfig$init(CallbackInfo ci) {
         if (SingletonHandler.get(ILodConfigWrapperSingleton.class).client().getOptionsButton())
-            this.addButton(new TexturedButtonWidget(
+            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

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

@@ -1,49 +0,0 @@
-package com.seibel.lod.forge.mixins;
-
-import java.util.Random;
-
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-//import com.seibel.lod.core.api.ClientApi;
-import com.terraforged.mod.chunk.generator.FeatureGenerator;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.WorldGenLevel;
-import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
-
-@Mixin(FeatureGenerator.class)
-public class MixinTFChunkGenerator {
-
-	@Redirect(method = "decorate("
-			+ "Lnet/minecraft/world/level/StructureFeatureManager;"
-			+ "Lnet/minecraft/world/level/WorldGenLevel;"
-			+ "Lnet/minecraft/world/level/chunk/ChunkAccess;"
-			+ "Lnet/minecraft/world/level/biome/Biome;"
-			+ "Lnet/minecraft/core/BlockPos;"
-			+ "Lcom/terraforged/mod/profiler/watchdog/WatchdogContext;)V",
-		at = @At(
-			value = "INVOKE",
-			target = "Lnet/minecraft/world/level/levelgen/feature/ConfiguredFeature;place("
-					+ "Lnet/minecraft/world/level/WorldGenLevel;"
-					+ "Lnet/minecraft/world/level/chunk/ChunkGenerator;"
-					+ "Ljava/util/Random;Lnet/minecraft/core/BlockPos;)Z"
-		))
-	private boolean wrapDecorate$FeaturePlace(ConfiguredFeature<?, ?> feature, WorldGenLevel arg,
-			ChunkGenerator arg2, Random random, BlockPos arg3) {
-		synchronized((FeatureGenerator)(Object)this) {
-			//ClientApi.LOGGER.info("wrapDecorate FeaturePlace triggered");
-			return feature.place(arg, arg2, random, arg3);
-		}
-	}
-	
-	//METHOD: com.terraforged.mod.chunk.generator.FeatureGenerator.decorate(StructureFeatureManager manager,
-	// WorldGenLevel region, ChunkAccess chunk, Biome biome, BlockPos pos, WatchdogContext context)
-	
-	//TARGET: boolean net.minecraft.world.level.levelgen.feature.ConfiguredFeature.place
-	// (WorldGenLevel arg, ChunkGenerator arg2, Random random, BlockPos arg3)
-}
-
-

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

@@ -20,19 +20,17 @@
 package com.seibel.lod.forge.mixins;
 
 import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.math.Matrix4f;
 import com.seibel.lod.common.wrappers.McObjectConverter;
+import com.seibel.lod.core.api.ClientApi;
+import com.seibel.lod.core.objects.math.Mat4f;
 import net.minecraft.client.renderer.LevelRenderer;
-import org.lwjgl.opengl.GL15;
+import net.minecraft.client.renderer.RenderType;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import com.seibel.lod.core.api.ClientApi;
-import com.seibel.lod.core.objects.math.Mat4f;
-
-import net.minecraft.client.renderer.RenderType;
-
 /**
  * This class is used to mix in my rendering code
  * before Minecraft starts rendering blocks.
@@ -49,35 +47,28 @@ import net.minecraft.client.renderer.RenderType;
 @Mixin(LevelRenderer.class)
 public class MixinWorldRenderer
 {
-	// TODO: Fix clouds
 	private static float previousPartialTicks = 0;
 
+	public MixinWorldRenderer() {
+		throw new NullPointerException("Null cannot be cast to non-null type.");
+	}
 
-	@Inject(at = @At("RETURN"), method = "renderSky(Lcom/mojang/blaze3d/vertex/PoseStack;F)V")
-	private void renderSky(PoseStack matrixStackIn, float partialTicks, CallbackInfo callback)
-	{
-		// get the partial ticks since renderBlockLayer doesn't
+	@Inject(method = "renderClouds", at = @At("HEAD"), cancellable = true)
+	public void renderClouds(PoseStack poseStack, Matrix4f projectionMatrix, float tickDelta, double cameraX, double cameraY, double cameraZ, CallbackInfo ci) {
+		// get the partial ticks since renderChunkLayer doesn't
 		// have access to them
-		previousPartialTicks = partialTicks;
+		previousPartialTicks = tickDelta;
 	}
 
 	// HEAD or RETURN
-	@Inject(at = @At("HEAD"), method = "renderChunkLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDD)V")
-	private void renderChunkLayer(RenderType renderType, PoseStack matrixStackIn, double xIn, double yIn, double zIn, CallbackInfo callback)
+	@Inject(at = @At("HEAD"), method = "renderChunkLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDDLcom/mojang/math/Matrix4f;)V")
+	private void renderChunkLayer(RenderType renderType, PoseStack modelViewMatrixStack, double cameraXBlockPos, double cameraYBlockPos, double cameraZBlockPos, Matrix4f projectionMatrix, CallbackInfo callback)
 	{
 		// only render before solid blocks
 		if (renderType.equals(RenderType.solid()))
 		{
-			// get MC's current projection matrix
-			float[] mcProjMatrixRaw = new float[16];
-			GL15.glGetFloatv(GL15.GL_PROJECTION_MATRIX, mcProjMatrixRaw);
-			Mat4f mcProjectionMatrix = new Mat4f(mcProjMatrixRaw);
-			// OpenGl outputs their matrices in col,row form instead of row,col
-			// (or maybe vice versa I have no idea :P)
-			mcProjectionMatrix.transpose();
-
-
-			Mat4f mcModelViewMatrix = McObjectConverter.Convert(matrixStackIn.last().pose());
+			Mat4f mcModelViewMatrix = McObjectConverter.Convert(modelViewMatrixStack.last().pose());
+			Mat4f mcProjectionMatrix = McObjectConverter.Convert(projectionMatrix);
 
 			ClientApi.INSTANCE.renderLods(mcModelViewMatrix, mcProjectionMatrix, previousPartialTicks);
 		}

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,10 +1,8 @@
 package com.seibel.lod.forge.wrappers;
 
 import com.seibel.lod.common.wrappers.config.LodConfigWrapperSingleton;
-import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
+import com.seibel.lod.core.util.SingletonHandler;
 import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
-import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModChecker;
-import com.seibel.lod.forge.wrappers.modAccessor.ModChecker;
 
 /**
  * Binds all necessary dependencies so we
@@ -14,18 +12,12 @@ import com.seibel.lod.forge.wrappers.modAccessor.ModChecker;
  * 
  * @author James Seibel
  * @author Ran
- * @version 3-5-2022
+ * @version 12-1-2021
  */
 public class ForgeDependencySetup
 {
 	public static void createInitialBindings()
 	{
 		SingletonHandler.bind(ILodConfigWrapperSingleton.class, LodConfigWrapperSingleton.INSTANCE);
-		SingletonHandler.bind(IModChecker.class, ModChecker.INSTANCE);
-	}
-	
-	public static void finishBinding()
-	{
-		SingletonHandler.finishBinding();
 	}
 }

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

@@ -1,4 +1,3 @@
-
 package com.seibel.lod.forge.wrappers.modAccessor;
 
 import java.util.HashSet;
@@ -9,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 String getModName()
+	{
+		return "Optifine-Forge-1.18.X";
+	}
 
-    @Override
-    public HashSet<AbstractChunkPosWrapper> getNormalRenderedChunks()
-    {
-        // TODO: Impl proper methods here
-        return null;
-    }
-
-}
+	@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="${issues}"
+issueTrackerURL="https://gitlab.com/jeseibel/minecraft-lod-mod/-/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="${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,10 +2,8 @@
 	"required": true,
 	"minVersion": "0.8",
 	"package": "com.seibel.lod.forge.mixins",
-	"compatibilityLevel": "JAVA_8",
+	"compatibilityLevel": "JAVA_17",
 	"mixins": [
-		"MixinChunkGenerator",
-		"MixinTFChunkGenerator"
 	],
 	"client": [
 		"MixinOptionsScreen",
@@ -13,4 +11,4 @@
 		"MixinFogRenderer"
 	],
 	"server": []
-}
+}

forge/src/main/resources/pack.mcmeta

@@ -1,6 +1,6 @@
 {
     "pack": {
         "description": "",
-        "pack_format": 6
+        "pack_format": 7
     }
 }

gradle.properties

@@ -1,9 +1,9 @@
 org.gradle.jvmargs=-Xmx2048M
 
-minecraft_version=1.16.5
+minecraft_version=1.18.1
 
 archives_base_name=DistantHorizons
-mod_version=1.6.2a
+mod_version=1.6.0a
 maven_group=com.seibel.lod
 toml_version=3.6.4
 
@@ -12,35 +12,20 @@ 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.13.2
-fabric_api_version=0.42.0+1.16
-    # Fabric mod versions
-    modmenu_version=1.16.22
-    lithium_version=mc1.16.5-0.6.6
-    sodium_version=3488820
-    iris_version=1.16.x-v1.1.4
-
-    # Fabric mod run
-    # 0 = Dont enable and dont run
-    # 1 = Can be refranced in code but dosnt run
-    # 2 = Can be refranced in code and runs in client
-    enable_lithium=0
-    enable_sodium=1
-    enable_iris=0
-
+fabric_loader_version=0.12.12
+fabric_api_version=0.44.0+1.18
+    # Fabric mods
+    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
+    immersive_portals_version = v1.0.4-1.18
+	bclib_version=1.2.5
 
 # Forge loader
-forge_version=36.2.28
-    # Forge mod versions
-	terraforged_version=3285909
-
-    # Forge mod run
-    # 0 = Dont enable and dont run
-    # 1 = Can be refranced in code but dosnt run
-    # 2 = Can be refranced in code and runs in client
-	enable_terraforged=1
+forge_version=39.0.44
+    # Forge mods
+    starlight_version_forge=3559934

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