Update the version number to 1.6.2a

Update and merge the render_test core
2022-02-17 20:11:13 -06:00 · 2022-02-17 20:10:02 -06:00 · 2022-02-17 22:26:48 +08:00 · 2022-02-15 11:50:14 +01:00 · 2022-02-15 11:37:54 +01:00 · 2022-02-15 11:21:23 +01:00
88 changed files with 2795 additions and 2870 deletions
@@ -50,7 +50,4 @@ classes/
 Merged/

 # file from notepad++
-*.bak
-
-# file genearated via MC version switching using preprocessor
-build.properties
+*.bak
@@ -3,9 +3,16 @@ image: gradle:eclipse-temurin

 # all stages need to be defined here
 stages:
-    - build_17_1
+  - gradleSetup
+  - build
+  - merge

 variables:
+    # Disable the Gradle daemon for Continuous Integration servers as correctness
+    # is usually a priority over speed in CI environments. Using a fresh
+    # runtime for each build is more reliable since the runtime is completely
+    # isolated from any previous builds.
+    GRADLE_OPTS: "-Dorg.gradle.daemon=false"
    # Pull core when building
    GIT_SUBMODULE_STRATEGY: recursive

@@ -16,30 +23,91 @@ before_script:
    - echo GE_JOB_ID=$CI_JOB_ID >> generate_jars.env


-# 1.17.1 build
-build_17_1:
-    stage: build_17_1
-    script:
-        - ./gradlew deleteMerged --gradle-user-home cache/; # make sure any previously merged jars are removed before running this job
-        - ./gradlew build -PmcVer=1.17.1 --gradle-user-home cache/;
-        - ./gradlew merge --gradle-user-home cache/;
-    # build using Java 16
-    image: eclipse-temurin:16
+
+
+# first stage
+# This prevents us from re-downloading Gradle every stage
+gradleSetup:
+    stage: gradleSetup
+    script: ./gradlew --build-cache --gradle-user-home cache/ check
+    # build using Java 17
+    image: eclipse-temurin:17
+    cache:
+        key:
+          files:
+            - gradle/wrapper/gradle-wrapper.properties 
+        policy: push
+        paths:
+          - cache/
+
+
+
+# second stage
+build:
+    stage: build
+    script: ./gradlew build --gradle-user-home cache/
+    # build using Java 17
+    image: eclipse-temurin:17
+    cache:
+        key: "$CI_COMMIT_REF_NAME"
+        policy: pull-push
+        paths:
+            - .architectury-transformer
+            - .gradle
+            - build
+            - common/.gradle
+            - common/build
+            - core/.gradle
+            - core/build
+            - fabric/.gradle
+            - fabric/src/generated
+            - forge/.gradle
+            - forge/src/generated
+            - build
+            - .gradle
+            - cache/
    artifacts:
-        name: "Merged_NightlyBuild_1_17_1-${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
+            - forge/build/libs
+        exclude:
+            - fabric/build/libs/*-dev.jar
+            - fabric/build/libs/*-dev-shadow.jar
+            - fabric/build/libs/*-sources-dev.jar
+            - fabric/build/libs/*-sources.jar
+            - forge/build/libs/*-dev.jar
+            - forge/build/libs/*-dev-shadow.jar
+            - forge/build/libs/*-sources-dev.jar
+            - forge/build/libs/*-sources.jar
+        reports:
+            # To ensure we've access to these files in the next stage
+            dotenv: generate_jars.env
+        expire_in: 1 day
+
+# third stage
+merge:
+    stage: merge
+    script: ./gradlew merge --gradle-user-home cache/ 
+    # build using Java 17
+    image: eclipse-temurin:17
+    cache:
+        key: "$CI_COMMIT_REF_NAME"
+        policy: pull-push
+        paths:
+            - build
+            - .gradle
+            - cache/
+    artifacts:
+        name: "Merged_NightlyBuild-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"  
        paths:
            # relative to the root directory
            - Merged
        expire_in: 1 day
-    cache:
-        key: "gradleCache"
-        policy: pull-push
-        paths:
-            - .gradle
-            - cache/


-# unused deployment stage
+## forth stage
 #deploy:
 #    stage: deploy
 #    image: registry.gitlab.com/gitlab-org/release-cli:latest
@@ -61,5 +129,4 @@ build_17_1:
 #                - 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' 
@@ -1,4 +1,3 @@
 [submodule "core"]
 	path = core
 	url = https://gitlab.com/jeseibel/distant-horizons-core.git
-    branch = main
@@ -1,36 +0,0 @@
-org.gradle.jvmargs=-Xmx2048M
-
-minecraft_version=1.17.1
-java_version=16
-
-# Fabric loader
-fabric_loader_version=0.13.2
-fabric_api_version=0.46.1+1.17
-    # Fabric mod versions
-    modmenu_version=2.0.14
-    starlight_version_fabric=3442770
-    lithium_version=mc1.17.1-0.7.5
-    sodium_version=3605275
-    iris_version=1.17.x-v1.1.4
-    immersive_portals_version = 0.14-1.17
-
-    # Fabric 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_starlight=0
-    enable_lithium=0
-    enable_sodium=1
-    enable_iris=0
-
-
-# Forge loader
-forge_version=37.1.1
-    # Forge mod versions
-    starlight_version_forge=3457784
-
-    # 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_starlight_forge=0
@@ -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\
@@ -16,19 +9,20 @@ 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>

-### Versions
-
 Architectury version: 3.4-SNAPSHOT\
-Java Compiler plugin: Manifold Preprocessor
+Forge version: 39.0.5 and 38.0.14\
+Fabric version: 0.12.12\
+Fabric API version: 0.44.0+1.18

-#### 1.17.1 mods
-Forge version: 37.1.1\
-Fabric version: 0.13.2\
-Fabric API version: 0.46.1+1.17\
-Modmenu version: 2.0.14
+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.18.1-39.0.5 and fabric version 1.18-0.12.12 and 1.18.1-0.12.12)


-## Source Code Installation
+## source code installation

 See the Fabric Documentation online for more detailed instructions:\
 https://fabricmc.net/wiki/tutorial:setup
@@ -37,45 +31,31 @@ https://fabricmc.net/wiki/tutorial:setup

 * 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 with plugins that support Manifold, for example Intellij IDEA.
+* (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.

 **If using IntelliJ:**
-0. Install Manifold plugin
 1. open IDEA and import the build.gradle
 2. refresh the Gradle project in IDEA if required

-**If using Ecplise: (Note that Eclispe currently doesn't support Manifold's preprocessor!)**
+**If using Ecplise:**
 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

-## Switching Versions
-This branch support 1 built versions:
- 1.17.1 (which also runs on 1.17)
-
-To switch between active versions, change `mcVer=1.17.?` in `gradle.properties` file.
-
-If running on IDE, to ensure IDE pickup the changed versions, you will need to run a gradle command again to allow gradle to update all the libs. (In IntellJ you will also need to do a gradle sync again if it didn't start it automatically.)
->Note: There may be a `java.nio.file.FileSystemException` thrown on running the command after switching versions. To fix it, either restart your IDE (as your IDE is locking up a file) or use tools like LockHunter to unlock the linked file. (Often a lib file under `common\build\lib` or `forge\build\lib` or `fabric\build\lib`). If anyone knows how to solve this issue please comment to this issue: https://gitlab.com/jeseibel/minecraft-lod-mod/-/issues/233
-
 ## Compiling

 **Using GUI**
-1. Download the zip of the project and extract it
-2. Download the core from https://gitlab.com/jeseibel/distant-horizons-core and extract into a folder called `core`
-3. Open a command line in the project folder
-4. Run the command: `./gradlew assemble`
-5. Then run command: `./gradlew mergeJars`
-6. The compiled jar file will be in the folder `Merged`
+1. Open a command line in the project folder
+2. Run the command: `./gradlew build`
+3. The compiled jar file will be in the folder `fabric/build/libs/` and `forge/build/libs/`

 **If in terminal:**
-1. `git clone -b preprocessor_test --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`
-4. `./gradlew mergeJars`
-5. The compiled jar file will be in the folder `Merged`
->Note: You can add the arg: `-PmcVer=1.17.?` to tell gradle to build a selected MC version instead of having to manually modify the `gradle.properties` file.
+3. `./gradlew assemble` or `./gradlew build`
+4. The build should be in `fabric/build/libs/` and `forge/build/libs/`


 ## Other commands
@@ -104,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
@@ -1,6 +1,5 @@
 import io.github.ran.jarmerger.JarMergerPlugin

-
 buildscript {
    dependencies{
        classpath files('plugins/DHJarMerger-1.0.jar')
@@ -9,34 +8,9 @@ buildscript {

 plugins {
    id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "0.10.0.195" apply false
+    id "dev.architectury.loom" version "0.10.0-SNAPSHOT" apply false
 }

-def writeBuildGradlePredefine() {
-    def excapedMCVersion = rootProject.minecraft_version.replace(".", "_")
-    new File(projectDir, "build.properties").text = "MC_VERSION_${excapedMCVersion}=\n"
-}
-
-def loadProperties() {
-    def defaultMcVersion = '1.17.1'
-    if (!project.hasProperty("mcVer")) {
-        println "No mcVer set! Defaulting to ${defaultMcVersion}."
-        println "Tip: Use -PmcVer='${defaultMcVersion}' in cmd arg to set mcVer."
-    }
-    def mcVersion = project.hasProperty("mcVer") ? mcVer : defaultMcVersion
-
-    println "Loading properties file at " + mcVersion + ".properties"
-    def props = new Properties()
-    props.load(new FileInputStream("$rootProject.rootDir/"+"$mcVersion"+".properties"))
-
-    props.each { prop ->
-        rootProject.ext.set(prop.key, prop.value)
-        // println "Added prop [key:" + prop.key + ", value:" + prop.value + "]"
-    }
-    writeBuildGradlePredefine()
-}
-loadProperties()
-
 apply plugin: JarMergerPlugin

 architectury {
@@ -61,9 +35,6 @@ subprojects { p ->
        // The following line declares the mojmap mappings
        mappings loom.officialMojangMappings()

-        //Manifold
-        annotationProcessor "systems.manifold:manifold-preprocessor:${rootProject.manifold_version}"
-
        // Toml
        implementation("com.electronwill.night-config:toml:${rootProject.toml_version}")

@@ -79,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"
@@ -103,9 +66,6 @@ allprojects {
        // used to download and compile dependencies from git repos
        maven { url 'https://jitpack.io' }

-        // For Manifold Preprocessor
-        maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' }
-
        // Required for importing Modrinth mods
        maven {
            name = "Modrinth"
@@ -138,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
@@ -149,11 +110,8 @@ allprojects {
                description: mod_description,
                homepage: mod_homepage,
                source: mod_source,
-                issues: mod_issues,
-                minecraft_version: minecraft_version,
-                java_version: java_version
+                issues: mod_issues
        ]   // The left side is what gets replaced in the mod info and the right side is where to get it from in the gradle.properties
-        //TODO: Make Forge loader version also be relaced with non hardcoded value instead of "[36,41)"

        inputs.properties replaceProperties
        replaceProperties.put 'project', project
@@ -174,36 +132,20 @@ allprojects {
        }
    }

+
    tasks.withType(JavaCompile) {
-//        // Add Manifold Preprocessor
-////		def excapedMCVersion = rootProject.minecraft_version.replace(".", "_")
-////		options.compilerArgs += ['-Xplugin:Manifold', "-AMC_VERSION_${excapedMCVersion}"]
-////
-//        //options.compilerArgs += ['-deprecation']
-//        //options.compilerArgs += ['-verbose']
-//        //options.compilerArgs += ['-Xlint:unchecked']
-//        //options.compilerArgs += ['-Xdiags:verbose']
-//        //options.compilerArgs += ['-Xprint']
-//        //options.compilerArgs += ['-XprintProcessorInfo']
-//        //options.compilerArgs += ['-XprintRounds']
-//
-//        // println options.compilerArgs
-//        if (p != project(":core")) {
-//            options.compilerArgs += ['-Xplugin:Manifold']
-//            options.release = rootProject.java_version as Integer
-//        }
-        options.encoding = "UTF-8"
-        options.release = 16
+        if (p != project(":core")) {
+            // Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
+            options.release = 17
+        }
    }

    java {
        withSourcesJar()
    }
+
+    if (p == project(":core") || p == project(":common")) {
+        runClient.enabled = false
+        runServer.enabled = false
+    }
 }
-
-
-// this deletes the merged folder so we don't carry over
-// the previous merges to each new build job in the CI/CD pipeline
-task deleteMerged(type: Delete) {
-    delete files("./Merged")
-}
@@ -1,472 +0,0 @@
-/*
- *    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;
-
-import com.seibel.lod.common.wrappers.config.ConfigGui;
-import com.seibel.lod.core.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.IAdvanced.*;
-import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IGraphics.*;
-import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IGraphics.IFogQuality.IAdvancedFog;
-import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IGraphics.IFogQuality.IAdvancedFog.IHeightFog;
-import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IMultiplayer;
-import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IWorldGenerator;
-import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IAdvanced;
-import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IAdvanced.IDebugging.*;
-
-/**
- * This handles any configuration the user has access to.
- * @author coolGi2007
- * @version 12-12-2021
- */
-public class Config extends ConfigGui
-//public class Config extends TinyConfig
-{
-	// CONFIG STRUCTURE
-	// 	-> Client
-	//		|
-	//		|-> Graphics
-	//		|		|-> Quality
-	//		|		|-> FogQuality
-	//		|		|-> AdvancedGraphics
-	//		|
-	//		|-> World Generation
-	//		|
-	//		|-> Advanced
-	//				|-> Threads
-	//				|-> Buffers
-	//				|-> Debugging
-
-	// Since the original config system uses forge stuff, that means we have to rewrite the whole config system
-
-	@ConfigAnnotations.ScreenEntry
-	public static Client client;
-
-	@ConfigAnnotations.FileComment
-	public static String _optionsButton = ILodConfigWrapperSingleton.IClient.OPTIONS_BUTTON_DESC;
-	// I know this option should be in Client
-	// This is a hacky method to not show the button in the options screen but show it in the mod menu
-	// Tough it is in client in the wrapper singleton
-	@ConfigAnnotations.Entry
-	public static boolean optionsButton = true;
-
-	public static class Client {
-		@ConfigAnnotations.ScreenEntry
-		public static Graphics graphics;
-
-		@ConfigAnnotations.ScreenEntry
-		public static WorldGenerator worldGenerator;
-
-		@ConfigAnnotations.ScreenEntry
-		public static Multiplayer multiplayer;
-
-		@ConfigAnnotations.ScreenEntry
-		public static Advanced advanced;
-
-
-		public static class Graphics {
-			@ConfigAnnotations.ScreenEntry
-			public static Quality quality;
-
-			@ConfigAnnotations.ScreenEntry
-			public static FogQuality fogQuality;
-
-			@ConfigAnnotations.ScreenEntry
-			public static AdvancedGraphics advancedGraphics;
-
-
-			public static class Quality {
-				@ConfigAnnotations.FileComment
-				public static String _drawResolution = IQuality.DRAW_RESOLUTION_DESC;
-				@ConfigAnnotations.Entry
-				public static HorizontalResolution drawResolution = IQuality.DRAW_RESOLUTION_DEFAULT;
-
-				@ConfigAnnotations.FileComment
-				public static String _lodChunkRenderDistance = IQuality.LOD_CHUNK_RENDER_DISTANCE_DESC;
-				@ConfigAnnotations.Entry(minValue = 16, maxValue = 2048)
-				public static int lodChunkRenderDistance = IQuality.LOD_CHUNK_RENDER_DISTANCE_MIN_DEFAULT_MAX.defaultValue;
-
-				@ConfigAnnotations.FileComment
-				public static String _verticalQuality = IQuality.VERTICAL_QUALITY_DESC;
-				@ConfigAnnotations.Entry
-				public static VerticalQuality verticalQuality = IQuality.VERTICAL_QUALITY_DEFAULT;
-
-				@ConfigAnnotations.FileComment
-				public static String _horizontalScale = IQuality.HORIZONTAL_SCALE_DESC;
-				@ConfigAnnotations.Entry(minValue = 2, maxValue = 32)
-				public static int horizontalScale = IQuality.HORIZONTAL_SCALE_MIN_DEFAULT_MAX.defaultValue;
-
-				@ConfigAnnotations.FileComment
-				public static String _horizontalQuality = IQuality.HORIZONTAL_SCALE_DESC;
-				@ConfigAnnotations.Entry
-				public static HorizontalQuality horizontalQuality = IQuality.HORIZONTAL_QUALITY_DEFAULT;
-
-				@ConfigAnnotations.FileComment
-				public static String _dropoffQuality = IQuality.DROPOFF_QUALITY_DESC;
-				@ConfigAnnotations.Entry
-				public static DropoffQuality dropoffQuality = IQuality.DROPOFF_QUALITY_DEFAULT;
-
-				@ConfigAnnotations.FileComment
-				public static String _lodBiomeBlending = IQuality.LOD_BIOME_BLENDING_DESC;
-				@ConfigAnnotations.Entry(minValue = 0, maxValue = 7)
-				public static int lodBiomeBlending = IQuality.LOD_BIOME_BLENDING_MIN_DEFAULT_MAX.defaultValue;
-			}
-
-
-			public static class FogQuality {
-				@ConfigAnnotations.FileComment
-				public static String _fogDistance = IFogQuality.FOG_DISTANCE_DESC;
-				@ConfigAnnotations.Entry
-				public static FogDistance fogDistance = IFogQuality.FOG_DISTANCE_DEFAULT;
-
-				@ConfigAnnotations.FileComment
-				public static String _fogDrawMode = IFogQuality.FOG_DRAW_MODE_DESC;
-				@ConfigAnnotations.Entry
-				public static FogDrawMode fogDrawMode = IFogQuality.FOG_DRAW_MODE_DEFAULT;
-
-				@ConfigAnnotations.FileComment
-				public static String _fogColorMode = IFogQuality.FOG_COLOR_MODE_DESC;
-				@ConfigAnnotations.Entry
-				public static FogColorMode fogColorMode = IFogQuality.FOG_COLOR_MODE_DEFAULT;
-
-				@ConfigAnnotations.FileComment
-				public static String _disableVanillaFog = IFogQuality.DISABLE_VANILLA_FOG_DESC;
-				@ConfigAnnotations.Entry
-				public static boolean disableVanillaFog = IFogQuality.DISABLE_VANILLA_FOG_DEFAULT;
-
-				@ConfigAnnotations.ScreenEntry
-				public static AdvancedFog advancedFog;
-
-				public static class AdvancedFog {
-					static final double SQRT2 = 1.4142135623730951;
-
-					@ConfigAnnotations.FileComment
-					public static String _farFogStart = IAdvancedFog.FAR_FOG_START_DESC;
-					@ConfigAnnotations.Entry(minValue = 0.0, maxValue = SQRT2)
-					public static double farFogStart = IAdvancedFog.FAR_FOG_START_MIN_DEFAULT_MAX.defaultValue;
-
-					@ConfigAnnotations.FileComment
-					public static String _farFogEnd = IAdvancedFog.FAR_FOG_END_DESC;
-					@ConfigAnnotations.Entry(minValue = 0.0, maxValue = SQRT2)
-					public static double farFogEnd = IAdvancedFog.FAR_FOG_END_MIN_DEFAULT_MAX.defaultValue;
-
-					@ConfigAnnotations.FileComment
-					public static String _farFogMin = IAdvancedFog.FAR_FOG_MIN_DESC;
-					@ConfigAnnotations.Entry(minValue = -5.0, maxValue = SQRT2)
-					public static double farFogMin = IAdvancedFog.FAR_FOG_MIN_MIN_DEFAULT_MAX.defaultValue;
-
-					@ConfigAnnotations.FileComment
-					public static String _farFogMax = IAdvancedFog.FAR_FOG_MAX_DESC;
-					@ConfigAnnotations.Entry(minValue = 0.0, maxValue = 5.0)
-					public static double farFogMax = IAdvancedFog.FAR_FOG_MAX_MIN_DEFAULT_MAX.defaultValue;
-
-					@ConfigAnnotations.FileComment
-					public static String _farFogType = IAdvancedFog.FAR_FOG_TYPE_DESC;
-					@ConfigAnnotations.Entry
-					public static FogSetting.FogType farFogType = IAdvancedFog.FAR_FOG_TYPE_DEFAULT;
-
-					@ConfigAnnotations.FileComment
-					public static String _farFogDensity = IAdvancedFog.FAR_FOG_DENSITY_DESC;
-					@ConfigAnnotations.Entry(minValue = 0.01, maxValue = 50.0)
-					public static double farFogDensity = IAdvancedFog.FAR_FOG_DENSITY_MIN_DEFAULT_MAX.defaultValue;
-
-					@ConfigAnnotations.ScreenEntry
-					public static HeightFog heightFog;
-
-					public static class HeightFog {
-
-						@ConfigAnnotations.FileComment
-						public static String _heightFogMixMode = IHeightFog.HEIGHT_FOG_MIX_MODE_DESC;
-						@ConfigAnnotations.Entry
-						public static HeightFogMixMode heightFogMixMode = IHeightFog.HEIGHT_FOG_MIX_MODE_DEFAULT;
-						@ConfigAnnotations.FileComment
-						public static String _heightFogMode = IHeightFog.HEIGHT_FOG_MODE_DESC;
-						@ConfigAnnotations.Entry
-						public static HeightFogMode heightFogMode = IHeightFog.HEIGHT_FOG_MODE_DEFAULT;
-
-						@ConfigAnnotations.FileComment
-						public static String _heightFogHeight = IHeightFog.HEIGHT_FOG_HEIGHT_DESC;
-						@ConfigAnnotations.Entry(minValue = -4096.0, maxValue = 4096.0)
-						public static double heightFogHeight = IHeightFog.HEIGHT_FOG_HEIGHT_MIN_DEFAULT_MAX.defaultValue;
-
-						@ConfigAnnotations.FileComment
-						public static String _heightFogStart = IHeightFog.HEIGHT_FOG_START_DESC;
-						@ConfigAnnotations.Entry(minValue = 0.0, maxValue = SQRT2)
-						public static double heightFogStart = IHeightFog.HEIGHT_FOG_START_MIN_DEFAULT_MAX.defaultValue;
-
-						@ConfigAnnotations.FileComment
-						public static String _heightFogEnd = IHeightFog.HEIGHT_FOG_END_DESC;
-						@ConfigAnnotations.Entry(minValue = 0.0, maxValue = SQRT2)
-						public static double heightFogEnd = IHeightFog.HEIGHT_FOG_END_MIN_DEFAULT_MAX.defaultValue;
-
-						@ConfigAnnotations.FileComment
-						public static String _heightFogMin = IHeightFog.HEIGHT_FOG_MIN_DESC;
-						@ConfigAnnotations.Entry(minValue = -5.0, maxValue = SQRT2)
-						public static double heightFogMin = IHeightFog.HEIGHT_FOG_MIN_MIN_DEFAULT_MAX.defaultValue;
-
-						@ConfigAnnotations.FileComment
-						public static String _heightFogMax = IHeightFog.HEIGHT_FOG_MAX_DESC;
-						@ConfigAnnotations.Entry(minValue = 0.0, maxValue = 5.0)
-						public static double heightFogMax = IHeightFog.HEIGHT_FOG_MAX_MIN_DEFAULT_MAX.defaultValue;
-
-						@ConfigAnnotations.FileComment
-						public static String _heightFogType = IHeightFog.HEIGHT_FOG_TYPE_DESC;
-						@ConfigAnnotations.Entry
-						public static FogSetting.FogType heightFogType = IHeightFog.HEIGHT_FOG_TYPE_DEFAULT;
-
-						@ConfigAnnotations.FileComment
-						public static String _heightFogDensity = IHeightFog.HEIGHT_FOG_DENSITY_DESC;
-						@ConfigAnnotations.Entry(minValue = 0.01, maxValue = 50.0)
-						public static double heightFogDensity = IHeightFog.HEIGHT_FOG_DENSITY_MIN_DEFAULT_MAX.defaultValue;
-					}
-				}
-			}
-
-
-			public static class AdvancedGraphics {
-				@ConfigAnnotations.FileComment
-				public static String _disableDirectionalCulling = IAdvancedGraphics.DISABLE_DIRECTIONAL_CULLING_DESC;
-				@ConfigAnnotations.Entry
-				public static boolean disableDirectionalCulling = IAdvancedGraphics.DISABLE_DIRECTIONAL_CULLING_DEFAULT;
-
-				@ConfigAnnotations.FileComment
-				public static String _vanillaOverdraw = IAdvancedGraphics.VANILLA_OVERDRAW_DESC;
-				@ConfigAnnotations.Entry
-				public static VanillaOverdraw vanillaOverdraw = IAdvancedGraphics.VANILLA_OVERDRAW_DEFAULT;
-
-				@ConfigAnnotations.FileComment
-				public static String _overdrawOffset = IAdvancedGraphics.OVERDRAW_OFFSET_DESC;
-				@ConfigAnnotations.Entry(minValue = -16, maxValue = 16)
-				public static int overdrawOffset = IAdvancedGraphics.OVERDRAW_OFFSET_MIN_DEFAULT_MAX.defaultValue;
-
-				@ConfigAnnotations.FileComment
-				public static String _useExtendedNearClipPlane = IAdvancedGraphics.USE_EXTENDED_NEAR_CLIP_PLANE_DESC;
-				@ConfigAnnotations.Entry
-				public static boolean useExtendedNearClipPlane = IAdvancedGraphics.USE_EXTENDED_NEAR_CLIP_PLANE_DEFAULT;
-
-				@ConfigAnnotations.FileComment
-				public static String _brightnessMultiplier = IAdvancedGraphics.BRIGHTNESS_MULTIPLIER_DESC;
-				@ConfigAnnotations.Entry
-				public static double brightnessMultiplier = IAdvancedGraphics.BRIGHTNESS_MULTIPLIER_DEFAULT;
-
-				@ConfigAnnotations.FileComment
-				public static String _saturationMultiplier = IAdvancedGraphics.SATURATION_MULTIPLIER_DESC;
-				@ConfigAnnotations.Entry
-				public static double saturationMultiplier = IAdvancedGraphics.SATURATION_MULTIPLIER_DEFAULT;
-
-				@ConfigAnnotations.FileComment
-				public static String _enableCaveCulling = IAdvancedGraphics.ENABLE_CAVE_CULLING_DESC;
-				@ConfigAnnotations.Entry
-				public static boolean enableCaveCulling = IAdvancedGraphics.ENABLE_CAVE_CULLING_DEFAULT;
-
-				@ConfigAnnotations.FileComment
-				public static String _caveCullingHeight = IAdvancedGraphics.CAVE_CULLING_HEIGHT_DESC;
-				@ConfigAnnotations.Entry(minValue = -4096, maxValue = 4096)
-				public static int caveCullingHeight = IAdvancedGraphics.CAVE_CULLING_HEIGHT_MIN_DEFAULT_MAX.defaultValue;
-
-				/*
-				@ConfigAnnotations.FileComment
-				public static String _backsideCullingRange = IAdvancedGraphics.VANILLA_CULLING_RANGE_DESC;
-				@ConfigAnnotations.Entry(minValue = 0, maxValue = 512)
-				public static int backsideCullingRange = IAdvancedGraphics.VANILLA_CULLING_RANGE_MIN_DEFAULT_MAX.defaultValue;
-				*/
-			}
-		}
-
-
-		public static class WorldGenerator {
-			@ConfigAnnotations.FileComment
-			public static String _enableDistantGeneration = IWorldGenerator.ENABLE_DISTANT_GENERATION_DESC;
-			@ConfigAnnotations.Entry
-			public static boolean enableDistantGeneration = IWorldGenerator.ENABLE_DISTANT_GENERATION_DEFAULT;
-
-			//			@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
-			public static GenerationPriority generationPriority = IWorldGenerator.GENERATION_PRIORITY_DEFAULT;
-
-			/*
-			@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 = 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;
-
-			@ConfigAnnotations.FileComment
-			public static String _multiDimensionRequiredSimilarity = IMultiplayer.MULTI_DIMENSION_REQUIRED_SIMILARITY_DESC;
-			@ConfigAnnotations.Entry(minValue = 0.0, maxValue = 1.0)
-			public static double multiDimensionRequiredSimilarity = IMultiplayer.MULTI_DIMENSION_REQUIRED_SIMILARITY_MIN_DEFAULT_MAX.defaultValue;
-		}
-
-
-		public static class Advanced {
-			@ConfigAnnotations.ScreenEntry
-			public static Threading threading;
-
-			@ConfigAnnotations.ScreenEntry
-			public static Debugging debugging;
-
-			@ConfigAnnotations.ScreenEntry
-			public static Buffers buffers;
-
-			@ConfigAnnotations.FileComment
-			public static String _lodOnlyMode = IAdvanced.LOD_ONLY_MODE_DESC;
-			@ConfigAnnotations.Entry
-			public static boolean lodOnlyMode = IAdvanced.LOD_ONLY_MODE_DEFAULT;
-
-
-			public static class Threading {
-				@ConfigAnnotations.FileComment
-				public static String _numberOfWorldGenerationThreads = IThreading.NUMBER_OF_WORLD_GENERATION_THREADS_DESC;
-				@ConfigAnnotations.Entry(minValue = 1, maxValue = 50)
-				public static int numberOfWorldGenerationThreads = IThreading.NUMBER_OF_WORLD_GENERATION_THREADS_DEFAULT.defaultValue;
-
-				@ConfigAnnotations.FileComment
-				public static String _numberOfBufferBuilderThreads = IThreading.NUMBER_OF_BUFFER_BUILDER_THREADS_DESC;
-				@ConfigAnnotations.Entry(minValue = 1, maxValue = 50)
-				public static int numberOfBufferBuilderThreads = IThreading.NUMBER_OF_BUFFER_BUILDER_THREADS_MIN_DEFAULT_MAX.defaultValue;
-			}
-
-
-			public static class Debugging {
-				@ConfigAnnotations.FileComment
-				public static String _rendererType = IDebugging.RENDERER_TYPE_DESC;
-				@ConfigAnnotations.Entry
-				public static RendererType rendererType = IDebugging.RENDERER_TYPE_DEFAULT;
-
-				@ConfigAnnotations.FileComment
-				public static String _debugMode = IDebugging.DEBUG_MODE_DESC;
-				@ConfigAnnotations.Entry
-				public static DebugMode debugMode = IDebugging.DEBUG_MODE_DEFAULT;
-
-				@ConfigAnnotations.FileComment
-				public static String _enableDebugKeybindings = IDebugging.DEBUG_KEYBINDINGS_ENABLED_DESC;
-				@ConfigAnnotations.Entry
-				public static boolean enableDebugKeybindings = IDebugging.DEBUG_KEYBINDINGS_ENABLED_DEFAULT;
-			}
-
-
-			@ConfigAnnotations.ScreenEntry
-			public static DebugSwitch debugSwitch;
-
-			public static class DebugSwitch {
-				/* The logging switches available:
-				 * WorldGenEvent
-				 * WorldGenPerformance
-				 * WorldGenLoadEvent
-				 * LodBuilderEvent
-				 * RendererBufferEvent
-				 * RendererGLEvent
-				 * FileReadWriteEvent
-				 * FileSubDimEvent
-				 * NetworkEvent //NOT IMPL YET
-				 */
-				@ConfigAnnotations.FileComment
-				public static String _logWorldGenEvent = IDebugSwitch.LOG_WORLDGEN_EVENT_DESC;
-				@ConfigAnnotations.Entry
-				public static LoggerMode logWorldGenEvent = IDebugSwitch.LOG_WORLDGEN_EVENT_DEFAULT;
-
-				@ConfigAnnotations.FileComment
-				public static String _logWorldGenPerformance = IDebugSwitch.LOG_WORLDGEN_PERFORMANCE_DESC;
-				@ConfigAnnotations.Entry
-				public static LoggerMode logWorldGenPerformance = IDebugSwitch.LOG_WORLDGEN_PERFORMANCE_DEFAULT;
-
-				@ConfigAnnotations.FileComment
-				public static String _logWorldGenLoadEvent = IDebugSwitch.LOG_WORLDGEN_LOAD_EVENT_DESC;
-				@ConfigAnnotations.Entry
-				public static LoggerMode logWorldGenLoadEvent = IDebugSwitch.LOG_WORLDGEN_LOAD_EVENT_DEFAULT;
-
-				@ConfigAnnotations.FileComment
-				public static String _logLodBuilderEvent = IDebugSwitch.LOG_LODBUILDER_EVENT_DESC;
-				@ConfigAnnotations.Entry
-				public static LoggerMode logLodBuilderEvent = IDebugSwitch.LOG_LODBUILDER_EVENT_DEFAULT;
-
-				@ConfigAnnotations.FileComment
-				public static String _logRendererBufferEvent = IDebugSwitch.LOG_RENDERER_BUFFER_EVENT_DESC;
-				@ConfigAnnotations.Entry
-				public static LoggerMode logRendererBufferEvent = IDebugSwitch.LOG_RENDERER_BUFFER_EVENT_DEFAULT;
-
-				@ConfigAnnotations.FileComment
-				public static String _logRendererGLEvent = IDebugSwitch.LOG_RENDERER_GL_EVENT_DESC;
-				@ConfigAnnotations.Entry
-				public static LoggerMode logRendererGLEvent = IDebugSwitch.LOG_RENDERER_GL_EVENT_DEFAULT;
-
-				@ConfigAnnotations.FileComment
-				public static String _logFileReadWriteEvent = IDebugSwitch.LOG_FILE_READWRITE_EVENT_DESC;
-				@ConfigAnnotations.Entry
-				public static LoggerMode logFileReadWriteEvent = IDebugSwitch.LOG_FILE_READWRITE_EVENT_DEFAULT;
-
-				@ConfigAnnotations.FileComment
-				public static String _logFileSubDimEvent = IDebugSwitch.LOG_FILE_SUB_DIM_EVENT_DESC;
-				@ConfigAnnotations.Entry
-				public static LoggerMode logFileSubDimEvent = IDebugSwitch.LOG_FILE_SUB_DIM_EVENT_DEFAULT;
-
-				@ConfigAnnotations.FileComment
-				public static String _logNetworkEvent = IDebugSwitch.LOG_NETWORK_EVENT_DESC;
-				@ConfigAnnotations.Entry
-				public static LoggerMode logNetworkEvent = IDebugSwitch.LOG_NETWORK_EVENT_DEFAULT;
-			}
-
-
-			public static class Buffers {
-				@ConfigAnnotations.FileComment
-				public static String _gpuUploadMethod = IBuffers.GPU_UPLOAD_METHOD_DESC;
-				@ConfigAnnotations.Entry
-				public static GpuUploadMethod gpuUploadMethod = IBuffers.GPU_UPLOAD_METHOD_DEFAULT;
-
-				@ConfigAnnotations.FileComment
-				public static String _gpuUploadPerMegabyteInMilliseconds = IBuffers.GPU_UPLOAD_PER_MEGABYTE_IN_MILLISECONDS_DESC;
-				@ConfigAnnotations.Entry(minValue = 0, maxValue = 5000)
-				public static int gpuUploadPerMegabyteInMilliseconds = IBuffers.GPU_UPLOAD_PER_MEGABYTE_IN_MILLISECONDS_DEFAULT.defaultValue;
-
-				@ConfigAnnotations.FileComment
-				public static String _rebuildTimes = IBuffers.REBUILD_TIMES_DESC;
-				@ConfigAnnotations.Entry
-				public static BufferRebuildTimes rebuildTimes = IBuffers.REBUILD_TIMES_DEFAULT;
-			}
-		}
-	}
-}
@@ -4,6 +4,8 @@ import com.seibel.lod.common.forge.LodForgeMethodCaller;
 import com.seibel.lod.common.networking.NetworkInterface;
 import com.seibel.lod.common.wrappers.DependencySetup;
 import com.seibel.lod.common.wrappers.config.ConfigGui;
+import com.seibel.lod.core.Config;
+import com.seibel.lod.core.config.ConfigBase;

 /**
 * This is the common main class
@@ -15,6 +17,8 @@ public class LodCommonMain {
    public static LodForgeMethodCaller forgeMethodCaller;
    public static NetworkInterface networkInterface;

+    public static final boolean IsNewConfig = false;
+
    public static void startup(LodForgeMethodCaller caller, boolean serverSided) {
        LodCommonMain.serverSided = serverSided;
        if (caller != null) {
@@ -25,8 +29,10 @@ public class LodCommonMain {
        DependencySetup.createInitialBindings();
    }

+
    public static void initConfig() {
-        ConfigGui.init(Config.class);
+        if (!IsNewConfig)
+            ConfigGui.init(OldConfig.class);
    }

    public static void registerNetworking(NetworkInterface networkInterface) {
@@ -0,0 +1,276 @@
+/*
+ *    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;
+
+import com.seibel.lod.common.wrappers.config.ConfigGui;
+import com.seibel.lod.core.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.IAdvanced.*;
+import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IGraphics.*;
+import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IWorldGenerator;
+
+/**
+ * This handles any configuration the user has access to.
+ * @author coolGi2007
+ * @version 12-12-2021
+ */
+public class OldConfig
+//public class Config extends TinyConfig
+{
+	// CONFIG STRUCTURE
+	// 	-> Client
+	//		|
+	//		|-> Graphics
+	//		|		|-> Quality
+	//		|		|-> FogQuality
+	//		|		|-> AdvancedGraphics
+	//		|
+	//		|-> World Generation
+	//		|
+	//		|-> Advanced
+	//				|-> Threads
+	//				|-> Buffers
+	//				|-> Debugging
+
+	// Since the original config system uses forge stuff, that means we have to rewrite the whole config system
+
+	@ConfigAnnotations.ScreenEntry
+	public static Client client;
+
+	@ConfigAnnotations.FileComment
+	public static String _optionsButton = ILodConfigWrapperSingleton.IClient.OPTIONS_BUTTON_DESC;
+	// I know this option should be in Client
+	// This is a hacky method to not show the button in the options screen but show it in the mod menu
+	// Tough it is in client in the wrapper singleton
+	@ConfigAnnotations.Entry
+	public static boolean optionsButton = true;
+
+	public static class Client
+	{
+		@ConfigAnnotations.ScreenEntry
+		public static Graphics graphics;
+
+		@ConfigAnnotations.ScreenEntry
+		public static WorldGenerator worldGenerator;
+
+		@ConfigAnnotations.ScreenEntry
+		public static Advanced advanced;
+
+
+		public static class Graphics
+		{
+			@ConfigAnnotations.ScreenEntry
+			public static Quality quality;
+
+			@ConfigAnnotations.ScreenEntry
+			public static FogQuality fogQuality;
+
+			@ConfigAnnotations.ScreenEntry
+			public static AdvancedGraphics advancedGraphics;
+
+
+			public static class Quality
+			{
+				@ConfigAnnotations.FileComment
+				public static String _drawResolution = IQuality.DRAW_RESOLUTION_DESC;
+				@ConfigAnnotations.Entry
+				public static HorizontalResolution drawResolution = IQuality.DRAW_RESOLUTION_DEFAULT;
+
+				@ConfigAnnotations.FileComment
+				public static String _lodChunkRenderDistance = IQuality.LOD_CHUNK_RENDER_DISTANCE_DESC;
+				@ConfigAnnotations.Entry(minValue = 16, maxValue = 2048)
+				public static int lodChunkRenderDistance = IQuality.LOD_CHUNK_RENDER_DISTANCE_MIN_DEFAULT_MAX.defaultValue;
+
+				@ConfigAnnotations.FileComment
+				public static String _verticalQuality = IQuality.VERTICAL_QUALITY_DESC;
+				@ConfigAnnotations.Entry
+				public static VerticalQuality verticalQuality = IQuality.VERTICAL_QUALITY_DEFAULT;
+
+				@ConfigAnnotations.FileComment
+				public static String _horizontalScale = IQuality.HORIZONTAL_SCALE_DESC;
+				@ConfigAnnotations.Entry(minValue = 2, maxValue = 32)
+				public static int horizontalScale = IQuality.HORIZONTAL_SCALE_MIN_DEFAULT_MAX.defaultValue;
+
+				@ConfigAnnotations.FileComment
+				public static String _horizontalQuality = IQuality.HORIZONTAL_SCALE_DESC;
+				@ConfigAnnotations.Entry
+				public static HorizontalQuality horizontalQuality = IQuality.HORIZONTAL_QUALITY_DEFAULT;
+
+				@ConfigAnnotations.FileComment
+				public static String _dropoffQuality = IQuality.DROPOFF_QUALITY_DESC;
+				@ConfigAnnotations.Entry
+				public static DropoffQuality dropoffQuality = IQuality.DROPOFF_QUALITY_DEFAULT;
+			}
+
+
+			public static class FogQuality
+			{
+				@ConfigAnnotations.FileComment
+				public static String _fogDistance = IFogQuality.FOG_DISTANCE_DESC;
+				@ConfigAnnotations.Entry
+				public static FogDistance fogDistance = IFogQuality.FOG_DISTANCE_DEFAULT;
+
+				@ConfigAnnotations.FileComment
+				public static String _fogDrawMode = IFogQuality.FOG_DRAW_MODE_DESC;
+				@ConfigAnnotations.Entry
+				public static FogDrawMode fogDrawMode = IFogQuality.FOG_DRAW_MODE_DEFAULT;
+
+				@ConfigAnnotations.FileComment
+				public static String _fogColorMode = IFogQuality.FOG_COLOR_MODE_DESC;
+				@ConfigAnnotations.Entry
+				public static FogColorMode fogColorMode = IFogQuality.FOG_COLOR_MODE_DEFAULT;
+
+				@ConfigAnnotations.FileComment
+				public static String _disableVanillaFog = IFogQuality.DISABLE_VANILLA_FOG_DESC;
+				@ConfigAnnotations.Entry
+				public static boolean disableVanillaFog = IFogQuality.DISABLE_VANILLA_FOG_DEFAULT;
+			}
+
+			
+			public static class AdvancedGraphics
+			{
+				@ConfigAnnotations.FileComment
+				public static String _disableDirectionalCulling = IAdvancedGraphics.DISABLE_DIRECTIONAL_CULLING_DESC;
+				@ConfigAnnotations.Entry
+				public static boolean disableDirectionalCulling = IAdvancedGraphics.DISABLE_DIRECTIONAL_CULLING_DEFAULT;
+
+				@ConfigAnnotations.FileComment
+				public static String _vanillaOverdraw = IAdvancedGraphics.VANILLA_OVERDRAW_DESC;
+				@ConfigAnnotations.Entry
+				public static VanillaOverdraw vanillaOverdraw = IAdvancedGraphics.VANILLA_OVERDRAW_DEFAULT;
+
+				@ConfigAnnotations.FileComment
+				public static String _useExtendedNearClipPlane = IAdvancedGraphics.USE_EXTENDED_NEAR_CLIP_PLANE_DESC;
+				@ConfigAnnotations.Entry
+				public static boolean useExtendedNearClipPlane = IAdvancedGraphics.USE_EXTENDED_NEAR_CLIP_PLANE_DEFAULT;
+
+				/*
+				@ConfigAnnotations.FileComment
+				public static String _backsideCullingRange = IAdvancedGraphics.VANILLA_CULLING_RANGE_DESC;
+				@ConfigAnnotations.Entry(minValue = 0, maxValue = 512)
+				public static int backsideCullingRange = IAdvancedGraphics.VANILLA_CULLING_RANGE_MIN_DEFAULT_MAX.defaultValue;
+				*/
+			}
+		}
+
+
+		public static class WorldGenerator
+		{
+			@ConfigAnnotations.FileComment
+			public static String _enableDistantGeneration = IWorldGenerator.ENABLE_DISTANT_GENERATION_DESC;
+			@ConfigAnnotations.Entry
+			public static boolean enableDistantGeneration = IWorldGenerator.ENABLE_DISTANT_GENERATION_DEFAULT;
+
+//			@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
+			public static GenerationPriority generationPriority = IWorldGenerator.GENERATION_PRIORITY_DEFAULT;
+
+			/*
+			@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 = 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 Advanced
+		{
+			@ConfigAnnotations.ScreenEntry
+			public static Threading threading;
+
+			@ConfigAnnotations.ScreenEntry
+			public static Debugging debugging;
+
+			@ConfigAnnotations.ScreenEntry
+			public static Buffers buffers;
+
+
+			public static class Threading
+			{
+				@ConfigAnnotations.FileComment
+				public static String _numberOfWorldGenerationThreads = IThreading.NUMBER_OF_WORLD_GENERATION_THREADS_DESC;
+				@ConfigAnnotations.Entry(minValue = 1, maxValue = 50)
+				public static int numberOfWorldGenerationThreads = IThreading.NUMBER_OF_WORLD_GENERATION_THREADS_DEFAULT.defaultValue;
+
+				@ConfigAnnotations.FileComment
+				public static String _numberOfBufferBuilderThreads = IThreading.NUMBER_OF_BUFFER_BUILDER_THREADS_DESC;
+				@ConfigAnnotations.Entry(minValue = 1, maxValue = 50)
+				public static int numberOfBufferBuilderThreads = IThreading.NUMBER_OF_BUFFER_BUILDER_THREADS_MIN_DEFAULT_MAX.defaultValue;
+			}
+
+
+			public static class Debugging
+			{
+				@ConfigAnnotations.FileComment
+				public static String _drawLods = IDebugging.DRAW_LODS_DESC;
+				@ConfigAnnotations.Entry
+				public static boolean drawLods = IDebugging.DRAW_LODS_DEFAULT;
+
+				@ConfigAnnotations.FileComment
+				public static String _debugMode = IDebugging.DEBUG_MODE_DESC;
+				@ConfigAnnotations.Entry
+				public static DebugMode debugMode = IDebugging.DEBUG_MODE_DEFAULT;
+
+				@ConfigAnnotations.FileComment
+				public static String _enableDebugKeybindings = IDebugging.DEBUG_KEYBINDINGS_ENABLED_DESC;
+				@ConfigAnnotations.Entry
+				public static boolean enableDebugKeybindings = IDebugging.DEBUG_KEYBINDINGS_ENABLED_DEFAULT;
+			}
+
+
+			public static class Buffers
+			{
+				@ConfigAnnotations.FileComment
+				public static String _gpuUploadMethod = IBuffers.GPU_UPLOAD_METHOD_DESC;
+				@ConfigAnnotations.Entry
+				public static GpuUploadMethod gpuUploadMethod = IBuffers.GPU_UPLOAD_METHOD_DEFAULT;
+
+				@ConfigAnnotations.FileComment
+				public static String _gpuUploadPerMegabyteInMilliseconds = IBuffers.GPU_UPLOAD_PER_MEGABYTE_IN_MILLISECONDS_DESC;
+				@ConfigAnnotations.Entry(minValue = 0, maxValue = 50)
+				public static int gpuUploadPerMegabyteInMilliseconds = IBuffers.GPU_UPLOAD_PER_MEGABYTE_IN_MILLISECONDS_DEFAULT.defaultValue;
+
+				@ConfigAnnotations.FileComment
+				public static String _rebuildTimes = IBuffers.REBUILD_TIMES_DESC;
+				@ConfigAnnotations.Entry
+				public static BufferRebuildTimes rebuildTimes = IBuffers.REBUILD_TIMES_DEFAULT;
+			}
+		}
+	}
+}
@@ -1,8 +1,7 @@
 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.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
@@ -16,6 +15,5 @@ import java.util.Random;
 * @author Ran
 */
 public interface LodForgeMethodCaller {
-    List<BakedQuad> getQuads(MinecraftClientWrapper mc, Block block, BlockState blockState, Direction direction, Random random);
-    int getPixelRGBA(TextureAtlasSprite sprite, int frameIndex, int x, int y);
+    List<BakedQuad> getQuads(MinecraftWrapper mc, Block block, BlockState blockState, Direction direction, Random random);
 }
@@ -1,15 +1,17 @@
 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.IMinecraftClientWrapper;
+import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftWrapper;

 /**
 * Binds all necessary dependencies, so we
@@ -23,12 +25,14 @@ import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 */
 public class DependencySetup {
    public static void createInitialBindings() {
-        SingletonHandler.bind(IVersionConstants.class, VersionConstants.INSTANCE);
+        SingletonHandler.bind(IBlockColorSingletonWrapper.class, BlockColorSingletonWrapper.INSTANCE);
        if (!LodCommonMain.serverSided) {
-            SingletonHandler.bind(IMinecraftClientWrapper.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(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;
    }
@@ -2,7 +2,9 @@ package com.seibel.lod.common.wrappers;

 import java.util.function.Supplier;

-public class DependencySetupDoneCheck {
+public class DependencySetupDoneCheck
+{
 	public static boolean isDone = false;
 	public static Supplier<Boolean> getIsCurrentThreadDistantGeneratorThread = (() -> {return false;});
+	
 }
@@ -24,9 +24,7 @@ import java.nio.FloatBuffer;
 import com.mojang.math.Matrix4f;
 import com.seibel.lod.core.enums.LodDirection;
 import com.seibel.lod.core.objects.math.Mat4f;
-import com.seibel.lod.core.wrapperInterfaces.block.AbstractBlockPosWrapper;

-import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;

 /**
@@ -49,29 +47,8 @@ public class McObjectConverter
    }


-    static final Direction[] directions;
-    static final LodDirection[] lodDirections;
-    static {
-        LodDirection[] lodDirs = LodDirection.values();
-        directions = new Direction[lodDirs.length];
-        lodDirections = new LodDirection[lodDirs.length];
-        for (LodDirection lodDir : lodDirs) {
-            Direction dir = Direction.byName(lodDir.name());
-            directions[lodDir.ordinal()] = dir;
-            lodDirections[dir.ordinal()] = lodDir;
-        }
-    }
-
-    public static BlockPos Convert(AbstractBlockPosWrapper wrappedPos) {
-        return new BlockPos(wrappedPos.getX(),wrappedPos.getY(), wrappedPos.getZ());
-    }
-
    public static Direction Convert(LodDirection lodDirection)
    {
-        return directions[lodDirection.ordinal()];
-    }
-    public static LodDirection Convert(Direction direction)
-    {
-        return lodDirections[direction.ordinal()];
+        return Direction.byName(lodDirection.name());
    }
 }
@@ -1,3 +1,4 @@
+
 package com.seibel.lod.common.wrappers;

 import com.seibel.lod.core.enums.config.DistanceGenerationMode;
@@ -5,30 +6,56 @@ import com.seibel.lod.core.wrapperInterfaces.IVersionConstants;

 /**
 * @author James Seibel
- * @version 3-3-2022
+ * @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 int getWorldGenerationCountPerThread() {
-        return 1;
-    }
-
-	@Override
-	public boolean isVanillaRenderedChunkSquare()
+public class VersionConstants implements IVersionConstants
+{
+	public static final VersionConstants INSTANCE = new VersionConstants();
+	
+	
+	private VersionConstants()
 	{
-		return false;
+		
+	}
+	
+	
+	@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;
+	}
+	
+	
+	@Override
+	public boolean hasBatchGenerationImplementation()
+	{
+		return true;
 	}
 }
@@ -26,9 +26,11 @@ import com.seibel.lod.core.wrapperInterfaces.block.AbstractBlockPosWrapper;
 import com.seibel.lod.core.wrapperInterfaces.chunk.AbstractChunkPosWrapper;
 import com.seibel.lod.core.wrapperInterfaces.world.IWorldWrapper;
 import com.seibel.lod.core.wrapperInterfaces.worldGeneration.AbstractBatchGenerationEnvionmentWrapper;
+import com.seibel.lod.core.wrapperInterfaces.worldGeneration.AbstractWorldGeneratorWrapper;
 import com.seibel.lod.common.wrappers.block.BlockPosWrapper;
 import com.seibel.lod.common.wrappers.chunk.ChunkPosWrapper;
 import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment;
+import com.seibel.lod.common.wrappers.worldGeneration.WorldGeneratorWrapper;

 /**
 * This handles creating abstract wrapper objects.
@@ -36,48 +38,67 @@ import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment
 * @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 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);
 	}
 }
@@ -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);
+    }
+}
+
@@ -0,0 +1,317 @@
+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.*;
+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() && !(block instanceof RotatedPillarBlock && direction == Direction.UP))
+                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() || waterInstance();
+    
+        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 = 16 + 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) * ColorUtil.getAlpha(tempColor) * colorMultiplier;
+                    red += ColorUtil.getBlue(tempColor) * ColorUtil.getBlue(tempColor) * colorMultiplier;
+                    green += ColorUtil.getGreen(tempColor) * ColorUtil.getGreen(tempColor) * colorMultiplier;
+                    blue += ColorUtil.getRed(tempColor) * ColorUtil.getRed(tempColor) * colorMultiplier;
+                }
+            }
+        }
+
+
+        if (count == 0)
+            // this block is entirely transparent
+            tempColor = 0;
+        else
+        {
+            // determine the average color
+            tempColor = ColorUtil.rgbToInt(
+                    (int) Math.sqrt(alpha / count),
+                    (int) Math.sqrt(red / count),
+                    (int) Math.sqrt(green / count),
+                    (int) Math.sqrt(blue / count));
+        }
+
+        // determine if this block should use the biome color tint
+        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 = waterInstance();
+        
+        //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 waterInstance()
+    {
+        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);
+    }
+}
@@ -1,26 +0,0 @@
-package com.seibel.lod.common.wrappers.block;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.LevelReader;
-import net.minecraft.world.level.block.state.BlockState;
-
-import java.util.concurrent.ConcurrentHashMap;
-
-public class BlockDetailMap
-{
-    private static ConcurrentHashMap<BlockState, BlockDetailWrapper> map = new ConcurrentHashMap<BlockState, BlockDetailWrapper>();
-
-    private BlockDetailMap() {}
-
-    public static BlockDetailWrapper getOrMakeBlockDetailCache(BlockState bs, BlockPos pos, LevelReader getter) {
-        BlockDetailWrapper cache = map.get(bs);
-        if (cache != null) return cache;
-        if (bs.getFluidState().isEmpty()) {
-            cache = BlockDetailWrapper.make(bs, pos, getter);
-        } else {
-            cache = BlockDetailWrapper.make(bs.getFluidState().createLegacyBlock(), pos, getter);
-        }
-        BlockDetailWrapper cacheCAS = map.putIfAbsent(bs, cache);
-        return cacheCAS==null ? cache : cacheCAS;
-    }
-}
@@ -1,326 +0,0 @@
-package com.seibel.lod.common.wrappers.block;
-
-import java.util.Arrays;
-import java.util.List;
-import java.util.Optional;
-import java.util.Random;
-import java.util.function.BiFunction;
-import java.util.function.Function;
-import java.util.function.Supplier;
-import java.util.stream.Stream;
-
-import com.seibel.lod.common.Config;
-import com.seibel.lod.common.wrappers.McObjectConverter;
-import com.seibel.lod.common.wrappers.chunk.ChunkWrapper;
-import com.seibel.lod.core.api.ApiShared;
-import com.seibel.lod.core.enums.LodDirection;
-import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
-import com.seibel.lod.core.util.ColorUtil;
-import com.seibel.lod.core.wrapperInterfaces.block.AbstractBlockPosWrapper;
-import com.seibel.lod.core.wrapperInterfaces.block.IBlockDetailWrapper;
-import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper;
-
-import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
-import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
-import net.minecraft.Util;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.color.block.BlockTintCache;
-import net.minecraft.client.renderer.BiomeColors;
-import net.minecraft.client.renderer.block.model.BakedQuad;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Cursor3D;
-import net.minecraft.core.Direction;
-import net.minecraft.world.level.*;
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.block.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.RenderShape;
-import net.minecraft.world.level.block.RotatedPillarBlock;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.BlockEntityType;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.lighting.LevelLightEngine;
-import net.minecraft.world.level.material.FluidState;
-import net.minecraft.world.phys.AABB;
-import net.minecraft.world.phys.BlockHitResult;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.phys.shapes.VoxelShape;
-import org.jetbrains.annotations.Nullable;
-
-public class BlockDetailWrapper extends IBlockDetailWrapper
-{
-    private static final ILodConfigWrapperSingleton CONFIG = SingletonHandler.get(ILodConfigWrapperSingleton.class);
-
-    public static final int FLOWER_COLOR_SCALE = 5;
-
-    public static final Random random = new Random(0);
-
-    enum ColorMode {
-        Default,
-        Flower,
-        Leaves;
-        static ColorMode getColorMode(Block b) {
-            if (b instanceof LeavesBlock) return Leaves;
-            if (b instanceof FlowerBlock) return Flower;
-            return Default;
-        }
-    }
-    //TODO: Perhaps make this not just use the first frame?
-    private static int calculateColorFromTexture(TextureAtlasSprite texture, ColorMode colorMode) {
-
-        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 (colorMode == ColorMode.Leaves) {
-                        r *= a;
-                        g *= a;
-                        b *= a;
-                        a = 1.;
-                    } else if (a==0.) {
-                        continue;
-                    } else if (colorMode == ColorMode.Flower && (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;
-    }
-
-
-
-
-
-    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};
-
-    private static boolean isBlockToBeAvoid(Block b) {
-        for (Block bta : BLOCK_TO_AVOID)
-            if (bta==b) return true;
-        return false;
-    }
-
-    final BlockState state;
-    final BlockPos samplePos;
-    final LevelReader sampleGetter;
-
-    boolean isShapeResolved = false;
-    boolean[] dontOccludeFaces = null;
-    boolean noCollision = false;
-    boolean noFullFace = false;
-
-    boolean isColorResolved = false;
-    int baseColor = 0; //TODO: Impl per-face color
-    boolean needShade = true;
-    boolean needPostTinting = false;
-    int tintIndex = 0;
-
-    public static BlockDetailWrapper NULL_BLOCK_DETAIL = new BlockDetailWrapper();
-
-    public BlockDetailWrapper(BlockState state, BlockPos pos, LevelReader getter) {
-        this.state = state;
-        this.samplePos = pos;
-        this.sampleGetter = getter;
-    }
-
-    private BlockDetailWrapper() {
-        this.state = null;
-        this.samplePos = null;
-        this.sampleGetter = null;
-    }
-
-    static BlockDetailWrapper make(BlockState bs, BlockPos pos, LevelReader getter) {
-        if(!bs.getFluidState().isEmpty()) { // Is a fluidBlock
-            if (isBlockToBeAvoid(bs.getBlock())) return NULL_BLOCK_DETAIL;
-            if (bs.isAir()) return NULL_BLOCK_DETAIL;
-            return new BlockDetailWrapper(bs, pos, getter);
-        } else {
-            if (bs.getRenderShape() != RenderShape.MODEL) return NULL_BLOCK_DETAIL;
-            if (isBlockToBeAvoid(bs.getBlock())) return NULL_BLOCK_DETAIL;
-            return new BlockDetailWrapper(bs, pos, getter);
-        }
-    }
-
-    private void resolveShapes() {
-        if (isShapeResolved) return;
-        if (state.getFluidState().isEmpty()) {
-            noCollision = state.getCollisionShape(sampleGetter, samplePos).isEmpty();
-            dontOccludeFaces = new boolean[6];
-            if (state.canOcclude()) {
-				/* FIXME: Figure out how or if needed to impl per-face culling?
-				for (Direction dir : Direction.values()) {
-					dontOccludeFaces[McObjectConverter.Convert(dir).ordinal()]
-							= state.getFaceOcclusionShape(sampleGetter, samplePos, dir).isEmpty();
-				}*/
-            } else {
-                Arrays.fill(dontOccludeFaces, true);
-            }
-
-            VoxelShape voxelShape = state.getShape(sampleGetter, samplePos);
-            if (voxelShape.isEmpty()) {
-                noFullFace = true;
-            } else {
-                AABB bbox = voxelShape.bounds();
-                double xWidth = (bbox.maxX - bbox.minX);
-                double yWidth = (bbox.maxY - bbox.minY);
-                double zWidth = (bbox.maxZ - bbox.minZ);
-                noFullFace = xWidth < 1 && zWidth < 1 && yWidth < 1;
-            }
-        } else { // Liquid Block
-            dontOccludeFaces = new boolean[6];
-        }
-        isShapeResolved = true;
-    }
-
-    private void resolveColors() {
-        if (isColorResolved) return;
-        if (state.getFluidState().isEmpty()) {
-            List<BakedQuad> quads = null;
-            for (Direction direction : DIRECTION_ORDER)
-            {
-                quads = Minecraft.getInstance().getModelManager().getBlockModelShaper().
-                        getBlockModel(state).getQuads(state, direction, random);
-                if (!quads.isEmpty() &&
-                        !(state.getBlock() instanceof RotatedPillarBlock && direction == Direction.UP))
-                    break;
-            };
-            if (quads == null || quads.isEmpty()) {
-                quads = Minecraft.getInstance().getModelManager().getBlockModelShaper().
-                        getBlockModel(state).getQuads(state, null, random);
-            }
-
-            if (quads != null && !quads.isEmpty()) {
-                needPostTinting = quads.get(0).isTinted();
-                needShade = quads.get(0).isShade();
-                tintIndex = quads.get(0).getTintIndex();
-                baseColor = calculateColorFromTexture(quads.get(0).getSprite(),
-                        ColorMode.getColorMode(state.getBlock()));
-            } else { // Backup method.
-                needPostTinting = false;
-                needShade = false;
-                tintIndex = 0;
-                baseColor = calculateColorFromTexture(Minecraft.getInstance().getModelManager().getBlockModelShaper().getParticleIcon(state),
-                        ColorMode.getColorMode(state.getBlock()));
-            }
-        } else { // Liquid Block
-
-            needPostTinting = true;
-            needShade = false;
-            tintIndex = 0;
-            baseColor = calculateColorFromTexture(Minecraft.getInstance().getModelManager().getBlockModelShaper().getParticleIcon(state),
-                    ColorMode.getColorMode(state.getBlock()));
-
-        }
-        isColorResolved = true;
-    }
-
-    private BlockAndTintGetter wrapColorResolver(LevelReader level) {
-        int blendDistance = CONFIG.client().graphics().quality().getLodBiomeBlending();
-        if (blendDistance == 0) {
-            return new TintGetterOverrideFast(level);
-        } else {
-            return new TintGetterOverrideSmooth(level, blendDistance);
-        }
-    }
-
-    @Override
-    public int getAndResolveFaceColor(LodDirection dir, IChunkWrapper chunk, AbstractBlockPosWrapper blockPos)
-    {
-        // FIXME: impl per-face colors
-        resolveColors();
-        if (!needPostTinting) return baseColor;
-        int tintColor = Minecraft.getInstance().getBlockColors()
-                .getColor(state, wrapColorResolver(((ChunkWrapper)chunk).getColorResolver()),
-                        McObjectConverter.Convert(blockPos), tintIndex);
-        if (tintColor == -1) return baseColor;
-        return ColorUtil.multiplyARGBwithRGB(baseColor, tintColor);
-    }
-
-    @Override
-    public boolean hasFaceCullingFor(LodDirection dir)
-    {
-        resolveShapes();
-        return !dontOccludeFaces[dir.ordinal()];
-    }
-
-    @Override
-    public boolean hasNoCollision()
-    {
-        resolveShapes();
-        return noCollision;
-    }
-
-    @Override
-    public boolean noFaceIsFullFace()
-    {
-        resolveShapes();
-        return noFullFace;
-    }
-
-    @Override
-    public String serialize()
-    {
-        // FIXME: Impl this for the blockState Storage stuff
-        return null;
-    }
-
-    @Override
-    protected boolean isSame(IBlockDetailWrapper iBlockDetail)
-    {
-        return ((BlockDetailWrapper)iBlockDetail).state.getBlock().equals(state.getBlock());
-    }
-
-}
@@ -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()
@@ -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);
+    }
+}
@@ -1,192 +0,0 @@
-package com.seibel.lod.common.wrappers.block;
-
-import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
-import net.minecraft.Util;
-import net.minecraft.client.color.block.BlockTintCache;
-import net.minecraft.client.renderer.BiomeColors;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Cursor3D;
-import net.minecraft.core.Direction;
-import net.minecraft.world.level.*;
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.BlockEntityType;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.lighting.LevelLightEngine;
-import net.minecraft.world.level.material.FluidState;
-import net.minecraft.world.phys.AABB;
-import net.minecraft.world.phys.BlockHitResult;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.phys.shapes.VoxelShape;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Optional;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.function.Supplier;
-import java.util.stream.Stream;
-
-public class TintGetterOverrideFast implements BlockAndTintGetter {
-    LevelReader parent;
-    private final Object2ObjectArrayMap<ColorResolver, ConcurrentHashMap<Biome, Integer>> tintCaches;
-
-    public TintGetterOverrideFast(LevelReader parent) {
-        this.parent = parent;
-        this.tintCaches = Util.make(new Object2ObjectArrayMap(3), object2ObjectArrayMap -> {
-            object2ObjectArrayMap.put(BiomeColors.GRASS_COLOR_RESOLVER, new ConcurrentHashMap<Biome, Integer>());
-            object2ObjectArrayMap.put(BiomeColors.FOLIAGE_COLOR_RESOLVER, new ConcurrentHashMap<Biome, Integer>());
-            object2ObjectArrayMap.put(BiomeColors.WATER_COLOR_RESOLVER, new ConcurrentHashMap<Biome, Integer>());
-        });
-    }
-
-    private Biome _getBiome(BlockPos pos) {
-        return parent.getBiome(pos);
-    }
-
-    @Override
-    public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver) {
-        Biome b = _getBiome(blockPos);
-        return tintCaches.get(colorResolver).computeIfAbsent(b, (key) -> colorResolver.getColor(b, blockPos.getX(), blockPos.getZ()));
-    }
-
-    @Override
-    public float getShade(Direction direction, boolean bl) {
-        return parent.getShade(direction, bl);
-    }
-
-    @Override
-    public LevelLightEngine getLightEngine() {
-        return parent.getLightEngine();
-    }
-
-    @Override
-    public int getBrightness(LightLayer lightLayer, BlockPos blockPos) {
-        return parent.getBrightness(lightLayer, blockPos);
-    }
-
-    @Override
-    public int getRawBrightness(BlockPos blockPos, int i) {
-        return parent.getRawBrightness(blockPos, i);
-    }
-
-    @Override
-    public boolean canSeeSky(BlockPos blockPos) {
-        return parent.canSeeSky(blockPos);
-    }
-
-    @Override
-    @Nullable
-    public BlockEntity getBlockEntity(BlockPos blockPos) {
-        return parent.getBlockEntity(blockPos);
-    }
-
-    @Override
-    public <T extends BlockEntity> Optional<T> getBlockEntity(BlockPos blockPos, BlockEntityType<T> blockEntityType) {
-        return parent.getBlockEntity(blockPos, blockEntityType);
-    }
-
-    @Override
-    public BlockState getBlockState(BlockPos blockPos) {
-        return parent.getBlockState(blockPos);
-    }
-
-    @Override
-    public FluidState getFluidState(BlockPos blockPos) {
-        return parent.getFluidState(blockPos);
-    }
-
-    @Override
-    public int getLightEmission(BlockPos blockPos) {
-        return parent.getLightEmission(blockPos);
-    }
-
-    @Override
-    public int getMaxLightLevel() {
-        return parent.getMaxLightLevel();
-    }
-
-    @Override
-    public Stream<BlockState> getBlockStates(AABB aABB) {
-        return parent.getBlockStates(aABB);
-    }
-
-    @Override
-    public BlockHitResult isBlockInLine(ClipBlockStateContext clipBlockStateContext) {
-        return parent.isBlockInLine(clipBlockStateContext);
-    }
-
-    @Override
-    public BlockHitResult clip(ClipContext clipContext) {
-        return parent.clip(clipContext);
-    }
-
-    @Override
-    @Nullable
-    public BlockHitResult clipWithInteractionOverride(Vec3 vec3, Vec3 vec32, BlockPos blockPos, VoxelShape voxelShape, BlockState blockState) {
-        return parent.clipWithInteractionOverride(vec3, vec32, blockPos, voxelShape, blockState);
-    }
-
-    @Override
-    public double getBlockFloorHeight(VoxelShape voxelShape, Supplier<VoxelShape> supplier) {
-        return parent.getBlockFloorHeight(voxelShape, supplier);
-    }
-
-    @Override
-    public double getBlockFloorHeight(BlockPos blockPos) {
-        return parent.getBlockFloorHeight(blockPos);
-    }
-
-    @Override
-    public int getHeight() {
-        return parent.getHeight();
-    }
-
-    @Override
-    public int getMinBuildHeight() {
-        return parent.getMinBuildHeight();
-    }
-
-    @Override
-    public int getMaxBuildHeight() {
-        return parent.getMaxBuildHeight();
-    }
-
-    @Override
-    public int getSectionsCount() {
-        return parent.getSectionsCount();
-    }
-
-    @Override
-    public int getMinSection() {
-        return parent.getMinSection();
-    }
-
-    @Override
-    public int getMaxSection() {
-        return parent.getMaxSection();
-    }
-
-    @Override
-    public boolean isOutsideBuildHeight(BlockPos blockPos) {
-        return parent.isOutsideBuildHeight(blockPos);
-    }
-
-    @Override
-    public boolean isOutsideBuildHeight(int i) {
-        return parent.isOutsideBuildHeight(i);
-    }
-
-    @Override
-    public int getSectionIndex(int i) {
-        return parent.getSectionIndex(i);
-    }
-
-    @Override
-    public int getSectionIndexFromSectionY(int i) {
-        return parent.getSectionIndexFromSectionY(i);
-    }
-
-    @Override
-    public int getSectionYFromSectionIndex(int i) {
-        return parent.getSectionYFromSectionIndex(i);
-    }
-}
@@ -1,215 +0,0 @@
-package com.seibel.lod.common.wrappers.block;
-
-import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
-import net.minecraft.Util;
-import net.minecraft.client.color.block.BlockTintCache;
-import net.minecraft.client.renderer.BiomeColors;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Cursor3D;
-import net.minecraft.core.Direction;
-import net.minecraft.world.level.*;
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.BlockEntityType;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.lighting.LevelLightEngine;
-import net.minecraft.world.level.material.FluidState;
-import net.minecraft.world.phys.AABB;
-import net.minecraft.world.phys.BlockHitResult;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.phys.shapes.VoxelShape;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.Optional;
-import java.util.function.Supplier;
-import java.util.stream.Stream;
-
-public class TintGetterOverrideSmooth implements BlockAndTintGetter {
-    LevelReader parent;
-    private final Object2ObjectArrayMap<ColorResolver, BlockTintCache> tintCaches;
-    public int smoothingRange;
-
-    public TintGetterOverrideSmooth(LevelReader parent, int smoothingRange) {
-        this.parent = parent;
-        this.smoothingRange = smoothingRange;
-        this.tintCaches = Util.make(new Object2ObjectArrayMap<>(3), object2ObjectArrayMap -> {
-            object2ObjectArrayMap.put(BiomeColors.GRASS_COLOR_RESOLVER, new BlockTintCache((pos) -> calculateBlockTint(pos, BiomeColors.GRASS_COLOR_RESOLVER)));
-            object2ObjectArrayMap.put(BiomeColors.FOLIAGE_COLOR_RESOLVER, new BlockTintCache((pos) -> calculateBlockTint(pos, BiomeColors.FOLIAGE_COLOR_RESOLVER)));
-            object2ObjectArrayMap.put(BiomeColors.WATER_COLOR_RESOLVER, new BlockTintCache((pos) -> calculateBlockTint(pos, BiomeColors.WATER_COLOR_RESOLVER)));
-        });
-    }
-
-    private Biome _getBiome(BlockPos pos) {
-        return parent.getBiome(pos);
-    }
-
-    public int calculateBlockTint(BlockPos blockPos, ColorResolver colorResolver)
-    {
-        int i = smoothingRange;
-        if (i == 0)
-            return colorResolver.getColor(_getBiome(blockPos), blockPos.getX(), blockPos.getZ());
-        int j = (i * 2 + 1) * (i * 2 + 1);
-        int k = 0;
-        int l = 0;
-        int m = 0;
-        Cursor3D cursor3D = new Cursor3D(blockPos.getX() - i, blockPos.getY(), blockPos.getZ() - i, blockPos.getX() + i, blockPos.getY(), blockPos.getZ() + i);
-        BlockPos.MutableBlockPos mutableBlockPos = new BlockPos.MutableBlockPos();
-        while (cursor3D.advance())
-        {
-            mutableBlockPos.set(cursor3D.nextX(), cursor3D.nextY(), cursor3D.nextZ());
-            int n = colorResolver.getColor(_getBiome(mutableBlockPos), mutableBlockPos.getX(), mutableBlockPos.getZ());
-            k += (n & 0xFF0000) >> 16;
-            l += (n & 0xFF00) >> 8;
-            m += n & 0xFF;
-        }
-        return (k / j & 0xFF) << 16 | (l / j & 0xFF) << 8 | m / j & 0xFF;
-    }
-
-    @Override
-    public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver) {
-        BlockTintCache blockTintCache = this.tintCaches.get(colorResolver);
-        return blockTintCache.getColor(blockPos, null); //FIXME
-    }
-
-    @Override
-    public float getShade(Direction direction, boolean bl) {
-        return parent.getShade(direction, bl);
-    }
-
-    @Override
-    public LevelLightEngine getLightEngine() {
-        return parent.getLightEngine();
-    }
-
-    @Override
-    public int getBrightness(LightLayer lightLayer, BlockPos blockPos) {
-        return parent.getBrightness(lightLayer, blockPos);
-    }
-
-    @Override
-    public int getRawBrightness(BlockPos blockPos, int i) {
-        return parent.getRawBrightness(blockPos, i);
-    }
-
-    @Override
-    public boolean canSeeSky(BlockPos blockPos) {
-        return parent.canSeeSky(blockPos);
-    }
-
-    @Override
-    @Nullable
-    public BlockEntity getBlockEntity(BlockPos blockPos) {
-        return parent.getBlockEntity(blockPos);
-    }
-
-    @Override
-    public <T extends BlockEntity> Optional<T> getBlockEntity(BlockPos blockPos, BlockEntityType<T> blockEntityType) {
-        return parent.getBlockEntity(blockPos, blockEntityType);
-    }
-
-    @Override
-    public BlockState getBlockState(BlockPos blockPos) {
-        return parent.getBlockState(blockPos);
-    }
-
-    @Override
-    public FluidState getFluidState(BlockPos blockPos) {
-        return parent.getFluidState(blockPos);
-    }
-
-    @Override
-    public int getLightEmission(BlockPos blockPos) {
-        return parent.getLightEmission(blockPos);
-    }
-
-    @Override
-    public int getMaxLightLevel() {
-        return parent.getMaxLightLevel();
-    }
-
-    @Override
-    public Stream<BlockState> getBlockStates(AABB aABB) {
-        return parent.getBlockStates(aABB);
-    }
-
-    @Override
-    public BlockHitResult isBlockInLine(ClipBlockStateContext clipBlockStateContext) {
-        return parent.isBlockInLine(clipBlockStateContext);
-    }
-
-    @Override
-    public BlockHitResult clip(ClipContext clipContext) {
-        return parent.clip(clipContext);
-    }
-
-    @Override
-    @Nullable
-    public BlockHitResult clipWithInteractionOverride(Vec3 vec3, Vec3 vec32, BlockPos blockPos, VoxelShape voxelShape, BlockState blockState) {
-        return parent.clipWithInteractionOverride(vec3, vec32, blockPos, voxelShape, blockState);
-    }
-
-    @Override
-    public double getBlockFloorHeight(VoxelShape voxelShape, Supplier<VoxelShape> supplier) {
-        return parent.getBlockFloorHeight(voxelShape, supplier);
-    }
-
-    @Override
-    public double getBlockFloorHeight(BlockPos blockPos) {
-        return parent.getBlockFloorHeight(blockPos);
-    }
-
-    @Override
-    public int getHeight() {
-        return parent.getHeight();
-    }
-
-    @Override
-    public int getMinBuildHeight() {
-        return parent.getMinBuildHeight();
-    }
-
-    @Override
-    public int getMaxBuildHeight() {
-        return parent.getMaxBuildHeight();
-    }
-
-    @Override
-    public int getSectionsCount() {
-        return parent.getSectionsCount();
-    }
-
-    @Override
-    public int getMinSection() {
-        return parent.getMinSection();
-    }
-
-    @Override
-    public int getMaxSection() {
-        return parent.getMaxSection();
-    }
-
-    @Override
-    public boolean isOutsideBuildHeight(BlockPos blockPos) {
-        return parent.isOutsideBuildHeight(blockPos);
-    }
-
-    @Override
-    public boolean isOutsideBuildHeight(int i) {
-        return parent.isOutsideBuildHeight(i);
-    }
-
-    @Override
-    public int getSectionIndex(int i) {
-        return parent.getSectionIndex(i);
-    }
-
-    @Override
-    public int getSectionIndexFromSectionY(int i) {
-        return parent.getSectionIndexFromSectionY(i);
-    }
-
-    @Override
-    public int getSectionYFromSectionIndex(int i) {
-        return parent.getSectionYFromSectionIndex(i);
-    }
-}
@@ -18,7 +18,7 @@ import net.minecraft.world.level.ChunkPos;
 */
 public class ChunkPosWrapper extends AbstractChunkPosWrapper
 {
-    private net.minecraft.world.level.ChunkPos chunkPos;
+    private final net.minecraft.world.level.ChunkPos chunkPos;

    public ChunkPosWrapper()
    {
@@ -45,9 +45,8 @@ public class ChunkPosWrapper extends AbstractChunkPosWrapper
        this.chunkPos = new ChunkPos(chunkX, chunkZ);
    }
    
-    public ChunkPosWrapper(long l)
-    {
-        this.chunkPos = new ChunkPos(l);
+    public ChunkPosWrapper(long l) {
+    	this.chunkPos = new ChunkPos(l);
    }


@@ -94,21 +93,21 @@ public class ChunkPosWrapper extends AbstractChunkPosWrapper
    {
    	return LevelPosUtil.convert(LodUtil.CHUNK_DETAIL_LEVEL, chunkPos.z, LodUtil.REGION_DETAIL_LEVEL);
    }
+    
+    @Override
+    public long getLong() {
+    	return chunkPos.toLong();
+    }

    public ChunkPos getChunkPos()
    {
        return chunkPos;
    }
-    
-	@Override
-	public long getLong() {
-		return chunkPos.toLong();
-	}

    @Override
    public boolean equals(Object o)
    {
-        // If the object is compared with itself then return true
+		// If the object is compared with itself then return true 
        if (o == this) {
            return true;
        }
@@ -134,5 +133,4 @@ public class ChunkPosWrapper extends AbstractChunkPosWrapper
        return new BlockPosWrapper(blockPos.getX(), blockPos.getY(), blockPos.getZ());
    }

-
 }
@@ -1,63 +1,57 @@
 package com.seibel.lod.common.wrappers.chunk;

-import com.seibel.lod.common.wrappers.block.BlockDetailWrapper;
-import com.seibel.lod.core.enums.LodDirection;
 import com.seibel.lod.core.util.LevelPosUtil;
 import com.seibel.lod.core.util.LodUtil;
-import com.seibel.lod.core.wrapperInterfaces.block.IBlockDetailWrapper;
+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 com.seibel.lod.common.wrappers.worldGeneration.mimicObject.LightedWorldGenRegion;

 import net.minecraft.core.BlockPos;
 import net.minecraft.core.QuartPos;
-import net.minecraft.world.level.LevelReader;
+import net.minecraft.world.level.BlockAndTintGetter;
 import net.minecraft.world.level.LightLayer;
+import net.minecraft.world.level.block.AirBlock;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.LiquidBlock;
 import net.minecraft.world.level.block.LiquidBlockContainer;
 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;

 /**
 *
 * @author James Seibel
- * @version 3-5-2022
+ * @version 11-21-2021
 */
 public class ChunkWrapper implements IChunkWrapper
 {
    private final ChunkAccess chunk;
-    private final LevelReader lightSource;
-
-
-    public ChunkWrapper(ChunkAccess chunk, LevelReader lightSource)
-    {
-        this.chunk = chunk;
-        this.lightSource = lightSource;
-    }
+    private final BlockAndTintGetter lightSource;

    @Override
    public int getHeight(){
        return chunk.getHeight();
    }

-    @Override
-    public int getMinBuildHeight()
-    {
-        return chunk.getMinBuildHeight();
-    }
-    @Override
-    public int getMaxBuildHeight()
-    {
-        return chunk.getMaxBuildHeight();
-    }
+	@Override
+	public int getMinBuildHeight()
+	{
+		return chunk.getMinBuildHeight();
+	}
+	@Override
+	public int getMaxBuildHeight()
+	{
+		return chunk.getMaxBuildHeight();
+	}

    @Override
    public int getHeightMapValue(int xRel, int zRel)
@@ -68,32 +62,36 @@ public class ChunkWrapper implements IChunkWrapper
    @Override
    public IBiomeWrapper getBiome(int x, int y, int z)
    {
-        return BiomeWrapper.getBiomeWrapper(chunk.getBiomes().getNoiseBiome(
-                QuartPos.fromBlock(x), QuartPos.fromBlock(y), QuartPos.fromBlock(z)));
+        return BiomeWrapper.getBiomeWrapper(chunk.getNoiseBiome(
+        		QuartPos.fromBlock(x), QuartPos.fromBlock(y), QuartPos.fromBlock(z)));
    }

    @Override
-    public IBlockDetailWrapper getBlockDetail(int x, int y, int z) {
-        BlockPos pos = new BlockPos(x,y,z);
-        BlockState blockState = chunk.getBlockState(pos);
-        IBlockDetailWrapper blockDetail = BlockDetailMap.getOrMakeBlockDetailCache(blockState, pos, lightSource);
-        return blockDetail == BlockDetailWrapper.NULL_BLOCK_DETAIL ? null : blockDetail;
+    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 IBlockDetailWrapper getBlockDetailAtFace(int x, int y, int z, LodDirection dir) {
-        int fy = y+dir.getNormal().y;
-        if (fy < getMinBuildHeight() || fy > getMaxBuildHeight()) return null;
-        BlockPos pos = new BlockPos(x+dir.getNormal().x,fy,z+dir.getNormal().z);
-        BlockState blockState;
-        if (blockPosInsideChunk(x,y,z))
-            blockState = chunk.getBlockState(pos);
-        else {
-            blockState = lightSource.getBlockState(pos);
-        }
-        if (blockState == null || blockState.isAir()) return null;
-        IBlockDetailWrapper blockDetail = BlockDetailMap.getOrMakeBlockDetailCache(blockState, pos, lightSource);
-        return blockDetail == BlockDetailWrapper.NULL_BLOCK_DETAIL ? null : blockDetail;
+    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
+    public ChunkWrapper(ChunkAccess chunk)
+    {
+        this.chunk = chunk;
+        this.lightSource = null;
+    }
+    public ChunkWrapper(ChunkAccess chunk, BlockAndTintGetter lightSource)
+    {
+        this.chunk = chunk;
+        this.lightSource = lightSource;
    }

    public ChunkAccess getChunk() {
@@ -112,12 +110,12 @@ public class ChunkWrapper implements IChunkWrapper

    @Override
    public int getRegionPosX(){
-        return LevelPosUtil.convert(LodUtil.CHUNK_DETAIL_LEVEL, chunk.getPos().x, 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, chunk.getPos().z, LodUtil.REGION_DETAIL_LEVEL);
+    	return LevelPosUtil.convert(LodUtil.CHUNK_DETAIL_LEVEL, chunk.getPos().z, LodUtil.REGION_DETAIL_LEVEL);
    }

    @Override
@@ -141,20 +139,19 @@ public class ChunkWrapper implements IChunkWrapper
    public int getMinZ() {
        return chunk.getPos().getMinBlockZ();
    }
-
+    
    @Override
    public long getLongChunkPos() {
-        return chunk.getPos().toLong();
+    	return chunk.getPos().toLong();
    }

    @Override
    public boolean isLightCorrect(){
-        return true;
-        // TODO
-//        if (chunk instanceof LevelChunk) {
-//            return ((LevelChunk) chunk).isClientLightReady();
-//        }
-//        return chunk.isLightCorrect();
+    	//return true;
+    	if (chunk instanceof LevelChunk) {
+    		return ((LevelChunk) chunk).isClientLightReady();
+    	}
+        return chunk.isLightCorrect();
    }

    public boolean isWaterLogged(int x, int y, int z)
@@ -172,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;
+	@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;
+	@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;
-    }
-
-    public LevelReader getColorResolver()
-    {
-        return lightSource;
-    }
+	}

 }
@@ -92,7 +92,7 @@ public abstract class ConfigGui
 	// Change these to your own mod
 	private static final String MOD_NAME = ModInfo.NAME;					// For file saving and identifying
 	private static final String MOD_NAME_READABLE = ModInfo.READABLE_NAME;	// For logs
-	//	private static final Logger LOGGER = ApiShared.LOGGER;						// For logs
+	//	private static final Logger LOGGER = ClientApi.LOGGER;						// For logs
 	private static final Logger LOGGER = LogManager.getLogger(ModInfo.NAME);		// For logs (this inits before ClientAPI so this is a temp fix)


@@ -379,7 +379,7 @@ public abstract class ConfigGui
 		// Just put this here for the future
 		config.setComment("_Version", " DONT TOUCH THIS, IF YOU DO THEN CONFIG FILE WOULD BREAK");
 		config.set("_Versions", ModInfo.VERSION);
-		
+

 		// Puts everything into its variable
 		for (EntryInfo info : entries) {
@@ -607,7 +607,6 @@ public abstract class ConfigGui
 					else if (info.screenButton)
 					{
 						Button widget = new Button(this.width / 2 - info.width, this.height - 28, info.width * 2, 20, name, (button -> {
-							saveToFile();
 							Objects.requireNonNull(minecraft).setScreen(ConfigGui.getScreen(this, info.gotoScreen));
 						}));
 						this.list.addButton(widget, null, null, null);
@@ -753,10 +752,10 @@ public abstract class ConfigGui

 		// Only for 1.17 and over
 		// Remove in 1.16 and below
-		@Override
-		public List<? extends NarratableEntry> narratables()
-		{
-			return children;
-		}
+        @Override
+        public List<? extends NarratableEntry> narratables()
+        {
+            return children;
+        }
 	}
 }
@@ -3,7 +3,7 @@ package com.seibel.lod.common.wrappers.config;
 import com.seibel.lod.core.enums.config.*;
 import com.seibel.lod.core.enums.rendering.*;
 import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
-import com.seibel.lod.common.Config;
+import com.seibel.lod.common.OldConfig;

 /**
 * This holds the config defaults and setters/getters
@@ -28,7 +28,6 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 	{
 		public final IGraphics graphics;
 		public final IWorldGenerator worldGenerator;
-		public final IMultiplayer multiplayer;
 		public final IAdvanced advanced;


@@ -44,11 +43,6 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 			return worldGenerator;
 		}

-		@Override
-		public IMultiplayer multiplayer() {
-			return multiplayer;
-		}
-
 		@Override
 		public IAdvanced advanced()
 		{
@@ -59,7 +53,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 		@Override
 		public boolean getOptionsButton()
 		{
-			return Config.optionsButton;
+			return OldConfig.optionsButton;
 		}
 		@Override
 		public void setOptionsButton(boolean newOptionsButton)
@@ -76,7 +70,6 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 		{
 			graphics = new Graphics();
 			worldGenerator = new WorldGenerator();
-			multiplayer = new Multiplayer();
 			advanced = new Advanced();
 		}

@@ -124,7 +117,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public HorizontalResolution getDrawResolution()
 				{
-					return Config.Client.Graphics.Quality.drawResolution;
+					return OldConfig.Client.Graphics.Quality.drawResolution;
 				}
 				@Override
 				public void setDrawResolution(HorizontalResolution newHorizontalResolution)
@@ -137,7 +130,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public int getLodChunkRenderDistance()
 				{
-					return Config.Client.Graphics.Quality.lodChunkRenderDistance;
+					return OldConfig.Client.Graphics.Quality.lodChunkRenderDistance;
 				}
 				@Override
 				public void setLodChunkRenderDistance(int newLodChunkRenderDistance)
@@ -150,7 +143,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public VerticalQuality getVerticalQuality()
 				{
-					return Config.Client.Graphics.Quality.verticalQuality;
+					return OldConfig.Client.Graphics.Quality.verticalQuality;
 				}
 				@Override
 				public void setVerticalQuality(VerticalQuality newVerticalQuality)
@@ -163,7 +156,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public int getHorizontalScale()
 				{
-					return Config.Client.Graphics.Quality.horizontalScale;
+					return OldConfig.Client.Graphics.Quality.horizontalScale;
 				}
 				@Override
 				public void setHorizontalScale(int newHorizontalScale)
@@ -176,7 +169,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public HorizontalQuality getHorizontalQuality()
 				{
-					return Config.Client.Graphics.Quality.horizontalQuality;
+					return OldConfig.Client.Graphics.Quality.horizontalQuality;
 				}
 				@Override
 				public void setHorizontalQuality(HorizontalQuality newHorizontalQuality)
@@ -184,43 +177,25 @@ 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;
+					return OldConfig.Client.Graphics.Quality.dropoffQuality;
 				}
 				@Override
 				public void setDropoffQuality(DropoffQuality newDropoffQuality) {
 					ConfigGui.editSingleOption.getEntry("client.graphics.quality.dropoffQuality").value = newDropoffQuality;
 					ConfigGui.editSingleOption.saveOption("client.graphics.quality.dropoffQuality");
 				}
-
-				@Override
-				public int getLodBiomeBlending() {
-					return Config.Client.Graphics.Quality.lodBiomeBlending;
-				}
-
-				@Override
-				public void setLodBiomeBlending(int newLodBiomeBlending) {
-					ConfigGui.editSingleOption.getEntry("client.graphics.quality.lodBiomeBlending").value = newLodBiomeBlending;
-					ConfigGui.editSingleOption.saveOption("client.graphics.quality.lodBiomeBlending");
-				}
 			}


 			public static class FogQuality implements IFogQuality
 			{
-				public final IAdvancedFog advancedFog;
-
-				FogQuality()
-				{
-					advancedFog = new AdvancedFog();
-				}
-
 				@Override
 				public FogDistance getFogDistance()
 				{
-					return Config.Client.Graphics.FogQuality.fogDistance;
+					return OldConfig.Client.Graphics.FogQuality.fogDistance;
 				}
 				@Override
 				public void setFogDistance(FogDistance newFogDistance)
@@ -233,7 +208,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public FogDrawMode getFogDrawMode()
 				{
-					return Config.Client.Graphics.FogQuality.fogDrawMode;
+					return OldConfig.Client.Graphics.FogQuality.fogDrawMode;
 				}

 				@Override
@@ -247,7 +222,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public FogColorMode getFogColorMode()
 				{
-					return Config.Client.Graphics.FogQuality.fogColorMode;
+					return OldConfig.Client.Graphics.FogQuality.fogColorMode;
 				}

 				@Override
@@ -261,7 +236,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public boolean getDisableVanillaFog()
 				{
-					return Config.Client.Graphics.FogQuality.disableVanillaFog;
+					return OldConfig.Client.Graphics.FogQuality.disableVanillaFog;
 				}
 				@Override
 				public void setDisableVanillaFog(boolean newDisableVanillaFog)
@@ -269,167 +244,6 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 					ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.disableVanillaFog").value = newDisableVanillaFog;
 					ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.disableVanillaFog");
 				}
-
-				@Override
-				public IAdvancedFog advancedFog() {
-					return advancedFog;
-				}
-
-				public static class AdvancedFog implements IAdvancedFog {
-					public final IHeightFog heightFog;
-
-					public AdvancedFog() {
-						heightFog = new HeightFog();
-					}
-
-					@Override
-					public double getFarFogStart() {
-						return Config.Client.Graphics.FogQuality.AdvancedFog.farFogStart;
-					}
-					@Override
-					public double getFarFogEnd() {
-						return Config.Client.Graphics.FogQuality.AdvancedFog.farFogEnd;
-					}
-					@Override
-					public double getFarFogMin() {
-						return Config.Client.Graphics.FogQuality.AdvancedFog.farFogMin;
-					}
-					@Override
-					public double getFarFogMax() {
-						return Config.Client.Graphics.FogQuality.AdvancedFog.farFogMax;
-					}
-					@Override
-					public FogSetting.FogType getFarFogType() {
-						return Config.Client.Graphics.FogQuality.AdvancedFog.farFogType;
-					}
-					@Override
-					public double getFarFogDensity() {
-						return Config.Client.Graphics.FogQuality.AdvancedFog.farFogDensity;
-					}
-
-					@Override
-					public void setFarFogStart(double newFarFogStart) {
-						ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.farFogStart").value = newFarFogStart;
-						ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.farFogStart");
-					}
-					@Override
-					public void setFarFogEnd(double newFarFogEnd) {
-						ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.farFogEnd").value = newFarFogEnd;
-						ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.farFogEnd");
-					}
-					@Override
-					public void setFarFogMin(double newFarFogMin) {
-						ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.farFogMin").value = newFarFogMin;
-						ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.farFogMin");
-					}
-					@Override
-					public void setFarFogMax(double newFarFogMax) {
-						ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.farFogMax").value = newFarFogMax;
-						ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.farFogMax");
-					}
-					@Override
-					public void setFarFogType(FogSetting.FogType newFarFogType) {
-						ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.farFogType").value = newFarFogType;
-						ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.farFogType");
-					}
-					@Override
-					public void setFarFogDensity(double newFarFogDensity) {
-						ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.farFogDensity").value = newFarFogDensity;
-						ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.farFogDensity");
-					}
-
-					@Override
-					public IHeightFog heightFog() {
-						return heightFog;
-					}
-
-					public static class HeightFog implements IHeightFog {
-
-						@Override
-						public HeightFogMixMode getHeightFogMixMode() {
-							return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogMixMode;
-						}
-						@Override
-						public HeightFogMode getHeightFogMode() {
-							return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogMode;
-						}
-						@Override
-						public double getHeightFogHeight() {
-							return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogHeight;
-						}
-						@Override
-						public double getHeightFogStart() {
-							return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogStart;
-						}
-						@Override
-						public double getHeightFogEnd() {
-							return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogEnd;
-						}
-						@Override
-						public double getHeightFogMin() {
-							return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogMin;
-						}
-						@Override
-						public double getHeightFogMax() {
-							return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogMax;
-						}
-						@Override
-						public FogSetting.FogType getHeightFogType() {
-							return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogType;
-						}
-						@Override
-						public double getHeightFogDensity() {
-							return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogDensity;
-						}
-
-						@Override
-						public void setHeightFogMixMode(HeightFogMixMode newHeightFogMixMode) {
-							ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogMixMode").value = newHeightFogMixMode;
-							ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogMixMode");
-						}
-						@Override
-						public void setHeightFogMode(HeightFogMode newHeightFogMode) {
-							ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogMode").value = newHeightFogMode;
-							ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogMode");
-						}
-						@Override
-						public void setHeightFogHeight(double newHeightFogHeight) {
-							ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogHeight").value = newHeightFogHeight;
-							ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogHeight");
-						}
-						@Override
-						public void setHeightFogStart(double newHeightFogStart) {
-							ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogStart").value = newHeightFogStart;
-							ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogStart");
-						}
-						@Override
-						public void setHeightFogEnd(double newHeightFogEnd) {
-							ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogEnd").value = newHeightFogEnd;
-							ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogEnd");
-						}
-						@Override
-						public void setHeightFogMin(double newHeightFogMin) {
-							ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogMin").value = newHeightFogMin;
-							ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogMin");
-						}
-						@Override
-						public void setHeightFogMax(double newHeightFogMax) {
-							ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogMax").value = newHeightFogMax;
-							ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogMax");
-						}
-						@Override
-						public void setHeightFogType(FogSetting.FogType newHeightFogType) {
-							ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogType").value = newHeightFogType;
-							ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogType");
-						}
-						@Override
-						public void setHeightFogDensity(double newHeightFogDensity) {
-							ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogDensity").value = newHeightFogDensity;
-							ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogDensity");
-						}
-					}
-				}
-
 			}


@@ -438,7 +252,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public boolean getDisableDirectionalCulling()
 				{
-					return Config.Client.Graphics.AdvancedGraphics.disableDirectionalCulling;
+					return OldConfig.Client.Graphics.AdvancedGraphics.disableDirectionalCulling;
 				}
 				@Override
 				public void setDisableDirectionalCulling(boolean newDisableDirectionalCulling)
@@ -451,7 +265,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public VanillaOverdraw getVanillaOverdraw()
 				{
-					return Config.Client.Graphics.AdvancedGraphics.vanillaOverdraw;
+					return OldConfig.Client.Graphics.AdvancedGraphics.vanillaOverdraw;
 				}
 				@Override
 				public void setVanillaOverdraw(VanillaOverdraw newVanillaOverdraw)
@@ -459,22 +273,11 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 					ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.vanillaOverdraw").value = newVanillaOverdraw;
 					ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.vanillaOverdraw");
 				}
-
-				@Override
-				public int getOverdrawOffset() {
-					return Config.Client.Graphics.AdvancedGraphics.overdrawOffset;
-				}
-
-				@Override
-				public void setOverdrawOffset(int newOverdrawOffset) {
-					ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.overdrawOffset").value = newOverdrawOffset;
-					ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.overdrawOffset");
-				}
 				/*
 				@Override
 				public int getBacksideCullingRange()
 				{
-					return Config.Client.Graphics.AdvancedGraphics.backsideCullingRange;
+					return OldConfig.Client.Graphics.AdvancedGraphics.backsideCullingRange;
 				}
 				@Override
 				public void setBacksideCullingRange(int newBacksideCullingRange)
@@ -482,11 +285,11 @@ 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()
 				{
-					return Config.Client.Graphics.AdvancedGraphics.useExtendedNearClipPlane;
+					return OldConfig.Client.Graphics.AdvancedGraphics.useExtendedNearClipPlane;
 				}
 				@Override
 				public void setUseExtendedNearClipPlane(boolean newUseExtendedNearClipPlane)
@@ -494,54 +297,6 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 					ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.useExtendedNearClipPlane").value = newUseExtendedNearClipPlane;
 					ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.useExtendedNearClipPlane");
 				}
-
-				@Override
-				public double getBrightnessMultiplier()
-				{
-					return Config.Client.Graphics.AdvancedGraphics.brightnessMultiplier;
-				}
-				@Override
-				public void setBrightnessMultiplier(double newBrightnessMultiplier)
-				{
-					ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.brightnessMultiplier").value = newBrightnessMultiplier;
-					ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.brightnessMultiplier");
-				}
-
-				@Override
-				public double getSaturationMultiplier()
-				{
-					return Config.Client.Graphics.AdvancedGraphics.saturationMultiplier;
-				}
-				@Override
-				public void setSaturationMultiplier(double newSaturationMultiplier)
-				{
-					ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.saturationMultiplier").value = newSaturationMultiplier;
-					ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.saturationMultiplier");
-				}
-
-				@Override
-				public boolean getEnableCaveCulling() {
-					return Config.Client.Graphics.AdvancedGraphics.enableCaveCulling;
-				}
-
-				@Override
-				public void setEnableCaveCulling(boolean newEnableCaveCulling) {
-					ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.enableCaveCulling").value = newEnableCaveCulling;
-					ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.enableCaveCulling");
-
-				}
-
-				@Override
-				public int getCaveCullingHeight() {
-					return Config.Client.Graphics.AdvancedGraphics.caveCullingHeight;
-				}
-
-				@Override
-				public void setCaveCullingHeight(int newCaveCullingHeight) {
-					ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.caveCullingHeight").value = newCaveCullingHeight;
-					ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.caveCullingHeight");
-
-				}
 			}
 		}

@@ -556,7 +311,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 			@Override
 			public GenerationPriority getGenerationPriority()
 			{
-				return Config.Client.WorldGenerator.generationPriority;
+				return OldConfig.Client.WorldGenerator.generationPriority;
 			}
 			@Override
 			public void setGenerationPriority(GenerationPriority newGenerationPriority)
@@ -569,7 +324,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 			@Override
 			public DistanceGenerationMode getDistanceGenerationMode()
 			{
-				return Config.Client.WorldGenerator.distanceGenerationMode;
+				return OldConfig.Client.WorldGenerator.distanceGenerationMode;
 			}
 			@Override
 			public void setDistanceGenerationMode(DistanceGenerationMode newDistanceGenerationMode)
@@ -582,7 +337,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 			@Override
 			public boolean getAllowUnstableFeatureGeneration()
 			{
-				return Config.Client.WorldGenerator.allowUnstableFeatureGeneration;
+				return OldConfig.Client.WorldGenerator.allowUnstableFeatureGeneration;
 			}
 			@Override
 			public void setAllowUnstableFeatureGeneration(boolean newAllowUnstableFeatureGeneration)
@@ -595,7 +350,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 			@Override
 			public BlocksToAvoid getBlocksToAvoid()
 			{
-				return Config.Client.WorldGenerator.blocksToAvoid;
+				return OldConfig.Client.WorldGenerator.blocksToAvoid;
 			}
 			@Override
 			public void setBlockToAvoid(BlocksToAvoid newBlockToAvoid)
@@ -617,7 +372,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 			@Override
 			public LightGenerationMode getLightGenerationMode()
 			{
-				return Config.Client.WorldGenerator.lightGenerationMode;
+				return OldConfig.Client.WorldGenerator.lightGenerationMode;
 			}
 			@Override
 			public void setLightGenerationMode(LightGenerationMode newLightGenerationMode)
@@ -629,38 +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");
-			}
-
-			@Override
-			public double getMultiDimensionRequiredSimilarity()
-			{
-				return Config.Client.Multiplayer.multiDimensionRequiredSimilarity;
-			}
-
-			@Override
-			public void setMultiDimensionRequiredSimilarity(double newMultiDimensionMinimumSimilarityPercent)
-			{
-				ConfigGui.editSingleOption.getEntry("client.multiplayer.multiDimensionMinimumSimilarityPercent").value = newMultiDimensionMinimumSimilarityPercent;
-				ConfigGui.editSingleOption.saveOption("client.multiplayer.multiDimensionMinimumSimilarityPercent");
-			}
-		}
-
-

 		//============================//
 		// AdvancedModOptions Configs //
@@ -705,7 +428,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public int getNumberOfWorldGenerationThreads()
 				{
-					return Config.Client.Advanced.Threading.numberOfWorldGenerationThreads;
+					return OldConfig.Client.Advanced.Threading.numberOfWorldGenerationThreads;
 				}
 				@Override
 				public void setNumberOfWorldGenerationThreads(int newNumberOfWorldGenerationThreads)
@@ -718,7 +441,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public int getNumberOfBufferBuilderThreads()
 				{
-					return Config.Client.Advanced.Threading.numberOfBufferBuilderThreads;
+					return OldConfig.Client.Advanced.Threading.numberOfBufferBuilderThreads;
 				}
 				@Override
 				public void setNumberOfBufferBuilderThreads(int newNumberOfWorldBuilderThreads)
@@ -736,28 +459,18 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 			//===============//
 			public static class Debugging implements IDebugging
 			{
-				public final IDebugSwitch debugSwitch;
-
 				@Override
-				public IDebugSwitch debugSwitch()
+				public boolean getDrawLods()
 				{
-					return debugSwitch;
+					return (boolean) ConfigGui.editSingleOption.getEntry("client.advanced.debugging.drawLods").value;
+				}
+				@Override
+				public void setDrawLods(boolean newDrawLods)
+				{
+					ConfigGui.editSingleOption.getEntry("client.advanced.debugging.drawLods").value = newDrawLods;
+					ConfigGui.editSingleOption.saveOption("client.advanced.debugging.drawLods");
 				}

-				/* RendererType:
-				 * DEFAULT
-				 * DEBUG
-				 * DISABLED
-				 * */
-				@Override
-				public RendererType getRendererType() {
-					return (RendererType) ConfigGui.editSingleOption.getEntry("client.advanced.debugging.rendererType").value;
-				}
-				@Override
-				public void setRendererType(RendererType newRenderType) {
-					ConfigGui.editSingleOption.getEntry("client.advanced.debugging.rendererType").value = newRenderType;
-					ConfigGui.editSingleOption.saveOption("client.advanced.debugging.rendererType");
-				}

 				@Override
 				public DebugMode getDebugMode()
@@ -783,116 +496,6 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 					ConfigGui.editSingleOption.getEntry("client.advanced.debugging.enableDebugKeybindings").value = newEnableDebugKeybindings;
 					ConfigGui.editSingleOption.saveOption("client.advanced.debugging.enableDebugKeybindings");
 				}
-
-				public Debugging()
-				{
-					debugSwitch = new DebugSwitch();
-				}
-
-				public static class DebugSwitch implements IDebugSwitch {
-
-					/* The logging switches available:
-					 * WorldGenEvent
-					 * WorldGenPerformance
-					 * WorldGenLoadEvent
-					 * LodBuilderEvent
-					 * RendererBufferEvent
-					 * RendererGLEvent
-					 * FileReadWriteEvent
-					 * FileSubDimEvent
-					 * NetworkEvent //NOT IMPL YET
-					 */
-
-					@Override
-					public LoggerMode getLogWorldGenEvent() {
-						return (LoggerMode) ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logWorldGenEvent").value;
-					}
-					@Override
-					public void setLogWorldGenEvent(LoggerMode newLogWorldGenEvent) {
-						ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logWorldGenEvent").value = newLogWorldGenEvent;
-						ConfigGui.editSingleOption.saveOption("client.advanced.debugging.debugSwitch.logWorldGenEvent");
-					}
-
-					@Override
-					public LoggerMode getLogWorldGenPerformance() {
-						return (LoggerMode) ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logWorldGenPerformance").value;
-					}
-					@Override
-					public void setLogWorldGenPerformance(LoggerMode newLogWorldGenPerformance) {
-						ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logWorldGenPerformance").value = newLogWorldGenPerformance;
-						ConfigGui.editSingleOption.saveOption("client.advanced.debugging.debugSwitch.logWorldGenPerformance");
-					}
-
-					@Override
-					public LoggerMode getLogWorldGenLoadEvent() {
-						return (LoggerMode) ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logWorldGenLoadEvent").value;
-					}
-					@Override
-					public void setLogWorldGenLoadEvent(LoggerMode newLogWorldGenLoadEvent) {
-						ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logWorldGenLoadEvent").value = newLogWorldGenLoadEvent;
-						ConfigGui.editSingleOption.saveOption("client.advanced.debugging.debugSwitch.logWorldGenLoadEvent");
-					}
-
-					@Override
-					public LoggerMode getLogLodBuilderEvent() {
-						return (LoggerMode) ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logLodBuilderEvent").value;
-					}
-					@Override
-					public void setLogLodBuilderEvent(LoggerMode newLogLodBuilderEvent) {
-						ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logLodBuilderEvent").value = newLogLodBuilderEvent;
-						ConfigGui.editSingleOption.saveOption("client.advanced.debugging.debugSwitch.logLodBuilderEvent");
-					}
-
-					@Override
-					public LoggerMode getLogRendererBufferEvent() {
-						return (LoggerMode) ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logRendererBufferEvent").value;
-					}
-					@Override
-					public void setLogRendererBufferEvent(LoggerMode newLogRendererBufferEvent) {
-						ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logRendererBufferEvent").value = newLogRendererBufferEvent;
-						ConfigGui.editSingleOption.saveOption("client.advanced.debugging.debugSwitch.logRendererBufferEvent");
-					}
-
-					@Override
-					public LoggerMode getLogRendererGLEvent() {
-						return (LoggerMode) ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logRendererGLEvent").value;
-					}
-					@Override
-					public void setLogRendererGLEvent(LoggerMode newLogRendererGLEvent) {
-						ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logRendererGLEvent").value = newLogRendererGLEvent;
-						ConfigGui.editSingleOption.saveOption("client.advanced.debugging.debugSwitch.logRendererGLEvent");
-					}
-
-					@Override
-					public LoggerMode getLogFileReadWriteEvent() {
-						return (LoggerMode) ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logFileReadWriteEvent").value;
-					}
-					@Override
-					public void setLogFileReadWriteEvent(LoggerMode newLogFileReadWriteEvent) {
-						ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logFileReadWriteEvent").value = newLogFileReadWriteEvent;
-						ConfigGui.editSingleOption.saveOption("client.advanced.debugging.debugSwitch.logFileReadWriteEvent");
-					}
-
-					@Override
-					public LoggerMode getLogFileSubDimEvent() {
-						return (LoggerMode) ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logFileSubDimEvent").value;
-					}
-					@Override
-					public void setLogFileSubDimEvent(LoggerMode newLogFileSubDimEvent) {
-						ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logFileSubDimEvent").value = newLogFileSubDimEvent;
-						ConfigGui.editSingleOption.saveOption("client.advanced.debugging.debugSwitch.logFileSubDimEvent");
-					}
-
-					@Override
-					public LoggerMode getLogNetworkEvent() {
-						return (LoggerMode) ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logNetworkEvent").value;
-					}
-					@Override
-					public void setLogNetworkEvent(LoggerMode newLogNetworkEvent) {
-						ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logNetworkEvent").value = newLogNetworkEvent;
-						ConfigGui.editSingleOption.saveOption("client.advanced.debugging.debugSwitch.logNetworkEvent");
-					}
-				}
 			}


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

-import com.mojang.blaze3d.pipeline.RenderTarget;
 import com.mojang.blaze3d.platform.NativeImage;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.seibel.lod.common.wrappers.misc.LightMapWrapper;
-import com.seibel.lod.core.api.ApiShared;
 import com.seibel.lod.core.api.ClientApi;
-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.LodUtil;
+import com.seibel.lod.core.util.SingletonHandler;

-import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import net.minecraft.client.renderer.LightTexture;

 import com.mojang.math.Vector3f;
@@ -26,6 +23,7 @@ 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;
@@ -59,7 +57,7 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper

    private static final Minecraft MC = Minecraft.getInstance();
    private static final GameRenderer GAME_RENDERER = MC.gameRenderer;
-    private static final IWrapperFactory FACTORY = WrapperFactory.INSTANCE;
+    private static final WrapperFactory FACTORY = WrapperFactory.INSTANCE;

    @Override
    public Vec3f getLookAtVector()
@@ -106,7 +104,7 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper

    @Override
    public Color getFogColor(float partialTicks) {
-        FogRenderer.setupColor(GAME_RENDERER.getMainCamera(), partialTicks, MC.level, 1, GAME_RENDERER.getDarkenWorldAmount(partialTicks));
+    	FogRenderer.setupColor(GAME_RENDERER.getMainCamera(), partialTicks, MC.level, 1, GAME_RENDERER.getDarkenWorldAmount(partialTicks));
        float[] colorValues = RenderSystem.getShaderFogColor();
        return new Color(colorValues[0], colorValues[1], colorValues[2], colorValues[3]);
    }
@@ -145,26 +143,6 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
        return MC.getWindow().getHeight();
    }

-    private RenderTarget getRenderTarget() {
-        RenderTarget r = null; //MC.levelRenderer.getCloudsTarget();
-        return r!=null ? r : MC.getMainRenderTarget();
-    }
-
-    @Override
-    public int getTargetFrameBuffer() {
-        return getRenderTarget().frameBufferId;
-    }
-
-    @Override
-    public int getTargetFrameBufferViewportWidth() {
-        return getRenderTarget().viewWidth;
-    }
-
-    @Override
-    public int getTargetFrameBufferViewportHeight() {
-        return getRenderTarget().viewHeight;
-    }
-
    /**
     * This method returns the ChunkPos of all chunks that Minecraft
     * is going to render this frame. <br><br>
@@ -172,45 +150,73 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
     */

    public boolean usingBackupGetVanillaRenderedChunks = false;
+	@Override
+	public HashSet<AbstractChunkPosWrapper> getVanillaRenderedChunks()
+	{
+		ISodiumAccessor sodium = ModAccessorApi.get(ISodiumAccessor.class);
+		if (sodium != null)
+		{
+			return sodium.getNormalRenderedChunks();
+		}
+		IOptifineAccessor optifine = ModAccessorApi.get(IOptifineAccessor.class);
+		if (optifine != null)
+		{
+			HashSet<AbstractChunkPosWrapper> pos = optifine.getNormalRenderedChunks();
+			if (pos == null)
+				pos = getMaximumRenderedChunks();
+			return pos;
+		}
+		if (!usingBackupGetVanillaRenderedChunks) {
+			try {
+			LevelRenderer levelRenderer = MC.levelRenderer;
+			LinkedHashSet<LevelRenderer.RenderChunkInfo> chunks = levelRenderer.renderChunkStorage.get().renderChunks;
+			return (chunks.stream().map((chunk) -> {
+				AABB chunkBoundingBox = chunk.chunk.bb;
+				return FACTORY.createChunkPos(Math.floorDiv((int) chunkBoundingBox.minX, 16),
+						Math.floorDiv((int) chunkBoundingBox.minZ, 16));
+			}).collect(Collectors.toCollection(HashSet::new)));
+			} catch (LinkageError e) {
+				try {
+					MinecraftWrapper.INSTANCE.sendChatMessage(
+							"\u00A7e\u00A7l\u00A7uWARNING: Distant Horizons: getVanillaRenderedChunks method failed."
+							+ " Using Backup Method.");
+					MinecraftWrapper.INSTANCE.sendChatMessage(
+							"\u00A7eOverdraw prevention will be worse than normal.");
+				} catch (Exception e2) {}
+				ClientApi.LOGGER.error("getVanillaRenderedChunks Error: {}", e);
+				usingBackupGetVanillaRenderedChunks = true;
+			}
+		}
+		return getMaximumRenderedChunks();
+	}
+    
    @Override
-    public HashSet<AbstractChunkPosWrapper> getVanillaRenderedChunks()
-    {
-        ISodiumAccessor sodium = 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;
-                ObjectArrayList<LevelRenderer.RenderChunkInfo> chunks = levelRenderer.renderChunks;
-                return (chunks.stream().map((chunk) -> {
-                    AABB chunkBoundingBox = chunk.chunk.bb;
-                    return FACTORY.createChunkPos(Math.floorDiv((int) chunkBoundingBox.minX, 16),
-                            Math.floorDiv((int) chunkBoundingBox.minZ, 16));
-                }).collect(Collectors.toCollection(HashSet::new)));
-            } 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;
-            }
-        }
-        return getMaximumRenderedChunks();
-    }
+	public HashSet<AbstractChunkPosWrapper> getMaximumRenderedChunks()
+	{
+    	//TODO: Make this a circle
+		IMinecraftWrapper mcWrapper = SingletonHandler.get(IMinecraftWrapper.class);
+		IWrapperFactory factory = SingletonHandler.get(IWrapperFactory.class);
+		
+		int chunkRenderDist = this.getRenderDistance();
+		
+		AbstractChunkPosWrapper centerChunkPos = mcWrapper.getPlayerChunkPos();
+		int startChunkX = centerChunkPos.getX() - chunkRenderDist;
+		int startChunkZ = centerChunkPos.getZ() - chunkRenderDist;
+		
+		// add every position within render distance
+		HashSet<AbstractChunkPosWrapper> renderedPos = new HashSet<AbstractChunkPosWrapper>();
+		for (int chunkX = 0; chunkX < (chunkRenderDist * 2+1); chunkX++)
+		{
+			for(int chunkZ = 0; chunkZ < (chunkRenderDist * 2+1); chunkZ++)
+			{
+				renderedPos.add(factory.createChunkPos(startChunkX + chunkX, startChunkZ + chunkZ));
+			}
+		}
+		
+		return renderedPos;	
+	}
+	
+

    @Override
    public int[] getLightmapPixels()
@@ -232,7 +238,7 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
                // this could probably be kept as a int, but
                // it is easier to test and see the colors when debugging this way.
                // When creating a new release this should be changed to the int version.
-                int col = lightMap.getLightValue(u, v);
+                Color c = LodUtil.intToColor(lightMap.getLightValue(u, v));

                // these should both create a totally white image
 //					int col =
@@ -243,11 +249,11 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 //							(0b11111111 << 16) + // blue
 //							(0b11111111 << 24); // blue

-//				int col =
-//						((c.getRed() & 0xFF) << 16) | // blue
-//								((c.getGreen() & 0xFF) << 8) | // green
-//								((c.getBlue() & 0xFF)) | // red
-//								((c.getAlpha() & 0xFF) << 24); // alpha
+                int col =
+                        ((c.getRed() & 0xFF) << 16) | // blue
+                        ((c.getGreen() & 0xFF) << 8) | // green
+                        ((c.getBlue() & 0xFF)) | // red
+                        ((c.getAlpha() & 0xFF) << 24); // alpha

                // 2D array stored in a 1D array.
                // Thank you Tim from College ;)
@@ -310,16 +316,16 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper

        return glFormat;
    }
-
+    
    @Override
    public boolean isFogStateSpecial() {
-        Entity entity = GAME_RENDERER.getMainCamera().getEntity();
-        boolean isBlind = (entity instanceof LivingEntity) && ((LivingEntity)entity).hasEffect(MobEffects.BLINDNESS);
-        return GAME_RENDERER.getMainCamera().getFluidInCamera() != FogType.NONE || isBlind;
+	    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
-    public boolean tryDisableVanillaFog() {
-        return true; // Handled via MixinFogRenderer in both forge and fabric
-    }
+	@Override
+	public boolean tryDisableVanillaFog() {
+		return true; // Handled via MixinFogRenderer in both forge and fabric
+	}
 }
@@ -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()
    {

    }
@@ -189,7 +188,7 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper
    {
        if (lightMap == null)
        {
-            //sendChatMessage("new");
+            sendChatMessage("new");
            // make sure the lightMap is up-to-date
            getCurrentLightMap();
        }
@@ -197,6 +196,22 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper
        return lightMap.getPixelRGBA(blockLight, skyLight);
    }

+    /**
+     * Returns the Color at the given pixel coordinates
+     * from the current lightmap.
+     * @param blockLight x location in texture space
+     * @param skyLight z location in texture space
+     */
+    @Override
+    public Color getColorFromLightMap(int blockLight, int skyLight) {
+        if (lightMap == null) {
+            // make sure the lightMap is up-to-date
+            getCurrentLightMap();
+        }
+
+        return LodUtil.intToColor(lightMap.getPixelRGBA(blockLight, skyLight));
+    }
+



@@ -403,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);
    }
@@ -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)
    {
@@ -65,7 +65,7 @@ public class BiomeWrapper implements IBiomeWrapper
    {
        int colorInt;

-        switch (biome.biomeCategory)
+        switch (biome.getBiomeCategory())
        {

            case NETHER:
@@ -110,23 +110,21 @@ public class BiomeWrapper implements IBiomeWrapper
            case SAVANNA:
            case SWAMP:
            default:
-                colorInt = biome.getGrassColor(x,z);
-                //FIXME: Repair what James did - LeeTom
-//                Color tmp = LodUtil.intToColor(biome.getGrassColor(x, z));
-//                tmp = tmp.darker();
-//                colorInt = LodUtil.colorToInt(tmp);
+                Color tmp = LodUtil.intToColor(biome.getGrassColor(x, z));
+                tmp = tmp.darker();
+                colorInt = LodUtil.colorToInt(tmp);
                break;

        }

        return colorInt;
    }
-
-    @Override
-    public String getName() {
+    
+    @Override public String getName()
+    {
        return biome.toString();
    }
-
+    
    @Override
    public int getGrassTint(int x, int z)
    {
@@ -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)
    {
@@ -36,7 +36,6 @@ import net.minecraft.server.level.ServerLevel;
 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.ChunkSource;
 import net.minecraft.world.level.chunk.ChunkStatus;

 import org.jetbrains.annotations.Nullable;
@@ -129,6 +128,12 @@ public class WorldWrapper implements IWorldWrapper
        return world.dimensionType().hasSkyLight();
    }

+    @Override
+    public boolean isEmpty()
+    {
+        return world == null;
+    }
+
    @Override
    public int getHeight()
    {
@@ -140,7 +145,7 @@ public class WorldWrapper implements IWorldWrapper
    {
        return (short) world.getMinBuildHeight();
    }
-
+    
    /** @throws UnsupportedOperationException if the WorldWrapper isn't for a ServerWorld */
    @Override
    public File getSaveFolder() throws UnsupportedOperationException
@@ -168,19 +173,12 @@ public class WorldWrapper implements IWorldWrapper
        // TODO this is depreciated, what should we use instead?
        return world.getSeaLevel();
    }
-
+    
    @Override
-    public IChunkWrapper tryGetChunk(AbstractChunkPosWrapper pos) {
-        ChunkAccess chunk = world.getChunk(pos.getX(), pos.getZ(), ChunkStatus.EMPTY, false);
-        if (chunk == null) return null;
-        return new ChunkWrapper(chunk, world);
-    }
-
-    @Override
-    public boolean hasChunkLoaded(int chunkX, int chunkZ) {
-        // world.hasChunk(chunkX, chunkZ); THIS DOES NOT WORK FOR CLIENT LEVEL CAUSE MOJANG ALWAYS RETURN TRUE FOR THAT!
-        ChunkSource source = world.getChunkSource();
-        return source.hasChunk(chunkX, chunkZ);
+	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);
    }


@@ -19,24 +19,20 @@

 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.logging.ConfigBasedLogger;
-import com.seibel.lod.core.logging.ConfigBasedSpamLogger;
 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.gridList.ArrayGridList;
+import com.seibel.lod.core.util.SingletonHandler;
 import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
-import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
+import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftWrapper;
 import com.seibel.lod.core.wrapperInterfaces.world.IWorldWrapper;
 import com.seibel.lod.core.wrapperInterfaces.worldGeneration.AbstractBatchGenerationEnvionmentWrapper;

-import java.io.IOException;
 import java.time.Duration;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -71,9 +67,9 @@ 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;
-import org.apache.logging.log4j.LogManager;

 /*
 Total:                   3.135214124s
@@ -91,16 +87,9 @@ Lod Generation:          0.269023348s

 public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnvionmentWrapper
 {
-	private static final ILodConfigWrapperSingleton CONFIG = SingletonHandler.get(ILodConfigWrapperSingleton.class);
-	public static final ConfigBasedSpamLogger PREF_LOGGER =
-			new ConfigBasedSpamLogger(LogManager.getLogger("LodWorldGen"),
-					() -> CONFIG.client().advanced().debugging().debugSwitch().getLogWorldGenPerformance(),1);
-	public static final ConfigBasedLogger EVENT_LOGGER =
-			new ConfigBasedLogger(LogManager.getLogger("LodWorldGen"),
-					() -> CONFIG.client().advanced().debugging().debugSwitch().getLogWorldGenEvent());
-	public static final ConfigBasedLogger LOAD_LOGGER =
-			new ConfigBasedLogger(LogManager.getLogger("LodWorldGen"),
-					() -> CONFIG.client().advanced().debugging().debugSwitch().getLogWorldGenLoadEvent());
+	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;
 	//TODO: Make actual proper support for StarLight
 	
 	public static class PrefEvent
@@ -201,6 +190,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 			if (e.endNano != 0)
 			{
 				lodTime.add(e.endNano - preTime);
+				preTime = e.endNano;
 			}
 		}
 		
@@ -224,7 +214,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 	
 	//=================Generation Step===================
 	
-	public final LinkedList<GenerationEvent> events = new LinkedList<>();
+	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(this);
@@ -235,16 +225,16 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 	public final StepLight stepLight = new StepLight(this);
 	public boolean unsafeThreadingRecorded = false;
 	//public boolean safeMode = false;
-	private static final IMinecraftClientWrapper MC = SingletonHandler.get(IMinecraftClientWrapper.class);
+	private static final ILodConfigWrapperSingleton CONFIG = SingletonHandler.get(ILodConfigWrapperSingleton.class);
+	private static final IMinecraftWrapper MC = SingletonHandler.get(IMinecraftWrapper.class);
 	public static final long EXCEPTION_TIMER_RESET_TIME = TimeUnit.NANOSECONDS.convert(1, TimeUnit.SECONDS);
 	public static final int EXCEPTION_COUNTER_TRIGGER = 20;
-	public static final int RANGE_TO_RANGE_EMPTY_EXTENSION = 1;
 	public int unknownExceptionCount = 0;
 	public long lastExceptionTriggerTime = 0;
-
+	
 	public static final LodThreadFactory threadFactory = new LodThreadFactory("Gen-Worker-Thread", Thread.MIN_PRIORITY);
 	
-	public static ThreadLocal<Boolean> isDistantGeneratorThread = new ThreadLocal<>();
+	public static ThreadLocal<Boolean> isDistantGeneratorThread = new ThreadLocal<Boolean>();
 	
 	public static boolean isCurrentThreadDistantGeneratorThread() {
 		return (isDistantGeneratorThread.get() != null);
@@ -256,16 +246,17 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 	
 	public ExecutorService executors = Executors.newFixedThreadPool(
 			CONFIG.client().advanced().threading().getNumberOfWorldGenerationThreads(), threadFactory);
-	
+
 	public <T> T joinSync(CompletableFuture<T> f) {
 		if (!unsafeThreadingRecorded && !f.isDone()) {
-			EVENT_LOGGER.error("Unsafe Threading in Chunk Generator: ", new RuntimeException("Concurrent future"));
-			EVENT_LOGGER.error("To increase stability, it is recommended to set world generation threads count to 1.");
+			MC.sendChatMessage("\u00A74\u00A7l\u00A7uERROR: Distant Horizons: Unsafe Threading in Chunk Generator Detected!");
+			MC.sendChatMessage("\u00A7eTo increase stability, it is recommended to set world generation threads count to 1.");
+			ClientApi.LOGGER.error("Unsafe Threading in Chunk Generator: ", new RuntimeException("Concurrent future"));
 			unsafeThreadingRecorded = true;
 		}
 		return f.join();
 	}
-
+	
 	public void resizeThreadPool(int newThreadCount)
 	{
 		executors = Executors.newFixedThreadPool(newThreadCount,
@@ -295,6 +286,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 				unknownExceptionCount = 0;
 			}
 		}
+		
 		// Update all current out standing jobs
 		Iterator<GenerationEvent> iter = events.iterator();
 		while (iter.hasNext())
@@ -308,8 +300,8 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 				}
 				catch (Throwable e)
 				{
-					EVENT_LOGGER.error("Batching World Generator: Event {} gotten an exception", event);
-					EVENT_LOGGER.error("Exception: ", e);
+					ClientApi.LOGGER.error("Batching World Generator: Event {} gotten an exception", event);
+					ClientApi.LOGGER.error("Exception: ", e);
 					unknownExceptionCount++;
 					lastExceptionTriggerTime = System.nanoTime();
 				}
@@ -320,12 +312,12 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 			}
 			else if (event.hasTimeout(TIMEOUT_SECONDS, TimeUnit.SECONDS))
 			{
-				EVENT_LOGGER.error("Batching World Generator: " + event + " timed out and terminated!");
-				EVENT_LOGGER.info("Dump PrefEvent: " + event.pEvent);
+				ClientApi.LOGGER.error("Batching World Generator: " + event + " timed out and terminated!");
+				ClientApi.LOGGER.info("Dump PrefEvent: " + event.pEvent);
 				try
 				{
 					if (!event.terminate())
-						EVENT_LOGGER.error("Failed to terminate the stuck generation event!");
+						ClientApi.LOGGER.error("Failed to terminate the stuck generation event!");
 				}
 				finally
 				{
@@ -334,7 +326,10 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 			}
 		}
 		if (unknownExceptionCount > EXCEPTION_COUNTER_TRIGGER) {
-			EVENT_LOGGER.error("Too many exceptions in Batching World Generator! Disabling the generator.");
+			try {
+				MC.sendChatMessage("\u00A74\u00A7l\u00A7uERROR: Distant Horizons: Too many exceptions in Batching World Generator! Disabling the generator.");
+			} catch (Exception e) {}
+			ClientApi.LOGGER.error("Too many exceptions in Batching World Generator! Now disabling.");
 			unknownExceptionCount = 0;
 			CONFIG.client().worldGenerator().setEnableDistantGeneration(false);
 		}
@@ -343,18 +338,18 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 	public BatchGenerationEnvironment(IWorldWrapper serverlevel, LodBuilder lodBuilder, LodDimension lodDim)
 	{
 		super(serverlevel, lodBuilder, lodDim);
-		EVENT_LOGGER.info("================WORLD_GEN_STEP_INITING=============");
+		ClientApi.LOGGER.info("================WORLD_GEN_STEP_INITING=============");
 		ChunkGenerator generator =  ((WorldWrapper) serverlevel).getServerWorld().getChunkSource().getGenerator();
 		if (!(generator instanceof NoiseBasedChunkGenerator ||
 				generator instanceof DebugLevelSource ||
 				generator instanceof FlatLevelSource)) {
-			EVENT_LOGGER.warn("Unknown Chunk Generator detected: [{}], Distant Generation May Fail!", generator.getClass());
-			EVENT_LOGGER.warn("If it does crash, set Distant Generation to OFF or Generation Mode to None.");
-			ApiShared.LOGGER.warn("Unknown Chunk Generator detected: {}", generator.getClass());
+			MC.sendChatMessage("\u00A74\u00A7l\u00A7uWARNING: Distant Horizons: Unknown Chunk Generator Detected! Distant Generation May Fail!");
+			MC.sendChatMessage("\u00A7eIf it does crash, set Distant Generation to OFF or Generation Mode to None.");
+			ClientApi.LOGGER.warn("Unknown Chunk Generator detected: {}", generator.getClass());
 		}
 		params = new GlobalParameters((ServerLevel) ((WorldWrapper) serverlevel).getWorld(), lodBuilder, lodDim);
 	}
-
+	
 	@SuppressWarnings("resource")
 	public static ChunkAccess loadOrMakeChunk(ChunkPos chunkPos, ServerLevel level, LevelLightEngine lightEngine)
 	{
@@ -365,19 +360,19 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 		}
 		catch (Exception e)
 		{
-			LOAD_LOGGER.error("DistantHorizons: Couldn't load chunk {}", chunkPos, e);
+			ClientApi.LOGGER.error("DistantHorizons: Couldn't load chunk {}", chunkPos, e);
 		}
 		if (chunkData == null)
 		{
-			return new ProtoChunk(chunkPos, UpgradeData.EMPTY, level);
+			return new ProtoChunk(chunkPos, UpgradeData.EMPTY, level, level.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY), null);
 		}
 		else
 		{
 			try {
-				return ChunkLoader.read(level, lightEngine, chunkPos, chunkData);
+			return ChunkLoader.read(level, lightEngine, chunkPos, chunkData);
 			} catch (Exception e) {
-				LOAD_LOGGER.error("DistantHorizons: Couldn't load chunk {}", chunkPos, e);
-				return new ProtoChunk(chunkPos, UpgradeData.EMPTY, level);
+				ClientApi.LOGGER.error("DistantHorizons: Couldn't load chunk {}", chunkPos, e);
+				return new ProtoChunk(chunkPos, UpgradeData.EMPTY, level, level.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY), null);
 			}
 		}
 		
@@ -385,23 +380,25 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 	
 	public void generateLodFromList(GenerationEvent e)
 	{
-		EVENT_LOGGER.debug("Lod Generate Event: " + e.pos);
+		if (ENABLE_EVENT_LOGGING)
+			ClientApi.LOGGER.info("Lod Generate Event: " + e.pos);
 		e.pEvent.beginNano = System.nanoTime();
-		ArrayGridList<ChunkAccess> referencedChunks;
-		ArrayGridList<ChunkAccess> genChunks;
+		GridList<ChunkAccess> referencedChunks;
 		DistanceGenerationMode generationMode;
 		LightedWorldGenRegion region;
 		WorldGenLevelLightEngine lightEngine;
 		LightGetterAdaptor adaptor;
-		int refRange = e.range + RANGE_TO_RANGE_EMPTY_EXTENSION;
-		int refOffsetX = e.pos.x - refRange;
-		int refOffsetZ = e.pos.z - refRange;
-
+		
 		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) ->
 			{
@@ -416,22 +413,27 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 					// Continue...
 				}
 				if (target == null)
-					target = new ProtoChunk(chunkPos, UpgradeData.EMPTY, params.level);
+					target = new ProtoChunk(chunkPos, UpgradeData.EMPTY, params.level,
+							params.biomes, null);
 				return target;
 			};
-
-			referencedChunks = new ArrayGridList<>(refRange*2+1,
-					(x,z) -> generator.generate(x + refOffsetX,z + refOffsetZ)
-			);
+			
+			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, referencedChunks,
-					ChunkStatus.STRUCTURE_STARTS, refRange, 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, params);
-			genChunks = new ArrayGridList<>(referencedChunks, RANGE_TO_RANGE_EMPTY_EXTENSION,
-					referencedChunks.gridSize - RANGE_TO_RANGE_EMPTY_EXTENSION);
-			generateDirect(e, genChunks, e.target, region);
+			e.tParam.makeStructFeat(region);
+			referencedChunks = chunks.subGrid(e.range);
+			referencedChunks = generateDirect(e, referencedChunks, e.target, region);
+			
 		}
 		catch (StepStructureStart.StructStartCorruptedException f)
 		{
@@ -463,31 +465,43 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 		default:
 			return;
 		}
-
-		for (int oy = 0; oy < genChunks.gridSize; oy++)
+		int centreIndex = referencedChunks.size() / 2;
+		
+		for (int oy = -e.range; oy <= e.range; oy++)
 		{
-			for (int ox = 0; ox < genChunks.gridSize; ox++)
+			for (int ox = -e.range; ox <= e.range; ox++)
 			{
-				ChunkAccess target = genChunks.get(ox, oy);
-				target.setLightCorrect(true);
-				//if (target instanceof LevelChunk)
-				//	((LevelChunk) target).setClientLightReady(true);
+				int targetIndex = referencedChunks.offsetOf(centreIndex, ox, oy);
+				ChunkAccess target = referencedChunks.get(targetIndex);
+				ChunkWrapper wrappedChunk = new ChunkWrapper(target, region);
+				if (!wrappedChunk.isLightCorrect()) {
+					throw new RuntimeException("The generated chunk somehow has isLightCorrect() returning false");
+				}
+				
 				boolean isFull = target.getStatus() == ChunkStatus.FULL || target instanceof LevelChunk;
-				//boolean isPartial = target.isOldNoiseGeneration();
+				boolean isPartial = target.isOldNoiseGeneration();
 				if (isFull)
 				{
-					LOAD_LOGGER.info("Detected full existing chunk at {}", target.getPos());
-					params.lodBuilder.generateLodNodeFromChunk(params.lodDim, new ChunkWrapper(target, region),
+					if (ENABLE_LOAD_EVENT_LOGGING)
+						ClientApi.LOGGER.info("Detected full existing chunk at {}", target.getPos());
+					params.lodBuilder.generateLodNodeFromChunk(params.lodDim, wrappedChunk,
 							new LodBuilderConfig(DistanceGenerationMode.FULL), true, e.genAllDetails);
 				}
+				else if (isPartial)
+				{
+					if (ENABLE_LOAD_EVENT_LOGGING)
+						ClientApi.LOGGER.info("Detected old existing chunk at {}", target.getPos());
+					params.lodBuilder.generateLodNodeFromChunk(params.lodDim, wrappedChunk,
+							new LodBuilderConfig(generationMode), true, e.genAllDetails);
+				}
 				else if (target.getStatus() == ChunkStatus.EMPTY && generationMode == DistanceGenerationMode.NONE)
 				{
-					params.lodBuilder.generateLodNodeFromChunk(params.lodDim, new ChunkWrapper(target, region),
+					params.lodBuilder.generateLodNodeFromChunk(params.lodDim,wrappedChunk,
 							LodBuilderConfig.getFillVoidConfig(), true, e.genAllDetails);
 				}
 				else
 				{
-					params.lodBuilder.generateLodNodeFromChunk(params.lodDim, new ChunkWrapper(target, region),
+					params.lodBuilder.generateLodNodeFromChunk(params.lodDim, wrappedChunk,
 							new LodBuilderConfig(generationMode), true, e.genAllDetails);
 				}
 				if (e.lightMode == LightGenerationMode.FANCY || isFull)
@@ -499,15 +513,15 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 		}
 		e.pEvent.endNano = System.nanoTime();
 		e.refreshTimeout();
-		if (PREF_LOGGER.canMaybeLog())
+		if (ENABLE_PERF_LOGGING)
 		{
 			e.tParam.perf.recordEvent(e.pEvent);
-			PREF_LOGGER.infoInc("{}", e.tParam.perf);
+			ClientApi.LOGGER.info(e.tParam.perf);
 		}
 	}
-
-	public void generateDirect(GenerationEvent e, ArrayGridList<ChunkAccess> subRange, Steps step,
-							   LightedWorldGenRegion region)
+	
+	public GridList<ChunkAccess> generateDirect(GenerationEvent e, GridList<ChunkAccess> subRange, Steps step,
+			LightedWorldGenRegion region)
 	{
 		try
 		{
@@ -520,38 +534,38 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 				}
 			});
 			if (step == Steps.Empty)
-				return;
+				return subRange;
 			stepStructureStart.generateGroup(e.tParam, region, subRange);
 			e.pEvent.structStartNano = System.nanoTime();
 			e.refreshTimeout();
 			if (step == Steps.StructureStart)
-				return;
+				return subRange;
 			stepStructureReference.generateGroup(e.tParam, region, subRange);
 			e.pEvent.structRefNano = System.nanoTime();
 			e.refreshTimeout();
 			if (step == Steps.StructureReference)
-				return;
+				return subRange;
 			stepBiomes.generateGroup(e.tParam, region, subRange);
 			e.pEvent.biomeNano = System.nanoTime();
 			e.refreshTimeout();
 			if (step == Steps.Biomes)
-				return;
+				return subRange;
 			stepNoise.generateGroup(e.tParam, region, subRange);
 			e.pEvent.noiseNano = System.nanoTime();
 			e.refreshTimeout();
 			if (step == Steps.Noise)
-				return;
+				return subRange;
 			stepSurface.generateGroup(e.tParam, region, subRange);
 			e.pEvent.surfaceNano = System.nanoTime();
 			e.refreshTimeout();
 			if (step == Steps.Surface)
-				return;
+				return subRange;
 			if (step == Steps.Carvers)
-				return;
+				return subRange;
 			stepFeatures.generateGroup(e.tParam, region, subRange);
 			e.pEvent.featureNano = System.nanoTime();
 			e.refreshTimeout();
-			return;
+			return subRange;
 		}
 		finally
 		{
@@ -565,6 +579,10 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 				{
 					if (p instanceof ProtoChunk)
 						((ProtoChunk) p).setLightCorrect(true);
+					if (p instanceof LevelChunk) {
+						((LevelChunk) p).setLightCorrect(true);
+						((LevelChunk) p).setClientLightReady(true);
+					}
 				});
 				break;
 			}
@@ -585,14 +603,14 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv

 	@Override
 	public void stop(boolean blocking) {
-		EVENT_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)) {
-				EVENT_LOGGER.error("Batch Chunk Generator shutdown failed! Ignoring child threads...");
+				ClientApi.LOGGER.error("Batch Chunk Generator shutdown failed! Ignoring child threads...");
 			}
 		} catch (InterruptedException e) {
-			EVENT_LOGGER.error("Batch Chunk Generator shutdown failed! Ignoring child threads...", e);
+			ClientApi.LOGGER.error("Batch Chunk Generator shutdown failed! Ignoring child threads...", e);
 		}
 	}
 }
@@ -6,10 +6,9 @@ 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;

@@ -71,7 +70,7 @@ public final class GenerationEvent
 	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();
 	}
@@ -4,6 +4,8 @@ package com.seibel.lod.common.wrappers.worldGeneration;
 import com.mojang.datafixers.DataFixer;
 import com.seibel.lod.core.builders.lodBuilding.LodBuilder;
 import com.seibel.lod.core.objects.lod.LodDimension;
+import com.seibel.lod.core.util.SingletonHandler;
+import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftWrapper;

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

 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.WorldGenLevel;
-import net.minecraft.world.level.levelgen.WorldGenSettings;
+import net.minecraft.world.level.levelgen.structure.StructureCheck;

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

 package com.seibel.lod.common.wrappers.worldGeneration.mimicObject;

-import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment;
-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 com.seibel.lod.core.logging.ConfigBasedLogger;
 import net.minecraft.core.Registry;
 import net.minecraft.core.SectionPos;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
+import net.minecraft.nbt.NbtOps;
+import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.level.ChunkTickList;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.LightLayer;
-import net.minecraft.world.level.TickList;
 import net.minecraft.world.level.WorldGenLevel;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.biome.Biomes;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.chunk.ChunkBiomeContainer;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.DataLayer;
 import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.world.level.chunk.LevelChunkSection;
-import net.minecraft.world.level.chunk.ProtoTickList;
+import net.minecraft.world.level.chunk.PalettedContainer;
 import net.minecraft.world.level.chunk.UpgradeData;
 import net.minecraft.world.level.levelgen.Heightmap;
+import net.minecraft.world.level.levelgen.blending.BlendingData;
+import net.minecraft.world.level.levelgen.feature.StructureFeature;
+import net.minecraft.world.level.levelgen.structure.StructureStart;
+import net.minecraft.world.level.levelgen.structure.pieces.StructurePieceSerializationContext;
 import net.minecraft.world.level.lighting.LevelLightEngine;
 import net.minecraft.world.level.material.Fluid;
-import net.minecraft.world.level.material.Fluids;
-
+import net.minecraft.world.ticks.LevelChunkTicks;
 import org.apache.logging.log4j.Logger;

-public class ChunkLoader {
-	private static final ConfigBasedLogger LOGGER = BatchGenerationEnvironment.LOAD_LOGGER;
-
-	private static LevelChunkSection[] readSections(WorldGenLevel level, LevelLightEngine lightEngine,
-			ChunkPos chunkPos, CompoundTag tagLevel) {
-		boolean isLightOn = tagLevel.getBoolean("isLightOn");
-		ListTag listTag = tagLevel.getList("Sections", 10);
-        int i = level.getSectionsCount();
-		LevelChunkSection[] levelChunkSections = new LevelChunkSection[i];
-		boolean bl2 = level.getLevel().dimensionType().hasSkyLight();
-		if (isLightOn)
-			lightEngine.retainData(chunkPos, true);
-		for (int j = 0; j < listTag.size(); j++) {
-			CompoundTag compoundTag3 = listTag.getCompound(j);
-			int k = compoundTag3.getByte("Y");
-			if (compoundTag3.contains("Palette", 9) && compoundTag3.contains("BlockStates", 12)) {
-				LevelChunkSection levelChunkSection = new LevelChunkSection(k << 4);
-				levelChunkSection.getStates().read(compoundTag3.getList("Palette", 10),
-						compoundTag3.getLongArray("BlockStates"));
-				levelChunkSection.recalcBlockCounts();
-				if (!levelChunkSection.isEmpty())
-					levelChunkSections[level.getSectionIndexFromSectionY(k)] = levelChunkSection;
-			}
-			if (isLightOn) {
-				if (compoundTag3.contains("BlockLight", 7))
-					lightEngine.queueSectionData(LightLayer.BLOCK, SectionPos.of(chunkPos, k),
-							new DataLayer(compoundTag3.getByteArray("BlockLight")), true);
-				if (bl2 && compoundTag3.contains("SkyLight", 7))
-					lightEngine.queueSectionData(LightLayer.SKY, SectionPos.of(chunkPos, k),
-							new DataLayer(compoundTag3.getByteArray("SkyLight")), true);
-			}
+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("Chunk file at {} is in the wrong location; Ignoring. (Expected {}, got {})", (Object) chunkPos, (Object) chunkPos, (Object) actualPos);
+	
+	public static LevelChunk read(WorldGenLevel level, LevelLightEngine lightEngine, ChunkPos chunkPos, CompoundTag chunkData)
+	{
+		
+		ChunkPos actualPos = new ChunkPos(chunkData.getInt("xPos"), chunkData.getInt("zPos"));
+		if (!Objects.equals(chunkPos, actualPos))
+		{
+			LOGGER.error("Distant Horizons: Chunk file at {} is in the wrong location; Ignoring. (Expected {}, got {})", (Object) chunkPos, (Object) chunkPos, (Object) actualPos);
 			return null;
 		}
-
-		// ====================== Read params for making the LevelChunk
-		// ============================
-		ChunkBiomeContainer chunkBiomeContainer = new ChunkBiomeContainer(
-				level.getLevel().registryAccess().registryOrThrow(Registry.BIOME_REGISTRY), level, chunkPos,
-				level.getLevel().getChunkSource().getGenerator().getBiomeSource(),
-				tagLevel.contains("Biomes", 11) ? tagLevel.getIntArray("Biomes") : null);
-
-		UpgradeData upgradeData = tagLevel.contains("UpgradeData", 10)
-				? new UpgradeData(tagLevel.getCompound("UpgradeData"), level)
+		
+		ChunkStatus.ChunkType chunkType = readChunkType(chunkData);
+		BlendingData blendingData = readBlendingData(chunkData);
+		if (chunkType == ChunkStatus.ChunkType.PROTOCHUNK && (blendingData == null || !blendingData.oldNoise()))
+			return null;
+		
+		// Prepare the light engine
+		boolean isLightOn = chunkData.getBoolean("isLightOn");
+		if (isLightOn)
+			level.getLightEngine().retainData(chunkPos, true);
+		
+		// Read params for making the LevelChunk
+		UpgradeData upgradeData = chunkData.contains(TAG_UPGRADE_DATA, 10)
+				? new UpgradeData(chunkData.getCompound(TAG_UPGRADE_DATA), level)
 				: UpgradeData.EMPTY;
-
-		TickList<Block> blockTicks = tagLevel.contains("TileTicks", 9)
-				? ChunkTickList.create(tagLevel.getList("TileTicks", 10), Registry.BLOCK::getKey, Registry.BLOCK::get)
-				: new ProtoTickList<Block>(block -> (block == null || block.defaultBlockState().isAir()), chunkPos,
-						tagLevel.getList("ToBeTicked", 9), level);
-
-		TickList<Fluid> liquidTicks = tagLevel.contains("LiquidTicks", 9)
-				? ChunkTickList.create(tagLevel.getList("LiquidTicks", 10), Registry.FLUID::getKey, Registry.FLUID::get)
-				: new ProtoTickList<Fluid>(fluid -> (fluid == null || fluid == Fluids.EMPTY), chunkPos,
-						tagLevel.getList("LiquidsToBeTicked", 9), level);
-
-		long inhabitedTime = tagLevel.getLong("InhabitedTime");
-
-		LevelChunkSection[] levelChunkSections = readSections(level, lightEngine, chunkPos, tagLevel);
-
-		// ======================== Make the chunk
-		// ===========================================
-		LevelChunk chunk = new LevelChunk(level.getLevel(), chunkPos, chunkBiomeContainer, upgradeData, blockTicks,
-				liquidTicks, inhabitedTime, levelChunkSections, null);
-
-		// ========================== Post setup some chunk data
-		// ==============================
-		chunk.setLightCorrect(tagLevel.getBoolean("isLightOn"));
-		readHeightmaps(chunk, tagLevel);
-		readPostPocessings(chunk, tagLevel);
-		// ApiShared.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);
+	}
 }
+
@@ -1,6 +1,6 @@
 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;
@@ -15,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) {
@@ -1,34 +1,24 @@
 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;
-import com.seibel.lod.core.api.ApiShared;
 import com.seibel.lod.core.api.ClientApi;
 import com.seibel.lod.core.enums.config.LightGenerationMode;

 import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
-import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
-import net.minecraft.Util;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.color.block.BlockTintCache;
-import net.minecraft.client.renderer.BiomeColors;
 import net.minecraft.core.BlockPos;
-import net.minecraft.core.Cursor3D;
 import net.minecraft.core.SectionPos;
 import net.minecraft.server.level.ServerLevel;
 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.ColorResolver;
+import net.minecraft.world.level.LevelHeightAccessor;
 import net.minecraft.world.level.LightLayer;
 import net.minecraft.world.level.StructureFeatureManager;
-import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
@@ -49,32 +39,21 @@ public class LightedWorldGenRegion extends WorldGenRegion {
 	public final int size;
 	private final ChunkPos firstPos;
 	private final List<ChunkAccess> cache;
+	private final StructureFeatureManager structFeat;
 	Long2ObjectOpenHashMap<ChunkAccess> chunkMap = new Long2ObjectOpenHashMap<ChunkAccess>();
-	private ChunkPos overrideCenterPos = null;
-	
-	public void setOverrideCenter(ChunkPos pos) {overrideCenterPos = pos;}
-	@Override
-	public ChunkPos getCenter() {
-		return overrideCenterPos==null ? super.getCenter() : overrideCenterPos;
-	}

 	public LightedWorldGenRegion(ServerLevel serverLevel, WorldGenLevelLightEngine lightEngine,
-			List<ChunkAccess> list, ChunkStatus chunkStatus, int i,
+			StructureFeatureManager structFeat, List<ChunkAccess> list, ChunkStatus chunkStatus, int i,
 			LightGenerationMode lightMode, EmptyChunkGenerator generator) {
 		super(serverLevel, list, chunkStatus, i);
 		this.lightMode = lightMode;
 		this.firstPos = list.get(0).getPos();
 		this.generator = generator;
+		this.structFeat = structFeat;
 		light = lightEngine;
 		writeRadius = i;
 		cache = list;
 		size = Mth.floor(Math.sqrt(list.size()));
-
-		this.tintCaches = Util.make(new Object2ObjectArrayMap(3), object2ObjectArrayMap -> {
-			object2ObjectArrayMap.put(BiomeColors.GRASS_COLOR_RESOLVER, new BlockTintCache());
-			object2ObjectArrayMap.put(BiomeColors.FOLIAGE_COLOR_RESOLVER, new BlockTintCache());
-			object2ObjectArrayMap.put(BiomeColors.WATER_COLOR_RESOLVER, new BlockTintCache());
-		});
 	}

 	// Bypass BCLib mixin overrides.
@@ -83,20 +62,26 @@ public class LightedWorldGenRegion extends WorldGenRegion {
        int i = SectionPos.blockToSectionCoord(blockPos.getX());
        int j = SectionPos.blockToSectionCoord(blockPos.getZ());
        ChunkPos chunkPos = this.getCenter();
+        ChunkAccess center = this.getChunk(chunkPos.x, chunkPos.z);
        int k = Math.abs(chunkPos.x - i);
        int l = Math.abs(chunkPos.z - j);
        if (k > this.writeRadius || l > this.writeRadius) {
            return false;
        }
+        if (center.isUpgrading()) {
+            LevelHeightAccessor levelHeightAccessor = center.getHeightAccessorForGeneration();
+            if (blockPos.getY() < levelHeightAccessor.getMinBuildHeight() || blockPos.getY() >= levelHeightAccessor.getMaxBuildHeight()) {
+                return false;
+            }
+        }
        return true;
    }
-
-	// TODO Check this
-//	@Override
-//	public List<? extends StructureStart<?>> startsForFeature(SectionPos sectionPos,
-//			StructureFeature<?> structureFeature) {
-//		return structFeat.startsForFeature(sectionPos, structureFeature);
-//	}
+    
+	@Override
+	public List<? extends StructureStart<?>> startsForFeature(SectionPos sectionPos,
+			StructureFeature<?> structureFeature) {
+		return structFeat.startsForFeature(sectionPos, structureFeature);
+	}

 	// Skip updating the related tile entities
 	@Override
@@ -174,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;
 	}
@@ -198,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;
 		}
@@ -239,37 +224,4 @@ public class LightedWorldGenRegion extends WorldGenRegion {
 		return (getBrightness(LightLayer.SKY, blockPos) >= getMaxLightLevel());
 	}

-	private final Object2ObjectArrayMap<ColorResolver, BlockTintCache> tintCaches;
-
-	public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver)
-	{
-		BlockTintCache blockTintCache = (BlockTintCache) this.tintCaches.get(colorResolver);
-		return blockTintCache.getColor(blockPos, null); // FIXME[Generator]: Replace this null with something else
-	}
-
-	private Biome _getBiome(BlockPos pos) {
-		return getBiome(pos);
-	}
-
-	public int calculateBlockTint(BlockPos blockPos, ColorResolver colorResolver)
-	{
-		int i = (Minecraft.getInstance()).options.biomeBlendRadius;
-		if (i == 0)
-			return colorResolver.getColor((Biome) getBiome(blockPos), blockPos.getX(), blockPos.getZ());
-		int j = (i * 2 + 1) * (i * 2 + 1);
-		int k = 0;
-		int l = 0;
-		int m = 0;
-		Cursor3D cursor3D = new Cursor3D(blockPos.getX() - i, blockPos.getY(), blockPos.getZ() - i, blockPos.getX() + i, blockPos.getY(), blockPos.getZ() + i);
-		BlockPos.MutableBlockPos mutableBlockPos = new BlockPos.MutableBlockPos();
-		while (cursor3D.advance())
-		{
-			mutableBlockPos.set(cursor3D.nextX(), cursor3D.nextY(), cursor3D.nextZ());
-			int n = colorResolver.getColor((Biome) getBiome((BlockPos) mutableBlockPos), mutableBlockPos.getX(), mutableBlockPos.getZ());
-			k += (n & 0xFF0000) >> 16;
-			l += (n & 0xFF00) >> 8;
-			m += n & 0xFF;
-		}
-		return (k / j & 0xFF) << 16 | (l / j & 0xFF) << 8 | m / j & 0xFF;
-	}
 }
@@ -125,10 +125,9 @@ public class WorldGenLevelLightEngine extends LevelLightEngine {
        LevelChunkSection[] levelChunkSections = chunkAccess.getSections();
        for (int i = 0; i < chunkAccess.getSectionsCount(); ++i) {
            LevelChunkSection levelChunkSection = levelChunkSections[i];
-			if (!LevelChunkSection.isEmpty(levelChunkSection)) {
-	            int j = this.levelHeightAccessor.getSectionYFromSectionIndex(i);
-				updateSectionStatus(SectionPos.of(chunkPos, j), false);
-			}
+            if (levelChunkSection.hasOnlyAir()) continue;
+            int j = this.levelHeightAccessor.getSectionYFromSectionIndex(i);
+            updateSectionStatus(SectionPos.of(chunkPos, j), false);
        }
        enableLightSources(chunkPos, true);
        if (needLightBlockUpdate) {
@@ -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 {
-	final WorldGenLevel genLevel;
+	WorldGenLevel genLevel;
 	WorldGenSettings worldGenSettings;
-	public WorldGenStructFeatManager(WorldGenSettings worldGenSettings,
-			WorldGenLevel genLevel) {
-		super(genLevel, worldGenSettings);
+	StructureCheck structureCheck;
+	public WorldGenStructFeatManager(LevelAccessor levelAccessor, WorldGenSettings 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(worldGenSettings, worldGenRegion);
-	}
-
-	private ChunkAccess _getChunk(int x, int z, ChunkStatus status) {
-		if (genLevel == null) return null;
-		return genLevel.getChunk(x, z, status, false);
+		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();
 	}
 }
@@ -3,43 +3,53 @@ package com.seibel.lod.common.wrappers.worldGeneration.step;
 import java.util.ArrayList;
 import java.util.List;

-import com.seibel.lod.common.wrappers.worldGeneration.ThreadedParameters;
 import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment;
+import com.seibel.lod.common.wrappers.worldGeneration.ThreadedParameters;

+import net.minecraft.core.Registry;
 import net.minecraft.server.level.WorldGenRegion;
+import net.minecraft.world.level.StructureFeatureManager;
+import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.chunk.ChunkAccess;
+import net.minecraft.world.level.chunk.ChunkGenerator;
 import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.ProtoChunk;
+import net.minecraft.world.level.levelgen.DebugLevelSource;
+import net.minecraft.world.level.levelgen.FlatLevelSource;
+import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator;
+import net.minecraft.world.level.levelgen.blending.Blender;

 public final class StepBiomes {
 	/**
 	 * 
 	 */
-	private final BatchGenerationEnvironment envionment;
+	private final BatchGenerationEnvironment environment;

 	/**
-	 * @param worldGenerationEnvironment
+	 * @param batchGenerationEnvironment
 	 */
-	public StepBiomes(BatchGenerationEnvironment worldGenerationEnvironment) {
-		envionment = worldGenerationEnvironment;
+	public StepBiomes(BatchGenerationEnvironment batchGenerationEnvironment)
+	{
+		environment = batchGenerationEnvironment;
 	}

 	public final ChunkStatus STATUS = ChunkStatus.BIOMES;
-
-	public void generateGroup(ThreadedParameters tParams, WorldGenRegion worldGenRegion, List<ChunkAccess> chunks) {
+	
+	public void generateGroup(ThreadedParameters tParams, WorldGenRegion worldGenRegion,
+			List<ChunkAccess> chunks) {

 		ArrayList<ChunkAccess> chunksToDo = new ArrayList<ChunkAccess>();
-
+		
 		for (ChunkAccess chunk : chunks) {
-			if (chunk.getStatus().isOrAfter(STATUS))
-				continue;
+			if (chunk.getStatus().isOrAfter(STATUS)) continue;
 			((ProtoChunk) chunk).setStatus(STATUS);
 			chunksToDo.add(chunk);
 		}
-
+		
 		for (ChunkAccess chunk : chunksToDo) {
 			// System.out.println("StepBiomes: "+chunk.getPos());
-			envionment.params.generator.createBiomes(envionment.params.biomes, chunk);
+			chunk = environment.joinSync(environment.params.generator.createBiomes(environment.params.biomes, Runnable::run, Blender.of(worldGenRegion),
+					tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk));
 		}
 	}
 }
@@ -2,49 +2,59 @@ package com.seibel.lod.common.wrappers.worldGeneration.step;

 import java.util.ArrayList;

-import com.seibel.lod.common.wrappers.worldGeneration.ThreadedParameters;
-import com.seibel.lod.common.wrappers.worldGeneration.mimicObject.LightedWorldGenRegion;
 import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment;
+import com.seibel.lod.common.wrappers.worldGeneration.ThreadedParameters;
+import com.seibel.lod.core.util.GridList;

-import com.seibel.lod.core.util.gridList.ArrayGridList;
 import net.minecraft.ReportedException;
+import net.minecraft.server.level.WorldGenRegion;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.ProtoChunk;
+import net.minecraft.world.level.levelgen.blending.Blender;

 public final class StepFeatures {
 	/**
 	 * 
 	 */
-	private final BatchGenerationEnvironment envionment;
+	private final BatchGenerationEnvironment environment;

 	/**
-	 * @param worldGenerationEnvironment
+	 * @param batchGenerationEnvironment
 	 */
-	public StepFeatures(BatchGenerationEnvironment worldGenerationEnvironment) {
-		envionment = worldGenerationEnvironment;
+	public StepFeatures(BatchGenerationEnvironment batchGenerationEnvironment)
+	{
+		environment = batchGenerationEnvironment;
 	}

 	public final ChunkStatus STATUS = ChunkStatus.FEATURES;

-	public void generateGroup(ThreadedParameters tParams, LightedWorldGenRegion worldGenRegion, ArrayGridList<ChunkAccess> chunks) {
+	public void generateGroup(ThreadedParameters tParams, WorldGenRegion worldGenRegion,
+			GridList<ChunkAccess> chunks) {
 		ArrayList<ChunkAccess> chunksToDo = new ArrayList<ChunkAccess>();
-
+		
 		for (ChunkAccess chunk : chunks) {
-			if (chunk.getStatus().isOrAfter(STATUS))
-				continue;
+			if (chunk.getStatus().isOrAfter(STATUS)) continue;
 			((ProtoChunk) chunk).setStatus(STATUS);
 			chunksToDo.add(chunk);
 		}
-
+		
 		for (ChunkAccess chunk : chunksToDo) {
 			try {
-				worldGenRegion.setOverrideCenter(chunk.getPos());
-				envionment.params.generator.applyBiomeDecoration(worldGenRegion, tParams.structFeat);
+				environment.params.generator.applyBiomeDecoration(worldGenRegion, chunk,
+						tParams.structFeat.forWorldGenRegion(worldGenRegion));
+				Blender.generateBorderTicks(worldGenRegion, chunk);
 			} catch (ReportedException e) {
 				e.printStackTrace();
+				// FIXME: Features concurrent modification issue. Something about cocobeans just
+				// aren't happy
+				// For now just retry.
 			}
-		}
-		worldGenRegion.setOverrideCenter(null);
+		}/*
+		for (ChunkAccess chunk : chunks) {
+			Heightmap.primeHeightmaps(chunk,
+					EnumSet.of(Heightmap.Types.MOTION_BLOCKING, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES,
+							Heightmap.Types.OCEAN_FLOOR, Heightmap.Types.WORLD_SURFACE));
+		}*/
 	}
 }
@@ -2,8 +2,8 @@ package com.seibel.lod.common.wrappers.worldGeneration.step;

 import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment;
 import com.seibel.lod.common.wrappers.worldGeneration.mimicObject.WorldGenLevelLightEngine;
+import com.seibel.lod.core.util.GridList;

-import com.seibel.lod.core.util.gridList.ArrayGridList;
 import net.minecraft.server.level.ThreadedLevelLightEngine;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ChunkStatus;
@@ -28,7 +28,7 @@ public final class StepLight {
 	public final ChunkStatus STATUS = ChunkStatus.LIGHT;
 	
 	public void generateGroup(LightEventListener lightEngine,
-							  ArrayGridList<ChunkAccess> chunks) {
+			GridList<ChunkAccess> chunks) {
 		//ArrayList<ChunkAccess> chunksToDo = new ArrayList<ChunkAccess>();
 		
 		for (ChunkAccess chunk : chunks) {
@@ -52,6 +52,7 @@ public final class StepLight {
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
+			if (chunk instanceof LevelChunk) ((LevelChunk)chunk).setClientLightReady(true);
 			chunk.setLightCorrect(true);
 		}
 		lightEngine.runUpdates(Integer.MAX_VALUE, true, true);
@@ -3,14 +3,15 @@ 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.google.common.collect.Sets;
 import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment;
 import com.seibel.lod.common.wrappers.worldGeneration.ThreadedParameters;

-import net.minecraft.core.QuartPos;
 import net.minecraft.server.level.WorldGenRegion;
 import net.minecraft.util.Mth;
+import net.minecraft.world.level.LevelHeightAccessor;
 import net.minecraft.world.level.StructureFeatureManager;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ChunkStatus;
@@ -18,6 +19,7 @@ import net.minecraft.world.level.chunk.LevelChunkSection;
 import net.minecraft.world.level.chunk.ProtoChunk;
 import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator;
 import net.minecraft.world.level.levelgen.NoiseSettings;
+import net.minecraft.world.level.levelgen.blending.Blender;

 public final class StepNoise {
 	/**
@@ -48,8 +50,8 @@ public final class StepNoise {
 		
 		for (ChunkAccess chunk : chunksToDo) {
 			// System.out.println("StepNoise: "+chunk.getPos());
-			chunk = environment.joinSync(environment.params.generator.fillFromNoise(Runnable::run, 
-					tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk));
+			chunk = environment.joinSync(environment.params.generator.fillFromNoise(Runnable::run, Blender.of(worldGenRegion),
+						tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk));
 		}
 	}
 }
@@ -53,6 +53,14 @@ public final class StepStructureStart {
 				// System.out.println("StepStructureStart: "+chunk.getPos());
 				environment.params.generator.createStructures(environment.params.registry, tParams.structFeat, chunk, environment.params.structures,
 						environment.params.worldSeed);
+				try {
+					tParams.structCheck.onStructureLoad(chunk.getPos(), chunk.getAllStarts());
+				} catch (ArrayIndexOutOfBoundsException e) {
+					// There's a rare issue with StructStart where it throws ArrayIndexOutOfBounds
+					// This means the structFeat is corrupted (For some reason) and I need to reset it.
+					// TODO: Figure out in the future why this happens even though I am using new structFeat
+					throw new StepStructureStart.StructStartCorruptedException(e);
+				}
 			}
 		}
 	}
@@ -39,7 +39,8 @@ public final class StepSurface {
 		
 		for (ChunkAccess chunk : chunksToDo) {
 			// System.out.println("StepSurface: "+chunk.getPos());
-			environment.params.generator.buildSurfaceAndBedrock(worldGenRegion, chunk);
+			environment.params.generator.buildSurface(worldGenRegion, tParams.structFeat.forWorldGenRegion(worldGenRegion),
+					chunk);
 		}
 	}
 }
@@ -1,6 +1,6 @@
 accessWidener v1 named

-# used when determining where to save files to
+# used when determining where to save files too
 accessible field net/minecraft/world/level/storage/DimensionDataStorage dataFolder Ljava/io/File;

 # used when rendering
@@ -8,12 +8,9 @@ accessible field com/mojang/blaze3d/vertex/VertexBuffer indexCount I
 accessible field com/mojang/blaze3d/vertex/VertexBuffer vertextBufferId I
 accessible method net/minecraft/client/renderer/GameRenderer getFov (Lnet/minecraft/client/Camera;FZ)D

-# pre-render setup
-accessible field net/minecraft/client/renderer/LevelRenderer renderChunks Lit/unimi/dsi/fastutil/objects/ObjectArrayList;
-accessible class net/minecraft/client/renderer/LevelRenderer$RenderChunkInfo
-accessible field net/minecraft/client/renderer/LevelRenderer$RenderChunkInfo chunk Lnet/minecraft/client/renderer/chunk/ChunkRenderDispatcher$RenderChunk;
-
 # used for grabbing vanilla rendered chunks
+accessible field net/minecraft/client/renderer/LevelRenderer renderChunkStorage Ljava/util/concurrent/atomic/AtomicReference;
+accessible class net/minecraft/client/renderer/LevelRenderer$RenderChunkStorage
 accessible class net/minecraft/client/renderer/LevelRenderer$RenderChunkInfo
 accessible field net/minecraft/client/renderer/LevelRenderer$RenderChunkInfo chunk Lnet/minecraft/client/renderer/chunk/ChunkRenderDispatcher$RenderChunk;

@@ -25,28 +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/biome/Biome biomeCategory Lnet/minecraft/world/level/biome/Biome$BiomeCategory;
-# accessible field net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator settings Lnet/minecraft/core/Holder;
 accessible field net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator settings Ljava/util/function/Supplier;
-#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/levelgen/NoiseBasedChunkGenerator doFill (Lnet/minecraft/world/level/StructureFeatureManager;Lnet/minecraft/world/level/chunk/ChunkAccess;II)Lnet/minecraft/world/level/chunk/ChunkAccess;
-
+accessible method net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator doFill (Lnet/minecraft/world/level/levelgen/blending/Blender;Lnet/minecraft/world/level/StructureFeatureManager;Lnet/minecraft/world/level/chunk/ChunkAccess;II)Lnet/minecraft/world/level/chunk/ChunkAccess;
+accessible method net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator doCreateBiomes (Lnet/minecraft/core/Registry;Lnet/minecraft/world/level/levelgen/blending/Blender;Lnet/minecraft/world/level/StructureFeatureManager;Lnet/minecraft/world/level/chunk/ChunkAccess;)V
 accessible method net/minecraft/world/level/lighting/LayerLightEngine queueSectionData (JLnet/minecraft/world/level/chunk/DataLayer;Z)V
-accessible field net/minecraft/world/level/chunk/ChunkGenerator biomeSource Lnet/minecraft/world/level/biome/BiomeSource;

 # lod generation from save file
 accessible field net/minecraft/server/level/ChunkMap mainThreadExecutor Lnet/minecraft/util/thread/BlockableEventLoop;
 accessible method net/minecraft/server/level/ChunkMap readChunk (Lnet/minecraft/world/level/ChunkPos;)Lnet/minecraft/nbt/CompoundTag;

+
 # grabbing textures
 accessible field net/minecraft/client/renderer/texture/TextureAtlasSprite animatedTexture Lnet/minecraft/client/renderer/texture/TextureAtlasSprite$AnimatedTexture;
 accessible field net/minecraft/client/renderer/texture/TextureAtlasSprite width I
 accessible field net/minecraft/client/renderer/texture/TextureAtlasSprite height I
 accessible field net/minecraft/client/renderer/texture/TextureAtlasSprite mainImage [Lcom/mojang/blaze3d/platform/NativeImage;
+accessible class net/minecraft/client/renderer/texture/TextureAtlasSprite$AnimatedTexture
 accessible method net/minecraft/client/renderer/texture/TextureAtlasSprite$AnimatedTexture getFrameX (I)I
 accessible method net/minecraft/client/renderer/texture/TextureAtlasSprite$AnimatedTexture getFrameY (I)I
 extendable class com/mojang/math/Matrix4f

 # hacky stuff
-accessible field net/minecraft/world/level/chunk/PalettedContainer lock Ljava/util/concurrent/Semaphore;
-mutable field net/minecraft/world/level/chunk/PalettedContainer lock Ljava/util/concurrent/Semaphore;
+accessible field net/minecraft/util/ThreadingDetector lock Ljava/util/concurrent/Semaphore;
+mutable field net/minecraft/util/ThreadingDetector lock Ljava/util/concurrent/Semaphore;
@@ -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")
@@ -17,10 +17,6 @@ configurations {
    compileClasspath.extendsFrom common
    runtimeClasspath.extendsFrom common
    developmentFabric.extendsFrom common
-
-    addModJar
-    include.extendsFrom addModJar
-    modImplementation.extendsFrom addModJar
 }

 repositories {
@@ -40,25 +36,29 @@ dependencies {
    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"

    // Fabric API
-    addModJar(fabricApi.module("fabric-lifecycle-events-v1", rootProject.fabric_api_version))
-    addModJar(fabricApi.module("fabric-key-binding-api-v1", rootProject.fabric_api_version))
-    addModJar(fabricApi.module("fabric-networking-api-v1", rootProject.fabric_api_version))
+    modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"

    // Mod Menu
    modImplementation("com.terraformersmc:modmenu:${rootProject.modmenu_version}") {
        exclude(group: "net.fabricmc.fabric-api")
    }

+    // Starlight
+    addMod("curse.maven:starlight-521783:${rootProject.starlight_version_fabric}", rootProject.enable_starlight)
+
    // Sodium
    addMod("curse.maven:sodium-394468:${rootProject.sodium_version}", rootProject.enable_sodium)
    implementation "org.joml:joml:1.10.2"
-
-    // Lithium
+	
+	// Lithium
    addMod("maven.modrinth:lithium:${rootProject.lithium_version}", rootProject.enable_lithium)

    // Iris
    addMod("maven.modrinth:iris:${rootProject.iris_version}", rootProject.enable_iris)

+    // BCLib
+    addMod("com.github.paulevsGitch:BCLib:${rootProject.bclib_version}", rootProject.enable_bclib)
+
    // Immersive Portals
    /*
    modImplementation("com.github.qouteall.ImmersivePortalsMod:build:${rootProject.immersive_portals_version}") {
@@ -73,7 +73,7 @@ dependencies {
        exclude(group: "net.fabricmc.fabric-api")
        transitive(false)
    }
-     */
+    */



@@ -19,7 +19,6 @@

 package com.seibel.lod.fabric;

-import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment;
 import com.seibel.lod.core.api.ClientApi;
 import com.seibel.lod.core.api.EventApi;
 import com.mojang.blaze3d.platform.InputConstants;
@@ -27,14 +26,15 @@ 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 net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientChunkEvents;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
+import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerWorldEvents;
+import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.MinecraftServer;
@@ -43,14 +43,14 @@ import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.chunk.LevelChunk;

 import java.util.HashSet;
-import java.util.function.Supplier;
+import java.util.List;

 import org.lwjgl.glfw.GLFW;

 /**
 * This handles all events sent to the client,
 * and is the starting point for most of the mod.
- *
+ * 
 * @author coolGi2007
 * @author Ran
 * @version 11-23-2021
@@ -60,7 +60,6 @@ public class ClientProxy
 	private final EventApi eventApi = EventApi.INSTANCE;
 	private final ClientApi clientApi = ClientApi.INSTANCE;

-	public static Supplier<Boolean> isGenerationThreadChecker = null;

 	/**
 	 * Registers Fabric Events
@@ -68,7 +67,7 @@ public class ClientProxy
 	 */
 	public void registerEvents() {
 		// TODO: Fix this if it's wrong
-
+		
 		/* Registor the mod accessor*/

 		/* World Events */
@@ -77,12 +76,12 @@ public class ClientProxy

 		/* World Events */
 		//ServerChunkEvents.CHUNK_LOAD.register(this::chunkLoadEvent);
-		ClientChunkEvents.CHUNK_LOAD.register(this::chunkLoadEvent);
+		//ClientChunkEvents.CHUNK_LOAD.register(this::chunkLoadEvent);

 		/* World Events */
 		ServerWorldEvents.LOAD.register((server, level) -> this.worldLoadEvent(level));
 		ServerWorldEvents.UNLOAD.register((server, level) -> this.worldUnloadEvent(level));
-
+		
 		/* The Client World Events are in the mixins
 		Client world load event is in MixinClientLevel
 		Client world unload event is in MixinMinecraft */
@@ -92,7 +91,6 @@ public class ClientProxy
 		ClientTickEvents.END_CLIENT_TICK.register(client -> {
 			if (client.player != null) onKeyInput();
 		});
-		isGenerationThreadChecker = BatchGenerationEnvironment::isCurrentThreadDistantGeneratorThread;
 	}


@@ -111,7 +109,7 @@ public class ClientProxy
 	{
 		eventApi.worldSaveEvent();
 	}
-
+	
 	/** This is also called when a new dimension loads */
 	public void worldLoadEvent(Level level)
 	{
@@ -154,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>();
 	
@@ -168,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);
 				}
@@ -21,17 +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.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.fabric.wrappers.FabricDependencySetup;
+import com.seibel.lod.core.wrapperInterfaces.modAccessor.IStarlightAccessor;
 import com.seibel.lod.fabric.wrappers.modAccessor.ModChecker;
 import com.seibel.lod.fabric.wrappers.modAccessor.OptifineAccessor;
 import com.seibel.lod.fabric.wrappers.modAccessor.SodiumAccessor;
+import com.seibel.lod.fabric.wrappers.modAccessor.StarlightAccessor;
+import com.seibel.lod.fabric.wrappers.DependencySetup;

 import net.fabricmc.api.ClientModInitializer;

@@ -39,14 +40,14 @@ import net.fabricmc.api.ClientModInitializer;
 * Initialize and setup the Mod. <br>
 * If you are looking for the real start of the mod
 * check out the ClientProxy.
- *
+ * 
 * @author coolGi2007
 * @author Ran
 * @version 12-1-2021
 */
 public class Main implements ClientModInitializer
 {
-	// This is a client mod, so it should implement ClientModInitializer and in fabric.mod.json it should have "environment": "client"
+	// This is a client mod so it should implement ClientModInitializer and in fabric.mod.json it should have "environment": "client"
 	// Once it works on servers change the implement to ModInitializer and in fabric.mod.json it should be "environment": "*"

 	public static ClientProxy client_proxy;
@@ -63,28 +64,28 @@ public class Main implements ClientModInitializer
 	public static void init() {
 		LodCommonMain.initConfig();
 		LodCommonMain.startup(null, false);
-		FabricDependencySetup.createInitialBindings();
-		FabricDependencySetup.finishBinding();
-		ApiShared.LOGGER.info(ModInfo.READABLE_NAME + ", Version: " + ModInfo.VERSION);
+		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")) {
-			ModAccessorHandler.bind(ISodiumAccessor.class, new SodiumAccessor());
+			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")) {
-			ModAccessorHandler.bind(IOptifineAccessor.class, new OptifineAccessor());
+			ModAccessorApi.bind(IOptifineAccessor.class, new OptifineAccessor());
 		}
-
-		ModAccessorHandler.finishBinding();
 	}

 	public static void initServer() {
 		LodCommonMain.initConfig();
 		LodCommonMain.startup(null, true);
-		FabricDependencySetup.createInitialBindings();
-		FabricDependencySetup.finishBinding();
-		ApiShared.LOGGER.info(ModInfo.READABLE_NAME + ", Version: " + ModInfo.VERSION);
+		DependencySetup.createInitialBindings();
+		ClientApi.LOGGER.info(ModInfo.READABLE_NAME + ", Version: " + ModInfo.VERSION);
 	}
 }
@@ -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);
-		}
-	}
-}
@@ -6,7 +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.handlers.dependencyInjection.SingletonHandler;
+import com.seibel.lod.core.util.SingletonHandler;
 import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;

 import net.minecraft.client.Camera;
@@ -19,8 +19,8 @@ import net.minecraft.world.level.material.FogType;

@Mixin(FogRenderer.class)
 public class MixinFogRenderer {
-    private static final ILodConfigWrapperSingleton CONFIG = SingletonHandler.get(ILodConfigWrapperSingleton.class);
-
+	private static final ILodConfigWrapperSingleton CONFIG = SingletonHandler.get(ILodConfigWrapperSingleton.class);
+	
 	// Using this instead of Float.MAX_VALUE because Sodium don't like it.
 	private static final float A_REALLY_REALLY_BIG_VALUE = 420694206942069.F;
 	private static final float A_EVEN_LARGER_VALUE = 42069420694206942069.F;
@@ -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
@@ -35,18 +35,18 @@ public class MixinOptionsScreen extends Screen {
    private void lodconfig$init(CallbackInfo ci) {
        if (SingletonHandler.get(ILodConfigWrapperSingleton.class).client().getOptionsButton())
            this.addRenderableWidget(new TexturedButtonWidget(
-                    // Where the button is on the screen
-                    this.width / 2 - 180, this.height / 6 - 12,
-                    // Width and height of the button
-                    20, 20,
-                    // Offset
-                    0, 0,
-                    // Some textuary stuff
-                    20, ICON_TEXTURE, 20, 40,
-                    // Create the button and tell it where to go
-                    // For now it goes to the client option by default
-                    (buttonWidget) -> Objects.requireNonNull(minecraft).setScreen(ConfigGui.getScreen(this, "client")),
-                    // Add a title to the screen
-                    new TranslatableComponent("text.autoconfig." + ModInfo.ID + ".title")));
+                // Where the button is on the screen
+                this.width / 2 - 180, this.height / 6 - 12,
+                // Width and height of the button
+                20, 20,
+                // Offset
+                0, 0,
+                // Some textuary stuff
+                20, ICON_TEXTURE, 20, 40,
+                // Create the button and tell it where to go
+                // For now it goes to the client option by default
+                (buttonWidget) -> Objects.requireNonNull(minecraft).setScreen(ConfigGui.getScreen(this, "client")),
+                // Add a title to the screen
+                new TranslatableComponent("text.autoconfig." + ModInfo.ID + ".title")));
    }
 }
@@ -1,8 +1,8 @@
 package com.seibel.lod.fabric.mixins;

-import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.function.Supplier;

-import com.seibel.lod.fabric.ClientProxy;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -10,40 +10,43 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;

 import com.seibel.lod.common.wrappers.DependencySetupDoneCheck;
 import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment;
-import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
-import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory;
+import com.seibel.lod.core.api.ClientApi;
+import com.seibel.lod.core.util.DummyRunExecutorService;

 import net.minecraft.Util;

@Mixin(Util.class)
 public class MixinUtilBackgroudThread
 {
-	private static boolean doTriggerOverride() {
-		try {
-			return DependencySetupDoneCheck.getIsCurrentThreadDistantGeneratorThread.get();
-		} catch (NullPointerException e) {
-			return false;
-		}
-	}
 	
 	@Inject(method = "wrapThreadWithTaskName(Ljava/lang/String;Ljava/lang/Runnable;)Ljava/lang/Runnable;",
 			at = @At("HEAD"), cancellable = true)
 	private static void overrideUtil$wrapThreadWithTaskName(String string, Runnable r, CallbackInfoReturnable<Runnable> ci)
 	{
-		if (ClientProxy.isGenerationThreadChecker != null && ClientProxy.isGenerationThreadChecker.get())
+		if (DependencySetupDoneCheck.isDone && BatchGenerationEnvironment.isCurrentThreadDistantGeneratorThread())
 		{
-			// ApiShared.LOGGER.info("util wrapThreadWithTaskName(Runnable) triggered");
+			//ClientApi.LOGGER.info("util wrapThreadWithTaskName(Runnable) triggered");
 			ci.setReturnValue(r);
 		}
 	}
-
-	@Inject(method = "backgroundExecutor", at = @At("HEAD"), cancellable = true)
-	private static void overrideUtil$backgroundExecutor(CallbackInfoReturnable<Executor> ci)
+	@Inject(method = "wrapThreadWithTaskName(Ljava/lang/String;Ljava/util/function/Supplier;)Ljava/util/function/Supplier;",
+			at = @At("HEAD"), cancellable = true)
+	private static void overrideUtil$wrapThreadWithTaskNameForSupplier(String string, Supplier<?> r, CallbackInfoReturnable<Supplier<?>> ci)
 	{
-		if (ClientProxy.isGenerationThreadChecker != null && ClientProxy.isGenerationThreadChecker.get())
+		if (DependencySetupDoneCheck.isDone && BatchGenerationEnvironment.isCurrentThreadDistantGeneratorThread())
 		{
-			// ApiShared.LOGGER.info("util backgroundExecutor triggered");
-			ci.setReturnValue(Runnable::run);
+			//ClientApi.LOGGER.info("util wrapThreadWithTaskName(Supplier) triggered");
+			ci.setReturnValue(r);
+		}
+	}
+	
+	@Inject(method = "backgroundExecutor", at = @At("HEAD"), cancellable = true)
+	private static void overrideUtil$backgroundExecutor(CallbackInfoReturnable<ExecutorService> ci)
+	{
+		if (DependencySetupDoneCheck.isDone && BatchGenerationEnvironment.isCurrentThreadDistantGeneratorThread())
+		{
+			//ClientApi.LOGGER.info("util backgroundExecutor triggered");
+			ci.setReturnValue(new DummyRunExecutorService());
 		}
 	}
 }
@@ -21,7 +21,6 @@ package com.seibel.lod.fabric.mixins;

 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Matrix4f;
-import com.seibel.lod.common.Config;
 import com.seibel.lod.common.wrappers.McObjectConverter;
 import com.seibel.lod.core.api.ClientApi;
 import com.seibel.lod.core.objects.math.Mat4f;
@@ -61,11 +60,8 @@ public class MixinWorldRenderer
 		previousPartialTicks = tickDelta;
 	}

-	// Inject rendering at first call to renderChunkLayer
 	// HEAD or RETURN
-	@Inject(at = @At("HEAD"),
-			method = "renderChunkLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDDLcom/mojang/math/Matrix4f;)V",
-			cancellable = true)
+	@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
@@ -76,8 +72,5 @@ public class MixinWorldRenderer

 			ClientApi.INSTANCE.renderLods(mcModelViewMatrix, mcProjectionMatrix, previousPartialTicks);
 		}
-		if (Config.Client.Advanced.lodOnlyMode) {
-			callback.cancel();
-		}
 	}
 }
@@ -18,11 +18,10 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 */
@Mixin(ClientboundBlockUpdatePacket.class)
 public abstract class MixinBlockUpdate {
-    @Shadow
-    public abstract BlockPos getPos();
+    @Shadow public abstract BlockPos getPos();

    @Inject(method = "handle(Lnet/minecraft/network/protocol/game/ClientGamePacketListener;)V", at = @At("TAIL"))
    private void onBlockUpdate(ClientGamePacketListener clientGamePacketListener, CallbackInfo ci) {
        Main.client_proxy.blockChangeEvent(Minecraft.getInstance().player.clientLevel, this.getPos());
    }
-}
+}
@@ -5,8 +5,7 @@ import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.multiplayer.ClientPacketListener;
 import net.minecraft.client.renderer.LevelRenderer;
 import net.minecraft.resources.ResourceKey;
-import net.minecraft.util.profiling.ProfilerFiller;
-import net.minecraft.world.level.Level;
+import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.world.level.dimension.DimensionType;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -22,7 +21,14 @@ import java.util.function.Supplier;
@Mixin(ClientLevel.class)
 public class MixinClientLevel {
    @Inject(method = "<init>", at = @At("TAIL"))
-    private void loadWorldEvent(ClientPacketListener clientPacketListener, ClientLevel.ClientLevelData clientLevelData, ResourceKey<Level> resourceKey, DimensionType dimensionType, int i, Supplier<ProfilerFiller> supplier, LevelRenderer levelRenderer, boolean bl, long l, CallbackInfo ci) {
+    private void loadWorldEvent(ClientPacketListener clientPacketListener, ClientLevel.ClientLevelData clientLevelData, ResourceKey resourceKey, DimensionType dimensionType, int i, int j, Supplier supplier, LevelRenderer levelRenderer, boolean bl, long l, CallbackInfo ci) {
        Main.client_proxy.worldLoadEvent((ClientLevel) (Object) this);
    }
+    @Inject(method = "setLightReady", at = @At("HEAD"))
+    private void onChunkLightReady(int x, int z, CallbackInfo ci) {
+    	ClientLevel l = (ClientLevel) (Object) this;
+    	LevelChunk chunk = l.getChunkSource().getChunk(x, z, false);
+    	if (chunk!=null && !chunk.isClientLightReady())
+    		Main.client_proxy.chunkLoadEvent(l, chunk);
+    }
 }
@@ -1,8 +1,9 @@
 package com.seibel.lod.fabric.mixins.unsafe;

-import net.minecraft.world.level.chunk.PalettedContainer;
+import net.minecraft.util.ThreadingDetector;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Mutable;
+import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -10,14 +11,12 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 import java.util.concurrent.Semaphore;

 /**
- * NOTE: THIS IS NOT A FIX TO THE PROBLEM.
- * TODO: Do/Find an actual fix to this
- *
- * @author Ran
+ * Why does this exist? But okay! (Will be probably removed when the experimental generator is done)
 */
-@Mixin(PalettedContainer.class)
-public class MixinPalettedContainer {
+@Mixin(ThreadingDetector.class)
+public class MixinThreadingDectector {
    @Mutable
+    @Shadow
    private Semaphore lock;

    @Inject(method = "<init>", at = @At("RETURN"))
@@ -0,0 +1,28 @@
+package com.seibel.lod.fabric.wrappers;
+
+import com.seibel.lod.common.LodCommonMain;
+import com.seibel.lod.common.wrappers.config.NewLodConfigWrapperSingleton;
+import com.seibel.lod.core.util.SingletonHandler;
+import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
+import com.seibel.lod.common.wrappers.config.LodConfigWrapperSingleton;
+
+/**
+ * Binds all necessary dependencies, so we
+ * can access them in Core. <br>
+ * This needs to be called before any Core classes
+ * are loaded.
+ * 
+ * @author James Seibel
+ * @author Ran
+ * @version 12-1-2021
+ */
+public class DependencySetup
+{
+	public static void createInitialBindings()
+	{
+		if (!LodCommonMain.IsNewConfig)
+			SingletonHandler.bind(ILodConfigWrapperSingleton.class, LodConfigWrapperSingleton.INSTANCE);
+		else
+			SingletonHandler.bind(ILodConfigWrapperSingleton.class, NewLodConfigWrapperSingleton.INSTANCE);
+	}
+}
@@ -1,31 +0,0 @@
-package com.seibel.lod.fabric.wrappers;
-
-import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
-import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
-import com.seibel.lod.common.wrappers.config.LodConfigWrapperSingleton;
-import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModChecker;
-import com.seibel.lod.fabric.wrappers.modAccessor.ModChecker;
-
-/**
- * Binds all necessary dependencies, so we
- * can access them in Core. <br>
- * This needs to be called before any Core classes
- * are loaded.
- * 
- * @author James Seibel
- * @author Ran
- * @version 12-1-2021
- */
-public class FabricDependencySetup
-{
-	public static void createInitialBindings()
-	{
-		SingletonHandler.bind(IModChecker.class, ModChecker.INSTANCE);
-
-		SingletonHandler.bind(ILodConfigWrapperSingleton.class, LodConfigWrapperSingleton.INSTANCE);
-	}
-
-	public static void finishBinding() {
-		SingletonHandler.finishBinding();
-	}
-}
@@ -1,4 +1,3 @@
-
 package com.seibel.lod.fabric.wrappers.modAccessor;

 import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModChecker;
@@ -8,17 +8,17 @@ import com.seibel.lod.core.wrapperInterfaces.modAccessor.IOptifineAccessor;
 public class OptifineAccessor implements IOptifineAccessor
 {

-    @Override
-    public String getModName()
-    {
-        return "Optifine-Fabric-1.18.X";
-    }
-
-    @Override
-    public HashSet<AbstractChunkPosWrapper> getNormalRenderedChunks()
-    {
-        // TODO: Impl proper methods here
-        return null;
-    }
+	@Override
+	public String getModName()
+	{
+		return "Optifine-Fabric-1.18.X";
+	}

+	@Override
+	public HashSet<AbstractChunkPosWrapper> getNormalRenderedChunks()
+	{
+		// TODO: Impl proper methods here
+		return null;
+	}
+	
 }
@@ -3,34 +3,40 @@ package com.seibel.lod.fabric.wrappers.modAccessor;
 import java.util.HashSet;
 import java.util.stream.Collectors;

-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.world.level.LevelHeightAccessor;

 public class SodiumAccessor implements ISodiumAccessor {
-	private final IMinecraftRenderWrapper MC_RENDER = SingletonHandler.get(IMinecraftRenderWrapper.class);
+	IWrapperFactory factory = SingletonHandler.get(IWrapperFactory.class);

-    @Override
-    public String getModName() {
-    	return "Sodium-Fabric-1.17.1";
+	@Override
+	public String getModName() {
+		return "Sodium-Fabric-1.18.X";
 	}

 	@Override
 	public HashSet<AbstractChunkPosWrapper> getNormalRenderedChunks() {
 		SodiumWorldRenderer renderer = SodiumWorldRenderer.instance();
-		LevelHeightAccessor height = Minecraft.getInstance().level;
-		
-		// TODO: Maybe use a mixin to make this more efficient
-		return MC_RENDER.getMaximumRenderedChunks().stream().filter((AbstractChunkPosWrapper chunk) -> {
-			return (renderer.isBoxVisible(
-					chunk.getMinBlockX()+1, height.getMinBuildHeight()+1, chunk.getMinBlockZ()+1,
-					chunk.getMinBlockX()+15, height.getMaxBuildHeight()-1, chunk.getMinBlockZ()+15));
-		}).collect(Collectors.toCollection(HashSet::new));
+		LevelHeightAccessor height =  Minecraft.getInstance().level; 
+		// 0b11 = Lighted chunk & loaded chunk
+		return renderer.getChunkTracker().getChunks(0b00).filter(
+			(long l) -> {
+				return true;
+				//for (int i = height.getMinSection(); i<height.getMaxSection(); i++) {
+				//	SectionPos p = SectionPos.of(new ChunkPos(l), i);
+				//	if (renderer.isBoxVisible(p.minBlockX()+1, p.minBlockY()+1, p.minBlockZ()+1,
+				//			p.maxBlockX()-1, p.maxBlockY()-1, p.maxBlockZ()-1)) return true;
+				//}
+				//return false;
+			}).mapToObj((long l) -> {
+				return (AbstractChunkPosWrapper)factory.createChunkPos(l);
+			}).collect(Collectors.toCollection(HashSet::new));
 	}
+
 }
@@ -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() {
+		
+	}
+}
@@ -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
@@ -2,12 +2,11 @@
  "required": true,
  "minVersion": "0.8",
  "package": "com.seibel.lod.fabric.mixins",
-  "compatibilityLevel": "JAVA_16",
+  "compatibilityLevel": "JAVA_17",
  "mixins": [
-    "events.MixinServerLevel",
-    "unsafe.MixinPalettedContainer",
-    "MixinChunkGenerator",
-    "MixinUtilBackgroudThread"
+    "unsafe.MixinThreadingDectector",
+    "MixinUtilBackgroudThread",
+    "events.MixinServerLevel"
  ],
  "client": [
    "MixinMinecraft",
@@ -22,4 +21,4 @@
  "injectors": {
    "defaultRequire": 1
  }
-}
+}
@@ -33,11 +33,9 @@
  "accessWidener" : "lod.accesswidener",
  "depends": {
    "fabricloader": "*",
-    "fabric-lifecycle-events-v1": "*",
-    "fabric-key-binding-api-v1": "*",
-    "fabric-networking-api-v1": "*",
-    "minecraft": "${minecraft_version}",
-    "java": ">=${java_version}"
+    "fabric": "*",
+    "minecraft": "1.18.x",
+    "java": ">=17"
  },
  "suggests": {
    "another-mod": "*"
@@ -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")
@@ -19,6 +19,12 @@ architectury {
    forge()
 }

+configurations {
+    compileClasspath.extendsFrom common
+    runtimeClasspath.extendsFrom common
+    developmentForge.extendsFrom common
+}
+
 def addMod(path, enabled) {
    if (enabled == "2")
        dependencies { modImplementation(path) }
@@ -26,21 +32,16 @@ def addMod(path, enabled) {
        dependencies { modCompileOnly(path) }
 }

-configurations {
-    compileClasspath.extendsFrom common
-    runtimeClasspath.extendsFrom common
-    developmentForge.extendsFrom common
-}
-
 dependencies {
    // Forge loader
    forge "net.minecraftforge:forge:${rootProject.minecraft_version}-${rootProject.forge_version}"

-    common(project(path: ":common", configuration: "namedElements")) { transitive false }
-    shadowMe(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }
-
    // Starlight
    addMod("curse.maven:starlight-forge-526854:${rootProject.starlight_version_forge}", rootProject.enable_starlight_forge)
+    annotationProcessor "org.spongepowered:mixin:0.8.4:processor"
+
+    common(project(path: ":common", configuration: "namedElements")) { transitive false }
+    shadowMe(project(path: ":common", configuration: "transformProductionForge")) { transitive = false }

 //    forgeDependencies(project(":core")) { transitive false }

@@ -48,6 +49,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'
@@ -40,7 +40,7 @@ import net.minecraftforge.eventbus.api.SubscribeEvent;
 /**
 * This handles all events sent to the client,
 * and is the starting point for most of the mod.
- *
+ * 
 * @author James_Seibel
 * @version 11-12-2021
 */
@@ -48,28 +48,28 @@ public class ForgeClientProxy
 {
 	private final EventApi eventApi = EventApi.INSTANCE;
 	private final ClientApi clientApi = ClientApi.INSTANCE;
-
-
-
+	
+	
+	
 	@SubscribeEvent
 	public void serverTickEvent(TickEvent.ServerTickEvent event)
 	{
 		if (event.phase != TickEvent.Phase.START) return;
 		eventApi.serverTickEvent();
 	}
-
+	
 	@SubscribeEvent
 	public void chunkLoadEvent(ChunkEvent.Load event)
 	{
 		clientApi.clientChunkLoadEvent(new ChunkWrapper(event.getChunk(), event.getWorld()), WorldWrapper.getWorldWrapper(event.getWorld()));
 	}
-
+	
 	@SubscribeEvent
 	public void worldSaveEvent(WorldEvent.Save event)
 	{
 		eventApi.worldSaveEvent();
 	}
-
+	
 	/** This is also called when a new dimension loads */
 	@SubscribeEvent
 	public void worldLoadEvent(WorldEvent.Load event)
@@ -78,13 +78,13 @@ public class ForgeClientProxy
 			eventApi.worldLoadEvent(WorldWrapper.getWorldWrapper(event.getWorld()));
 		}
 	}
-
+	
 	@SubscribeEvent
 	public void worldUnloadEvent(WorldEvent.Unload event)
 	{
 		eventApi.worldUnloadEvent(WorldWrapper.getWorldWrapper(event.getWorld()));
 	}
-
+	
 	@SubscribeEvent
 	public void blockChangeEvent(BlockEvent event)
 	{
@@ -97,12 +97,12 @@ public class ForgeClientProxy
 		{
 			IChunkWrapper chunk = new ChunkWrapper(event.getWorld().getChunk(event.getPos()), event.getWorld());
 			DimensionTypeWrapper dimType = DimensionTypeWrapper.getDimensionTypeWrapper(event.getWorld().dimensionType());
-
+			
 			// recreate the LOD where the blocks were changed
 			eventApi.blockChangeEvent(chunk, dimType);
 		}
 	}
-
+	
 	@SubscribeEvent
 	public void onKeyInput(InputEvent.KeyInputEvent event)
 	{
@@ -110,5 +110,7 @@ public class ForgeClientProxy
 		if (event.getAction() != GLFW.GLFW_PRESS) return;
 		clientApi.keyPressedEvent(event.getKey());
 	}
-
+	
+	
+	
 }
@@ -22,33 +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.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraftforge.client.model.data.ModelDataMap;
+import net.minecraftforge.client.ConfigGuiHandler;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.fml.ModList;
 import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import net.minecraftforge.fml.loading.FMLLoader;
-import net.minecraftforge.fmlclient.ConfigGuiHandler;
+import net.minecraftforge.forgespi.language.IModInfo;

 import java.util.List;
 import java.util.Random;
@@ -57,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
 */
@@ -65,53 +66,43 @@ import java.util.Random;
 public class ForgeMain implements LodForgeMethodCaller
 {
 	public static ForgeClientProxy forgeClientProxy;
-
+	
 	private void init(final FMLCommonSetupEvent event)
 	{
+		// make sure the dependencies are set up before the mod needs them
 		LodCommonMain.initConfig();
 		LodCommonMain.startup(this, !FMLLoader.getDist().isClient());
 		ForgeDependencySetup.createInitialBindings();
-		ForgeDependencySetup.finishBinding();
-		ApiShared.LOGGER.info("Distant Horizons initializing...");
+		ClientApi.LOGGER.info("Distant Horizons initializing...");
+		SingletonHandler.bind(IModChecker.class, ModChecker.INSTANCE);
+
+		if (ReflectionHandler.instance.optifinePresent()) {
+			ModAccessorApi.bind(IOptifineAccessor.class, new OptifineAccessor());
+		}
 	}
-
-
+	
+	
 	public ForgeMain()
 	{
 		// Register the methods
 		FMLJavaModLoadingContext.get().getModEventBus().addListener(this::init);
 		FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onClientStart);
-
+		
 		// Register ourselves for server and other game events we are interested in
 		MinecraftForge.EVENT_BUS.register(this);
 	}
-
+	
 	private void onClientStart(final FMLClientSetupEvent event)
 	{
-		if (ReflectionHandler.instance.optifinePresent()) {
-			ModAccessorHandler.bind(IOptifineAccessor.class, new OptifineAccessor());
-		}
-
-		ModAccessorHandler.finishBinding();
-
-
-		ModAccessorHandler.finishBinding();
-
 		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);
 	}
-
-
-	@Override
-	public int getPixelRGBA(TextureAtlasSprite sprite, int frameIndex, int x, int y) {
-		return sprite.getPixelRGBA(frameIndex, x, y);
-	}
 }
@@ -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);
-		}
-	}
-}
@@ -6,7 +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.handlers.dependencyInjection.SingletonHandler;
+import com.seibel.lod.core.util.SingletonHandler;
 import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;

 import net.minecraft.client.Camera;
@@ -19,21 +19,22 @@ import net.minecraft.world.level.material.FogType;

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

-import java.util.concurrent.Executor;
+import java.util.concurrent.ExecutorService;
+import java.util.function.Supplier;

 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -8,41 +9,47 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;

 import com.seibel.lod.common.wrappers.DependencySetupDoneCheck;
-import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment;
-import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
-import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory;
+import com.seibel.lod.core.util.DummyRunExecutorService;

 import net.minecraft.Util;

@Mixin(Util.class)
 public class MixinUtilBackgroudThread
 {
-	private static boolean doTriggerOverride() {
-		try {
-			return DependencySetupDoneCheck.getIsCurrentThreadDistantGeneratorThread.get();
-		} catch (NullPointerException e) {
-			return false;
-		}
+	
+	private static boolean shouldApplyOverride() {
+		return DependencySetupDoneCheck.getIsCurrentThreadDistantGeneratorThread.get();
 	}
 	
+	
 	@Inject(method = "wrapThreadWithTaskName(Ljava/lang/String;Ljava/lang/Runnable;)Ljava/lang/Runnable;",
 			at = @At("HEAD"), cancellable = true)
 	private static void overrideUtil$wrapThreadWithTaskName(String string, Runnable r, CallbackInfoReturnable<Runnable> ci)
 	{
-		if (DependencySetupDoneCheck.isDone && doTriggerOverride())
+		if (DependencySetupDoneCheck.isDone && shouldApplyOverride())
 		{
-			// ApiShared.LOGGER.info("util wrapThreadWithTaskName(Runnable) triggered");
+			//ClientApi.LOGGER.info("util wrapThreadWithTaskName(Runnable) triggered");
 			ci.setReturnValue(r);
 		}
 	}
-
-	@Inject(method = "backgroundExecutor", at = @At("HEAD"), cancellable = true)
-	private static void overrideUtil$backgroundExecutor(CallbackInfoReturnable<Executor> ci)
+	@Inject(method = "wrapThreadWithTaskName(Ljava/lang/String;Ljava/util/function/Supplier;)Ljava/util/function/Supplier;",
+			at = @At("HEAD"), cancellable = true)
+	private static void overrideUtil$wrapThreadWithTaskNameForSupplier(String string, Supplier<?> r, CallbackInfoReturnable<Supplier<?>> ci)
 	{
-		if (DependencySetupDoneCheck.isDone && doTriggerOverride())
+		if (DependencySetupDoneCheck.isDone && shouldApplyOverride())
 		{
-			// ApiShared.LOGGER.info("util backgroundExecutor triggered");
-			ci.setReturnValue(Runnable::run);
+			//ClientApi.LOGGER.info("util wrapThreadWithTaskName(Supplier) triggered");
+			ci.setReturnValue(r);
+		}
+	}
+	
+	@Inject(method = "backgroundExecutor", at = @At("HEAD"), cancellable = true)
+	private static void overrideUtil$backgroundExecutor(CallbackInfoReturnable<ExecutorService> ci)
+	{
+		if (DependencySetupDoneCheck.isDone && shouldApplyOverride())
+		{
+			//ClientApi.LOGGER.info("util backgroundExecutor triggered");
+			ci.setReturnValue(new DummyRunExecutorService());
 		}
 	}
 }
@@ -21,7 +21,6 @@ package com.seibel.lod.forge.mixins;

 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Matrix4f;
-import com.seibel.lod.common.Config;
 import com.seibel.lod.common.wrappers.McObjectConverter;
 import com.seibel.lod.core.api.ClientApi;
 import com.seibel.lod.core.objects.math.Mat4f;
@@ -62,9 +61,7 @@ public class MixinWorldRenderer
 	}

 	// HEAD or RETURN
-	@Inject(at = @At("HEAD"),
-			method = "renderChunkLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDDLcom/mojang/math/Matrix4f;)V",
-			cancellable = true)
+	@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
@@ -75,8 +72,5 @@ public class MixinWorldRenderer

 			ClientApi.INSTANCE.renderLods(mcModelViewMatrix, mcProjectionMatrix, previousPartialTicks);
 		}
-		if (Config.Client.Advanced.lodOnlyMode) {
-			callback.cancel();
-		}
 	}
 }
@@ -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);
+    }
+}
@@ -1,10 +1,10 @@
 package com.seibel.lod.forge.wrappers;

+import com.seibel.lod.common.LodCommonMain;
 import com.seibel.lod.common.wrappers.config.LodConfigWrapperSingleton;
-import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
+import com.seibel.lod.common.wrappers.config.NewLodConfigWrapperSingleton;
+import com.seibel.lod.core.util.SingletonHandler;
 import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
-import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModChecker;
-import com.seibel.lod.forge.wrappers.modAccessor.ModChecker;

 /**
 * Binds all necessary dependencies so we
@@ -14,18 +14,15 @@ 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();
+		if (!LodCommonMain.IsNewConfig)
+			SingletonHandler.bind(ILodConfigWrapperSingleton.class, LodConfigWrapperSingleton.INSTANCE);
+		else
+			SingletonHandler.bind(ILodConfigWrapperSingleton.class, NewLodConfigWrapperSingleton.INSTANCE);
 	}
 }
@@ -10,4 +10,4 @@ public class ModChecker implements IModChecker {
    public boolean isModLoaded(String modid) {
        return ModList.get().isLoaded(modid);
    }
-}
+}
@@ -8,17 +8,17 @@ import com.seibel.lod.core.wrapperInterfaces.modAccessor.IOptifineAccessor;
 public class OptifineAccessor implements IOptifineAccessor
 {

-    @Override
-    public String getModName()
-    {
-        return "Optifine-Forge-1.18.X";
-    }
-
-    @Override
-    public HashSet<AbstractChunkPosWrapper> getNormalRenderedChunks()
-    {
-        // TODO: Impl proper methods here
-        return null;
-    }
+	@Override
+	public String getModName()
+	{
+		return "Optifine-Forge-1.18.X";
+	}

+	@Override
+	public HashSet<AbstractChunkPosWrapper> getNormalRenderedChunks()
+	{
+		// TODO: Impl proper methods here
+		return null;
+	}
+	
 }
@@ -1,6 +1,6 @@

 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}"

@@ -9,14 +9,13 @@ issueTrackerURL="${issues}"
 	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"
@@ -2,10 +2,9 @@
 	"required": true,
 	"minVersion": "0.8",
 	"package": "com.seibel.lod.forge.mixins",
-	"compatibilityLevel": "JAVA_16",
+	"compatibilityLevel": "JAVA_17",
 	"mixins": [
-    	"MixinChunkGenerator",
-    	"MixinUtilBackgroudThread"
+		"MixinUtilBackgroudThread"
 	],
 	"client": [
 		"MixinOptionsScreen",
@@ -1,11 +1,13 @@
 org.gradle.jvmargs=-Xmx2048M
-org.gradle.daemon=false

-maven_group=com.seibel.lod
+minecraft_version=1.18.1
+
 archives_base_name=DistantHorizons
+mod_version=1.6.2a
+maven_group=com.seibel.lod
+toml_version=3.6.4

 # Mod info
-mod_version=1.6.2a
 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
@@ -13,9 +15,35 @@ 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

-# Global Plugin versions
-toml_version=3.6.4
-manifold_version=2022.1.7
+# Fabric loader
+fabric_loader_version=0.13.1
+fabric_api_version=0.46.4+1.18
+    # Fabric mod versions
+    modmenu_version=3.0.0
+    starlight_version_fabric=3554912
+    lithium_version=mc1.18.1-0.7.7
+    sodium_version=3605309
+    iris_version=1.18.x-v1.1.4
+    bclib_version=1.2.5
+    immersive_portals_version = v1.0.4-1.18

-##### FOR IDE SUPPORT AND TELL IDE TO USE CERTIAN MC VERSION: SWITCH THIS:
-mcVer=1.17.1
+    # Fabric mod run
+    # 0 = Don't enable and don't run
+    # 1 = Can be referenced in code but doesn't run
+    # 2 = Can be referenced in code and runs in client
+    enable_starlight=0
+    enable_sodium=1
+    enable_lithium=0
+    enable_iris=0
+    enable_bclib=0
+
+# Forge loader
+forge_version=39.0.76
+    # Forge mod versions
+    starlight_version_forge=3559934
+
+    # Forge mod run
+    # 0 = Dont enable and don't run
+    # 1 = Can be referenced in code but doesn't run
+    # 2 = Can be referenced in code and runs in client
+    enable_starlight_forge=0
@@ -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