Update Readme.md

Added the multiplayer folder thing from 1.18
Rename MinecraftWrapper -> MinecraftClientWrapper
2022-04-17 17:00:23 +00:00 · 2022-03-08 17:33:22 +10:30 · 2022-03-05 18:32:43 -06:00 · 2022-03-05 18:15:42 -06:00 · 2022-03-05 17:37:04 -06:00 · 2022-03-03 22:55:01 -06:00
166 changed files with 3000 additions and 11978 deletions
@@ -51,6 +51,3 @@ Merged/

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

 # all stages need to be defined here
 stages:
-  - build_18_2
-  - build_18_1
-  - build_17_1
-  - build_16_5
+    - 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

@@ -20,99 +24,90 @@ before_script:



-# 1.16.5 build
-build_16_5:
-  stage: build_16_5
-  script:
-    - ./gradlew deleteMerged --gradle-user-home cache/;
-    - ./gradlew build -PmcVer=1.16.5 --gradle-user-home cache/;
-    - ./gradlew merge --gradle-user-home cache/;
-  image: eclipse-temurin:16
-  artifacts:
-    name: "Merged_NightlyBuild_1_16_5-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
-    paths:
-      - Merged
-    expire_in: 1 day
-    when: always
-  cache:
-    key: "gradleCache"
-    policy: pull-push
-    paths:
-      - .gradle
-      - cache/
-  allow_failure: true

-# 1.17.1 build
-build_17_1:
-  stage: build_17_1
-  script:
-    - ./gradlew deleteMerged --gradle-user-home cache/;
-    - ./gradlew build -PmcVer=1.17.1 --gradle-user-home cache/;
-    - ./gradlew merge --gradle-user-home cache/;
-  image: eclipse-temurin:16
-  artifacts:
-    name: "Merged_NightlyBuild_1_17_1-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
-    paths:
-      - Merged
-    expire_in: 1 day
-    # even if one build fails, upload the successful jars
-    when: always
-  cache:
-    key: "gradleCache"
-    policy: pull-push
-    paths:
-      - .gradle
-      - cache/
-  allow_failure: true
-
-# 1.18.1 build 
-build_18_1:
-  stage: build_18_1
-  script: 
-    - ./gradlew deleteMerged --gradle-user-home cache/; # make sure any previously merged jars are removed before running this job
-    - ./gradlew build -PmcVer=1.18.1 --gradle-user-home cache/; 
-    - ./gradlew merge --gradle-user-home cache/;
-  # build using Java 17
-  image: eclipse-temurin:17
-  artifacts:
-    name: "Merged_NightlyBuild_1_18_1-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
-    paths:
-    # relative to the root directory
-    - Merged
-    expire_in: 1 day
-    when: always
-  cache:
-    key: "gradleCache"
-    policy: pull-push
-    paths:
-      - .gradle
-      - cache/
-  allow_failure: true
-
-# 1.18.2 build
-build_18_2:
-  stage: build_18_2
-  script:
-    - ./gradlew deleteMerged --gradle-user-home cache/;
-    - ./gradlew build -PmcVer=1.18.2 --gradle-user-home cache/;
-    - ./gradlew merge --gradle-user-home cache/;
-  image: eclipse-temurin:17
-  artifacts:
-    name: "Merged_NightlyBuild_1_18_2-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
-    paths:
-      - Merged
-    expire_in: 1 day
-    when: always
-  cache:
-    key: "gradleCache"
-    policy: pull-push
-    paths:
-      - .gradle
-      - cache/
-  allow_failure: true
+# 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/


-# unused deployment stage
+
+# 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: "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
+
+
+## forth stage
 #deploy:
 #    stage: deploy
 #    image: registry.gitlab.com/gitlab-org/release-cli:latest
@@ -134,5 +129,4 @@ build_18_2:
 #                - 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,43 +0,0 @@
-# 1.16.5 version
-
-java_version=8
-minecraft_version=1.16.5
-parchment_version=2022.03.06
-compatible_minecraft_versions=["1.16.4", "1.16.5"]
-
-# Fabric loader
-fabric_loader_version=0.13.2
-fabric_api_version=0.42.0+1.16
-    # Fabric mod versions
-    modmenu_version=1.16.22
-    starlight_version_fabric=
-    phosphor_version_fabric=
-    lithium_version=mc1.16.5-0.6.6
-    sodium_version=3488820
-    iris_version=1.16.x-v1.1.4
-    bclib_version=
-    immersive_portals_version =
-
-    # 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_phosphor=0
-    enable_lithium=0
-    enable_sodium=1
-    enable_iris=0
-    enable_bclib=0
-
-# Forge loader
-forge_version=36.2.28
-    # Forge mod versions
-    starlight_version_forge=
-    terraforged_version=3285909
-
-    # Forge mod run
-    # 0 = Dont enable and dont run
-    # 1 = Can be refranced in code but dosnt run
-    # 2 = Can be refranced in code and runs in client
-    enable_starlight_forge=0
-    enable_terraforged=2
@@ -1,43 +0,0 @@
-# 1.17.1 version
-
-java_version=16
-minecraft_version=1.17.1
-parchment_version=2021.12.12
-compatible_minecraft_versions=["1.17", "1.17.1"]
-
-# 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
-    phosphor_version_fabric=
-    lithium_version=mc1.17.1-0.7.5
-    sodium_version=3605275
-    iris_version=1.17.x-v1.1.4
-    bclib_version=
-    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_phosphor=0
-    enable_lithium=0
-    enable_sodium=1
-    enable_iris=0
-    enable_bclib=0
-
-# Forge loader
-forge_version=37.1.1
-    # Forge mod versions
-    starlight_version_forge=3457784
-    terraforged_version=
-
-    # 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
-    enable_terraforged=0
@@ -1,43 +0,0 @@
-# 1.18.1 version
-
-java_version = 17
-minecraft_version=1.18.1
-parchment_version=2022.03.06
-compatible_minecraft_versions=["1.18", "1.18.1"]
-
-# Fabric loader
-fabric_loader_version=0.13.3
-fabric_api_version=0.46.6+1.18
-    # Fabric mod versions
-    modmenu_version=3.0.1
-    starlight_version_fabric=3554912
-    phosphor_version_fabric=3573395
-    lithium_version=mc1.18.1-0.7.7
-    sodium_version=3605309
-    iris_version=1.18.x-v1.1.4
-    bclib_version=1.2.5
-    immersive_portals_version = v1.0.4-1.18
-
-    # Fabric mod run
-    # 0 = Don't enable and don't run
-    # 1 = Can be referenced in code but doesn't run
-    # 2 = Can be referenced in code and runs in client
-    enable_starlight=0
-    enable_phosphor=0
-    enable_sodium=1
-    enable_lithium=0
-    enable_iris=0
-    enable_bclib=0
-
-# Forge loader
-forge_version=39.1.2
-    # Forge mod versions
-    starlight_version_forge=3559934
-    terraforged_version=
-
-    # 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
-    enable_terraforged=0
@@ -1,43 +0,0 @@
-# 1.18.2 version based stuff
-
-java_version = 17
-minecraft_version=1.18.2
-parchment_version=2022.03.13
-compatible_minecraft_versions=["1.18.2"]
-
-# Fabric loader
-fabric_loader_version=0.13.3
-fabric_api_version=0.48.0+1.18.2
-    # Fabric mod versions
-    modmenu_version=3.1.0
-    starlight_version_fabric=3667443
-    phosphor_version_fabric=3573395
-    lithium_version=mc1.18.2-0.7.9
-    sodium_version=3669187
-    iris_version=1.18.x-v1.2.2
-    immersive_portals_version = v1.0.4-1.18
-    bclib_version=0
-
-    # Fabric mod run
-    # 0 = Don't enable and don't run
-    # 1 = Can be referenced in code but doesn't run
-    # 2 = Can be referenced in code and runs in client
-    enable_starlight=0
-    enable_phosphor=0
-    enable_sodium=1
-    enable_lithium=0
-    enable_iris=0
-    enable_bclib=0
-
-# Forge loader
-forge_version=40.0.18
-    # Forge mod versions
-    starlight_version_forge=0
-    terraforged_version=
-
-    # Forge mod run
-    # 0 = Don't enable and don't run
-    # 1 = Can be referenced in code but doesn't run
-    # 2 = Can be referenced in code and runs in client
-    enable_starlight_forge=0
-    enable_terraforged=0
@@ -1,3 +1,5 @@
+# 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
@@ -14,105 +16,53 @@ 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
-
-This branch is for these versions of Minecraft
- 1.18.2
- 1.18.1 & 1.18
- 1.17.1 & 1.17
- 1.16.5 & 1.16.4
-
 Architectury version: 3.4-SNAPSHOT\
-Java Compiler plugin: Manifold Preprocessor
-
-#### 1.18.2 mods
-Forge version: 40.0.18\
-Fabric version: 0.13.3\
-Fabric API version: 0.48.0+1.18.2\
-Modmenu version: 3.1.0
-
-#### 1.18.1 mods
-Forge version: 39.1.2\
-Fabric version: 0.13.3\
-Fabric API version: 0.42.6+1.18\
-Modmenu version: 3.0.1
-
-#### 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
-
-#### 1.16.5 mods
 Forge version: 36.2.28\
-Fabric vetsion: 0.13.2\
-Fabric API version: 0.42.0+1.16\
+Fabric version: 0.13.2\
+Fabric API version: 0.42.0+1.16
+
 Modmenu version: 1.16.22

-
-
 Notes:\
-This version has been confirmed to work in IDE and Retail Minecraft with ether the Fabric or Forge mod-loader.
+This version has been confirmed to work in Eclipse and Retail Minecraft.\
+(Retail running forge version 1.16.5-36.1.0 and fabric version 1.16.5-0.12.3)


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

-#### Nightlly builds
-This mod has an autobuild system to automatically build the mod on each commit
- 1.18.2: https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/main/download?job=build_18_2
- 1.18.1: https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/main/download?job=build_18_1
- 1.17.1: https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/main/download?job=build_17_1
- 1.16.5: https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/main/download?job=build_16_5
-
-See the Fabric Documentation online for more detailed instructions:\
-https://fabricmc.net/wiki/tutorial:setup
+See the Forge Documentation online for more detailed instructions:\
+http://mcforge.readthedocs.io/en/latest/gettingstarted/

 ### Prerequisites

-* A Java Development Kit (JDK) for Java 17 (recommended) or newer. Visit https://www.oracle.com/java/technologies/downloads/ for installers.
+* A Java Development Kit (JDK) for Java 16 (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!)**
-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
+**If using Ecplise:**
+Not supported...

-## Switching Versions
-This branch support 4 built versions:
- - 1.18.2
- - 1.18.1 (which also runs on 1.18)
- - 1.17.1 (which also runs on 1.17)
- - 1.16.5 (which also runs 1.16.5)
+Side note: invalidate caches and restart if required

-To switch between active versions, change `mcVer=1.?` 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`
+1. Open a command line in the project folder
+2. Run the command: `./gradlew build`
 5. Then run command: `./gradlew mergeJars`
 6. The compiled jar file will be in the folder `Merged`

 **If in terminal:**
-1. `git clone --recurse-submodules https://gitlab.com/jeseibel/minecraft-lod-mod.git`
+1. `git clone -b 1.16.5_architectury --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.?` to tell gradle to build a selected MC version instead of having to manually modify the `gradle.properties` file.
+5. `./gradlew mergeJars`
+6. The compiled jar file will be in the folder `Merged`


 ## Other commands
@@ -126,19 +76,15 @@ If running on IDE, to ensure IDE pickup the changed versions, you will need to r

 The Minecraft source code is NOT added to your workspace in an editable way. Minecraft is treated like a normal Library. Sources are there for documentation and research purposes only.

-Source code uses Mojang mappings & [Parchment](https://parchmentmc.org/) mappings.
-
-To generate the source code run `./gradlew genSources`\
-If your IDE fails to auto-detect the sources JAR when browsing Minecraft classes manually select the JAR file ending with -sources.jar when prompted by your IDE
-
-In IntelliJ it's at the top where it says choose sources when browsing Minecraft classes
+Source code uses Mojang mappings.

 ## Useful commands

 Build only Fabric: `./gradlew fabric:assemble` or `./gradlew fabric:build`\
 Build only Forge: `./gradlew fabric:assemble` or `./gradlew forge:build`\
 Run the Fabric client (for debugging): `./gradlew fabric:runClient`\
-Run the Forge client (for debugging): `./gradlew forge:runClient`
+Run the Forge client (**THIS DOST WORK** due to a bug with architectury): `./gradlew forge:runClient`\
+To use a custom version of Java use `-D` then the path for Java

 ## Open Source Acknowledgements

@@ -1,6 +1,5 @@
 import io.github.ran.jarmerger.JarMergerPlugin

-
 buildscript {
    dependencies{
        classpath files('plugins/DHJarMerger-1.0.jar')
@@ -12,85 +11,17 @@ plugins {
    id "dev.architectury.loom" version "0.10.0-SNAPSHOT" apply false
 }

-def writeBuildGradlePredefine(List<String> mcVers, int mcIndex) {
-    ArrayList<String> redefineList = new ArrayList<String>()
-    for (int i=0; i<mcVers.size(); i++) {
-        String mcStr = mcVers.get(i).replace(".", "_")
-        if (mcIndex<i) {
-            redefineList.add("PRE_MC_"+mcStr)
-        }
-        if (mcIndex==i) {
-            redefineList.add("MC_"+mcStr)
-        }
-        if (mcIndex>=i) {
-            redefineList.add("POST_MC_"+mcStr)
-        }
-    }
-    StringBuilder sb = new StringBuilder()
-    for (String s : redefineList) {
-        sb.append(s)
-        sb.append("=\n")
-    }
-    new File(projectDir, "build.properties").text = sb.toString()
-}
-
-// Sets up the variables for Manifold in the code
-def loadProperties() {
-    def defaultMcVersion = "1.18.2"
-    def mcVersion = ""
-    def mcVers = mcVersions.split(",")
-    int mcIndex = -1
-    println "Avalible MC versions: ${mcVersions}"
-    if (project.hasProperty("mcVer")) {
-        mcVersion = mcVer
-        mcIndex = Arrays.asList(mcVers).indexOf(mcVer)
-    }
-    if (mcIndex == -1) {
-        println "No mcVer set or the set mcVer is invalid! Defaulting to ${defaultMcVersion}."
-        println "Tip: Use -PmcVer='${defaultMcVersion}' in cmd arg to set mcVer."
-        mcVersion = defaultMcVersion
-        mcIndex = Arrays.asList(mcVers).indexOf(defaultMcVersion)
-        assert mcIndex != -1
-    }
-
-	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(Arrays.asList(mcVers), mcIndex)
-
-    // Stuff for access wideners
-    def mcVersionToAcsessWidenerVersion = [
-            "1.16.5": "1_16",
-            "1.17.1": "1_17",
-            "1.18.1": "1_18",
-            "1.18.2": "1_18",
-    ]
-    // Use this as sometimes multiple versions use the same access wideners
-    rootProject.ext.set("acsessWidenerVersion", mcVersionToAcsessWidenerVersion.get(mcVersion))
-}
-loadProperties()
-
 apply plugin: JarMergerPlugin

 architectury {
    minecraft = rootProject.minecraft_version
 }

-
 subprojects { p ->
    apply plugin: "dev.architectury.loom"

    loom {
        silentMojangMappingsLicense()
-
-        if (p != project(":core")) {
-            accessWidenerPath.set(project(":common").file("src/main/resources/${acsessWidenerVersion}.lod.accesswidener"))
-        }
    }

    configurations {
@@ -101,16 +32,8 @@ subprojects { p ->

    dependencies {
        minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
-        // The following line declares the mojmap mappings & parchment mappings
-        mappings loom.layered() {
-            // Mojmap mappings
-            officialMojangMappings()
-            // Parchment mappings (it adds parameter mappings & javadoc)
-            parchment("org.parchmentmc.data:parchment-${rootProject.minecraft_version}:${rootProject.parchment_version}@zip")
-        }
-
-		//Manifold
-		annotationProcessor "systems.manifold:manifold-preprocessor:${rootProject.manifold_version}"
+        // The following line declares the mojmap mappings
+        mappings loom.officialMojangMappings()

        // Toml
        implementation("com.electronwill.night-config:toml:${rootProject.toml_version}")
@@ -121,23 +44,23 @@ subprojects { p ->
            modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
        }

+
        if (p != project(":core")) {
            common(project(":core")) { transitive false }
            shadowMe(project(":core")) { transitive false }
        }
    }

-    // Allows the jar to run standalone
    jar {
        manifest {
            attributes 'Implementation-Title': rootProject.archives_base_name,
                    'Implementation-Version': rootProject.mod_version,
-                    'Main-Class': 'com.seibel.lod.core.JarMain' // When changing the main of the jar change this line
+                    'Main-Class': 'com.seibel.lod.core.JarMain'
        }
    }
 }

-allprojects { p ->
+allprojects {
    apply plugin: "java"
    apply plugin: "architectury-plugin"
    apply plugin: "maven-publish"
@@ -146,19 +69,11 @@ allprojects { p ->
    version = rootProject.mod_version
    group = rootProject.maven_group

-
    repositories {
        mavenCentral()
-
-        // For parchment mappings
-        maven { url "https://maven.parchmentmc.org" }
-
        // 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"
@@ -191,25 +106,19 @@ allprojects { p ->
        }
    }

-
    // Put stuff from gradle.properties into the mod info
    processResources {
        def resourceTargets = ["fabric.mod.json", "META-INF/mods.toml"] // Location of where to put
        def intoTargets = ["$buildDir/resources/main/"] // Location of the built resources folder
        def replaceProperties = [
-                version                      : mod_version,
-                mod_name                     : mod_name,
-                authors                      : mod_authors,
-                description                  : mod_description,
-                homepage                     : mod_homepage,
-                source                       : mod_source,
-                issues                       : mod_issues,
-                minecraft_version            : minecraft_version,
-                compatible_minecraft_versions: compatible_minecraft_versions,
-                java_version                 : java_version
-        ]
-        // 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)"
+                version: mod_version,
+                mod_name: mod_name,
+                authors: mod_authors,
+                description: mod_description,
+                homepage: mod_homepage,
+                source: mod_source,
+                issues: mod_issues
+        ]   // The left side is what gets replaced in the mod info and the right side is where to get it from in the gradle.properties

        inputs.properties replaceProperties
        replaceProperties.put 'project', project
@@ -230,76 +139,19 @@ allprojects { p ->
        }
    }

-
-    // Copies the correct accesswidener and renames it
-    task copyAccessWidener(type: Copy) {
-        from project(":common").file("src/main/resources/${rootProject.acsessWidenerVersion}.lod.accesswidener")
-        into(file(p.file("build/resources/main")))
-        rename "${rootProject.acsessWidenerVersion}.lod.accesswidener", "lod.accesswidener"
-    }
-
-    task copyCoreResources(type: Copy) {
-        from fileTree(project(":core").file("src/main/resources"))
-        into p.file("build/resources/main")
-    }
-
-    task copyCommonResources(type: Copy) {
-        from fileTree(project(":common").file("src/main/resources"))
-        into p.file("build/resources/main")
-    }
-
-
-    // Is this necessary for running the fabric build
-    if (p == project(":common")) {
-        println "Copying [common/src/main/resources/${acsessWidenerVersion}.lod.accesswidner] to [fabric/build/resources/main]."
-
-        copy {
-            from project(":common").file("src/main/resources/${acsessWidenerVersion}.lod.accesswidener")
-            into project(":fabric").file("build/resources/main")
-            rename "${acsessWidenerVersion}.lod.accesswidener", "lod.accesswidener"
-        }
-    }
-
    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']
+        options.encoding = "UTF-8"

-        // println options.compilerArgs
-
-        // Set the java version
-        if (p != project(":core")) {
-            options.compilerArgs += ['-Xplugin:Manifold']
-            options.release = rootProject.java_version as Integer
-        } else if (p == project(":core")) {
-            options.release = 8; // Core should use Java 8 no matter what
+        // The Minecraft launcher currently installs Java 8 for users, so your mod probably wants to target Java 8 too
+        // JDK 9 introduced a new way of specifying this that will make sure no newer classes or methods are used.
+        // We'll use that if it's available, but otherwise we'll use the older option.
+        def targetVersion = 8
+        if (JavaVersion.current().isJava9Compatible()) {
+            options.release = targetVersion
        }
-        // TODO: make everything use java 8
-//        options.release = 8 // Use Java 8 for everything so back porting is easier
    }

    java {
        withSourcesJar()
    }
-
-    // Disable running the core and common
-    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,3 +1,7 @@
+loom {
+    accessWidenerPath.set(file("src/main/resources/lod.accesswidener"))
+}
+
 architectury {
    common()
 }
@@ -1,8 +1,8 @@
 /*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
 *    licensed under the GNU GPL v3 License.
 *
- *    Copyright (C) 2020-2022  James Seibel
+ *    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
@@ -19,27 +19,23 @@

 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.*;
-
+import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IMultiplayer;
+import net.minecraft.client.renderer.DimensionSpecialEffects;

 /**
 * This handles any configuration the user has access to.
 * @author coolGi2007
 * @version 12-12-2021
 */
-
-public class Config
+public class Config extends ConfigGui
 //public class Config extends TinyConfig
 {
 	// CONFIG STRUCTURE
@@ -56,12 +52,12 @@ public class Config
 	//				|-> 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
@@ -69,231 +65,108 @@ public class Config
 	// 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 = 32, maxValue = 2048)
+				@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 = 64)
+				@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 _earthCurveRatio = IAdvancedGraphics.EARTH_CURVE_RATIO_DESC;
-				@ConfigAnnotations.Entry(minValue = 0, maxValue = 5000)
-				public static int earthCurveRatio = IAdvancedGraphics.EARTH_CURVE_RATIO_MIN_DEFAULT_MAX.defaultValue;

 				/*
 				@ConfigAnnotations.FileComment
@@ -303,175 +176,107 @@ public class Config
 				*/
 			}
 		}
-		
-		
+
+
 		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;
+			@ConfigAnnotations.Entry
+			public static boolean allowUnstableFeatureGeneration = 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
-		{
+
+		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 = 0.1, maxValue = 50.0)
-				public static double numberOfWorldGenerationThreads = IThreading.NUMBER_OF_WORLD_GENERATION_THREADS_DEFAULT.defaultValue;
-				
+				@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;
+				public static String _drawLods = IDebugging.DRAW_LODS_DESC;
 				@ConfigAnnotations.Entry
-				public static RendererType rendererType = IDebugging.RENDERER_TYPE_DEFAULT;
-				
+				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;
-
-				@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 = 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
@@ -1,28 +1,10 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.forge.LodForgeMethodCaller;
 import com.seibel.lod.common.networking.NetworkInterface;
 import com.seibel.lod.common.wrappers.DependencySetup;
 import com.seibel.lod.common.wrappers.config.ConfigGui;
+import com.seibel.lod.core.ModInfo;

 /**
 * This is the common main class
@@ -34,7 +16,7 @@ public class LodCommonMain {
    public static LodForgeMethodCaller forgeMethodCaller;
    public static NetworkInterface networkInterface;

-    public static void startup(LodForgeMethodCaller caller, boolean serverSided, NetworkInterface networkInterface) {
+    public static void startup(LodForgeMethodCaller caller, boolean serverSided) {
        LodCommonMain.serverSided = serverSided;
        if (caller != null) {
            LodCommonMain.forge = true;
@@ -42,17 +24,13 @@ public class LodCommonMain {
        }

        DependencySetup.createInitialBindings();
-
-        LodCommonMain.networkInterface = networkInterface;
-        if (!serverSided) {
-            networkInterface.register_Client();
-        } else {
-            networkInterface.register_Server();
-        }
    }

-
    public static void initConfig() {
        ConfigGui.init(Config.class);
    }
+
+    public static void registerNetworking(NetworkInterface networkInterface) {
+        LodCommonMain.networkInterface = networkInterface;
+    }
 }
@@ -1,29 +1,8 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.forge;

 import com.seibel.lod.common.wrappers.minecraft.MinecraftClientWrapper;
 import net.minecraft.client.renderer.block.model.BakedQuad;
 import net.minecraft.core.Direction;
-import net.minecraft.world.level.ColorResolver;
-import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;

@@ -37,6 +16,4 @@ import java.util.Random;
 */
 public interface LodForgeMethodCaller {
    List<BakedQuad> getQuads(MinecraftClientWrapper mc, Block block, BlockState blockState, Direction direction, Random random);
-
-    int colorResolverGetColor(ColorResolver resolver, Biome biome, double x, double z);
 }
@@ -1,49 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.networking;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.multiplayer.ClientPacketListener;
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.server.network.ServerGamePacketListenerImpl;
-
-/**
- * This is packet handler for our mod
- * It basically handles the packets sent from the server & client
- *
- * @author Ran
- */
-public class NetworkHandler {
-    // If you need the response sender then tell me
-    // I'll add extra code to get the response sender
-    public static void receivePacketClient(Minecraft client, ClientPacketListener handler, FriendlyByteBuf buf) {
-        // TODO: Server sided stuff here
-        // You can make client execute something by using client.execute(Runnable)
-        // In the fabric docs it says that client.execute is ran on the render thread?
-    }
-
-    // If you need the response sender then tell me
-    // I'll add extra code to get the response sender
-    public static void receivePacketServer(MinecraftServer server, ServerPlayer client, ServerGamePacketListenerImpl handler, FriendlyByteBuf buf) {
-        // TODO: Server sided stuff here
-    }
-}
@@ -1,28 +1,12 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.networking;

+import net.minecraft.network.FriendlyByteBuf;
+
 /**
 * @author Ran
 */
 public interface NetworkInterface {
-    void register_Client();
-    void register_Server();
+    void send(FriendlyByteBuf packetByteBuf);
+
+    FriendlyByteBuf receive();
 }
@@ -1,119 +1,23 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.networking;

-import com.seibel.lod.core.ModInfo;
+import com.seibel.lod.common.LodCommonMain;
 import io.netty.buffer.Unpooled;
-import net.minecraft.client.Minecraft;
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.network.protocol.Packet;
-import net.minecraft.network.protocol.game.ClientboundCustomPayloadPacket;
-import net.minecraft.network.protocol.game.ServerboundCustomPayloadPacket;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.level.ServerPlayer;

-import java.util.Objects;
+import java.nio.charset.StandardCharsets;

 /**
 * This class holds most of the networking code for the mod.
 * @author Ran
 */
 public class Networking {
-    public static final ResourceLocation resourceLocation_meow = new ResourceLocation("lod", "meow");
+//    public void example(int packetId) {
+//        FriendlyByteBuf packetByteBuf = Networking.createNew();
+//        packetByteBuf.writeInt(packetId);
+//        LodCommonMain.networkInterface.send(packetByteBuf);
+//    }

    public static FriendlyByteBuf createNew() {
-        // TODO: Probably replace the Unpooled.buffer()
-        FriendlyByteBuf buf = new FriendlyByteBuf(Unpooled.buffer());
-        buf.writeInt(ModInfo.PROTOCOL_VERSION);
-        return buf;
+        return new FriendlyByteBuf(Unpooled.buffer());
    }
-
-    /*
-     * All code below is from the fabric api and might have been modified to work with Distant Horizons
-     * Which is licensed under the Apache License 2.0
-     */
-
-    /**
-     * Sends a packet to a player.
-     *
-     * @param player the player to send the packet to
-     * @param buf the payload of the packet.
-     */
-    public static void send(ServerPlayer player, FriendlyByteBuf buf) {
-        Objects.requireNonNull(player, "Server player entity cannot be null");
-        Objects.requireNonNull(resourceLocation_meow, "Channel name cannot be null");
-        Objects.requireNonNull(buf, "Packet byte buf cannot be null");
-
-        player.connection.send(createS2CPacket(resourceLocation_meow, buf));
-    }
-
-    /**
-     * Sends a packet to the connected server.
-     *
-     * @param buf the payload of the packet
-     * @throws IllegalStateException if the client is not connected to a server
-     */
-    public static void send(FriendlyByteBuf buf) throws IllegalStateException {
-        // You cant send without a client player, so this is fine
-        if (Minecraft.getInstance().getConnection() != null) {
-            Minecraft.getInstance().getConnection().send(createC2SPacket(resourceLocation_meow, buf));
-            return;
-        }
-
-        throw new IllegalStateException("Cannot send packets when not in game!");
-    }
-
-    /**
-     * Creates a packet which may be sent to the connected client.
-     *
-     * @param channelName the channel name
-     * @param buf the packet byte buf which represents the payload of the packet
-     * @return a new packet
-     */
-    public static Packet<?> createS2CPacket(ResourceLocation channelName, FriendlyByteBuf buf) {
-        Objects.requireNonNull(channelName, "Channel cannot be null");
-        Objects.requireNonNull(buf, "Buf cannot be null");
-
-        return createPlayS2CPacket(channelName, buf);
-    }
-
-    public static Packet<?> createPlayS2CPacket(ResourceLocation channel, FriendlyByteBuf buf) {
-        return new ClientboundCustomPayloadPacket(channel, buf);
-    }
-
-    /**
-     * Creates a packet which may be sent to a the connected server.
-     *
-     * @param channelName the channel name
-     * @param buf the packet byte buf which represents the payload of the packet
-     * @return a new packet
-     */
-    public static Packet<?> createC2SPacket(ResourceLocation channelName, FriendlyByteBuf buf) {
-        Objects.requireNonNull(channelName, "Channel name cannot be null");
-        Objects.requireNonNull(buf, "Buf cannot be null");
-
-        return createPlayC2SPacket(channelName, buf);
-    }
-
-    public static Packet<?> createPlayC2SPacket(ResourceLocation channelName, FriendlyByteBuf buf) {
-        return new ServerboundCustomPayloadPacket(channelName, buf);
-    }
-
 }
@@ -1,34 +1,15 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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;

 import com.seibel.lod.common.LodCommonMain;
-import com.seibel.lod.common.wrappers.minecraft.MinecraftClientWrapper;
 import com.seibel.lod.common.wrappers.minecraft.MinecraftRenderWrapper;
+import com.seibel.lod.common.wrappers.minecraft.MinecraftClientWrapper;
 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.wrapperInterfaces.IVersionConstants;
 import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory;
-import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
+import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftWrapper;

 /**
 * Binds all necessary dependencies, so we
@@ -41,16 +22,14 @@ import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
 * @version 12-1-2021
 */
 public class DependencySetup {
-    public static void createInitialBindings()
-    {
+    public static void createInitialBindings() {
        SingletonHandler.bind(IVersionConstants.class, VersionConstants.INSTANCE);
-        if (!LodCommonMain.serverSided)
-        {
-            SingletonHandler.bind(IMinecraftClientWrapper.class, MinecraftClientWrapper.INSTANCE);
+        if (!LodCommonMain.serverSided) {
+            SingletonHandler.bind(IMinecraftWrapper.class, MinecraftClientWrapper.INSTANCE);
            SingletonHandler.bind(IMinecraftRenderWrapper.class, MinecraftRenderWrapper.INSTANCE);
            SingletonHandler.bind(IReflectionHandler.class, ReflectionHandler.createSingleton(MinecraftClientWrapper.INSTANCE.getOptions().getClass().getDeclaredFields(), MinecraftClientWrapper.INSTANCE.getOptions()));
+            SingletonHandler.bind(IVersionConstants.class, VersionConstants.INSTANCE);
        }
-
        SingletonHandler.bind(IWrapperFactory.class, WrapperFactory.INSTANCE);
        DependencySetupDoneCheck.isDone = true;
    }
@@ -1,29 +1,7 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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;

-import java.util.function.Supplier;
-
 public class DependencySetupDoneCheck
 {
 	public static boolean isDone = false;
-	public static Supplier<Boolean> getIsCurrentThreadDistantGeneratorThread = (() -> {return false;});
 	
 }
@@ -1,8 +1,8 @@
 /*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
 *    licensed under the GNU GPL v3 License.
 *
- *    Copyright (C) 2020-2022  James Seibel
+ *    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
@@ -22,12 +22,9 @@ package com.seibel.lod.common.wrappers;
 import java.nio.FloatBuffer;

 import com.mojang.math.Matrix4f;
-import com.seibel.lod.common.wrappers.block.BlockPosWrapper;
 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,31 +46,17 @@ public class McObjectConverter
        return matrix;
    }

-
    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;
-    	}
+        LodDirection[] lodDirs = LodDirection.values();
+        directions = new Direction[lodDirs.length];
+        for (LodDirection lodDir : lodDirs) {
+            directions[lodDir.ordinal()] = Direction.byName(lodDir.name());
+        }
    }
-    
-    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()];
-    }
 }
@@ -1,22 +1,3 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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;

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

 	@Override
-	public int getWorldGenerationCountPerThread()
-	{
-		return 1;
+	public boolean hasBatchGenerationImplementation() {
+		return true;
 	}

-	@Override
-	public boolean isVanillaRenderedChunkSquare()
-	{
-		return false;
-	}
+    @Override
+    public boolean isVanillaRenderedChunkSquare() {
+        return true;
+    }
 }
@@ -1,8 +1,8 @@
 /*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
 *    licensed under the GNU GPL v3 License.
 *
- *    Copyright (C) 2020-2022  James Seibel
+ *    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
@@ -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,59 +38,53 @@ 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);
-	}
-	
-	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);
+    }
+    
+    @Override
+    public AbstractBatchGenerationEnvionmentWrapper createBatchGenerator(LodBuilder newLodBuilder, LodDimension newLodDimension, IWorldWrapper worldWrapper) {
 		return new BatchGenerationEnvironment(worldWrapper, newLodBuilder, newLodDimension);
 	}
 }
+
@@ -1,8 +1,8 @@
 /*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
 *    licensed under the GNU GPL v3 License.
 *
- *    Copyright (C) 2020-2022  James Seibel
+ *    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
@@ -1,47 +1,286 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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 java.util.List;
+import java.util.Random;
 import java.util.concurrent.ConcurrentHashMap;

 import com.seibel.lod.core.api.ApiShared;
+import com.seibel.lod.core.util.ColorUtil;
+import com.seibel.lod.core.wrapperInterfaces.block.BlockDetail;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.color.block.BlockColors;
+import net.minecraft.client.renderer.block.model.BakedQuad;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
 import net.minecraft.world.level.LevelReader;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.FlowerBlock;
+import net.minecraft.world.level.block.LeavesBlock;
+import net.minecraft.world.level.block.LiquidBlock;
+import net.minecraft.world.level.block.RenderShape;
+import net.minecraft.world.level.block.RotatedPillarBlock;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.material.FluidState;
+import net.minecraft.world.phys.AABB;
+import net.minecraft.world.phys.shapes.VoxelShape;

 public class BlockDetailMap
 {
-	
-	private static ConcurrentHashMap<BlockState, BlockDetailWrapper> map = new ConcurrentHashMap<BlockState, BlockDetailWrapper>();
-	
-	private BlockDetailMap() {}
-	
-	public static BlockDetailWrapper getOrMakeBlockDetailCache(BlockState bs, BlockPos pos, LevelReader getter) {
-		if (!bs.getFluidState().isEmpty()) {
-			bs = bs.getFluidState().createLegacyBlock();
-		}
-		BlockDetailWrapper cache = map.get(bs);
-		if (cache != null) return cache;
-		cache = BlockDetailWrapper.make(bs, pos, getter);
-		//ApiShared.LOGGER.info("New blockDetail cache for {} to {} ", bs, cache);
-		BlockDetailWrapper cacheCAS = map.putIfAbsent(bs, cache);
-		return cacheCAS==null ? cache : cacheCAS;
-	}
+    public static final int FLOWER_COLOR_SCALE = 5;
+
+    public static final Random random = new Random(0);
+
+    //TODO: Perhaps make this not just use the first frame?
+    //FIXME: Stuff is wrong.
+    private static int calculateColorFromTexture(TextureAtlasSprite texture, boolean useFlowerScaling, boolean useFastLeaf) {
+
+        int count = 0;
+        double alpha = 0;
+        double red = 0;
+        double green = 0;
+        double blue = 0;
+        int tempColor;
+
+        {
+            // textures normally use u and v instead of x and y
+            for (int u = 0; u < texture.getWidth(); u++)
+            {
+                for (int v = 0; v < texture.getHeight(); v++)
+                {
+                    //note: Minecraft color format is: 0xAA BB GG RR
+                    //________ DH mod color format is: 0xAA RR GG BB
+                    //OpenGL RGBA format native order: 0xRR GG BB AA
+                    //_ OpenGL RGBA format Java Order: 0xAA BB GG RR
+                    tempColor = TextureAtlasSpriteWrapper.getPixelRGBA(texture, 0, u, v);
+
+                    double r = ((tempColor & 0x000000FF)      )/255.;
+                    double g = ((tempColor & 0x0000FF00) >>> 8)/255.;
+                    double b = ((tempColor & 0x00FF0000) >>> 16)/255.;
+                    double a = ((tempColor & 0xFF000000) >>> 24)/255.;
+                    int scale = 1;
+
+                    if (useFastLeaf) {
+                        r *= a;
+                        g *= a;
+                        b *= a;
+                        a = 1.;
+                    } else if (a==0.) {
+                        continue;
+                    } else if (useFlowerScaling && (g+0.1<b || g+0.1<r)) {
+                        scale = FLOWER_COLOR_SCALE;
+                    }
+
+                    count += scale;
+                    alpha += a*a*scale;
+                    red += r*r*scale;
+                    green += g*g*scale;
+                    blue += b*b*scale;
+                }
+            }
+        }
+
+        if (count == 0)
+            // this block is entirely transparent
+            tempColor = ColorUtil.rgbToInt(255,255,0,255);
+        else
+        {
+            // determine the average color
+            tempColor = ColorUtil.rgbToInt(
+                    (int) (Math.sqrt(alpha/count)*255.),
+                    (int) (Math.sqrt(red / count)*255.),
+                    (int) (Math.sqrt(green / count)*255.),
+                    (int) (Math.sqrt(blue / count)*255.));
+        }
+        // TODO: Remove this when transparency is added!
+        double colorAlpha = ColorUtil.getAlpha(tempColor)/255.;
+        tempColor = ColorUtil.rgbToInt(
+                ColorUtil.getAlpha(tempColor),
+                (int)(ColorUtil.getRed(tempColor) * colorAlpha),
+                (int)(ColorUtil.getGreen(tempColor) * colorAlpha),
+                (int)(ColorUtil.getBlue(tempColor) * colorAlpha)
+        );
+
+        return tempColor;
+    }
+
+
+    static class BlockDetailCache {
+        static BlockDetailCache NULL_BLOCK_DETAIL = new BlockDetailCache();
+
+        private static final Block[] BLOCK_TO_AVOID = {Blocks.AIR, Blocks.CAVE_AIR, Blocks.BARRIER};
+
+        private static final Direction[] DIRECTION_ORDER = {Direction.UP, Direction.NORTH, Direction.EAST, Direction.WEST, Direction.SOUTH, Direction.DOWN};
+
+        ConcurrentHashMap<Biome, BlockDetail> biomeDetailMap = null;
+        BlockDetail blockDetail;
+        BlockDetail defaultTintedDetail = null;
+        boolean requireResolving;
+        @SuppressWarnings("unused")
+        boolean requireShade; //TODO: Add back using this in renderer
+        @SuppressWarnings("unused")
+        boolean scaleFlowerColor; //FIXME: Do I need to scale the tint color???
+        int tintIndex;
+
+        static boolean isBlockToBeAvoid(Block b) {
+            for (Block bta : BLOCK_TO_AVOID)
+                if (bta==b) return true;
+            return false;
+        }
+
+        static boolean hasNoCollision(BlockState bs, BlockPos pos, LevelReader getter) {
+            if (!bs.getFluidState().isEmpty() || bs.getBlock() instanceof LiquidBlock) // Is blockState a fluid?
+                return false;
+            if (bs.getCollisionShape(getter, pos).isEmpty())
+                return true;
+            return false;
+        }
+        static boolean hasOnlyNonFullFace(BlockState bs, BlockPos pos, LevelReader getter) {
+            if (!bs.getFluidState().isEmpty() || bs.getBlock() instanceof LiquidBlock) // Is blockState a fluid?
+                return false;
+            VoxelShape voxelShape = bs.getShape(getter, pos);
+            if (voxelShape.isEmpty()) return true;
+            AABB bbox = voxelShape.bounds();
+            double xWidth = (bbox.maxX - bbox.minX);
+            double yWidth = (bbox.maxY - bbox.minY);
+            double zWidth = (bbox.maxZ - bbox.minZ);
+            return xWidth < 1 && zWidth < 1 && yWidth < 1;
+        }
+
+        static BlockDetailCache make(BlockState bs, BlockPos pos, LevelReader getter) {
+            boolean noCol, nonFull, canOcclude;
+            if(!bs.getFluidState().isEmpty()) {
+                bs = bs.getFluidState().createLegacyBlock();
+                FluidState fs = bs.getFluidState();
+                fs.getType();
+                noCol = false;
+                nonFull = false;
+                canOcclude = false;
+                BlockDetailCache result = new BlockDetailCache(fs);
+                //ApiShared.LOGGER.info(fs.toString()+" = ["+result+"]");
+                return result;
+            } else {
+                if (bs.getRenderShape() != RenderShape.MODEL) return NULL_BLOCK_DETAIL;
+                if (isBlockToBeAvoid(bs.getBlock())) return NULL_BLOCK_DETAIL;
+                //BlocksToAvoid toAvoid = CONFIG.client().worldGenerator().getBlocksToAvoid();
+                noCol = hasNoCollision(bs, pos, getter);
+                nonFull = hasOnlyNonFullFace(bs, pos, getter);
+                canOcclude = bs.canOcclude();
+                List<BakedQuad> quads = null;
+                for (Direction direction : DIRECTION_ORDER)
+                {
+                    quads = Minecraft.getInstance().getModelManager().getBlockModelShaper().getBlockModel(bs).getQuads(bs, direction, random);
+                    if (!quads.isEmpty() && !(bs.getBlock() instanceof RotatedPillarBlock && direction == Direction.UP))
+                        break;
+                };
+                if (quads == null || quads.isEmpty()) return NULL_BLOCK_DETAIL;
+                BlockDetailCache result = new BlockDetailCache(canOcclude, noCol, nonFull, quads.get(0),
+                        bs.getBlock() instanceof FlowerBlock, bs.getBlock() instanceof LeavesBlock);
+                // ApiShared.LOGGER.info(bs.toString()+" = ["+result+"]");
+                return result;
+            }
+        }
+
+        BlockDetailCache(boolean isFullBlock, boolean noCol, boolean nonFull, BakedQuad quad, boolean useFlowerScaling, boolean useFastLeaf) {
+            requireResolving = quad.isTinted();
+            requireShade = quad.isShade();
+            tintIndex = quad.getTintIndex();
+            scaleFlowerColor = useFlowerScaling;
+            blockDetail = new BlockDetail(calculateColorFromTexture(quad.sprite, useFlowerScaling, useFastLeaf), isFullBlock, noCol, nonFull);
+            if (quad.isTinted()) biomeDetailMap = new ConcurrentHashMap<Biome, BlockDetail>();
+        }
+
+        BlockDetailCache(FluidState fluid) {
+            requireResolving = true; // TODO: Maybe in the future recheck that there really is no way to see if a fluid needs tinting
+            requireShade = false;
+            tintIndex = 0; // Vanilla doesn't use this index currently. (Checked at 1.18.X, See BlockColors.class)
+            scaleFlowerColor = false;
+            TextureAtlasSprite text = Minecraft.getInstance().getModelManager().getBlockModelShaper().getBlockModel(fluid.createLegacyBlock()).getParticleIcon();
+            blockDetail = new BlockDetail(calculateColorFromTexture(text, false, false), true, false, false);
+            biomeDetailMap = new ConcurrentHashMap<Biome, BlockDetail>();
+        }
+
+        private BlockDetailCache()
+        {
+            //DUMMY CREATOR
+        }
+
+        BlockDetail getResolvedBlockDetail(BlockState bs, int x, int y, int z, LevelReader getter) {
+            if (!requireResolving) return blockDetail;
+            BlockPos pos = new BlockPos(x,y,z);
+            Biome biome = getter.getBiome(pos);
+            BlockDetail tintDetail = biomeDetailMap.get(biome);
+            if (tintDetail == null) {
+                if (!bs.getFluidState().isEmpty()) bs = bs.getFluidState().createLegacyBlock();
+                BlockColors bc = Minecraft.getInstance().getBlockColors();
+                int tintColor = bc.getColor(bs, getter, pos, tintIndex);
+                tintColor = ColorUtil.multiplyARGBwithRGB(blockDetail.color, tintColor);
+                tintDetail = new BlockDetail(tintColor, blockDetail.isFullBlock,
+                        blockDetail.hasNoCollision, blockDetail.hasOnlyNonFullFace);
+                BlockDetail tintDetailCAS = biomeDetailMap.putIfAbsent(biome, tintDetail);
+                if (tintDetailCAS != null) tintDetail = tintDetailCAS;
+            }
+            return tintDetail;
+        }
+
+        // Note: this one won't resolve biome based or pos based colors. (Kinda like GUI block icons)
+        BlockDetail getResolvedBlockDetail(BlockState bs) {
+            if (!requireResolving) return blockDetail;
+            if (defaultTintedDetail != null) return defaultTintedDetail;
+
+            BlockColors bc = Minecraft.getInstance().getBlockColors();
+            if (!bs.getFluidState().isEmpty()) bs = bs.getFluidState().createLegacyBlock();
+            int tintColor = bc.getColor(bs, null, null, tintIndex);
+            if (tintColor == -1) {
+                defaultTintedDetail = blockDetail;
+            }
+            else {
+                defaultTintedDetail = new BlockDetail(ColorUtil.multiplyARGBwithRGB(blockDetail.color, tintColor),
+                        blockDetail.isFullBlock, blockDetail.hasNoCollision, blockDetail.hasOnlyNonFullFace);
+            }
+            return defaultTintedDetail;
+        }
+
+        @Override
+        public String toString() {
+            return "[BlockDetail: "+blockDetail+", RequireResolving: "+requireResolving+", requireShade: "+requireShade+", scaleFlowerColor: "+scaleFlowerColor+"]";
+        }
+
+    }
+
+
+
+    private static ConcurrentHashMap<BlockState, BlockDetailCache> map = new ConcurrentHashMap<BlockState, BlockDetailCache>();
+
+    private BlockDetailMap() {}
+
+    private static BlockDetailCache getOrMakeBlockDetailCache(BlockState bs, BlockPos pos, LevelReader getter) {
+        BlockDetailCache cache = map.get(bs);
+        if (cache != null) return cache;
+        if (bs.getFluidState().isEmpty()) {
+            cache = BlockDetailCache.make(bs, pos, getter);
+        } else {
+            cache = BlockDetailCache.make(bs.getFluidState().createLegacyBlock(), pos, getter);
+        }
+        BlockDetailCache cacheCAS = map.putIfAbsent(bs, cache);
+        return cacheCAS==null ? cache : cacheCAS;
+    }
+
+
+    // Return null means skip the block
+    public static BlockDetail getBlockDetail(BlockState bs) {
+        BlockDetailCache cache = getOrMakeBlockDetailCache(bs, new BlockPos(0, 0, 0), null);
+        if (cache == BlockDetailCache.NULL_BLOCK_DETAIL) return null;
+        return cache.getResolvedBlockDetail(bs);
+    }
+
+    // Return null means skip the block
+    public static BlockDetail getBlockDetailWithCompleteTint(BlockState bs, int x, int y, int z, LevelReader tintGetter) {
+        BlockDetailCache cache = getOrMakeBlockDetailCache(bs, new BlockPos(x,y,z), tintGetter);
+        if (cache == BlockDetailCache.NULL_BLOCK_DETAIL) return null;
+        return cache.getResolvedBlockDetail(bs, x, y, z, tintGetter);
+    }
 }
@@ -1,343 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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 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;
-
-/*-- WARN: This class should NEVER hold reference to anything large,
- as this is never dealloc until the end of runtime!! --*/
-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;
-	
-	//boolean isShapeResolved = false;
-	//^ Shapes no longer lazy resolved due to memory leaks from needing
-	// to keep a reference to the block getter
-
-	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;
-		resolveShapes(getter, pos);
-		//ApiShared.LOGGER.info("Created BlockDetailWrapper for blockstate {} at {}", state, pos);
-	}
-	
-	private BlockDetailWrapper() {
-		this.state = 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(LevelReader sampleGetter, BlockPos samplePos) {
-		//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];
-		}
-	}
-	
-	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(
-						#if PRE_MC_1_17_1 quads.get(0).sprite,
-						#else quads.get(0).getSprite(), #endif
-	        		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());
-	}
-
-	public String toString() {
-		return "BlockDetail{" + state + "}";
-	}
-}
@@ -1,22 +1,3 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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 java.util.Objects;
@@ -33,7 +14,7 @@ import net.minecraft.core.BlockPos;
 */
 public class BlockPosWrapper extends AbstractBlockPosWrapper
 {
-    private final BlockPos.MutableBlockPos blockPos;
+    private BlockPos.MutableBlockPos blockPos;


    public BlockPosWrapper()
@@ -1,22 +1,3 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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;


@@ -37,16 +18,7 @@ public class TextureAtlasSpriteWrapper {
     * The code has been modified to use TextureAtlasSprite
     */
    public static int getPixelRGBA(TextureAtlasSprite sprite, int frameIndex, int x, int y) {
-        #if PRE_MC_1_17_1
-        return sprite.mainImage[0].getPixelRGBA(
-                x + sprite.framesX[frameIndex] * sprite.getWidth(),
-                y + sprite.framesY[frameIndex] * sprite.getHeight());
-        #else
-        if (sprite.animatedTexture != null) {
-            x += sprite.animatedTexture.getFrameX(frameIndex) * sprite.width;
-            y += sprite.animatedTexture.getFrameY(frameIndex) * sprite.height;
-        }
-        return sprite.mainImage[0].getPixelRGBA(x, y);
-        #endif
+    	// Require access widener
+        return sprite.mainImage[0].getPixelRGBA(x + sprite.framesX[frameIndex] * sprite.getWidth(), y + sprite.framesY[frameIndex] * sprite.getHeight());
    }
 }
@@ -1,217 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.common.LodCommonMain;
-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;
-
-    public TintGetterOverrideFast(LevelReader parent) {
-        this.parent = parent;
-    }
-
-    private Biome _getBiome(BlockPos pos) {
-		#if POST_MC_1_18_2
-        return parent.getBiome(pos).value();
-		#else
-		return parent.getBiome(pos);
-		#endif
-    }
-
-    @Override
-    public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver) {
-        if (LodCommonMain.forgeMethodCaller != null) {
-            return LodCommonMain.forgeMethodCaller.colorResolverGetColor(colorResolver, _getBiome(blockPos),
-                    blockPos.getX(), blockPos.getZ());
-        } else {
-            return colorResolver.getColor(_getBiome(blockPos), 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 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 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 getMaxBuildHeight() {
-        return parent.getMaxBuildHeight();
-    }
-
-    #if POST_MC_1_17_1
-    @Override
-    public <T extends BlockEntity> Optional<T> getBlockEntity(BlockPos blockPos, BlockEntityType<T> blockEntityType) {
-        return parent.getBlockEntity(blockPos, blockEntityType);
-    }
-
-    @Override
-    public BlockHitResult isBlockInLine(ClipBlockStateContext clipBlockStateContext) {
-        return parent.isBlockInLine(clipBlockStateContext);
-    }
-
-    @Override
-    public int getHeight() {
-        return parent.getHeight();
-    }
-
-    @Override
-    public int getMinBuildHeight() {
-        return parent.getMinBuildHeight();
-    }
-
-    @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);
-    }
-    #endif
-}
@@ -1,241 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.common.LodCommonMain;
-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;
-    public int smoothingRange;
-
-    public TintGetterOverrideSmooth(LevelReader parent, int smoothingRange) {
-        this.parent = parent;
-        this.smoothingRange = smoothingRange;
-    }
-
-    private Biome _getBiome(BlockPos pos) {
-		#if POST_MC_1_18_2
-        return parent.getBiome(pos).value();
-		#else
-        return parent.getBiome(pos);
-		#endif
-    }
-
-    public int calculateBlockTint(BlockPos blockPos, ColorResolver colorResolver)
-    {
-        int i = smoothingRange;
-        if (i == 0)
-            return colorResolver.getColor(_getBiome(blockPos), blockPos.getX(), blockPos.getZ());
-        int j = (i * 2 + 1) * (i * 2 + 1);
-        int k = 0;
-        int l = 0;
-        int m = 0;
-        Cursor3D cursor3D = new Cursor3D(blockPos.getX() - i, blockPos.getY(), blockPos.getZ() - i, blockPos.getX() + i, blockPos.getY(), blockPos.getZ() + i);
-        BlockPos.MutableBlockPos mutableBlockPos = new BlockPos.MutableBlockPos();
-        while (cursor3D.advance())
-        {
-            mutableBlockPos.set(cursor3D.nextX(), cursor3D.nextY(), cursor3D.nextZ());
-            int n;
-            if (LodCommonMain.forgeMethodCaller != null) {
-                n = LodCommonMain.forgeMethodCaller.colorResolverGetColor(colorResolver, _getBiome(mutableBlockPos),
-                        mutableBlockPos.getX(), mutableBlockPos.getZ());
-            } else {
-                n = colorResolver.getColor(_getBiome(mutableBlockPos), mutableBlockPos.getX(), mutableBlockPos.getZ());
-            }
-
-            k += (n & 0xFF0000) >> 16;
-            l += (n & 0xFF00) >> 8;
-            m += n & 0xFF;
-        }
-        return (k / j & 0xFF) << 16 | (l / j & 0xFF) << 8 | m / j & 0xFF;
-    }
-
-    @Override
-    public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver) {
-        return calculateBlockTint(blockPos, colorResolver);
-    }
-
-    @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 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 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 getMaxBuildHeight() {
-        return parent.getMaxBuildHeight();
-    }
-
-    #if POST_MC_1_17_1
-    @Override
-    public <T extends BlockEntity> Optional<T> getBlockEntity(BlockPos blockPos, BlockEntityType<T> blockEntityType) {
-        return parent.getBlockEntity(blockPos, blockEntityType);
-    }
-
-    @Override
-    public BlockHitResult isBlockInLine(ClipBlockStateContext clipBlockStateContext) {
-        return parent.isBlockInLine(clipBlockStateContext);
-    }
-
-    @Override
-    public int getHeight() {
-        return parent.getHeight();
-    }
-
-    @Override
-    public int getMinBuildHeight() {
-        return parent.getMinBuildHeight();
-    }
-
-    @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);
-    }
-    #endif
-}
@@ -1,22 +1,3 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.chunk;

 import java.util.Objects;
@@ -37,7 +18,7 @@ import net.minecraft.world.level.ChunkPos;
 */
 public class ChunkPosWrapper extends AbstractChunkPosWrapper
 {
-    private final net.minecraft.world.level.ChunkPos chunkPos;
+    private net.minecraft.world.level.ChunkPos chunkPos;

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

+    public ChunkPosWrapper(long l)
+    {
+        this.chunkPos = new ChunkPos(l);
+    }

    public ChunkPosWrapper(ChunkPos pos)
    {
@@ -104,29 +85,29 @@ public class ChunkPosWrapper extends AbstractChunkPosWrapper
    @Override
    public int getRegionX()
    {
-    	return LevelPosUtil.convert(LodUtil.CHUNK_DETAIL_LEVEL, chunkPos.x, LodUtil.REGION_DETAIL_LEVEL);
+        return LevelPosUtil.convert(LodUtil.CHUNK_DETAIL_LEVEL, chunkPos.x, LodUtil.REGION_DETAIL_LEVEL);
    }

    @Override
    public int getRegionZ()
    {
-    	return LevelPosUtil.convert(LodUtil.CHUNK_DETAIL_LEVEL, chunkPos.z, LodUtil.REGION_DETAIL_LEVEL);
-    }
-    
-    @Override
-    public long getLong() {
-    	return chunkPos.toLong();
+        return LevelPosUtil.convert(LodUtil.CHUNK_DETAIL_LEVEL, chunkPos.z, LodUtil.REGION_DETAIL_LEVEL);
    }

    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;
        }
@@ -148,12 +129,9 @@ public class ChunkPosWrapper extends AbstractChunkPosWrapper
    public AbstractBlockPosWrapper getWorldPosition()
    {
        // the parameter here is the y position
-        #if PRE_MC_1_17_1
        BlockPos blockPos = chunkPos.getWorldPosition();
-        #else
-        BlockPos blockPos = chunkPos.getMiddleBlockPosition(0);
-        #endif
        return new BlockPosWrapper(blockPos.getX(), blockPos.getY(), blockPos.getZ());
    }

+
 }
@@ -1,251 +1,177 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.chunk;

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

 import net.minecraft.core.BlockPos;
-#if POST_MC_1_17_1
-import net.minecraft.core.QuartPos;
-#endif
+import net.minecraft.world.level.BlockAndTintGetter;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.LightLayer;
+import net.minecraft.world.level.block.Block;
 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.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;
-	}
-	
-	@Override
-	public int getHeight(){
-		#if PRE_MC_1_17_1
-		return 255;
-		#else
-		return chunk.getHeight();
-		#endif
-	}
-	
-	@Override
-	public int getMinBuildHeight()
-	{
-		#if PRE_MC_1_17_1
-		return 0;
-		#else
-		return chunk.getMinBuildHeight();
-		#endif
-	}
-	@Override
-	public int getMaxBuildHeight()
-	{
-		return chunk.getMaxBuildHeight();
-	}
-	
-	@Override
-	public int getHeightMapValue(int xRel, int zRel)
-	{
-		return chunk.getOrCreateHeightmapUnprimed(WrapperUtil.DEFAULT_HEIGHTMAP).getFirstAvailable(xRel, zRel);
-	}
-	
-	@Override
-	public IBiomeWrapper getBiome(int x, int y, int z)
-	{
-		#if PRE_MC_1_17_1
-		return BiomeWrapper.getBiomeWrapper(chunk.getBiomes().getNoiseBiome(
-				x >> 2, y >> 2, z >> 2));
-		#elif PRE_MC_1_18_1
-		return BiomeWrapper.getBiomeWrapper(chunk.getBiomes().getNoiseBiome(
-				QuartPos.fromBlock(x), QuartPos.fromBlock(y), QuartPos.fromBlock(z)));
-		#elif PRE_MC_1_18_2
-		return BiomeWrapper.getBiomeWrapper(chunk.getNoiseBiome(
-				QuartPos.fromBlock(x), QuartPos.fromBlock(y), QuartPos.fromBlock(z)));
-		#else
-		return BiomeWrapper.getBiomeWrapper(chunk.getNoiseBiome(
-				QuartPos.fromBlock(x), QuartPos.fromBlock(y), QuartPos.fromBlock(z)).value());
-		#endif
-	}
-	
-	@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;
-	}
+    private ChunkAccess chunk;
+    private LevelReader lightSource;

    @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 int getHeight(){
+        return 255;
    }
-	
-	public ChunkAccess getChunk() {
-		return chunk;
-	}
-	
-	@Override
-	public int getChunkPosX(){
-		return chunk.getPos().x;
-	}
-	
-	@Override
-	public int getChunkPosZ(){
-		return chunk.getPos().z;
-	}
-	
-	@Override
-	public int getRegionPosX(){
-		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);
-	}
-	
-	@Override
-	public int getMaxY(int x, int z) {
-		return chunk.getHeight(Heightmap.Types.WORLD_SURFACE, Math.floorMod(x, 16), Math.floorMod(z, 16));
-	}
-	
-	@Override
-	public int getMaxX(){
-		return chunk.getPos().getMaxBlockX();
-	}
-	@Override
-	public int getMaxZ(){
-		return chunk.getPos().getMaxBlockZ();
-	}
-	@Override
-	public int getMinX(){
-		return chunk.getPos().getMinBlockX();
-	}
-	@Override
-	public int getMinZ() {
-		return chunk.getPos().getMinBlockZ();
-	}
-	
+
+    @Override
+    public int getMinBuildHeight()
+    {
+        return 0;
+    }
+    @Override
+    public int getMaxBuildHeight()
+    {
+        return chunk.getMaxBuildHeight();
+    }
+
+    @Override
+    public int getHeightMapValue(int xRel, int zRel)
+    {
+        return chunk.getOrCreateHeightmapUnprimed(WrapperUtil.DEFAULT_HEIGHTMAP).getFirstAvailable(xRel, zRel);
+    }
+
+    @Override
+    public IBiomeWrapper getBiome(int x, int y, int z)
+    {
+        return BiomeWrapper.getBiomeWrapper(chunk.getBiomes().getNoiseBiome(
+                x >> 2, y >> 2, z >> 2));
+    }
+
+    @Override
+    public BlockDetail getBlockDetail(int x, int y, int z) {
+        BlockState blockState = chunk.getBlockState(new BlockPos(x, y, z));
+        return BlockDetailMap.getBlockDetailWithCompleteTint(blockState, x, y, z, lightSource);
+    }
+
+    @Deprecated
+    public ChunkWrapper(ChunkAccess chunk)
+    {
+        this.chunk = chunk;
+        this.lightSource = null;
+    }
+    public ChunkWrapper(ChunkAccess chunk, LevelReader lightSource) {
+        this.chunk = chunk;
+        this.lightSource = lightSource;
+    }
+
+    public ChunkAccess getChunk() {
+        return chunk;
+    }
+
+    @Override
+    public int getChunkPosX(){
+        return chunk.getPos().x;
+    }
+
+    @Override
+    public int getChunkPosZ(){
+        return chunk.getPos().z;
+    }
+
+    @Override
+    public int getRegionPosX(){
+        return LevelPosUtil.convert(LodUtil.CHUNK_DETAIL_LEVEL, getChunkPosX(), LodUtil.REGION_DETAIL_LEVEL);
+    }
+
+    @Override
+    public int getRegionPosZ(){
+        return LevelPosUtil.convert(LodUtil.CHUNK_DETAIL_LEVEL, getChunkPosZ(), LodUtil.REGION_DETAIL_LEVEL);
+    }
+
+    @Override
+    public int getMaxY(int x, int z) {
+        return chunk.getHeight(Heightmap.Types.MOTION_BLOCKING, Math.floorMod(x, 16), Math.floorMod(z, 16));
+    }
+
+    @Override
+    public int getMaxX(){
+        return chunk.getPos().getMaxBlockX();
+    }
+    @Override
+    public int getMaxZ(){
+        return chunk.getPos().getMaxBlockZ();
+    }
+    @Override
+    public int getMinX(){
+        return chunk.getPos().getMinBlockX();
+    }
+    @Override
+    public int getMinZ() {
+        return chunk.getPos().getMinBlockZ();
+    }
+
+    @Override
+    public boolean isLightCorrect(){
+        return true;//chunk.isLightCorrect();
+    }
+
+    public boolean isWaterLogged(int x, int y, int z)
+    {
+        BlockState blockState = chunk.getBlockState(new BlockPos(x,y,z));
+
+        //This type of block is always in water
+        return (!(blockState.getBlock() instanceof LiquidBlockContainer) && (blockState.getBlock() instanceof SimpleWaterloggedBlock))
+                && (blockState.hasProperty(BlockStateProperties.WATERLOGGED) && blockState.getValue(BlockStateProperties.WATERLOGGED));
+    }
+
+    @Override
+    public int getEmittedBrightness(int x, int y, int z)
+    {
+        return chunk.getLightEmission(new BlockPos(x,y,z));
+    }
+
+    @Override
+    public int getBlockLight(int x, int y, int z) {
+        if (lightSource == null) return -1;
+        return lightSource.getBrightness(LightLayer.BLOCK, new BlockPos(x,y,z));
+    }
+
+    @Override
+    public int getSkyLight(int x, int y, int z) {
+        if (lightSource == null) return -1;
+        return lightSource.getBrightness(LightLayer.SKY, new BlockPos(x, y, z));
+    }
+
 	@Override
 	public long getLongChunkPos() {
 		return chunk.getPos().toLong();
 	}
-	
-	@Override
-	public boolean isLightCorrect(){
-		#if PRE_MC_1_18_1
-		return true;
-		#else
-		if (chunk instanceof LevelChunk) {
-			return ((LevelChunk) chunk).isClientLightReady();
-		}
-		return chunk.isLightCorrect();
-		#endif
-	}
-	
-	public boolean isWaterLogged(int x, int y, int z)
-	{
-		BlockState blockState = chunk.getBlockState(new BlockPos(x,y,z));
-		
-		//This type of block is always in water
-		return (!(blockState.getBlock() instanceof LiquidBlockContainer) && (blockState.getBlock() instanceof SimpleWaterloggedBlock))
-				&& (blockState.hasProperty(BlockStateProperties.WATERLOGGED) && blockState.getValue(BlockStateProperties.WATERLOGGED));
-	}
-	
-	@Override
-	public int getEmittedBrightness(int x, int y, int z)
-	{
-		return chunk.getLightEmission(new BlockPos(x,y,z));
-	}
-	
-	@Override
-	public int getBlockLight(int x, int y, int z) {
-		if (lightSource == null) return -1;
-		return lightSource.getBrightness(LightLayer.BLOCK, new BlockPos(x,y,z));
-	}
-	
-	@Override
-	public int getSkyLight(int x, int y, int z) {
-		if (lightSource == null) return -1;
-		return lightSource.getBrightness(LightLayer.SKY, new BlockPos(x,y,z));
-	}
-	
-	@Override
-	public 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;
-	}

-	@Override
-	public String toString() {
-		return chunk.getClass().getSimpleName() + chunk.getPos();
-	}
-	
+    @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;
+    }
 }
@@ -3,6 +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.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IMultiplayer;
 import com.seibel.lod.common.Config;

 /**
@@ -15,47 +16,47 @@ import com.seibel.lod.common.Config;
 public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 {
 	public static final LodConfigWrapperSingleton INSTANCE = new LodConfigWrapperSingleton();
-	
-	
+
+
 	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 IMultiplayer multiplayer;
 		public final IAdvanced advanced;
-		
-		
+
+
 		@Override
 		public IGraphics graphics()
 		{
 			return graphics;
 		}
-		
+
 		@Override
 		public IWorldGenerator worldGenerator()
 		{
 			return worldGenerator;
 		}
-		
+
 		@Override
 		public IMultiplayer multiplayer() {
 			return multiplayer;
 		}
-		
+
 		@Override
 		public IAdvanced advanced()
 		{
 			return advanced;
 		}
-		
-		
+
+
 		@Override
 		public boolean getOptionsButton()
 		{
@@ -67,8 +68,8 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 			ConfigGui.editSingleOption.getEntry("optionsButton").value = newOptionsButton;
 			ConfigGui.editSingleOption.saveOption("optionsButton");
 		}
-		
-		
+
+
 		//================//
 		// Client Configs //
 		//================//
@@ -79,8 +80,8 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 			multiplayer = new Multiplayer();
 			advanced = new Advanced();
 		}
-		
-		
+
+
 		//==================//
 		// Graphics Configs //
 		//==================//
@@ -89,36 +90,36 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 			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
@@ -132,8 +133,8 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 					ConfigGui.editSingleOption.getEntry("client.graphics.quality.drawResolution").value = newHorizontalResolution;
 					ConfigGui.editSingleOption.saveOption("client.graphics.quality.drawResolution");
 				}
-				
-				
+
+
 				@Override
 				public int getLodChunkRenderDistance()
 				{
@@ -145,8 +146,8 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 					ConfigGui.editSingleOption.getEntry("client.graphics.quality.lodChunkRenderDistance").value = newLodChunkRenderDistance;
 					ConfigGui.editSingleOption.saveOption("client.graphics.quality.lodChunkRenderDistance");
 				}
-				
-				
+
+
 				@Override
 				public VerticalQuality getVerticalQuality()
 				{
@@ -158,8 +159,8 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 					ConfigGui.editSingleOption.getEntry("client.graphics.quality.verticalQuality").value = newVerticalQuality;
 					ConfigGui.editSingleOption.saveOption("client.graphics.quality.verticalQuality");
 				}
-				
-				
+
+
 				@Override
 				public int getHorizontalScale()
 				{
@@ -171,8 +172,8 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 					ConfigGui.editSingleOption.getEntry("client.graphics.quality.horizontalScale").value = newHorizontalScale;
 					ConfigGui.editSingleOption.saveOption("client.graphics.quality.horizontalScale");
 				}
-				
-				
+
+
 				@Override
 				public HorizontalQuality getHorizontalQuality()
 				{
@@ -184,7 +185,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 					ConfigGui.editSingleOption.getEntry("client.graphics.quality.horizontalQuality").value = newHorizontalQuality;
 					ConfigGui.editSingleOption.saveOption("client.graphics.quality.horizontalQuality");
 				}
-				
+
 				@Override
 				public DropoffQuality getDropoffQuality() {
 					return Config.Client.Graphics.Quality.dropoffQuality;
@@ -194,29 +195,11 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 					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()
 				{
@@ -228,36 +211,36 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 					ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.fogDistance").value = newFogDistance;
 					ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.fogDistance");
 				}
-				
-				
+
+
 				@Override
 				public FogDrawMode getFogDrawMode()
 				{
 					return Config.Client.Graphics.FogQuality.fogDrawMode;
 				}
-				
+
 				@Override
 				public void setFogDrawMode(FogDrawMode setFogDrawMode)
 				{
 					ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.fogDrawMode").value = setFogDrawMode;
 					ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.fogDrawMode");
 				}
-				
-				
+
+
 				@Override
 				public FogColorMode getFogColorMode()
 				{
 					return Config.Client.Graphics.FogQuality.fogColorMode;
 				}
-				
+
 				@Override
 				public void setFogColorMode(FogColorMode newFogColorMode)
 				{
 					ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.fogColorMode").value = newFogColorMode;
 					ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.fogColorMode");
 				}
-				
-				
+
+
 				@Override
 				public boolean getDisableVanillaFog()
 				{
@@ -269,170 +252,9 @@ 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");
-						}
-					}
-				}
-
 			}
-			
-			
+
+
 			public static class AdvancedGraphics implements IAdvancedGraphics
 			{
 				@Override
@@ -446,8 +268,8 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 					ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.disableDirectionalCulling").value = newDisableDirectionalCulling;
 					ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.disableDirectionalCulling");
 				}
-				
-				
+
+
 				@Override
 				public VanillaOverdraw getVanillaOverdraw()
 				{
@@ -459,17 +281,6 @@ 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()
@@ -482,7 +293,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 					ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.backsideCullingRange").value = newBacksideCullingRange;
 					ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.backsideCullingRange");
 				}*/
-				
+
 				@Override
 				public boolean getUseExtendedNearClipPlane()
 				{
@@ -494,73 +305,12 @@ 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");
-
-				}
-
-				@Override
-				public int getEarthCurveRatio()
-				{
-					return (int) ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.earthCurveRatio").value;
-				}
-				@Override
-				public void setEarthCurveRatio(int newEarthCurveRatio)
-				{
-					if (newEarthCurveRatio < 50) newEarthCurveRatio = 0;
-					ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.earthCurveRatio").value = newEarthCurveRatio;
-					ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.earthCurveRatio");
-				}
 			}
 		}
-		
-		
-		
-		
+
+
+
+
 		//========================//
 		// WorldGenerator Configs //
 		//========================//
@@ -577,8 +327,8 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				ConfigGui.editSingleOption.getEntry("client.worldGenerator.generationPriority").value = newGenerationPriority;
 				ConfigGui.editSingleOption.saveOption("client.worldGenerator.generationPriority");
 			}
-			
-			
+
+
 			@Override
 			public DistanceGenerationMode getDistanceGenerationMode()
 			{
@@ -591,20 +341,6 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				ConfigGui.editSingleOption.saveOption("client.worldGenerator.distanceGenerationMode");
 			}

-			/*
-			@Override
-			public boolean getAllowUnstableFeatureGeneration()
-			{
-				return Config.Client.WorldGenerator.allowUnstableFeatureGeneration;
-			}
-			@Override
-			public void setAllowUnstableFeatureGeneration(boolean newAllowUnstableFeatureGeneration)
-			{
-				ConfigGui.editSingleOption.getEntry("client.worldGenerator.allowUnstableFeatureGeneration").value = newAllowUnstableFeatureGeneration;
-				ConfigGui.editSingleOption.saveOption("client.worldGenerator.allowUnstableFeatureGeneration");
-			}*/
-			
-			
 			@Override
 			public BlocksToAvoid getBlocksToAvoid()
 			{
@@ -639,9 +375,9 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				ConfigGui.editSingleOption.saveOption("client.worldGenerator.lightGenerationMode");
 			}
 		}
-		
-		
-		
+
+
+
 		//=====================//
 		// Multiplayer Configs //
 		//=====================//
@@ -658,23 +394,12 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				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 //
 		//============================//
@@ -683,22 +408,22 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 			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()
 			{
@@ -712,22 +437,22 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				debugging = new Debugging();
 				buffers = new Buffers();
 			}
-			
+
 			public static class Threading implements IThreading
 			{
 				@Override
-				public double getNumberOfWorldGenerationThreads()
+				public int getNumberOfWorldGenerationThreads()
 				{
 					return Config.Client.Advanced.Threading.numberOfWorldGenerationThreads;
 				}
 				@Override
-				public void setNumberOfWorldGenerationThreads(double newNumberOfWorldGenerationThreads)
+				public void setNumberOfWorldGenerationThreads(int newNumberOfWorldGenerationThreads)
 				{
 					ConfigGui.editSingleOption.getEntry("client.advanced.threading.numberOfWorldGenerationThreads").value = newNumberOfWorldGenerationThreads;
 					ConfigGui.editSingleOption.saveOption("client.advanced.threading.numberOfWorldGenerationThreads");
 				}
-				
-				
+
+
 				@Override
 				public int getNumberOfBufferBuilderThreads()
 				{
@@ -740,38 +465,28 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 					ConfigGui.editSingleOption.saveOption("client.advanced.threading.numberOfBufferBuilderThreads");
 				}
 			}
-			
-			
-			
-			
+
+
+
+
 			//===============//
 			// Debug Options //
 			//===============//
 			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,8 +498,8 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 					ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugMode").value = newDebugMode;
 					ConfigGui.editSingleOption.saveOption("client.advanced.debugging.debugMode");
 				}
-				
-				
+
+
 				@Override
 				public boolean getDebugKeybindingsEnabled()
 				{
@@ -796,122 +511,12 @@ 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");
-					}
-				}
 			}
-			
-			
+
+
 			public static class Buffers implements IBuffers
 			{
-				
+
 				@Override
 				public GpuUploadMethod getGpuUploadMethod()
 				{
@@ -923,8 +528,8 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 					ConfigGui.editSingleOption.getEntry("client.advanced.buffers.gpuUploadMethod").value = newDisableVanillaFog;
 					ConfigGui.editSingleOption.saveOption("client.advanced.buffers.gpuUploadMethod");
 				}
-				
-				
+
+
 				@Override
 				public int getGpuUploadPerMegabyteInMilliseconds()
 				{
@@ -935,8 +540,8 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 					ConfigGui.editSingleOption.getEntry("client.advanced.buffers.gpuUploadPerMegabyteInMilliseconds").value = newMilliseconds;
 					ConfigGui.editSingleOption.saveOption("client.advanced.buffers.gpuUploadPerMegabyteInMilliseconds");
 				}
-				
-				
+
+
 				@Override
 				public BufferRebuildTimes getRebuildTimes()
 				{
@@ -949,18 +554,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");
-
-			}
 		}
 	}
 }
@@ -1,29 +1,10 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.config;

 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
+
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.ImageButton;
-import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;

@@ -31,12 +12,9 @@ import net.minecraft.resources.ResourceLocation;
 * Creates a button with a texture on it
 */
 public class TexturedButtonWidget extends ImageButton {
-    #if POST_MC_1_17_1
-    public TexturedButtonWidget(int x, int y, int width, int height, int u, int v, ResourceLocation texture, OnPress pressAction) {
-        super(x, y, width, height, u, v, texture, pressAction);
-    }
-    #endif
-
+//    public TexturedButtonWidget(int x, int y, int width, int height, int u, int v, ResourceLocation texture, OnPress pressAction) {
+//        super(x, y, width, height, u, v, texture, pressAction);
+//    }
    public TexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, ResourceLocation texture, int textureWidth, int textureHeight, OnPress pressAction) {
        super(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, pressAction);
    }
@@ -49,24 +27,20 @@ public class TexturedButtonWidget extends ImageButton {
        super(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, pressAction, tooltipSupplier, text);
    }

-    @Override
-    public void renderButton(PoseStack matrices, int mouseX, int mouseY, float delta) {
-        #if PRE_MC_1_17_1
-        Minecraft.getInstance().getTextureManager().bind(WIDGETS_LOCATION);
-        RenderSystem.color4f(1.0F, 1.0F, 1.0F, this.alpha);
-        #else
-        RenderSystem.setShader(GameRenderer::getPositionTexShader);
-        RenderSystem.setShaderTexture(0, WIDGETS_LOCATION);
-        RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, this.alpha);
-        #endif
+	@Override
+	public void renderButton(PoseStack matrices, int mouseX, int mouseY, float delta) {

-        int i = this.getYImage(this.isHovered);
-        RenderSystem.enableBlend();
-        RenderSystem.defaultBlendFunc();
-        RenderSystem.enableDepthTest();
-        this.blit(matrices, this.x, this.y, 0, 46 + i * 20, this.width / 2, this.height);
-        this.blit(matrices, this.x + this.width / 2, this.y, 200 - this.width / 2, 46 + i * 20, this.width / 2, this.height);
+		Minecraft.getInstance().getTextureManager().bind(WIDGETS_LOCATION);
+		RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, this.alpha);
+		int i = getYImage(isHovered());

-        super.renderButton(matrices, mouseX, mouseY, delta);
-    }
+		RenderSystem.enableBlend();
+		RenderSystem.defaultBlendFunc();
+		RenderSystem.enableDepthTest();
+		this.blit(matrices, this.x, this.y, 0, 46 + i * 20, this.width / 2, this.height);
+		this.blit(matrices, this.x + this.width / 2, this.y, 200 - this.width / 2, 46 + i * 20, this.width / 2,
+				this.height);
+
+		super.renderButton(matrices, mouseX, mouseY, delta);
+	}
 }
@@ -1,8 +1,8 @@
 /*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
 *    licensed under the GNU GPL v3 License.
 *
- *    Copyright (C) 2020-2022  James Seibel
+ *    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
@@ -27,6 +27,7 @@ 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;
@@ -59,15 +60,15 @@ import net.minecraft.network.chat.TextComponent;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.ChunkPos;
-import net.minecraft.world.level.LightLayer;
 import net.minecraft.world.level.dimension.DimensionType;
 import org.jetbrains.annotations.Nullable;

 /**
- * A singleton that wraps the Minecraft object.
+ * A singleton that wraps the Minecraft class
+ * to allow for easier movement between Minecraft versions.
 *
 * @author James Seibel
- * @version 3-5-2022
+ * @version 9-16-2021
 */
 public class MinecraftClientWrapper implements IMinecraftClientWrapper
 {
@@ -164,6 +165,57 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper
        return LodUtil.getDimensionIDFromWorld(WorldWrapper.getWorldWrapper(mc.level));
    }

+    /** This texture changes every frame */
+    @Override
+    public ILightMapWrapper getCurrentLightMap()
+    {
+        // get the current lightMap if the cache is empty
+        if (lightMap == null)
+        {
+            LightTexture tex = mc.gameRenderer.lightTexture();
+            lightMap = tex.lightPixels;
+        }
+        return new LightMapWrapper(lightMap);
+    }
+
+    /**
+     * Returns the color int 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 int getColorIntFromLightMap(int blockLight, int skyLight)
+    {
+        if (lightMap == null)
+        {
+            sendChatMessage("new");
+            // make sure the lightMap is up-to-date
+            getCurrentLightMap();
+        }
+
+        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));
+    }
+
+
+
+
    //=============//
    // Simple gets //
    //=============//
@@ -189,12 +241,7 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper
    @Override
    public ChunkPosWrapper getPlayerChunkPos()
    {
-        #if PRE_MC_1_17_1
-        ChunkPos playerPos = new ChunkPos(getPlayer().blockPosition());
-        #else
-        ChunkPos playerPos = getPlayer().chunkPosition();
-        #endif
-        return new ChunkPosWrapper(playerPos.x, playerPos.z);
+        return new ChunkPosWrapper(getPlayer().chunkPosition().x, getPlayer().chunkPosition().z);
    }

    public Options getOptions()
@@ -327,14 +374,6 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper
        return mc.getCurrentServer() != null;
    }

-    @Override
-    public int getPlayerSkylight() {
-        if (mc.level == null) return -1;
-        if (mc.player == null) return -1;
-        if (mc.player.blockPosition() == null) return -1;
-        return mc.level.getBrightness(LightLayer.SKY, mc.player.blockPosition());
-    }
-
    public ServerData getCurrentServer()
    {
        return mc.getCurrentServer();
@@ -1,75 +1,48 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.minecraft;

-import java.awt.Color;
-import java.util.Collection;
+import java.awt.*;
 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.WrapperFactory;
 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.util.LodUtil;
 import com.seibel.lod.core.handlers.dependencyInjection.ModAccessorHandler;
 import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
-import com.seibel.lod.core.util.LodUtil;
-
-import com.seibel.lod.core.wrapperInterfaces.misc.ILightMapWrapper;
+import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory;
+import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftWrapper;
+import com.seibel.lod.core.wrapperInterfaces.modAccessor.IOptifineAccessor;
+import com.seibel.lod.core.wrapperInterfaces.modAccessor.ISodiumAccessor;
+import it.unimi.dsi.fastutil.objects.ObjectList;
 import net.minecraft.client.renderer.LightTexture;
+import net.minecraft.world.phys.AABB;
+import org.lwjgl.opengl.GL15;

 import com.mojang.math.Vector3f;
 import com.seibel.lod.core.objects.math.Mat4f;
 import com.seibel.lod.core.objects.math.Vec3d;
 import com.seibel.lod.core.objects.math.Vec3f;
-import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory;
 import com.seibel.lod.core.wrapperInterfaces.block.AbstractBlockPosWrapper;
 import com.seibel.lod.core.wrapperInterfaces.chunk.AbstractChunkPosWrapper;
 import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
-import com.seibel.lod.core.wrapperInterfaces.modAccessor.IOptifineAccessor;
-import com.seibel.lod.core.wrapperInterfaces.modAccessor.ISodiumAccessor;
 import com.seibel.lod.common.wrappers.McObjectConverter;
-import com.seibel.lod.common.wrappers.WrapperFactory;
 import com.seibel.lod.common.wrappers.block.BlockPosWrapper;

 import net.minecraft.client.Camera;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.FogRenderer;
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.renderer.LevelRenderer;
 import net.minecraft.core.BlockPos;
+import net.minecraft.tags.FluidTags;
 import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
-#if PRE_MC_1_17_1
-import net.minecraft.tags.FluidTags;
 import net.minecraft.world.level.material.FluidState;
-#else
 import net.minecraft.world.level.material.FogType;
-#endif
-import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
-import org.lwjgl.opengl.GL15;


 /**
@@ -77,222 +50,261 @@ import org.lwjgl.opengl.GL15;
 * related to rendering in Minecraft.
 *
 * @author James Seibel
- * @version 12-12-2021
+ * @version 12-14-2021
 */
 public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 {
-	public static final MinecraftRenderWrapper INSTANCE = new MinecraftRenderWrapper();
-	
-	private static final Minecraft MC = Minecraft.getInstance();
-	private static final GameRenderer GAME_RENDERER = MC.gameRenderer;
-	private static final IWrapperFactory FACTORY = WrapperFactory.INSTANCE;
+    public static final MinecraftRenderWrapper INSTANCE = new MinecraftRenderWrapper();

-	public LightMapWrapper lightmap = null;
+    private static final Minecraft MC = Minecraft.getInstance();
+    private static final GameRenderer GAME_RENDERER = MC.gameRenderer;
+    private static final WrapperFactory FACTORY = WrapperFactory.INSTANCE;

-	@Override
-	public Vec3f getLookAtVector()
-	{
-		Camera camera = GAME_RENDERER.getMainCamera();
-		Vector3f cameraDir = camera.getLookVector();
-		return new Vec3f(cameraDir.x(), cameraDir.y(), cameraDir.z());
-	}
-	
-	@Override
-	public AbstractBlockPosWrapper getCameraBlockPosition()
-	{
-		Camera camera = GAME_RENDERER.getMainCamera();
-		BlockPos blockPos = camera.getBlockPosition();
-		return new BlockPosWrapper(blockPos.getX(), blockPos.getY(), blockPos.getZ());
-	}
-	
-	@Override
-	public boolean playerHasBlindnessEffect()
-	{
-		return MC.player.getActiveEffectsMap().get(MobEffects.BLINDNESS) != null;
-	}
-	
-	@Override
-	public Vec3d getCameraExactPosition()
-	{
-		Camera camera = GAME_RENDERER.getMainCamera();
-		Vec3 projectedView = camera.getPosition();
-		
-		return new Vec3d(projectedView.x, projectedView.y, projectedView.z);
-	}
-	
-	@Override
-	public Mat4f getDefaultProjectionMatrix(float partialTicks)
-	{
-		#if PRE_MC_1_17_1
-		return McObjectConverter.Convert(GAME_RENDERER.getProjectionMatrix(GAME_RENDERER.getMainCamera(), partialTicks, true));
-		#else
-		return McObjectConverter.Convert(GAME_RENDERER.getProjectionMatrix(GAME_RENDERER.getFov(GAME_RENDERER.getMainCamera(), partialTicks, true)));
-		#endif
-	}
-	
-	@Override
-	public double getGamma()
-	{
-		return MC.options.gamma;
-	}
-	
-	@Override
-	public Color getFogColor(float partialTicks) {

-		#if PRE_MC_1_17_1
-		float[] colorValues = new float[4];
-		GL15.glGetFloatv(GL15.GL_FOG_COLOR, colorValues);
-		#else
-		FogRenderer.setupColor(GAME_RENDERER.getMainCamera(), partialTicks, MC.level, 1, GAME_RENDERER.getDarkenWorldAmount(partialTicks));
-		float[] colorValues = RenderSystem.getShaderFogColor();
-		#endif
-		return new Color(colorValues[0], colorValues[1], colorValues[2], colorValues[3]);
-	}
-	// getSpecialFogColor() is the same as getFogColor()
-	
-	@Override
-	public Color getSkyColor() {
-		if (MC.level.dimensionType().hasSkyLight()) {
-			#if PRE_MC_1_17_1
-			Vec3 colorValues = MC.level.getSkyColor(MC.gameRenderer.getMainCamera().getBlockPosition(), MC.getFrameTime());
-			#else
-			Vec3 colorValues = MC.level.getSkyColor(MC.gameRenderer.getMainCamera().getPosition(), MC.getFrameTime());
-			#endif
-			return new Color((float) colorValues.x, (float) colorValues.y, (float) colorValues.z);
-		} else
-			return new Color(0, 0, 0);
-	}
-	
-	@Override
-	public double getFov(float partialTicks)
-	{
-		return GAME_RENDERER.getFov(GAME_RENDERER.getMainCamera(), partialTicks, true);
-	}
-	
-	/** Measured in chunks */
-	@Override
-	public int getRenderDistance()
-	{
-		#if PRE_MC_1_18_1
-		//FIXME: How to resolve this?
-		return MC.options.renderDistance;
-		#else
-		return MC.options.getEffectiveRenderDistance();
-		#endif
-	}
-	
-	@Override
-	public int getScreenWidth()
-	{
-		return MC.getWindow().getWidth();
-	}
-	@Override
-	public int getScreenHeight()
-	{
-		return MC.getWindow().getHeight();
-	}
-	
-    private RenderTarget getRenderTarget() {
-        RenderTarget r = null; //MC.levelRenderer.getCloudsTarget();
-        return r!=null ? r : MC.getMainRenderTarget();
+
+    @Override
+    public Vec3f getLookAtVector()
+    {
+        Camera camera = GAME_RENDERER.getMainCamera();
+        Vector3f cameraDir = camera.getLookVector();
+        return new Vec3f(cameraDir.x(), cameraDir.y(), cameraDir.z());
    }

    @Override
-    public int getTargetFrameBuffer() {
-        return getRenderTarget().frameBufferId;
+    public AbstractBlockPosWrapper getCameraBlockPosition()
+    {
+        Camera camera = GAME_RENDERER.getMainCamera();
+        BlockPos blockPos = camera.getBlockPosition();
+        return new BlockPosWrapper(blockPos.getX(), blockPos.getY(), blockPos.getZ());
    }

    @Override
-    public int getTargetFrameBufferViewportWidth() {
-        return getRenderTarget().viewWidth;
+    public boolean playerHasBlindnessEffect()
+    {
+        return MC.player.getActiveEffectsMap().get(MobEffects.BLINDNESS) != null;
    }

    @Override
-    public int getTargetFrameBufferViewportHeight() {
-        return getRenderTarget().viewHeight;
+    public Vec3d getCameraExactPosition()
+    {
+        Camera camera = GAME_RENDERER.getMainCamera();
+        Vec3 projectedView = camera.getPosition();
+
+        return new Vec3d(projectedView.x, projectedView.y, projectedView.z);
    }

-	/**
-	 * This method returns the ChunkPos of all chunks that Minecraft
-	 * is going to render this frame. <br><br>
-	 * <p>
-	 */
-	
+    @Override
+    public Mat4f getDefaultProjectionMatrix(float partialTicks)
+    {
+        return McObjectConverter.Convert(GAME_RENDERER.getProjectionMatrix(GAME_RENDERER.getMainCamera(), partialTicks, true));
+    }
+
+    @Override
+    public double getGamma()
+    {
+        return MC.options.gamma;
+    }
+
+    @Override
+    public Color getFogColor(float partialTick) {
+        float[] colorValues = new float[4];
+        GL15.glGetFloatv(GL15.GL_FOG_COLOR, colorValues);
+        return new Color(colorValues[0], colorValues[1], colorValues[2], colorValues[3]);
+    }
+    // getSpecialFogColor() is the same as getFogColor()
+
+    @Override
+    public Color getSkyColor() {
+        if (MC.level.dimensionType().hasSkyLight()) {
+            Vec3 colorValues = MC.level.getSkyColor(MC.gameRenderer.getMainCamera().getPosition(), MC.getFrameTime());
+            return new Color((float) colorValues.x, (float) colorValues.y, (float) colorValues.z);
+        } else
+            return new Color(0, 0, 0);
+    }
+
+    @Override
+    public double getFov(float partialTicks)
+    {
+        return GAME_RENDERER.getFov(GAME_RENDERER.getMainCamera(), partialTicks, true);
+    }
+
+    /** Measured in chunks */
+    @Override
+    public int getRenderDistance()
+    {
+        return MC.options.renderDistance;
+    }
+
+    @Override
+    public int getScreenWidth()
+    {
+        return MC.getWindow().getWidth();
+    }
+    @Override
+    public int getScreenHeight()
+    {
+        return MC.getWindow().getHeight();
+    }
+
+    /**
+     * This method returns the ChunkPos of all chunks that Minecraft
+     * is going to render this frame. <br><br>
+     * <p>
+     */
    public boolean usingBackupGetVanillaRenderedChunks = false;
-	@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) {
+    @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;
-				Collection<LevelRenderer.RenderChunkInfo> chunks =
-					#if PRE_MC_1_18_1 levelRenderer.renderChunks;
-					#else levelRenderer.renderChunkStorage.get().renderChunks; #endif
-
-				return (chunks.stream().map((chunk) -> {
-					AABB chunkBoundingBox =
-						#if PRE_MC_1_18_2 chunk.chunk.bb;
-						#else chunk.chunk.getBoundingBox(); #endif
-					return FACTORY.createChunkPos(Math.floorDiv((int) chunkBoundingBox.minX, 16),
-							Math.floorDiv((int) chunkBoundingBox.minZ, 16));
-				}).collect(Collectors.toCollection(HashSet::new)));
+		        LevelRenderer levelRenderer = MC.levelRenderer;
+		        ObjectList<LevelRenderer.RenderChunkInfo> chunks = levelRenderer.renderChunks;
+		        return (chunks.stream().map((chunk) -> {
+		            AABB chunkBoundingBox = chunk.chunk.bb;
+		            return FACTORY.createChunkPos(Math.floorDiv((int) chunkBoundingBox.minX, 16),
+		                    Math.floorDiv((int) chunkBoundingBox.minZ, 16));
+		        }).collect(Collectors.toCollection(HashSet::new)));
 			} catch (LinkageError e) {
 				try {
 					MinecraftClientWrapper.INSTANCE.sendChatMessage(
 							"\u00A7e\u00A7l\u00A7uWARNING: Distant Horizons: getVanillaRenderedChunks method failed."
-									+ " Using Backup Method.");
+							+ " Using Backup Method.");
 					MinecraftClientWrapper.INSTANCE.sendChatMessage(
 							"\u00A7eOverdraw prevention will be worse than normal.");
-				} catch (Exception e2) {
-				}
-				ApiShared.LOGGER.error("getVanillaRenderedChunks Error: ", e);
+				} catch (Exception e2) {}
+				ApiShared.LOGGER.error("getVanillaRenderedChunks Error: {}", e);
 				usingBackupGetVanillaRenderedChunks = true;
 			}
 		}
 		return getMaximumRenderedChunks();
-	}
-
-	@Override
-	public ILightMapWrapper getLightmapWrapper() {
-		return lightmap;
-	}
-	
-	@Override
-	public boolean isFogStateSpecial() {
-		#if PRE_MC_1_17_1
-		Camera camera = GAME_RENDERER.getMainCamera();
-		FluidState fluidState = camera.getFluidInCamera();
-		Entity entity = camera.getEntity();
-		boolean isUnderWater = (entity instanceof LivingEntity) && ((LivingEntity)entity).hasEffect(MobEffects.BLINDNESS);
-			isUnderWater |= fluidState.is(FluidTags.WATER);
-			isUnderWater |= fluidState.is(FluidTags.LAVA);
-		return isUnderWater;
-		#else
-		Entity entity = GAME_RENDERER.getMainCamera().getEntity();
-		boolean isBlind = (entity instanceof LivingEntity) && ((LivingEntity)entity).hasEffect(MobEffects.BLINDNESS);
-		return GAME_RENDERER.getMainCamera().getFluidInCamera() != FogType.NONE || isBlind;
-		#endif
-	}
-	
-	@Override
-	public boolean tryDisableVanillaFog() {
-		return true; // Handled via MixinFogRenderer in both forge and fabric
-	}
-
-    public void updateLightmap(NativeImage lightPixels) {
-		if (lightmap== null) {
-			lightmap = new LightMapWrapper();
-		}
-		lightmap.uploadLightmap(lightPixels);
    }
+
+    @Override
+    public int[] getLightmapPixels()
+    {
+        LightTexture tex = GAME_RENDERER.lightTexture();
+        tex.tick(); // This call makes no sense, but it fixes pause menu flicker bug
+        NativeImage lightMapPixels = tex.lightPixels;
+        LightMapWrapper lightMap = new LightMapWrapper(lightMapPixels);
+
+
+        int lightMapHeight = getLightmapTextureHeight();
+        int lightMapWidth = getLightmapTextureWidth();
+
+        int pixels[] = new int[lightMapWidth * lightMapHeight];
+        for (int u = 0; u < lightMapWidth; u++)
+        {
+            for (int v = 0; v < lightMapWidth; v++)
+            {
+                // this could probably be kept as a int, but
+                // it is easier to test and see the colors when debugging this way.
+                // When creating a new release this should be changed to the int version.
+                Color c = LodUtil.intToColor(lightMap.getLightValue(u, v));
+
+                // these should both create a totally white image
+//					int col =
+//							Integer.MAX_VALUE;
+//					int col =
+//							0b11111111 + // red
+//							(0b11111111 << 8) + // green
+//							(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
+
+                        
+                // 2D array stored in a 1D array.
+                // Thank you Tim from College ;)
+                pixels[u * lightMapWidth + v] = col;
+            }
+        }
+
+        return pixels;
+    }
+
+
+    @Override
+    public int getLightmapTextureHeight()
+    {
+        int height = -1;
+
+        LightTexture lightTexture = GAME_RENDERER.lightTexture();
+        if (lightTexture != null)
+        {
+            NativeImage tex = lightTexture.lightPixels;
+            if (tex != null)
+            {
+                height = tex.getHeight();
+            }
+        }
+
+        return height;
+    }
+
+    @Override
+    public int getLightmapTextureWidth()
+    {
+        int width = -1;
+
+        LightTexture lightTexture = GAME_RENDERER.lightTexture();
+        if (lightTexture != null)
+        {
+            NativeImage tex = lightTexture.lightPixels;
+            if (tex != null)
+            {
+                width = tex.getWidth();
+            }
+        }
+
+        return width;
+    }
+
+
+    @Override
+    public int getLightmapGLFormat() {
+        int glFormat = -1;
+
+        LightTexture lightTexture = GAME_RENDERER.lightTexture();
+        if (lightTexture != null) {
+            NativeImage tex = lightTexture.lightPixels;
+            if (tex != null) {
+                glFormat = tex.format().glFormat();
+            }
+        }
+
+        return glFormat;
+    }
+
+    @Override
+    public boolean isFogStateSpecial() {
+    	Camera camera = GAME_RENDERER.getMainCamera();
+		FogType fogType = camera.getFluidInCamera();
+	    Entity entity = camera.getEntity();
+	    boolean enableFog = (entity instanceof LivingEntity) && ((LivingEntity)entity).hasEffect(MobEffects.BLINDNESS);
+	    enableFog |= fogType.equals(FogType.WATER);
+	    enableFog |= fogType.equals(FogType.LAVA);
+	    enableFog |= fogType.equals(FogType.POWDER_SNOW);
+        return enableFog;
+    }
+
+    @Override
+	public boolean tryDisableVanillaFog() {
+		return true; // Handled via the MixinFogRenderer at fabric and forge
+	}
 }
@@ -1,22 +1,3 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.minecraft;

 import com.seibel.lod.core.wrapperInterfaces.minecraft.IProfilerWrapper;
@@ -1,31 +1,7 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.misc;

 import com.mojang.blaze3d.platform.NativeImage;
 import com.seibel.lod.core.wrapperInterfaces.misc.ILightMapWrapper;
-import net.minecraft.client.renderer.LightTexture;
-import org.lwjgl.opengl.GL;
-import org.lwjgl.opengl.GL32;
-
-import java.nio.ByteBuffer;

 /**
 * @author James Seibel
@@ -33,39 +9,21 @@ import java.nio.ByteBuffer;
 */
 public class LightMapWrapper implements ILightMapWrapper
 {
-    private int textureId = 0;
+    static NativeImage lightMap = null;

-    public LightMapWrapper()
+    public LightMapWrapper(NativeImage newLightMap)
    {
+        lightMap = newLightMap;
    }

-    private void createLightmap(NativeImage image)
+    public static void setLightMap(NativeImage newLightMap)
    {
-        textureId = GL32.glGenTextures();
-        GL32.glBindTexture(GL32.GL_TEXTURE_2D, textureId);
-        GL32.glTexImage2D(GL32.GL_TEXTURE_2D, 0, image.format().glFormat(), image.getWidth(), image.getHeight(),
-                0, image.format().glFormat(), GL32.GL_UNSIGNED_BYTE, (ByteBuffer) null);
-    }
-
-    public void uploadLightmap(NativeImage image)
-    {
-        int currentBind = GL32.glGetInteger(GL32.GL_TEXTURE_BINDING_2D);
-        GL32.glBindTexture(GL32.GL_TEXTURE_2D, textureId);
-        if (textureId == 0) {
-            createLightmap(image);
-        }
-        // NativeImage::upload(int levelOfDetail, int xOffset, int yOffset, bool shouldCleanup?)
-        image.upload(0, 0, 0, false);
-        GL32.glBindTexture(GL32.GL_TEXTURE_2D, currentBind);
+        lightMap = newLightMap;
    }

    @Override
-    public void bind() {
-        GL32.glBindTexture(GL32.GL_TEXTURE_2D, textureId);
-    }
-
-    @Override
-    public void unbind() {
-        GL32.glBindTexture(GL32.GL_TEXTURE_2D, 0);
+    public int getLightValue(int skyLight, int blockLight)
+    {
+        return lightMap.getPixelRGBA(skyLight, blockLight);
    }
 }
@@ -1,8 +1,8 @@
 /*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
 *    licensed under the GNU GPL v3 License.
 *
- *    Copyright (C) 2020-2022  James Seibel
+ *    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
@@ -36,7 +36,7 @@ public class BiomeWrapper implements IBiomeWrapper
 {

    public static final ConcurrentMap<Biome, BiomeWrapper> biomeWrapperMap = new ConcurrentHashMap<>();
-    private final Biome biome;
+    private 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)
    {
@@ -1,8 +1,8 @@
 /*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
 *    licensed under the GNU GPL v3 License.
 *
- *    Copyright (C) 2020-2022  James Seibel
+ *    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
@@ -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 final DimensionType dimensionType;
+    private DimensionType dimensionType;

    public DimensionTypeWrapper(DimensionType dimensionType)
    {
@@ -1,8 +1,8 @@
 /*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
 *    licensed under the GNU GPL v3 License.
 *
- *    Copyright (C) 2020-2022  James Seibel
+ *    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
@@ -23,11 +23,13 @@ import java.io.File;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;

-import com.seibel.lod.core.enums.WorldType;
-import com.seibel.lod.core.wrapperInterfaces.chunk.AbstractChunkPosWrapper;
-import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper;
-import com.seibel.lod.core.wrapperInterfaces.world.IWorldWrapper;
 import com.seibel.lod.common.wrappers.chunk.ChunkWrapper;
+import com.seibel.lod.core.enums.WorldType;
+import com.seibel.lod.core.wrapperInterfaces.block.AbstractBlockPosWrapper;
+import com.seibel.lod.core.wrapperInterfaces.chunk.AbstractChunkPosWrapper;
+import com.seibel.lod.core.wrapperInterfaces.world.IBiomeWrapper;
+import com.seibel.lod.core.wrapperInterfaces.world.IWorldWrapper;
+import com.seibel.lod.common.wrappers.block.BlockPosWrapper;

 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.core.BlockPos;
@@ -36,9 +38,7 @@ 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;

 /**
@@ -51,12 +51,12 @@ public class WorldWrapper implements IWorldWrapper
    private static final ConcurrentMap<LevelAccessor, WorldWrapper> worldWrapperMap = new ConcurrentHashMap<>();
    private final LevelAccessor world;
    public final WorldType worldType;
-    
-    
+
+
    public WorldWrapper(LevelAccessor newWorld)
    {
        world = newWorld;
-        
+
        if (world.getClass() == ServerLevel.class)
            worldType = WorldType.ServerWorld;
        else if (world.getClass() == ClientLevel.class)
@@ -64,8 +64,8 @@ public class WorldWrapper implements IWorldWrapper
        else
            worldType = WorldType.Unknown;
    }
-    
-    
+
+
    @Nullable
    public static WorldWrapper getWorldWrapper(LevelAccessor world)
    {
@@ -73,117 +73,100 @@ public class WorldWrapper implements IWorldWrapper
        //first we check if the biome has already been wrapped
        if(worldWrapperMap.containsKey(world) && worldWrapperMap.get(world) != null)
            return worldWrapperMap.get(world);
-        
-        
+
+
        //if it hasn't been created yet, we create it and save it in the map
        WorldWrapper worldWrapper = new WorldWrapper(world);
        worldWrapperMap.put(world, worldWrapper);
-        
+
        //we return the newly created wrapper
        return worldWrapper;
    }
-    
+
    public static void clearMap()
    {
        worldWrapperMap.clear();
    }
-    
+
    @Override
    public WorldType getWorldType()
    {
        return worldType;
    }
-    
+
    @Override
    public DimensionTypeWrapper getDimensionType()
    {
        return DimensionTypeWrapper.getDimensionTypeWrapper(world.dimensionType());
    }
-    
+
    @Override
    public int getBlockLight(int x, int y, int z)
    {
        return world.getBrightness(LightLayer.BLOCK, new BlockPos(x,y,z));
    }
-    
+
    @Override
    public int getSkyLight(int x, int y, int z)
    {
        return world.getBrightness(LightLayer.SKY, new BlockPos(x,y,z));
    }
-    
+
    public LevelAccessor getWorld()
    {
        return world;
    }
-    
+
    @Override
    public boolean hasCeiling()
    {
        return world.dimensionType().hasCeiling();
    }
-    
+
    @Override
    public boolean hasSkyLight()
    {
        return world.dimensionType().hasSkyLight();
    }
-    
+
    @Override
    public int getHeight()
    {
        return world.getHeight();
    }
-    
-    @Override
-    public short getMinHeight()
-    {
-        #if PRE_MC_1_17_1
-        return (short) 0;
-        #else
-        return (short) world.getMinBuildHeight();
-        #endif
-    }
-    
+
    /** @throws UnsupportedOperationException if the WorldWrapper isn't for a ServerWorld */
    @Override
    public File getSaveFolder() throws UnsupportedOperationException
    {
        if (worldType != WorldType.ServerWorld)
            throw new UnsupportedOperationException("getSaveFolder can only be called for ServerWorlds.");
-        
+
        ServerChunkCache chunkSource = ((ServerLevel) world).getChunkSource();
        return chunkSource.getDataStorage().dataFolder;
    }
-    
-    
+
+
    /** @throws UnsupportedOperationException if the WorldWrapper isn't for a ServerWorld */
    public ServerLevel getServerWorld() throws UnsupportedOperationException
    {
        if (worldType != WorldType.ServerWorld)
            throw new UnsupportedOperationException("getSaveFolder can only be called for ServerWorlds.");
-        
+
        return (ServerLevel) world;
    }
-    
+
    @Override
    public int getSeaLevel()
    {
        // TODO this is depreciated, what should we use instead?
        return world.getSeaLevel();
    }
-    
+
    @Override
-    public IChunkWrapper tryGetChunk(AbstractChunkPosWrapper pos) {
+    public ChunkWrapper tryGetChunk(AbstractChunkPosWrapper pos) {
        ChunkAccess chunk = world.getChunk(pos.getX(), pos.getZ(), ChunkStatus.EMPTY, false);
        if (chunk == null) return null;
        return new ChunkWrapper(chunk, world);
    }
-    
-    @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);
-    }
 }
@@ -1,9 +1,8 @@
 /*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
 *    licensed under the GNU GPL v3 License.
 *
- *    Copyright (C) 2021  Tom Lee (TomTheFurry)
- *    Copyright (C) 2020-2022  James Seibel
+ *    Copyright (C) 2021 Tom Lee (TomTheFurry)
 *
 *    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
@@ -17,22 +16,20 @@
 *    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.worldGeneration;

-import com.seibel.lod.core.logging.ConfigBasedLogger;
-import com.seibel.lod.core.logging.ConfigBasedSpamLogger;
+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.handlers.dependencyInjection.SingletonHandler;
 import com.seibel.lod.core.objects.lod.LodDimension;
-import com.seibel.lod.core.util.gridList.ArrayGridList;
+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.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;

@@ -44,7 +41,6 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;

-import com.seibel.lod.common.wrappers.DependencySetupDoneCheck;
 import com.seibel.lod.common.wrappers.chunk.ChunkWrapper;
 import com.seibel.lod.common.wrappers.world.WorldWrapper;
 import com.seibel.lod.common.wrappers.worldGeneration.mimicObject.ChunkLoader;
@@ -70,10 +66,8 @@ 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
@@ -89,23 +83,14 @@ Feature Step:            0.389072425s
 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 final class BatchGenerationEnvironment extends AbstractBatchGenerationEnvionmentWrapper {
+	public static final boolean ENABLE_PERF_LOGGING = false;
+	public static final boolean ENABLE_EVENT_LOGGING = false;
+	public static final boolean ENABLE_LOAD_EVENT_LOGGING = false;
+	public static final boolean DISABLE_LOADING_SAVES = false;
+	// TODO: Make actual proper support for StarLight

-	//TODO: Make actual proper support for StarLight
-	
-	public static class PrefEvent
-	{
+	public static class PrefEvent {
 		long beginNano = 0;
 		long emptyNano = 0;
 		long structStartNano = 0;
@@ -117,27 +102,20 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 		long featureNano = 0;
 		long lightNano = 0;
 		long endNano = 0;
-		
+
 		@Override
-		public String toString()
-		{
-			return "beginNano: " + beginNano + ",\n" +
-					"emptyNano: " + emptyNano + ",\n" +
-					"structStartNano: " + structStartNano + ",\n" +
-					"structRefNano: " + structRefNano + ",\n" +
-					"biomeNano: " + biomeNano + ",\n" +
-					"noiseNano: " + noiseNano + ",\n" +
-					"surfaceNano: " + surfaceNano + ",\n" +
-					"carverNano: " + carverNano + ",\n" +
-					"featureNano: " + featureNano + ",\n" +
-					"lightNano: " + lightNano + ",\n" +
-					"endNano: " + endNano + "\n";
+		public String toString() {
+			return "beginNano: " + beginNano + ",\n" + "emptyNano: " + emptyNano + ",\n" + "structStartNano: "
+					+ structStartNano + ",\n" + "structRefNano: " + structRefNano + ",\n" + "biomeNano: " + biomeNano
+					+ ",\n" + "noiseNano: " + noiseNano + ",\n" + "surfaceNano: " + surfaceNano + ",\n" + "carverNano: "
+					+ carverNano + ",\n" + "featureNano: " + featureNano + ",\n" + "lightNano: " + lightNano + ",\n"
+					+ "endNano: " + endNano + "\n";
 		}
 	}
-	
-	public static class PerfCalculator
-	{
-		public static final int SIZE = 50;
+
+	public static class PerfCalculator {
+		public static final int SIZE = 10;
+		private int dataCount = 0;
 		Rolling totalTime = new Rolling(SIZE);
 		Rolling emptyTime = new Rolling(SIZE);
 		Rolling structStartTime = new Rolling(SIZE);
@@ -149,64 +127,56 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 		Rolling featureTime = new Rolling(SIZE);
 		Rolling lightTime = new Rolling(SIZE);
 		Rolling lodTime = new Rolling(SIZE);
-		
-		public void recordEvent(PrefEvent e)
-		{
+
+		public void recordEvent(PrefEvent e) {
+			dataCount++;
 			long preTime = e.beginNano;
 			totalTime.add(e.endNano - preTime);
-			if (e.emptyNano != 0)
-			{
+			if (e.emptyNano != 0) {
 				emptyTime.add(e.emptyNano - preTime);
 				preTime = e.emptyNano;
 			}
-			if (e.structStartNano != 0)
-			{
+			if (e.structStartNano != 0) {
 				structStartTime.add(e.structStartNano - preTime);
 				preTime = e.structStartNano;
 			}
-			if (e.structRefNano != 0)
-			{
+			if (e.structRefNano != 0) {
 				structRefTime.add(e.structRefNano - preTime);
 				preTime = e.structRefNano;
 			}
-			if (e.biomeNano != 0)
-			{
+			if (e.biomeNano != 0) {
 				biomeTime.add(e.biomeNano - preTime);
 				preTime = e.biomeNano;
 			}
-			if (e.noiseNano != 0)
-			{
+			if (e.noiseNano != 0) {
 				noiseTime.add(e.noiseNano - preTime);
 				preTime = e.noiseNano;
 			}
-			if (e.surfaceNano != 0)
-			{
+			if (e.surfaceNano != 0) {
 				surfaceTime.add(e.surfaceNano - preTime);
 				preTime = e.surfaceNano;
 			}
-			if (e.carverNano != 0)
-			{
+			if (e.carverNano != 0) {
 				carverTime.add(e.carverNano - preTime);
 				preTime = e.carverNano;
 			}
-			if (e.featureNano != 0)
-			{
+			if (e.featureNano != 0) {
 				featureTime.add(e.featureNano - preTime);
 				preTime = e.featureNano;
 			}
-			if (e.lightNano != 0)
-			{
+			if (e.lightNano != 0) {
 				lightTime.add(e.lightNano - preTime);
 				preTime = e.lightNano;
 			}
-			if (e.endNano != 0)
-			{
+			if (e.endNano != 0) {
 				lodTime.add(e.endNano - preTime);
+				preTime = e.endNano;
 			}
 		}
-		
-		public String toString()
-		{
+
+		public String toString() {
+			if (dataCount < SIZE)
+				return "Pref Calculator collecting samples...";
 			return "Total: " + Duration.ofNanos((long) totalTime.getAverage()) + ", Empty/LoadChunk: "
 					+ Duration.ofNanos((long) emptyTime.getAverage()) + ", StructStart: "
 					+ Duration.ofNanos((long) structStartTime.getAverage()) + ", StructRef: "
@@ -220,241 +190,199 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 					+ Duration.ofNanos((long) lodTime.getAverage());
 		}
 	}
-	
+
 	public static final int TIMEOUT_SECONDS = 60;
-	
-	//=================Generation Step===================
-	
-	public final LinkedList<GenerationEvent> events = new LinkedList<>();
+
+	// =================Generation Step===================
+
+	public final LinkedList<GenerationEvent> events = new LinkedList<GenerationEvent>();
 	public final GlobalParameters params;
 	public final StepStructureStart stepStructureStart = new StepStructureStart(this);
-	public final StepStructureReference stepStructureReference = new StepStructureReference(this);
+	public final StepStructureReference stepStructureReference = new StepStructureReference();
 	public final StepBiomes stepBiomes = new StepBiomes(this);
 	public final StepNoise stepNoise = new StepNoise(this);
 	public final StepSurface stepSurface = new StepSurface(this);
 	public final StepFeatures stepFeatures = new StepFeatures(this);
 	public final StepLight stepLight = new StepLight(this);
 	public boolean unsafeThreadingRecorded = false;
-	//public boolean safeMode = false;
-	private static final IMinecraftClientWrapper MC = SingletonHandler.get(IMinecraftClientWrapper.class);
+	static private final ILodConfigWrapperSingleton CONFIG = SingletonHandler.get(ILodConfigWrapperSingleton.class);
+	private static final IMinecraftWrapper MC = SingletonHandler.get(IMinecraftWrapper.class);
 	public static final long EXCEPTION_TIMER_RESET_TIME = TimeUnit.NANOSECONDS.convert(1, TimeUnit.SECONDS);
 	public static final int EXCEPTION_COUNTER_TRIGGER = 20;
-	public 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 boolean isCurrentThreadDistantGeneratorThread() {
-		return (isDistantGeneratorThread.get() != null);
-	}
-	
-	static {
-		DependencySetupDoneCheck.getIsCurrentThreadDistantGeneratorThread = BatchGenerationEnvironment::isCurrentThreadDistantGeneratorThread;
-	}
-	
+
 	public ExecutorService executors = Executors.newFixedThreadPool(
-			CONFIG.client().advanced().threading()._getWorldGenerationThreadPoolSize(), threadFactory);
+			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.");
+			ApiShared.LOGGER.error("Unsafe Threading in Chunk Generator: ", new RuntimeException("Concurrent future"));
 			unsafeThreadingRecorded = true;
 		}
 		return f.join();
 	}
-	
-	public void resizeThreadPool(int newThreadCount)
-	{
+
+	@Override
+	public void resizeThreadPool(int newThreadCount) {
 		executors = Executors.newFixedThreadPool(newThreadCount,
 				new LodThreadFactory("Gen-Worker-Thread", Thread.MIN_PRIORITY));
 	}
-	
-	public boolean tryAddPoint(int px, int pz, int range, Steps target, boolean genAllDetails, double runTimeRatio)
-	{
+
+	@Override
+	public boolean tryAddPoint(int px, int pz, int range, Steps target, boolean genAllDetails) {
 		int boxSize = range * 2 + 1;
 		int x = Math.floorDiv(px, boxSize) * boxSize + range;
 		int z = Math.floorDiv(pz, boxSize) * boxSize + range;
-		
-		for (GenerationEvent event : events)
-		{
+
+		for (GenerationEvent event : events) {
 			if (event.tooClose(x, z, range))
 				return false;
 		}
 		// System.out.println(x + ", "+z);
-		events.add(new GenerationEvent(new ChunkPos(x, z), range, this, target, genAllDetails, runTimeRatio));
+		events.add(new GenerationEvent(new ChunkPos(x, z), range, this, target, genAllDetails));
 		return true;
 	}
-	
-	public void updateAllFutures()
-	{
+
+	@Override
+	public void updateAllFutures() {
 		if (unknownExceptionCount > 0) {
 			if (System.nanoTime() - lastExceptionTriggerTime >= EXCEPTION_TIMER_RESET_TIME) {
 				unknownExceptionCount = 0;
 			}
 		}
-		
 		// Update all current out standing jobs
 		Iterator<GenerationEvent> iter = events.iterator();
-		while (iter.hasNext())
-		{
+		while (iter.hasNext()) {
 			GenerationEvent event = iter.next();
-			if (event.isCompleted())
-			{
-				try
-				{
+			if (event.isCompleted()) {
+				try {
 					event.join();
-				}
-				catch (Throwable e)
-				{
-					EVENT_LOGGER.error("Batching World Generator: Event {} gotten an exception", event);
-					EVENT_LOGGER.error("Exception: ", e);
+				} catch (Throwable e) {
+					ApiShared.LOGGER.error("Batching World Generator: Event {} gotten an exception", event);
+					ApiShared.LOGGER.error("Exception: ", e);
 					unknownExceptionCount++;
 					lastExceptionTriggerTime = System.nanoTime();
-				}
-				finally
-				{
+				} finally {
 					iter.remove();
 				}
-			}
-			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);
-				try
-				{
+			} else if (event.hasTimeout(TIMEOUT_SECONDS, TimeUnit.SECONDS)) {
+				ApiShared.LOGGER.error("Batching World Generator: " + event + " timed out and terminated!");
+				ApiShared.LOGGER.info("Dump PrefEvent: " + event.pEvent);
+				try {
 					if (!event.terminate())
-						EVENT_LOGGER.error("Failed to terminate the stuck generation event!");
-				}
-				finally
-				{
+						ApiShared.LOGGER.error("Failed to terminate the stuck generation event!");
+				} finally {
 					iter.remove();
 				}
 			}
 		}
 		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) {}
+			ApiShared.LOGGER.error("Too many exceptions in Batching World Generator! Now disabling.");
 			unknownExceptionCount = 0;
 			CONFIG.client().worldGenerator().setEnableDistantGeneration(false);
 		}
 	}
-	
-	public BatchGenerationEnvironment(IWorldWrapper serverlevel, LodBuilder lodBuilder, LodDimension lodDim)
-	{
+
+	public BatchGenerationEnvironment(IWorldWrapper serverlevel, LodBuilder lodBuilder, LodDimension lodDim) {
 		super(serverlevel, lodBuilder, lodDim);
-		EVENT_LOGGER.info("================WORLD_GEN_STEP_INITING=============");
+		ApiShared.LOGGER.info("================WORLD_GEN_STEP_INITING=============");
 		ChunkGenerator generator =  ((WorldWrapper) serverlevel).getServerWorld().getChunkSource().getGenerator();
 		if (!(generator instanceof NoiseBasedChunkGenerator ||
 				generator instanceof DebugLevelSource ||
 				generator instanceof FlatLevelSource)) {
-			if (generator.getClass().toString().equals("class com.terraforged.mod.chunk.TFChunkGenerator")) {
-				EVENT_LOGGER.info("TerraForge Chunk Generator detected: [{}], Distant Generation will try its best to support it.", generator.getClass());
-				EVENT_LOGGER.info("If it does crash, set Distant Generation to OFF or Generation Mode to None.");
-			} else {
-				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.");
-			}
+			MC.sendChatMessage("\u00A74\u00A7l\u00A7uWARNING: Distant Horizons: Unknown Chunk Generator Detected! Distant Generation May Fail!");
+			MC.sendChatMessage("\u00A7eIf it does crash, set Distant Generation to OFF or Generation Mode to None.");
+			ApiShared.LOGGER.warn("Unknown Chunk Generator detected: {}", generator.getClass());
 		}
 		params = new GlobalParameters((ServerLevel) ((WorldWrapper) serverlevel).getWorld(), lodBuilder, lodDim);
 	}
-	
+
 	@SuppressWarnings("resource")
-	public static ChunkAccess loadOrMakeChunk(ChunkPos chunkPos, ServerLevel level, LevelLightEngine lightEngine)
-	{
+	private static ChunkAccess loadOrMakeChunk(ChunkPos chunkPos, ServerLevel level, LevelLightEngine lightEngine) {
+		if (DISABLE_LOADING_SAVES) {
+			return new ProtoChunk(chunkPos, UpgradeData.EMPTY);
+		}
 		CompoundTag chunkData = null;
-		try
-		{
+		try {
 			chunkData = level.getChunkSource().chunkMap.readChunk(chunkPos);
+		} catch (Exception e) {
+			ApiShared.LOGGER.error("DistantHorizons: Couldn't load chunk {}", chunkPos, e);
 		}
-		catch (Exception e)
-		{
-			LOAD_LOGGER.error("DistantHorizons: Couldn't load chunk {}", chunkPos, e);
-		}
-		if (chunkData == null)
-		{
-			return new ProtoChunk(chunkPos, UpgradeData.EMPTY
-							#if POST_MC_1_17_1, level #endif
-							#if POST_MC_1_18_1, level.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY), null #endif
-			);
-		}
-		else
-		{
+		if (chunkData == null) {
+			return new ProtoChunk(chunkPos, UpgradeData.EMPTY);
+		} 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
-							#if POST_MC_1_17_1, level #endif
-							#if POST_MC_1_18_1, level.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY), null #endif
-				);
+				ApiShared.LOGGER.error("DistantHorizons: Couldn't load chunk {}", chunkPos, e);
+				return new ProtoChunk(chunkPos, UpgradeData.EMPTY);
 			}
 		}
-		
+
 	}
-	
-	public void generateLodFromList(GenerationEvent e)
-	{
-		EVENT_LOGGER.debug("Lod Generate Event: " + e.pos);
+
+	void generateLodFromList(GenerationEvent e) {
+		if (ENABLE_EVENT_LOGGING)
+			ApiShared.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
-		{
+
+		try {
 			adaptor = new LightGetterAdaptor(params.level);
 			lightEngine = new WorldGenLevelLightEngine(adaptor);

+			int cx = e.pos.x;
+			int cy = e.pos.z;
+			int rangeEmpty = e.range + 1;
+			GridList<ChunkAccess> chunks = new GridList<ChunkAccess>(rangeEmpty);
+
 			@SuppressWarnings("resource")
-			EmptyChunkGenerator generator = (int x, int z) ->
-			{
+			EmptyChunkGenerator generator = (int x, int z) -> {
 				ChunkPos chunkPos = new ChunkPos(x, z);
 				ChunkAccess target = null;
-				try
-				{
+				try {
 					target = loadOrMakeChunk(chunkPos, params.level, lightEngine);
-				}
-				catch (RuntimeException e2)
-				{
+				} catch (RuntimeException e2) {
 					// Continue...
 				}
 				if (target == null)
-					target = new ProtoChunk(chunkPos, UpgradeData.EMPTY
-							#if POST_MC_1_17_1, params.level #endif
-							#if POST_MC_1_18_1, params.biomes, null #endif
-					);
+					target = new ProtoChunk(chunkPos, UpgradeData.EMPTY);
 				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);
-		}
-		catch (StepStructureStart.StructStartCorruptedException f)
-		{
+			e.tParam.makeStructFeat(region);
+			referencedChunks = chunks.subGrid(e.range);
+			referencedChunks = generateDirect(e, referencedChunks, e.target, region);
+
+		} catch (StructStartCorruptedException f) {
 			e.tParam.markAsInvalid();
 			return;
 		}
-		
-		switch (e.target)
-		{
+
+		switch (e.target) {
 		case Empty:
 		case StructureStart:
 		case StructureReference:
@@ -462,6 +390,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 			break;
 		case Biomes:
 			generationMode = DistanceGenerationMode.BIOME_ONLY;
+			break;
 		case Noise:
 			generationMode = DistanceGenerationMode.BIOME_ONLY_SIMULATE_HEIGHT;
 			break;
@@ -477,125 +406,88 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 		default:
 			return;
 		}
-		
-		for (int oy = 0; oy < genChunks.gridSize; oy++)
-		{
-			for (int ox = 0; ox < genChunks.gridSize; ox++)
-			{
-				ChunkAccess target = genChunks.get(ox, oy);
-				ChunkWrapper wrappedChunk = new ChunkWrapper(target, region);
-				if (!wrappedChunk.isLightCorrect()) {
-					throw new RuntimeException("The generated chunk somehow has isLightCorrect() returning false");
-				}
-				
+		int centreIndex = referencedChunks.size() / 2;
+
+		for (int oy = -e.range; oy <= e.range; oy++) {
+			for (int ox = -e.range; ox <= e.range; ox++) {
+				int targetIndex = referencedChunks.offsetOf(centreIndex, ox, oy);
+				ChunkAccess target = referencedChunks.get(targetIndex);
+				target.setLightCorrect(true);
 				boolean isFull = target.getStatus() == ChunkStatus.FULL || target instanceof LevelChunk;
-				#if POST_MC_1_18_1
-				boolean isPartial = target.isOldNoiseGeneration();
-				#endif
-				if (isFull)
-				{
-					LOAD_LOGGER.info("Detected full existing chunk at {}", target.getPos());
-					params.lodBuilder.generateLodNodeFromChunk(params.lodDim, wrappedChunk,
+				if (isFull) {
+					if (ENABLE_LOAD_EVENT_LOGGING)
+						ApiShared.LOGGER.info("Detected full existing chunk at {}", target.getPos());
+					params.lodBuilder.generateLodNodeFromChunk(params.lodDim, new ChunkWrapper(target, region),
 							new LodBuilderConfig(DistanceGenerationMode.FULL), true, e.genAllDetails);
-				}
-				#if POST_MC_1_18_1
-				else if (isPartial)
-				{
-					LOAD_LOGGER.info("Detected old existing chunk at {}", target.getPos());
-					params.lodBuilder.generateLodNodeFromChunk(params.lodDim, wrappedChunk,
-							new LodBuilderConfig(generationMode), true, e.genAllDetails);
-				}
-				#endif
-				else if (target.getStatus() == ChunkStatus.EMPTY && generationMode == DistanceGenerationMode.NONE)
-				{
-					params.lodBuilder.generateLodNodeFromChunk(params.lodDim,wrappedChunk,
+				} else if (target.getStatus() == ChunkStatus.EMPTY && generationMode == DistanceGenerationMode.NONE) {
+					params.lodBuilder.generateLodNodeFromChunk(params.lodDim, new ChunkWrapper(target, region),
 							LodBuilderConfig.getFillVoidConfig(), true, e.genAllDetails);
-				}
-				else
-				{
-					params.lodBuilder.generateLodNodeFromChunk(params.lodDim, wrappedChunk,
+				} else {
+					params.lodBuilder.generateLodNodeFromChunk(params.lodDim, new ChunkWrapper(target, region),
 							new LodBuilderConfig(generationMode), true, e.genAllDetails);
 				}
-				if (e.lightMode == LightGenerationMode.FANCY || isFull)
-				{
-					lightEngine.retainData(target.getPos(), false);
-				}
-				
+				lightEngine.retainData(target.getPos(), false);
 			}
 		}
 		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);
+			ApiShared.LOGGER.info(e.tParam.perf);
 		}
 	}
-	
-	public void generateDirect(GenerationEvent e, ArrayGridList<ChunkAccess> subRange, Steps step,
-													 LightedWorldGenRegion region)
-	{
-		try
-		{
-			subRange.forEach((chunk) ->
-			{
-				if (chunk instanceof ProtoChunk)
-				{
+
+	GridList<ChunkAccess> generateDirect(GenerationEvent e, GridList<ChunkAccess> subRange, Steps step,
+			LightedWorldGenRegion region) {
+		try {
+			subRange.forEach((chunk) -> {
+				if (chunk instanceof ProtoChunk) {
 					((ProtoChunk) chunk).setLightEngine(region.getLightEngine());
-					region.getLightEngine().retainData(chunk.getPos(), true);
+					//region.getLightEngine().retainData(chunk.getPos(), true);
 				}
 			});
 			if (step == Steps.Empty)
-				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();
-		}
-		finally
-		{
-			switch (region.lightMode)
-			{
+			return subRange;
+		} finally {
+			switch (region.lightMode) {
 			case FANCY:
 				stepLight.generateGroup(region.getLightEngine(), subRange);
 				break;
 			case FAST:
-				subRange.forEach((p) ->
-				{
+				subRange.forEach((p) -> {
 					if (p instanceof ProtoChunk)
 						((ProtoChunk) p).setLightCorrect(true);
-					#if POST_MC_1_18_1
-					if (p instanceof LevelChunk) {
-						((LevelChunk) p).setLightCorrect(true);
-						((LevelChunk) p).setClientLightReady(true);
-					}
-					#endif
 				});
 				break;
 			}
@@ -603,9 +495,8 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 			e.refreshTimeout();
 		}
 	}
-	
-	public interface EmptyChunkGenerator
-	{
+
+	public interface EmptyChunkGenerator {
 		ChunkAccess generate(int x, int z);
 	}

@@ -616,14 +507,16 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv

 	@Override
 	public void stop(boolean blocking) {
-		EVENT_LOGGER.info("Batch Chunk Generator shutting down...");
+		ApiShared.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...");
+		if (blocking) {
+			try {
+				if (!executors.awaitTermination(10, TimeUnit.SECONDS)) {
+					ApiShared.LOGGER.error("Batch Chunk Generator shutdown failed! Ignoring child threads...");
+				}
+			} catch (InterruptedException e) {
+				ApiShared.LOGGER.error("Batch Chunk Generator shutdown failed! Ignoring child threads...", e);
 			}
-		} catch (InterruptedException e) {
-			EVENT_LOGGER.error("Batch Chunk Generator shutdown failed! Ignoring child threads...", e);
 		}
 	}
-}
+}
@@ -1,22 +1,3 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.worldGeneration;

 import java.util.concurrent.ExecutionException;
@@ -25,118 +6,86 @@ 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.LodUtil;
 import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
 import com.seibel.lod.core.wrapperInterfaces.worldGeneration.AbstractBatchGenerationEnvionmentWrapper.Steps;

 import net.minecraft.world.level.ChunkPos;

 //======================= Main Event class======================
-public final class GenerationEvent
-{
+public final class GenerationEvent {
 	static private final ILodConfigWrapperSingleton CONFIG = SingletonHandler.get(ILodConfigWrapperSingleton.class);
-	
+
 	private static int generationFutureDebugIDs = 0;
 	final ThreadedParameters tParam;
 	final ChunkPos pos;
 	final int range;
 	final Future<?> future;
-	long creationNanotime;
+	long nanotime;
 	final int id;
 	final Steps target;
 	final LightGenerationMode lightMode;
 	final PrefEvent pEvent = new PrefEvent();
 	final boolean genAllDetails;

-	final double runTimeRatio;
-	
-	public GenerationEvent(ChunkPos pos, int range, BatchGenerationEnvironment generationGroup,
-						   Steps target, boolean genAllDetails, double runTimeRatio)
-	{
-		creationNanotime = System.nanoTime();
+	public GenerationEvent(ChunkPos pos, int range, BatchGenerationEnvironment generationGroup, Steps target, boolean genAllDetails) {
+		nanotime = System.nanoTime();
 		this.pos = pos;
 		this.range = range;
 		id = generationFutureDebugIDs++;
 		this.target = target;
 		this.tParam = ThreadedParameters.getOrMake(generationGroup.params);
 		LightGenerationMode mode = CONFIG.client().worldGenerator().getLightGenerationMode();
-		
+
 		this.lightMode = mode;
 		this.genAllDetails = genAllDetails;
-		this.runTimeRatio = runTimeRatio;
-		
-		future = generationGroup.executors.submit(() ->
-		{
-			long startTime = System.nanoTime();
-			BatchGenerationEnvironment.isDistantGeneratorThread.set(true);
-			try {
-				generationGroup.generateLodFromList(this);
-			} finally {
-				BatchGenerationEnvironment.isDistantGeneratorThread.remove();
-				if (!Thread.interrupted() && runTimeRatio < 1.0) {
-					long endTime = System.nanoTime();
-					try {
-						long deltaMs = TimeUnit.NANOSECONDS.toMillis(endTime - startTime);
-						Thread.sleep((long) (deltaMs/runTimeRatio - deltaMs));
-					} catch (InterruptedException ignored) {
-					}
-				}
-			}
+
+		future = generationGroup.executors.submit(() -> {
+			generationGroup.generateLodFromList(this);
 		});
 	}
-	
-	public boolean isCompleted()
-	{
+
+	public boolean isCompleted() {
 		return future.isDone();
 	}
-	
-	public boolean hasTimeout(int duration, TimeUnit unit)
-	{
+
+	public boolean hasTimeout(int duration, TimeUnit unit) {
 		long currentTime = System.nanoTime();
-		long delta = currentTime - creationNanotime;
+		long delta = currentTime - nanotime;
 		return (delta > TimeUnit.NANOSECONDS.convert(duration, unit));
 	}
-	
-	public boolean terminate()
-	{
+
+	public boolean terminate() {
+		future.cancel(true);
 		ApiShared.LOGGER.info("======================DUMPING ALL THREADS FOR WORLD GEN=======================");
 		BatchGenerationEnvironment.threadFactory.dumpAllThreadStacks();
-		future.cancel(true);
 		return future.isCancelled();
 	}
-	
-	public void join()
-	{
-		try
-		{
+
+	public void join() {
+		try {
 			future.get();
-		}
-		catch (InterruptedException | ExecutionException e)
-		{
+		} catch (InterruptedException | ExecutionException e) {
 			throw new RuntimeException(e.getCause()==null? e : e.getCause());
 		}
 	}
-	
-	public boolean tooClose(int cx, int cz, int cr)
-	{
+
+	public boolean tooClose(int cx, int cz, int cr) {
 		int distX = Math.abs(cx - pos.x);
 		int distZ = Math.abs(cz - pos.z);
 		int minRange = cr + range + 1; // Need one to account for the center
 		minRange += 1 + 1; // Account for required empty chunks
 		return distX < minRange && distZ < minRange;
 	}
-	
-	public void refreshTimeout()
-	{
-		creationNanotime = System.nanoTime();
-		LodUtil.checkInterruptsUnchecked();
+
+	public void refreshTimeout() {
+		nanotime = System.nanoTime();
 	}
-	
+
 	@Override
-	public String toString()
-	{
+	public String toString() {
 		return id + ":" + range + "@" + pos + "(" + target + ")";
 	}
 }
@@ -1,22 +1,3 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.worldGeneration;

 import com.mojang.datafixers.DataFixer;
@@ -29,17 +10,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;
-#if POST_MC_1_18_1
-import net.minecraft.world.level.chunk.storage.ChunkScanAccess;
-#endif
 import net.minecraft.world.level.levelgen.WorldGenSettings;
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
 import net.minecraft.world.level.storage.WorldData;

-public final class GlobalParameters
-{
+public final class GlobalParameters {
 	public final ChunkGenerator generator;
 	public final StructureManager structures;
 	public final WorldGenSettings worldGenSettings;
@@ -51,13 +27,8 @@ public final class GlobalParameters
 	public final long worldSeed;
 	public final ServerLevel level; // TODO: Figure out a way to remove this. Maybe ClientLevel also works?
 	public final DataFixer fixerUpper;
-	#if POST_MC_1_18_1
-	public final BiomeManager biomeManager;
-	public final ChunkScanAccess chunkScanner; // FIXME: Figure out if this is actually needed
-	#endif
-	
-	public GlobalParameters(ServerLevel level, LodBuilder lodBuilder, LodDimension lodDim)
-	{
+
+	public GlobalParameters(ServerLevel level, LodBuilder lodBuilder, LodDimension lodDim) {
 		this.lodBuilder = lodBuilder;
 		this.lodDim = lodDim;
 		this.level = level;
@@ -68,10 +39,8 @@ public final class GlobalParameters
 		registry = server.registryAccess();
 		biomes = registry.registryOrThrow(Registry.BIOME_REGISTRY);
 		worldSeed = worldGenSettings.seed();
-		#if POST_MC_1_18_1
-		biomeManager = new BiomeManager(level, BiomeManager.obfuscateSeed(worldSeed));
-		chunkScanner = level.getChunkSource().chunkScanner();
-		#endif
+		// biomeManager = new BiomeManager(level,
+		// BiomeManager.obfuscateSeed(worldSeed));
 		structures = server.getStructureManager();
 		generator = level.getChunkSource().getGenerator();
 		fixerUpper = server.getFixerUpper();
@@ -1,53 +1,29 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.worldGeneration;

 //FIXME: Move this outside the WorldGenerationStep thingy
-public class Rolling
-{
-	
+public class Rolling {
+
 	private final int size;
 	private double total = 0d;
 	private int index = 0;
 	private final double[] samples;
-	
-	public Rolling(int size)
-	{
+
+	public Rolling(int size) {
 		this.size = size;
 		samples = new double[size];
 		for (int i = 0; i < size; i++)
 			samples[i] = 0d;
 	}
-	
-	public void add(double x)
-	{
+
+	public void add(double x) {
 		total -= samples[index];
 		samples[index] = x;
 		total += x;
 		if (++index == size)
 			index = 0; // cheaper than modulus
 	}
-	
-	public double getAverage()
-	{
+
+	public double getAverage() {
 		return total / size;
 	}
 }
@@ -0,0 +1,11 @@
+package com.seibel.lod.common.wrappers.worldGeneration;
+
+public class StructStartCorruptedException extends RuntimeException {
+	private static final long serialVersionUID = -8987434342051563358L;
+
+	public StructStartCorruptedException(ArrayIndexOutOfBoundsException e) {
+		super("StructStartCorruptedException");
+		super.initCause(e);
+		fillInStackTrace();
+	}
+}
@@ -1,23 +1,3 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.worldGeneration;

 import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment.PerfCalculator;
@@ -26,23 +6,15 @@ 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;
-#if POST_MC_1_18_1
-import net.minecraft.world.level.levelgen.structure.StructureCheck;
-#endif

-public final class ThreadedParameters
-{
+public final class ThreadedParameters {
 	private static final ThreadLocal<ThreadedParameters> localParam = new ThreadLocal<ThreadedParameters>();
 	final ServerLevel level;
-	public WorldGenStructFeatManager structFeat = null;
-	#if POST_MC_1_18_1
-	public final StructureCheck structCheck;
-	#endif
+	public final WorldGenStructFeatManager structFeat;
 	boolean isValid = true;
 	public final PerfCalculator perf = new PerfCalculator();
-	
-	public static ThreadedParameters getOrMake(GlobalParameters param)
-	{
+
+	public static ThreadedParameters getOrMake(GlobalParameters param) {
 		ThreadedParameters tParam = localParam.get();
 		if (tParam != null && tParam.isValid && tParam.level == param.level)
 			return tParam;
@@ -50,26 +22,17 @@ public final class ThreadedParameters
 		localParam.set(tParam);
 		return tParam;
 	}
-	
-	public void markAsInvalid()
-	{
+
+	public void markAsInvalid() {
 		isValid = false;
 	}
-	
-	private ThreadedParameters(GlobalParameters param)
-	{
+
+	private ThreadedParameters(GlobalParameters param) {
 		level = param.level;
-		#if PRE_MC_1_18_1
-		structFeat = new WorldGenStructFeatManager(param.worldGenSettings, level);
-		#else
-		structCheck = new StructureCheck(param.chunkScanner, param.registry, param.structures,
-				param.level.dimension(), param.generator, level, param.generator.getBiomeSource(), param.worldSeed,
-				param.fixerUpper);
-		#endif
+		structFeat = new WorldGenStructFeatManager(level, param.worldGenSettings, null);
 	}
-	
-	public void makeStructFeat(WorldGenLevel genLevel, GlobalParameters param)
-	{
-		structFeat = new WorldGenStructFeatManager(param.worldGenSettings, genLevel #if POST_MC_1_18_1, structCheck #endif);
+
+	public void makeStructFeat(WorldGenLevel genLevel) {
+		structFeat.setGenLevel(genLevel);
 	}
 }
@@ -0,0 +1,144 @@
+package com.seibel.lod.common.wrappers.worldGeneration;
+
+import java.util.concurrent.ExecutionException;
+
+import com.seibel.lod.core.builders.lodBuilding.LodBuilder;
+import com.seibel.lod.core.builders.lodBuilding.LodBuilderConfig;
+import com.seibel.lod.core.enums.config.DistanceGenerationMode;
+import com.seibel.lod.core.objects.lod.LodDimension;
+//import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
+import com.seibel.lod.core.wrapperInterfaces.chunk.AbstractChunkPosWrapper;
+//import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
+import com.seibel.lod.core.wrapperInterfaces.world.IWorldWrapper;
+import com.seibel.lod.core.wrapperInterfaces.worldGeneration.AbstractWorldGeneratorWrapper;
+import com.seibel.lod.common.wrappers.chunk.ChunkWrapper;
+import com.seibel.lod.common.wrappers.world.WorldWrapper;
+
+import net.minecraft.server.level.ChunkHolder;
+import net.minecraft.server.level.ServerChunkCache;
+import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.chunk.*;
+
+/**
+ * @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
+	 * <p>
+	 */
+	@Override
+	public void generateFeatures(AbstractChunkPosWrapper pos) {
+		generate(pos.getX(), pos.getZ(), DistanceGenerationMode.FEATURES);
+	}
+
+	/**
+	 * Generates using MC's ServerWorld.
+	 * <p>
+	 * on pre generated chunks 0 - 1 ms <br>
+	 * on un generated chunks 0 - 50 ms <br>
+	 * with the median seeming to hover around 15 - 30 ms <br>
+	 * and outliers in the 100 - 200 ms range <br>
+	 * <p>
+	 * Note this should not be multithreaded and does cause server/simulation lag
+	 * (Higher lag for generating than loading)
+	 */
+	@Override
+	public void generateFull(AbstractChunkPosWrapper pos) {
+		generate(pos.getX(), pos.getZ(), DistanceGenerationMode.FULL);
+	}
+
+	private void generate(int chunkX, int chunkZ, DistanceGenerationMode generationMode) {
+
+//        long t = System.nanoTime();
+
+		ChunkStatus targetStatus;
+		switch (generationMode) {
+		case NONE:
+			return;
+		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;
+		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: Ask leetom to update 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,178 +1,73 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.worldGeneration.mimicObject;

-import com.google.common.collect.Maps;
-import com.mojang.serialization.Codec;
-import com.mojang.serialization.Dynamic;
-import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment;
 import com.seibel.lod.core.api.ApiShared;
+import com.seibel.lod.core.api.ClientApi;

-import com.seibel.lod.core.logging.ConfigBasedLogger;
-import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
-import it.unimi.dsi.fastutil.longs.LongSet;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
 import java.util.Objects;

-
 import net.minecraft.core.Registry;
 import net.minecraft.core.SectionPos;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
-import net.minecraft.nbt.NbtOps;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.level.*;
-import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.biome.Biomes;
+import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.ChunkTickList;
+import net.minecraft.world.level.LightLayer;
+import net.minecraft.world.level.TickList;
+import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.chunk.*;
-import net.minecraft.world.level.chunk.storage.ChunkSerializer;
+import net.minecraft.world.level.chunk.ChunkBiomeContainer;
+import net.minecraft.world.level.chunk.ChunkGenerator;
+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.UpgradeData;
 import net.minecraft.world.level.levelgen.Heightmap;
-#if POST_MC_1_18_1
-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.ticks.LevelChunkTicks;
-#endif
-#if POST_MC_1_18_2
-import net.minecraft.core.Holder;
-import net.minecraft.core.RegistryAccess;
-import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
-#endif
-
 import net.minecraft.world.level.lighting.LevelLightEngine;
 import net.minecraft.world.level.material.Fluid;
 import net.minecraft.world.level.material.Fluids;
+
 import org.apache.logging.log4j.Logger;

-public class ChunkLoader
-{
-	#if POST_MC_1_18_1
-	private static final Codec<PalettedContainer<BlockState>> BLOCK_STATE_CODEC = PalettedContainer.codec(Block.BLOCK_STATE_REGISTRY, BlockState.CODEC, PalettedContainer.Strategy.SECTION_STATES, Blocks.AIR.defaultBlockState());
-	#endif
-	private static final String TAG_UPGRADE_DATA = "UpgradeData";
-	private static final String BLOCK_TICKS_TAG_18 = "block_ticks";
-	private static final String FLUID_TICKS_TAG_18 = "fluid_ticks";
-	private static final String BLOCK_TICKS_TAG_PRE18 = "TileTicks";
-	private static final String FLUID_TICKS_TAG_PRE18 = "LiquidTicks";
-	private static final ConfigBasedLogger LOGGER = BatchGenerationEnvironment.LOAD_LOGGER;
+public class ChunkLoader {
+	private static final Logger LOGGER = ApiShared.LOGGER;

-	#if POST_MC_1_18_1
-	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 blendingData;
-	}
-	#endif
-	
-	private static LevelChunkSection[] readSections(LevelAccessor level, LevelLightEngine lightEngine, ChunkPos chunkPos, CompoundTag chunkData)
-	{
-		#if POST_MC_1_18_1
-		Registry<Biome> biomes = level.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY);
-			#if PRE_MC_1_18_2
-			Codec<PalettedContainer<Biome>> biomeCodec = PalettedContainer.codec(
-					biomes, biomes.byNameCodec(), PalettedContainer.Strategy.SECTION_BIOMES, biomes.getOrThrow(Biomes.PLAINS));
-			#else
-			Codec<PalettedContainer<Holder<Biome>>> biomeCodec = PalettedContainer.codec(
-					biomes.asHolderIdMap(), biomes.holderByNameCodec(), PalettedContainer.Strategy.SECTION_BIOMES, biomes.getHolderOrThrow(Biomes.PLAINS));
-			#endif
-		#endif
-		int i = #if PRE_MC_1_17_1 16; #else level.getSectionsCount(); #endif
-		LevelChunkSection[] chunkSections = new LevelChunkSection[i];
-
-		boolean isLightOn = chunkData.getBoolean("isLightOn");
-		boolean hasSkyLight = level.dimensionType().hasSkyLight();
-		ListTag tagSections = chunkData.getList("Sections", 10);
-		if (tagSections.isEmpty()) tagSections = chunkData.getList("sections", 10);
-
-		for (int j = 0; j < tagSections.size(); ++j)
-		{
-			CompoundTag tagSection = tagSections.getCompound(j);
-			int sectionYPos = tagSection.getByte("Y");
-
-			#if PRE_MC_1_18_1
-			if (tagSection.contains("Palette", 9) && tagSection.contains("BlockStates", 12)) {
-				LevelChunkSection levelChunkSection = new LevelChunkSection(sectionYPos << 4);
-				levelChunkSection.getStates().read(tagSection.getList("Palette", 10),
-						tagSection.getLongArray("BlockStates"));
+	private static LevelChunkSection[] readSections(WorldGenLevel level, LevelLightEngine lightEngine,
+			ChunkPos chunkPos, CompoundTag tagLevel) {
+		boolean isLightOn = tagLevel.getBoolean("isLightOn");
+		ListTag listTag = tagLevel.getList("Sections", 10);
+		LevelChunkSection[] levelChunkSections = new LevelChunkSection[16];
+		boolean bl2 = level.getLevel().dimensionType().hasSkyLight();
+		if (isLightOn)
+			lightEngine.retainData(chunkPos, true);
+		for (int j = 0; j < listTag.size(); j++) {
+			CompoundTag compoundTag3 = listTag.getCompound(j);
+			int k = compoundTag3.getByte("Y");
+			if (compoundTag3.contains("Palette", 9) && compoundTag3.contains("BlockStates", 12)) {
+				LevelChunkSection levelChunkSection = new LevelChunkSection(k << 4);
+				levelChunkSection.getStates().read(compoundTag3.getList("Palette", 10),
+						compoundTag3.getLongArray("BlockStates"));
 				levelChunkSection.recalcBlockCounts();
 				if (!levelChunkSection.isEmpty())
-					chunkSections[#if PRE_MC_1_17_1 sectionYPos #else level.getSectionIndexFromSectionY(sectionYPos) #endif]
-							 = levelChunkSection;
+					levelChunkSections[k] = levelChunkSection;
 			}
-			#else
-			int sectionId = level.getSectionIndexFromSectionY(sectionYPos);
-			if (sectionId >= 0 && sectionId < chunkSections.length)
-			{
-				PalettedContainer<BlockState> blockStateContainer;
-				#if PRE_MC_1_18_2
-				PalettedContainer<Biome> biomeContainer;
-				#else
-				PalettedContainer<Holder<Biome>> biomeContainer;
-				#endif
-
-				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);
-
-				#if PRE_MC_1_18_2
-				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);
-				#else
-				biomeContainer = tagSection.contains("biomes", 10)
-						? biomeCodec.parse(NbtOps.INSTANCE, tagSection.getCompound("biomes")).promotePartial(string -> logErrors(chunkPos, i, (String) string)).getOrThrow(false, LOGGER::error)
-						: new PalettedContainer<Holder<Biome>>(biomes.asHolderIdMap(), biomes.getHolderOrThrow(Biomes.PLAINS), PalettedContainer.Strategy.SECTION_BIOMES);
-				#endif
-				chunkSections[sectionId] = new LevelChunkSection(sectionYPos, blockStateContainer, biomeContainer);
+			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);
 			}
-			#endif
-
-			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;
+		return levelChunkSections;
 	}
-	
-	private static void readHeightmaps(LevelChunk chunk, CompoundTag chunkData)
-	{
+
+	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));
@@ -180,103 +75,76 @@ public class ChunkLoader
 		Heightmap.primeHeightmaps(chunk, ChunkStatus.FULL.heightmapsAfter());
 	}

-	private static void readPostPocessings(LevelChunk chunk, CompoundTag chunkData)
-	{
+	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)
-	{
+
+	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 LevelChunk read(WorldGenLevel level, LevelLightEngine lightEngine, ChunkPos chunkPos, CompoundTag chunkData)
-	{
-		#if PRE_MC_1_18_1
+
+	public static LevelChunk read(WorldGenLevel level, LevelLightEngine lightEngine, ChunkPos chunkPos,
+			CompoundTag chunkData) {
 		CompoundTag tagLevel = chunkData.getCompound("Level");
-		#else
-		CompoundTag tagLevel = chunkData;
-		#endif
+
+		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 {})", chunkPos, 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;
 		}

-		ChunkStatus.ChunkType chunkType = readChunkType(tagLevel);
-		#if PRE_MC_1_18_1
-		if (chunkType != ChunkStatus.ChunkType.LEVELCHUNK)
-			return null;
-		#else
-		BlendingData blendingData = readBlendingData(tagLevel);
-		if (chunkType == ChunkStatus.ChunkType.PROTOCHUNK && (blendingData == null || !blendingData.oldNoise()))
-			return null;
-		#endif
+		// ====================== Read params for making the LevelChunk
+		// ============================
+
+		ChunkBiomeContainer chunkBiomeContainer = new ChunkBiomeContainer(
+				level.getLevel().registryAccess().registryOrThrow(Registry.BIOME_REGISTRY), chunkPos,
+				level.getLevel().getChunkSource().getGenerator().getBiomeSource(),
+				tagLevel.contains("Biomes", 11) ? tagLevel.getIntArray("Biomes") : null);
+
+		UpgradeData upgradeData = tagLevel.contains("UpgradeData", 10)
+				? new UpgradeData(tagLevel.getCompound("UpgradeData"))
+				: UpgradeData.EMPTY;
+
+		TickList<Block> blockTicks = tagLevel.contains("TileTicks", 9)
+				? ChunkTickList.create(tagLevel.getList("TileTicks", 10), Registry.BLOCK::getKey, Registry.BLOCK::get)
+				: new ProtoTickList<Block>(block -> (block == null || block.defaultBlockState().isAir()), chunkPos,
+						tagLevel.getList("ToBeTicked", 9));
+
+		TickList<Fluid> liquidTicks = tagLevel.contains("LiquidTicks", 9)
+				? ChunkTickList.create(tagLevel.getList("LiquidTicks", 10), Registry.FLUID::getKey, Registry.FLUID::get)
+				: new ProtoTickList<Fluid>(fluid -> (fluid == null || fluid == Fluids.EMPTY), chunkPos,
+						tagLevel.getList("LiquidsToBeTicked", 9));

 		long inhabitedTime = tagLevel.getLong("InhabitedTime");

-		//================== Read params for making the LevelChunk ==================
-		UpgradeData upgradeData = tagLevel.contains(TAG_UPGRADE_DATA, 10)
-				? new UpgradeData(tagLevel.getCompound(TAG_UPGRADE_DATA)#if POST_MC_1_17_1, level #endif)
-				: UpgradeData.EMPTY;
-
-		boolean isLightOn = tagLevel.getBoolean("isLightOn");
-		if (isLightOn) lightEngine.retainData(chunkPos, true);
-		#if PRE_MC_1_18_1
-		ChunkBiomeContainer chunkBiomeContainer = new ChunkBiomeContainer(
-				level.getLevel().registryAccess().registryOrThrow(Registry.BIOME_REGISTRY)#if POST_MC_1_17_1, level #endif,
-				chunkPos, level.getLevel().getChunkSource().getGenerator().getBiomeSource(),
-				tagLevel.contains("Biomes", 11) ? tagLevel.getIntArray("Biomes") : null);
-
-		TickList<Block> blockTicks = tagLevel.contains(BLOCK_TICKS_TAG_PRE18, 9)
-				? ChunkTickList.create(tagLevel.getList(BLOCK_TICKS_TAG_PRE18, 10), Registry.BLOCK::getKey, Registry.BLOCK::get)
-				: new ProtoTickList<Block>(block -> (block == null || block.defaultBlockState().isAir()), chunkPos,
-				tagLevel.getList("ToBeTicked", 9)#if POST_MC_1_17_1, level #endif);
-
-		TickList<Fluid> fluidTicks = tagLevel.contains(FLUID_TICKS_TAG_PRE18, 9)
-				? ChunkTickList.create(tagLevel.getList(FLUID_TICKS_TAG_PRE18, 10), Registry.FLUID::getKey, Registry.FLUID::get)
-				: new ProtoTickList<Fluid>(fluid -> (fluid == null || fluid == Fluids.EMPTY), chunkPos,
-				tagLevel.getList("LiquidsToBeTicked", 9)#if POST_MC_1_17_1, level #endif);
-		#else
-		LevelChunkTicks<Block> blockTicks = LevelChunkTicks.load(tagLevel.getList(BLOCK_TICKS_TAG_18, 10),
-				string -> Registry.BLOCK.getOptional(ResourceLocation.tryParse(string)), chunkPos);
-		LevelChunkTicks<Fluid> fluidTicks = LevelChunkTicks.load(tagLevel.getList(FLUID_TICKS_TAG_18, 10),
-				string -> Registry.FLUID.getOptional(ResourceLocation.tryParse(string)), chunkPos);
-		#endif
-
 		LevelChunkSection[] levelChunkSections = readSections(level, lightEngine, chunkPos, tagLevel);

-		// ====================== Make the chunk =========================
-		#if PRE_MC_1_18_1
-		LevelChunk chunk = new LevelChunk((Level) level.getLevel(), chunkPos, chunkBiomeContainer, upgradeData, blockTicks,
-				fluidTicks, inhabitedTime, levelChunkSections, null);
-		#else
-		LevelChunk chunk = new LevelChunk((Level) level, chunkPos, upgradeData, blockTicks,
-		 		fluidTicks, inhabitedTime, levelChunkSections, null, blendingData);
-		#endif
-		// Set some states after object creation
-		chunk.setLightCorrect(isLightOn);
-		readHeightmaps(chunk, chunkData);
-		readPostPocessings(chunk, chunkData);
+		// ======================== Make the chunk
+		// ===========================================
+		LevelChunk chunk = new LevelChunk(level.getLevel(), chunkPos, chunkBiomeContainer, upgradeData, blockTicks,
+				liquidTicks, inhabitedTime, levelChunkSections, null);
+
+		// ========================== Post setup some chunk data
+		// ==============================
+		chunk.setLightCorrect(tagLevel.getBoolean("isLightOn"));
+		readHeightmaps(chunk, tagLevel);
+		readPostPocessings(chunk, tagLevel);
+		// ClientApi.LOGGER.info("Loaded chunk @ "+chunk.getPos());
 		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,31 +1,9 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.worldGeneration.mimicObject;

 import com.seibel.lod.core.handlers.dependencyInjection.ModAccessorHandler;
 import com.seibel.lod.core.wrapperInterfaces.modAccessor.IStarlightAccessor;

 import net.minecraft.world.level.BlockGetter;
-#if POST_MC_1_17_1
-import net.minecraft.world.level.LevelHeightAccessor;
-#endif
 import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.LightChunkGetter;

@@ -55,10 +33,4 @@ public class LightGetterAdaptor implements LightChunkGetter {
 	public BlockGetter getLevel() {
 		return shouldReturnNull ? null : (genRegion != null ? genRegion : heightGetter);
 	}
-
-	#if POST_MC_1_17_1
-	public LevelHeightAccessor getLevelHeightAccessor() {
-		return heightGetter;
-	}
-	#endif
 }
@@ -1,53 +1,25 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.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.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;
-#if POST_MC_1_17_1
-import net.minecraft.world.level.LevelHeightAccessor;
-#endif
 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;
@@ -68,71 +40,39 @@ 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>();
-	#if PRE_MC_1_18_1
 	private ChunkPos overrideCenterPos = null;
+	
 	public void setOverrideCenter(ChunkPos pos) {overrideCenterPos = pos;}
-		#if PRE_MC_1_17_1
-		@Override
-		public int getCenterX() {
-			return overrideCenterPos==null ? super.getCenterX() : overrideCenterPos.x;
-		}
-		@Override
-		public int getCenterZ() {
-			return overrideCenterPos==null ? super.getCenterX() : overrideCenterPos.z;
-		}
-		#else
-		@Override
-		public ChunkPos getCenter() {
-			return overrideCenterPos==null ? super.getCenter() : overrideCenterPos;
-		}
-		#endif
-	#endif
+	@Override
+	public int getCenterX() {
+		return overrideCenterPos==null ? super.getCenterX() : overrideCenterPos.x;
+	}
+	@Override
+	public int getCenterZ() {
+		return overrideCenterPos==null ? super.getCenterZ() : overrideCenterPos.z;
+	}

 	public LightedWorldGenRegion(ServerLevel serverLevel, WorldGenLevelLightEngine lightEngine,
-			List<ChunkAccess> list, ChunkStatus chunkStatus, int i,
+			StructureFeatureManager structFeat, List<ChunkAccess> list, ChunkStatus chunkStatus, int i,
 			LightGenerationMode lightMode, EmptyChunkGenerator generator) {
-		super(serverLevel, list #if POST_MC_1_17_1, chunkStatus, i #endif);
+		super(serverLevel, list);
 		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()));
 	}

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

 	// Skip updating the related tile entities
 	@Override
@@ -210,7 +150,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 #if POST_MC_1_18_1, true #endif);
+			chunk = new ImposterProtoChunk((LevelChunk) chunk);
 		}
 		return chunk;
 	}
@@ -274,40 +214,5 @@ public class LightedWorldGenRegion extends WorldGenRegion {
 	public boolean canSeeSky(BlockPos blockPos) {
 		return (getBrightness(LightLayer.SKY, blockPos) >= getMaxLightLevel());
 	}
-	
-	public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver)
-	{
-		return calculateBlockTint(blockPos, colorResolver);
-	}
-
-	private Biome _getBiome(BlockPos pos) {
-		#if POST_MC_1_18_2
-		return getBiome(pos).value();
-		#else
-		return getBiome(pos);
-		#endif
-	}
-	
-	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;
-	}

 }
@@ -1,22 +1,3 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.worldGeneration.mimicObject;

 import org.jetbrains.annotations.Nullable;
@@ -24,9 +5,6 @@ import org.jetbrains.annotations.Nullable;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.SectionPos;
 import net.minecraft.world.level.ChunkPos;
-#if POST_MC_1_17_1
-import net.minecraft.world.level.LevelHeightAccessor;
-#endif
 import net.minecraft.world.level.LightLayer;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.DataLayer;
@@ -38,184 +16,149 @@ import net.minecraft.world.level.lighting.SkyLightEngine;

 public class WorldGenLevelLightEngine extends LevelLightEngine {
 	public static final int MAX_SOURCE_LEVEL = 15;
-    public static final int LIGHT_SECTION_PADDING = 1;
-    #if POST_MC_1_17_1
-    protected final LevelHeightAccessor levelHeightAccessor;
-    #endif
-    @Nullable
-    public final BlockLightEngine blockEngine;
-    @Nullable
-    public final SkyLightEngine skyEngine;
+	public static final int LIGHT_SECTION_PADDING = 1;
+	@Nullable
+	public final BlockLightEngine blockEngine;
+	@Nullable
+	public final SkyLightEngine skyEngine;

-    public WorldGenLevelLightEngine(LightGetterAdaptor genRegion) {
-    	super(genRegion, false, false);
-        #if POST_MC_1_17_1
-        this.levelHeightAccessor = genRegion.getLevelHeightAccessor();
-        #endif
-        this.blockEngine = new BlockLightEngine(genRegion);
-        this.skyEngine = new SkyLightEngine(genRegion);
-    }
+	public WorldGenLevelLightEngine(LightGetterAdaptor genRegion) {
+		super(genRegion, false, false);
+		this.blockEngine = new BlockLightEngine(genRegion);
+		this.skyEngine = new SkyLightEngine(genRegion);
+	}

-    @Override
-    public void checkBlock(BlockPos blockPos) {
-        if (this.blockEngine != null) {
-            this.blockEngine.checkBlock(blockPos);
-        }
-        if (this.skyEngine != null) {
-            this.skyEngine.checkBlock(blockPos);
-        }
-    }
+	@Override
+	public void checkBlock(BlockPos blockPos) {
+		if (this.blockEngine != null) {
+			this.blockEngine.checkBlock(blockPos);
+		}
+		if (this.skyEngine != null) {
+			this.skyEngine.checkBlock(blockPos);
+		}
+	}

-    @Override
-    public void onBlockEmissionIncrease(BlockPos blockPos, int i) {
-        if (this.blockEngine != null) {
-            this.blockEngine.onBlockEmissionIncrease(blockPos, i);
-        }
-    }
+	@Override
+	public void onBlockEmissionIncrease(BlockPos blockPos, int i) {
+		if (this.blockEngine != null) {
+			this.blockEngine.onBlockEmissionIncrease(blockPos, i);
+		}
+	}

-    @Override
-    public boolean hasLightWork() {
-        if (this.skyEngine != null && this.skyEngine.hasLightWork()) {
-            return true;
-        }
-        return this.blockEngine != null && this.blockEngine.hasLightWork();
-    }
+	@Override
+	public boolean hasLightWork() {
+		if (this.skyEngine != null && this.skyEngine.hasLightWork()) {
+			return true;
+		}
+		return this.blockEngine != null && this.blockEngine.hasLightWork();
+	}

-    @Override
-    public int runUpdates(int i, boolean bl, boolean bl2) {
-        if (this.blockEngine != null && this.skyEngine != null) {
-            int j = i / 2;
-            int k = this.blockEngine.runUpdates(j, bl, bl2);
-            int l = i - j + k;
-            int m = this.skyEngine.runUpdates(l, bl, bl2);
-            if (k == 0 && m > 0) {
-                return this.blockEngine.runUpdates(m, bl, bl2);
-            }
-            return m;
-        }
-        if (this.blockEngine != null) {
-            return this.blockEngine.runUpdates(i, bl, bl2);
-        }
-        if (this.skyEngine != null) {
-            return this.skyEngine.runUpdates(i, bl, bl2);
-        }
-        return i;
-    }
+	@Override
+	public int runUpdates(int i, boolean bl, boolean bl2) {
+		if (this.blockEngine != null && this.skyEngine != null) {
+			int j = i / 2;
+			int k = this.blockEngine.runUpdates(j, bl, bl2);
+			int l = i - j + k;
+			int m = this.skyEngine.runUpdates(l, bl, bl2);
+			if (k == 0 && m > 0) {
+				return this.blockEngine.runUpdates(m, bl, bl2);
+			}
+			return m;
+		}
+		if (this.blockEngine != null) {
+			return this.blockEngine.runUpdates(i, bl, bl2);
+		}
+		if (this.skyEngine != null) {
+			return this.skyEngine.runUpdates(i, bl, bl2);
+		}
+		return i;
+	}

-    @Override
-    public void updateSectionStatus(SectionPos sectionPos, boolean bl) {
-        if (this.blockEngine != null) {
-            this.blockEngine.updateSectionStatus(sectionPos, bl);
-        }
-        if (this.skyEngine != null) {
-            this.skyEngine.updateSectionStatus(sectionPos, bl);
-        }
-    }
+	@Override
+	public void updateSectionStatus(SectionPos sectionPos, boolean bl) {
+		if (this.blockEngine != null) {
+			this.blockEngine.updateSectionStatus(sectionPos, bl);
+		}
+		if (this.skyEngine != null) {
+			this.skyEngine.updateSectionStatus(sectionPos, bl);
+		}
+	}

-    @Override
-    public void enableLightSources(ChunkPos chunkPos, boolean bl) {
-        if (this.blockEngine != null) {
-            this.blockEngine.enableLightSources(chunkPos, bl);
-        }
-        if (this.skyEngine != null) {
-            this.skyEngine.enableLightSources(chunkPos, bl);
-        }
-    }
+	@Override
+	public void enableLightSources(ChunkPos chunkPos, boolean bl) {
+		if (this.blockEngine != null) {
+			this.blockEngine.enableLightSources(chunkPos, bl);
+		}
+		if (this.skyEngine != null) {
+			this.skyEngine.enableLightSources(chunkPos, bl);
+		}
+	}

-    @Override
-    public LayerLightEventListener getLayerListener(LightLayer lightLayer) {
-        if (lightLayer == LightLayer.BLOCK) {
-            if (this.blockEngine == null) {
-                return LayerLightEventListener.DummyLightLayerEventListener.INSTANCE;
-            }
-            return this.blockEngine;
-        }
-        if (this.skyEngine == null) {
-            return LayerLightEventListener.DummyLightLayerEventListener.INSTANCE;
-        }
-        return this.skyEngine;
-    }
+	@Override
+	public LayerLightEventListener getLayerListener(LightLayer lightLayer) {
+		if (lightLayer == LightLayer.BLOCK) {
+			if (this.blockEngine == null) {
+				return LayerLightEventListener.DummyLightLayerEventListener.INSTANCE;
+			}
+			return this.blockEngine;
+		}
+		if (this.skyEngine == null) {
+			return LayerLightEventListener.DummyLightLayerEventListener.INSTANCE;
+		}
+		return this.skyEngine;
+	}

-    @Override
-    public int getRawBrightness(BlockPos blockPos, int i) {
-        int j = this.skyEngine == null ? 0 : this.skyEngine.getLightValue(blockPos) - i;
-        int k = this.blockEngine == null ? 0 : this.blockEngine.getLightValue(blockPos);
-        return Math.max(k, j);
-    }
+	@Override
+	public int getRawBrightness(BlockPos blockPos, int i) {
+		int j = this.skyEngine == null ? 0 : this.skyEngine.getLightValue(blockPos) - i;
+		int k = this.blockEngine == null ? 0 : this.blockEngine.getLightValue(blockPos);
+		return Math.max(k, j);
+	}

-    public void lightChunk(ChunkAccess chunkAccess, boolean needLightBlockUpdate) {
-    	ChunkPos chunkPos = chunkAccess.getPos();
-        chunkAccess.setLightCorrect(false);
-        
-        LevelChunkSection[] levelChunkSections = chunkAccess.getSections();
-        for (int i = 0; i <
-        #if POST_MC_1_17_1
-            chunkAccess.getSectionsCount()
-        #else
-            16
-        #endif
-        ; ++i) {
-            LevelChunkSection levelChunkSection = levelChunkSections[i];
-            #if PRE_MC_1_17_1
-            if (!LevelChunkSection.isEmpty(levelChunkSection)) {
-                updateSectionStatus(SectionPos.of(chunkPos, i), false);
-            }
-            #elif PRE_MC_1_18_1
-            if (!LevelChunkSection.isEmpty(levelChunkSection)) {
-                int j = this.levelHeightAccessor.getSectionYFromSectionIndex(i);
-                updateSectionStatus(SectionPos.of(chunkPos, j), false);
-            }
-            #else
-            if (levelChunkSection.hasOnlyAir()) continue;
-            int j = this.levelHeightAccessor.getSectionYFromSectionIndex(i);
-            updateSectionStatus(SectionPos.of(chunkPos, j), false);
-            #endif
-        }
-        enableLightSources(chunkPos, true);
-        if (needLightBlockUpdate) {
-            chunkAccess.getLights().forEach(blockPos ->
-                    onBlockEmissionIncrease(blockPos, chunkAccess.getLightEmission(blockPos)));
-        }
+	public void lightChunk(ChunkAccess chunkAccess, boolean needLightBlockUpdate) {
+		ChunkPos chunkPos = chunkAccess.getPos();
+		chunkAccess.setLightCorrect(false);

-        chunkAccess.setLightCorrect(true);
-    }
+		LevelChunkSection[] levelChunkSections = chunkAccess.getSections();
+		for (int i = 0; i < 16; i++) {
+			LevelChunkSection levelChunkSection = levelChunkSections[i];
+			if (!LevelChunkSection.isEmpty(levelChunkSection)) {
+				updateSectionStatus(SectionPos.of(chunkPos, i), false);
+			}
+		}
+		enableLightSources(chunkPos, true);
+		if (needLightBlockUpdate) {
+			chunkAccess.getLights()
+					.forEach(blockPos -> onBlockEmissionIncrease(blockPos, chunkAccess.getLightEmission(blockPos)));
+		}

-    @Override
-    public String getDebugData(LightLayer lightLayer, SectionPos sectionPos) {
-    	throw new UnsupportedOperationException("This should never be used!");
-    }
-    @Override
-    public void queueSectionData(LightLayer lightLayer, SectionPos sectionPos, @Nullable DataLayer dataLayer, boolean bl) {
-        if (lightLayer == LightLayer.BLOCK) {
-            if (this.blockEngine != null) {
-                this.blockEngine.queueSectionData(sectionPos.asLong(), dataLayer, bl);
-            }
-        } else if (this.skyEngine != null) {
-            this.skyEngine.queueSectionData(sectionPos.asLong(), dataLayer, bl);
-        }
-    }
-    @Override
-    public void retainData(ChunkPos chunkPos, boolean bl) {
-        if (this.blockEngine != null) {
-            this.blockEngine.retainData(chunkPos, bl);
-        }
-        if (this.skyEngine != null) {
-            this.skyEngine.retainData(chunkPos, bl);
-        }
-    }
+		chunkAccess.setLightCorrect(true);
+	}

-    #if POST_MC_1_17_1
-    @Override
-    public int getLightSectionCount() {
-    	throw new UnsupportedOperationException("This should never be used!");
-    }
-    @Override
-    public int getMinLightSection() {
-    	throw new UnsupportedOperationException("This should never be used!");
-    }
-    @Override
-    public int getMaxLightSection() {
-    	throw new UnsupportedOperationException("This should never be used!");
-    }
-    #endif
+	@Override
+	public String getDebugData(LightLayer lightLayer, SectionPos sectionPos) {
+		throw new UnsupportedOperationException("This should never be used!");
+	}
+
+	@Override
+	public void queueSectionData(LightLayer lightLayer, SectionPos sectionPos, @Nullable DataLayer dataLayer,
+			boolean bl) {
+		if (lightLayer == LightLayer.BLOCK) {
+			if (this.blockEngine != null) {
+				this.blockEngine.queueSectionData(sectionPos.asLong(), dataLayer, bl);
+			}
+		} else if (this.skyEngine != null) {
+			this.skyEngine.queueSectionData(sectionPos.asLong(), dataLayer, bl);
+		}
+	}
+
+	@Override
+	public void retainData(ChunkPos chunkPos, boolean bl) {
+		if (this.blockEngine != null) {
+			this.blockEngine.retainData(chunkPos, bl);
+		}
+		if (this.skyEngine != null) {
+			this.skyEngine.retainData(chunkPos, bl);
+		}
+	}
 }
@@ -1,38 +1,7 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.worldGeneration.mimicObject;

-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.function.Consumer;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
 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;
@@ -42,130 +11,46 @@ import net.minecraft.world.level.WorldGenLevel;
 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.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.feature.StructureFeature;
-#if POST_MC_1_18_1
-import net.minecraft.world.level.levelgen.structure.StructureCheck;
-#endif
 import net.minecraft.world.level.levelgen.structure.StructureStart;

 public class WorldGenStructFeatManager extends StructureFeatureManager {
-	final WorldGenLevel genLevel;
+	WorldGenLevel genLevel;
 	WorldGenSettings worldGenSettings;
-	#if POST_MC_1_18_1
-	StructureCheck structureCheck;
-	#endif
-	public WorldGenStructFeatManager(WorldGenSettings worldGenSettings,
-			WorldGenLevel genLevel #if POST_MC_1_18_1, StructureCheck structureCheck #endif) {

-		super(genLevel, worldGenSettings #if POST_MC_1_18_1, structureCheck #endif);
+	public WorldGenStructFeatManager(LevelAccessor levelAccessor, WorldGenSettings worldGenSettings,
+			WorldGenLevel genLevel) {
+		super(levelAccessor, worldGenSettings);
 		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 #if POST_MC_1_18_1, structureCheck #endif);
+		return new WorldGenStructFeatManager(worldGenRegion, worldGenSettings, worldGenRegion);
 	}

-	private ChunkAccess _getChunk(int x, int z, ChunkStatus status) {
-		if (genLevel == null) return null;
-		return genLevel.getChunk(x, z, status, false);
-	}
-
-	#if PRE_MC_1_18_1
 	@Override
 	public Stream<? extends StructureStart<?>> startsForFeature(SectionPos sectionPos2,
-																StructureFeature<?> structureFeature) {
-		ChunkAccess chunk = _getChunk(sectionPos2.x(), sectionPos2.z(), ChunkStatus.STRUCTURE_REFERENCES);
-		if (chunk == null) return Stream.empty();
-
+			StructureFeature<?> structureFeature) {
+		if (genLevel == null)
+			return Stream.empty();
+		ChunkAccess chunk = genLevel.getChunk(sectionPos2.x(), sectionPos2.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 = _getChunk(sectPos.x(), sectPos.z(), ChunkStatus.STRUCTURE_STARTS);
-			if (startChunk == null) return null;
+			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());
 	}
-	#else
-	@Override
-	public boolean hasAnyStructureAt(BlockPos blockPos) {
-		SectionPos sectionPos = SectionPos.of(blockPos);
-		ChunkAccess chunk = _getChunk(sectionPos.x(), sectionPos.z(), ChunkStatus.STRUCTURE_REFERENCES);
-		if (chunk == null) return false;
-		return chunk.hasAnyStructureReferences();
-	}
-		#if MC_1_18_1
-		@Override
-		@SuppressWarnings({ "rawtypes", "unchecked" })
-		public List<? extends StructureStart<?>> startsForFeature(SectionPos sectionPos,
-																  StructureFeature<?> structureFeature) {
-
-			ChunkAccess chunk = _getChunk(sectionPos.x(), sectionPos.z(), ChunkStatus.STRUCTURE_REFERENCES);
-			if (chunk == null) return List.of();
-
-			// Copied from StructureFeatureManager::startsForFeature(...) with slight tweaks
-			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 = _getChunk(sectPos.x(), sectPos.z(), ChunkStatus.STRUCTURE_STARTS);
-				if (startChunk == null) continue;
-				StructureStart<?> structureStart = this.getStartForFeature(sectPos, structureFeature, startChunk);
-				if (structureStart == null || !structureStart.isValid()) continue;
-				builder.add(structureStart);
-			}
-			return builder.build();
-		}
-		#else
-		@Override
-		public List<StructureStart> startsForFeature(SectionPos sectionPos, Predicate<ConfiguredStructureFeature<?, ?>> predicate) {
-			ChunkAccess chunk = _getChunk(sectionPos.x(), sectionPos.z(), ChunkStatus.STRUCTURE_REFERENCES);
-			if (chunk == null) return List.of();
-
-			// Copied from StructureFeatureManager::startsForFeature(...)
-			Map<ConfiguredStructureFeature<?, ?>, LongSet> map = chunk.getAllReferences();
-
-			ImmutableList.Builder<StructureStart> builder = ImmutableList.builder();
-			Iterator<Map.Entry<ConfiguredStructureFeature<?, ?>, LongSet>> var5 = map.entrySet().iterator();
-
-			while(var5.hasNext()) {
-				Map.Entry<ConfiguredStructureFeature<?, ?>, LongSet> entry = var5.next();
-				ConfiguredStructureFeature<?, ?> configuredStructureFeature = entry.getKey();
-				if (predicate.test(configuredStructureFeature)) {
-					LongSet var10002 = (LongSet)entry.getValue();
-					Objects.requireNonNull(builder);
-					this.fillStartsForFeature(configuredStructureFeature, var10002, builder::add);
-				}
-			}
-
-			return builder.build();
-		}
-
-		@Override
-		public List<StructureStart> startsForFeature(SectionPos sectionPos, ConfiguredStructureFeature<?, ?> configuredStructureFeature) {
-			ChunkAccess chunk = _getChunk(sectionPos.x(), sectionPos.z(), ChunkStatus.STRUCTURE_REFERENCES);
-			if (chunk == null) return (List<StructureStart>) Stream.empty();
-
-			// Copied from StructureFeatureManager::startsForFeature(...)
-			LongSet longSet = chunk.getReferencesForFeature(configuredStructureFeature);
-			ImmutableList.Builder<StructureStart> builder = ImmutableList.builder();
-			Objects.requireNonNull(builder);
-			this.fillStartsForFeature(configuredStructureFeature, longSet, builder::add);
-			return builder.build();
-		}
-
-		@Override
-		public Map<ConfiguredStructureFeature<?, ?>, LongSet> getAllStructuresAt(BlockPos blockPos) {
-			SectionPos sectionPos = SectionPos.of(blockPos);
-			ChunkAccess chunk = _getChunk(sectionPos.x(), sectionPos.z(), ChunkStatus.STRUCTURE_REFERENCES);
-			if (chunk == null) return (Map<ConfiguredStructureFeature<?, ?>, LongSet>) Stream.empty();
-			return chunk.getAllReferences();
-		}
-		#endif
-	#endif
-}
+}
@@ -1,80 +1,45 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.worldGeneration.step;

 import java.util.ArrayList;
 import java.util.List;

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

-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;
-#if POST_MC_1_18_1
-import net.minecraft.world.level.levelgen.blending.Blender;
-#endif

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

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

 	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());
-			#if PRE_MC_1_18_1
-			environment.params.generator.createBiomes(environment.params.biomes, chunk);
-			#else
-			chunk = environment.joinSync(environment.params.generator.createBiomes(environment.params.biomes, Runnable::run, Blender.of(worldGenRegion),
-					tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk));
-			#endif
+			envionment.params.generator.createBiomes(envionment.params.biomes, chunk);
 		}
 	}
 }
@@ -1,83 +1,53 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.worldGeneration.step;

 import java.util.ArrayList;
+import java.util.EnumSet;

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

 import net.minecraft.ReportedException;
-import net.minecraft.server.level.WorldGenRegion;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.ProtoChunk;
 import net.minecraft.world.level.levelgen.Heightmap;
-#if POST_MC_1_18_1
-import net.minecraft.world.level.levelgen.blending.Blender;
-#endif

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

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

 	public final ChunkStatus STATUS = ChunkStatus.FEATURES;

-	public void generateGroup(ThreadedParameters tParams, LightedWorldGenRegion worldGenRegion,
-			ArrayGridList<ChunkAccess> chunks) {
+	public void generateGroup(ThreadedParameters tParams, LightedWorldGenRegion 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 {
-				#if PRE_MC_1_18_1
 				worldGenRegion.setOverrideCenter(chunk.getPos());
 				Heightmap.primeHeightmaps(chunk, STATUS.heightmapsAfter());
-				environment.params.generator.applyBiomeDecoration(worldGenRegion, tParams.structFeat);
-				#else
-				Heightmap.primeHeightmaps(chunk, STATUS.heightmapsAfter());
-				environment.params.generator.applyBiomeDecoration(worldGenRegion, chunk,
-						tParams.structFeat.forWorldGenRegion(worldGenRegion));
-				#endif
+				envionment.params.generator.applyBiomeDecoration(worldGenRegion, tParams.structFeat);
 			} catch (ReportedException e) {
 				e.printStackTrace();
-				// FIXME: Features concurrent modification issue. Something about cocobeans might just
-				// error out. For now just retry.
 			}
 		}
+		worldGenRegion.setOverrideCenter(null);
 	}
 }
@@ -1,27 +1,8 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.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.ArrayGridList;
+import com.seibel.lod.core.util.GridList;

 import net.minecraft.server.level.ThreadedLevelLightEngine;
 import net.minecraft.world.level.chunk.ChunkAccess;
@@ -29,53 +10,47 @@ import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.world.level.chunk.ProtoChunk;
 import net.minecraft.world.level.lighting.LevelLightEngine;
-import net.minecraft.world.level.lighting.LightEventListener;

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

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

 	public final ChunkStatus STATUS = ChunkStatus.LIGHT;
-	
-	public void generateGroup(
-			#if PRE_MC_1_17_1 LevelLightEngine lightEngine,
-			#else LightEventListener lightEngine, #endif
-			ArrayGridList<ChunkAccess> chunks) {
-		
+
+	public void generateGroup(LevelLightEngine lightEngine, GridList<ChunkAccess> chunks) {
+		// ArrayList<ChunkAccess> chunksToDo = new ArrayList<ChunkAccess>();
+
 		for (ChunkAccess chunk : chunks) {
-			if (chunk.getStatus().isOrAfter(STATUS)) continue;
+			if (chunk.getStatus().isOrAfter(STATUS))
+				continue;
 			((ProtoChunk) chunk).setStatus(STATUS);
 		}
-		
+
 		for (ChunkAccess chunk : chunks) {
 			boolean hasCorrectBlockLight = (chunk instanceof LevelChunk && chunk.isLightCorrect());
 			try {
 				if (lightEngine == null) {
 					// Do nothing
 				} else if (lightEngine instanceof WorldGenLevelLightEngine) {
-					((WorldGenLevelLightEngine)lightEngine).lightChunk(chunk, !hasCorrectBlockLight);
+					((WorldGenLevelLightEngine) lightEngine).lightChunk(chunk, !hasCorrectBlockLight);
 				} else if (lightEngine instanceof ThreadedLevelLightEngine) {
 					((ThreadedLevelLightEngine) lightEngine).lightChunk(chunk, !hasCorrectBlockLight).join();
 				} else {
-					assert(false);
+					assert (false);
 				}
-				
+
 			} catch (Exception e) {
 				e.printStackTrace();
 			}
-			#if POST_MC_1_18_1
-			if (chunk instanceof LevelChunk) ((LevelChunk)chunk).setClientLightReady(true);
-			#endif
 			chunk.setLightCorrect(true);
 		}
 		lightEngine.runUpdates(Integer.MAX_VALUE, true, true);
@@ -1,89 +1,45 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.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 com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment;

-import com.seibel.lod.core.util.LodUtil;
 import net.minecraft.server.level.WorldGenRegion;
-import net.minecraft.util.Mth;
-#if POST_MC_1_17_1
-import net.minecraft.world.level.LevelHeightAccessor;
-#endif
-import net.minecraft.world.level.StructureFeatureManager;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ChunkStatus;
-import net.minecraft.world.level.chunk.LevelChunkSection;
 import net.minecraft.world.level.chunk.ProtoChunk;
-import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator;
-import net.minecraft.world.level.levelgen.NoiseSettings;
-#if POST_MC_1_18_1
-import net.minecraft.world.level.levelgen.blending.Blender;
-#endif

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

 	/**
-	 * @param batchGenerationEnvironment
+	 * @param worldGenerationEnvironment
 	 */
-	public StepNoise(BatchGenerationEnvironment batchGenerationEnvironment)
-	{
-		environment = batchGenerationEnvironment;
+	public StepNoise(BatchGenerationEnvironment worldGenerationEnvironment) {
+		envionment = worldGenerationEnvironment;
 	}
-	
+
 	public final ChunkStatus STATUS = ChunkStatus.NOISE;
-    
-	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("StepNoise: "+chunk.getPos());
-			#if PRE_MC_1_17_1
-			environment.params.generator.fillFromNoise(worldGenRegion, tParams.structFeat, chunk);
-			#elif PRE_MC_1_18_1
-			chunk = environment.joinSync(environment.params.generator.fillFromNoise(Runnable::run,
-					tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk));
-			#else
-			chunk = environment.joinSync(environment.params.generator.fillFromNoise(Runnable::run, Blender.of(worldGenRegion),
-					tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk));
-			#endif
-			LodUtil.checkInterruptsUnchecked(); // Speed up termination responsiveness
+			envionment.params.generator.fillFromNoise(worldGenRegion, tParams.structFeat, chunk);
 		}
 	}
 }
@@ -1,29 +1,10 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.worldGeneration.step;

 import java.util.ArrayList;
 import java.util.List;

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

 import net.minecraft.CrashReport;
 import net.minecraft.CrashReportCategory;
@@ -39,35 +20,59 @@ import net.minecraft.world.level.chunk.ProtoChunk;
 import net.minecraft.world.level.levelgen.structure.StructureStart;

 public final class StepStructureReference {
-	/**
-	 * 
-	 */
-	private final BatchGenerationEnvironment environment;
-
-	/**
-	 * @param batchGenerationEnvironment
-	 */
-	public StepStructureReference(BatchGenerationEnvironment batchGenerationEnvironment)
-	{
-		environment = batchGenerationEnvironment;
-	}
-
 	public final ChunkStatus STATUS = ChunkStatus.STRUCTURE_REFERENCES;

-	public void generateGroup(ThreadedParameters tParams, WorldGenRegion worldGenRegion,
-			List<ChunkAccess> chunks) {
+	private void createReferences(WorldGenRegion worldGenLevel, StructureFeatureManager structureFeatureManager,
+			ChunkAccess chunkAccess) {
+		ChunkPos chunkPos = chunkAccess.getPos();
+		int j = chunkPos.x;
+		int k = chunkPos.z;
+		int l = chunkPos.getMinBlockX();
+		int m = chunkPos.getMinBlockZ();
+
+		SectionPos sectionPos = SectionPos.of(chunkAccess.getPos(), 0);
+
+		for (int n = j - 8; n <= j + 8; n++) {
+			for (int o = k - 8; o <= k + 8; o++) {
+				if (!worldGenLevel.hasChunk(n, o))
+					continue;
+				long p = ChunkPos.asLong(n, o);
+				for (StructureStart<?> structureStart : worldGenLevel.getChunk(n, o).getAllStarts().values()) {
+					try {
+						if (structureStart.isValid()
+								&& structureStart.getBoundingBox().intersects(l, m, l + 15, m + 15)) {
+							structureFeatureManager.addReferenceForFeature(sectionPos, structureStart.getFeature(), p,
+									chunkAccess);
+						}
+					} catch (Exception exception) {
+						CrashReport crashReport = CrashReport.forThrowable(exception, "Generating structure reference");
+						CrashReportCategory crashReportCategory = crashReport.addCategory("Structure");
+						crashReportCategory.setDetail("Id",
+								() -> Registry.STRUCTURE_FEATURE.getKey(structureStart.getFeature()).toString());
+						crashReportCategory.setDetail("Name", () -> structureStart.getFeature().getFeatureName());
+						crashReportCategory.setDetail("Class",
+								() -> structureStart.getFeature().getClass().getCanonicalName());
+						throw new ReportedException(crashReport);
+					}
+				}
+			}
+		}
+	}
+
+	public void generateGroup(ThreadedParameters tParams, WorldGenRegion worldGenRegion, List<ChunkAccess> chunks) {

 		ArrayList<ChunkAccess> chunksToDo = new ArrayList<ChunkAccess>();
-		
+
 		for (ChunkAccess chunk : chunks) {
-			if (chunk.getStatus().isOrAfter(STATUS)) continue;
+			if (chunk.getStatus().isOrAfter(STATUS))
+				continue;
 			((ProtoChunk) chunk).setStatus(STATUS);
 			chunksToDo.add(chunk);
 		}
-		
+
 		for (ChunkAccess chunk : chunksToDo) {
 			// System.out.println("StepStructureReference: "+chunk.getPos());
-			environment.params.generator.createReferences(worldGenRegion, tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk);
+			createReferences(worldGenRegion, tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk);
 		}
 	}
 }
@@ -1,29 +1,10 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.worldGeneration.step;

 import java.util.ArrayList;
 import java.util.List;

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

 import net.minecraft.server.level.WorldGenRegion;
 import net.minecraft.world.level.chunk.ChunkAccess;
@@ -34,55 +15,33 @@ public final class StepStructureStart {
 	/**
 	 * 
 	 */
-	private final BatchGenerationEnvironment environment;
+	private final BatchGenerationEnvironment envionment;

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

 	public final ChunkStatus STATUS = ChunkStatus.STRUCTURE_STARTS;
-	
-	public static class StructStartCorruptedException extends RuntimeException {
-		private static final long serialVersionUID = -8987434342051563358L;

-		public StructStartCorruptedException(ArrayIndexOutOfBoundsException e) {
-			super("StructStartCorruptedException");
-			super.initCause(e);
-			fillInStackTrace();
-		}
-	}
-
-	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);
 		}
-		
-		if (environment.params.worldGenSettings.generateFeatures()) {
+
+		if (envionment.params.worldGenSettings.generateFeatures()) {
 			for (ChunkAccess chunk : chunksToDo) {
 				// System.out.println("StepStructureStart: "+chunk.getPos());
-				environment.params.generator.createStructures(environment.params.registry, tParams.structFeat, chunk, environment.params.structures,
-						environment.params.worldSeed);
-
-				#if POST_MC_1_18_1
-				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);
-				}
-				#endif
+				envionment.params.generator.createStructures(envionment.params.registry, tParams.structFeat, chunk,
+						envionment.params.structures, envionment.params.worldSeed);
 			}
 		}
 	}
@@ -1,29 +1,10 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.worldGeneration.step;

 import java.util.ArrayList;
 import java.util.List;

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

 import net.minecraft.server.level.WorldGenRegion;
 import net.minecraft.world.level.chunk.ChunkAccess;
@@ -34,36 +15,30 @@ public final class StepSurface {
 	/**
 	 * 
 	 */
-	private final BatchGenerationEnvironment environment;
+	private final BatchGenerationEnvironment envionment;

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

 	public final ChunkStatus STATUS = ChunkStatus.SURFACE;

-	public void generateGroup(ThreadedParameters tParams, WorldGenRegion worldGenRegion,
-			List<ChunkAccess> chunks) {
+	public void generateGroup(ThreadedParameters tParams, WorldGenRegion worldGenRegion, List<ChunkAccess> chunks) {
 		ArrayList<ChunkAccess> chunksToDo = new ArrayList<ChunkAccess>();
-		
+
 		for (ChunkAccess chunk : chunks) {
-			if (chunk.getStatus().isOrAfter(STATUS)) continue;
+			if (chunk.getStatus().isOrAfter(STATUS))
+				continue;
 			((ProtoChunk) chunk).setStatus(STATUS);
 			chunksToDo.add(chunk);
 		}
-		
+
 		for (ChunkAccess chunk : chunksToDo) {
 			// System.out.println("StepSurface: "+chunk.getPos());
-			#if PRE_MC_1_18_1
-			environment.params.generator.buildSurfaceAndBedrock(worldGenRegion, chunk);
-
-			#else
-			environment.params.generator.buildSurface(worldGenRegion, tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk);
-			#endif
+			envionment.params.generator.buildSurfaceAndBedrock(worldGenRegion, chunk);
 		}
 	}
 }
@@ -1,48 +0,0 @@
-accessWidener v1 named
-
-
-# used when determining where to save files to
-accessible field net/minecraft/world/level/storage/DimensionDataStorage dataFolder Ljava/io/File;
-
-# used when rendering
-accessible field com/mojang/blaze3d/vertex/VertexBuffer indexCount I
-accessible field com/mojang/blaze3d/vertex/VertexBuffer vertextBufferId I
-accessible method net/minecraft/client/renderer/GameRenderer getFov (Lnet/minecraft/client/Camera;FZ)D
-
-# 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 class net/minecraft/client/renderer/LevelRenderer$RenderChunkInfo
-accessible field net/minecraft/client/renderer/LevelRenderer$RenderChunkInfo chunk Lnet/minecraft/client/renderer/chunk/ChunkRenderDispatcher$RenderChunk;
-
-# lighting
-accessible field net/minecraft/client/renderer/LightTexture lightPixels Lcom/mojang/blaze3d/platform/NativeImage;
-accessible field net/minecraft/client/renderer/LightTexture lightTexture Lnet/minecraft/client/renderer/texture/DynamicTexture;
-accessible field net/minecraft/world/level/lighting/LevelLightEngine blockEngine Lnet/minecraft/world/level/lighting/LayerLightEngine;
-accessible field net/minecraft/world/level/lighting/LevelLightEngine skyEngine Lnet/minecraft/world/level/lighting/LayerLightEngine;
-
-# 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 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
-
-# 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
@@ -1,50 +0,0 @@
-accessWidener v1 named
-
-
-# used when determining where to save files to
-accessible field net/minecraft/world/level/storage/DimensionDataStorage dataFolder Ljava/io/File;
-
-# used when rendering
-accessible field com/mojang/blaze3d/vertex/VertexBuffer indexCount I
-accessible field com/mojang/blaze3d/vertex/VertexBuffer vertextBufferId I
-accessible method net/minecraft/client/renderer/GameRenderer getFov (Lnet/minecraft/client/Camera;FZ)D
-
-# used for grabbing vanilla rendered chunks
-accessible field net/minecraft/client/renderer/LevelRenderer 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;
-
-# lighting
-accessible field net/minecraft/client/renderer/LightTexture lightPixels Lcom/mojang/blaze3d/platform/NativeImage;
-accessible field net/minecraft/client/renderer/LightTexture lightTexture Lnet/minecraft/client/renderer/texture/DynamicTexture;
-accessible field net/minecraft/world/level/lighting/LevelLightEngine blockEngine Lnet/minecraft/world/level/lighting/LayerLightEngine;
-accessible field net/minecraft/world/level/lighting/LevelLightEngine skyEngine Lnet/minecraft/world/level/lighting/LayerLightEngine;
-
-# 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 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
-
-# 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/util/ThreadingDetector lock Ljava/util/concurrent/Semaphore;
-mutable field net/minecraft/util/ThreadingDetector lock Ljava/util/concurrent/Semaphore;
@@ -1,36 +1,26 @@
 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
-accessible field com/mojang/blaze3d/vertex/VertexBuffer vertexCount I
-accessible field com/mojang/blaze3d/vertex/VertexBuffer id I
 accessible method net/minecraft/client/renderer/GameRenderer getFov (Lnet/minecraft/client/Camera;FZ)D

-# pre-render setup
+# used for grabbing vanilla rendered chunks
 accessible field net/minecraft/client/renderer/LevelRenderer renderChunks Lit/unimi/dsi/fastutil/objects/ObjectList;
 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 class net/minecraft/client/renderer/LevelRenderer$RenderChunkInfo
-accessible field net/minecraft/client/renderer/LevelRenderer$RenderChunkInfo chunk Lnet/minecraft/client/renderer/chunk/ChunkRenderDispatcher$RenderChunk;
-#accessible field net/minecraft/world/entity/Entity blockPosition Lnet/minecraft/core/BlockPos;
-
 # lighting
 accessible field net/minecraft/client/renderer/LightTexture lightPixels Lcom/mojang/blaze3d/platform/NativeImage;
-accessible field net/minecraft/client/renderer/LightTexture lightTexture Lnet/minecraft/client/renderer/texture/DynamicTexture;
 accessible field net/minecraft/world/level/lighting/LevelLightEngine blockEngine Lnet/minecraft/world/level/lighting/LayerLightEngine;
 accessible field net/minecraft/world/level/lighting/LevelLightEngine skyEngine Lnet/minecraft/world/level/lighting/LayerLightEngine;

 # 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 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;
@@ -41,5 +31,3 @@ accessible field net/minecraft/client/renderer/block/model/BakedQuad sprite Lnet
 accessible field net/minecraft/client/renderer/texture/TextureAtlasSprite framesX [I
 accessible field net/minecraft/client/renderer/texture/TextureAtlasSprite framesY [I
 accessible field net/minecraft/client/renderer/texture/TextureAtlasSprite mainImage [Lcom/mojang/blaze3d/platform/NativeImage;
-
-extendable class com/mojang/math/Matrix4f
@@ -1,9 +1,14 @@
 plugins {
-    id "com.github.johnrengelman.shadow" version "7.1.0"
+    id "com.github.johnrengelman.shadow" version "7.0.0"
+    id "com.modrinth.minotaur" version "1.2.1"
 }

 version = rootProject.mod_version+"-"+rootProject.minecraft_version+"-"+new Date().format("yyyy_MM_dd_HH_mm")

+loom {
+    accessWidenerPath.set(project(":common").file("src/main/resources/lod.accesswidener"))
+}
+
 architectury {
    platformSetupLoomIde()
    fabric()
@@ -13,10 +18,6 @@ configurations {
    compileClasspath.extendsFrom common
    runtimeClasspath.extendsFrom common
    developmentFabric.extendsFrom common
-
-    addModJar
-    include.extendsFrom addModJar
-    modImplementation.extendsFrom addModJar
 }

 repositories {
@@ -36,50 +37,23 @@ 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}")
-
-    // Starlight
-    addMod("curse.maven:starlight-521783:${rootProject.starlight_version_fabric}", rootProject.enable_starlight)
-
-    // Phosphor
-    addMod("curse.maven:phosphor-372124:${rootProject.phosphor_version_fabric}", rootProject.enable_phosphor)
+    modImplementation("com.terraformersmc:modmenu:${rootProject.modmenu_version}") {
+        exclude(group: "net.fabricmc.fabric-api")
+    }

    // Sodium
    addMod("curse.maven:sodium-394468:${rootProject.sodium_version}", rootProject.enable_sodium)
    implementation "org.joml:joml:1.10.2"
-    modImplementation(fabricApi.module("fabric-rendering-data-attachment-v1", rootProject.fabric_api_version))
-    modImplementation(fabricApi.module("fabric-rendering-fluids-v1", rootProject.fabric_api_version))

-	// 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}") {
-        exclude(group: "net.fabricmc.fabric-api")
-        transitive(false)
-    }
-    modImplementation("com.github.qouteall.ImmersivePortalsMod:imm_ptl_core:${rootProject.immersive_portals_version}") {
-        exclude(group: "net.fabricmc.fabric-api")
-        transitive(false)
-    }
-    modImplementation("com.github.qouteall.ImmersivePortalsMod:q_misc_util:${rootProject.immersive_portals_version}") {
-        exclude(group: "net.fabricmc.fabric-api")
-        transitive(false)
-    }
-    */
-


    // Toml
@@ -95,24 +69,37 @@ dependencies {
    shadowMe 'org.apache.commons:commons-compress:1.21'
 }

+// This method copies the access wideners from the common project to the fabric project. And it was generated by Github Copilot
+task copyAccessWidener(type: Copy) {
+    from project(":common").file("src/main/resources/lod.accesswidener")
+    into file("src/generated/resources")
+}
+
+task copyCoreResources(type: Copy) {
+    from fileTree(project(":core").file("src/main/resources"))
+    into file("build/resources/main")
+}
+
 task deleteResources(type: Delete) {
    delete file("build/resources/main")
 }

-processResources {
-    dependsOn(copyCoreResources)
-    dependsOn(copyCommonResources)
-    dependsOn(copyAccessWidener)
+task copyCommonResources(type: Copy) {
+    from fileTree(project(":common").file("src/main/resources"))
+    into file("build/resources/main")
 }

 runClient {
    dependsOn(copyCoreResources)
    dependsOn(copyCommonResources)
-    dependsOn(copyAccessWidener)
    jvmArgs "-XX:-OmitStackTraceInFastThrow"
    finalizedBy(deleteResources)
 }

+processResources {
+    dependsOn(copyAccessWidener)
+}
+
 shadowJar {
    configurations = [project.configurations.shadowMe]
    relocate 'org.tukaani', 'shaded.tukaani'
@@ -1,8 +1,8 @@
 /*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
 *    licensed under the GNU GPL v3 License.
 *
- *    Copyright (C) 2020-2022  James Seibel
+ *    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
@@ -19,26 +19,29 @@

 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.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
 import com.mojang.blaze3d.platform.InputConstants;
 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.wrapperInterfaces.chunk.IChunkWrapper;
 import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
+import com.seibel.lod.fabric.mixins.events.MixinClientLevel;

-import com.seibel.lod.fabric.mixins.MixinUtilBackgroudThread;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientChunkEvents;
+import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientLifecycleEvents;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
+import net.fabricmc.fabric.api.event.lifecycle.v1.ServerChunkEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerWorldEvents;
+import net.fabricmc.fabric.mixin.event.lifecycle.client.ClientChunkManagerMixin;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screens.TitleScreen;
+import net.minecraft.client.multiplayer.ClientChunkCache;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.level.Level;
@@ -47,14 +50,13 @@ import net.minecraft.world.level.chunk.LevelChunk;

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

 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
@@ -64,14 +66,13 @@ public class ClientProxy
 	private final EventApi eventApi = EventApi.INSTANCE;
 	private final ClientApi clientApi = ClientApi.INSTANCE;

-	public static Supplier<Boolean> isGenerationThreadChecker = null;

 	/**
 	 * Registers Fabric Events
 	 * @author Ran
 	 */
 	public void registerEvents() {
-		/* Registor the mod accessor*/
+		// TODO: Fix this if it's wrong

 		/* World Events */
 		//ServerTickEvents.START_SERVER_TICK.register(this::serverTickEvent);
@@ -79,14 +80,14 @@ public class ClientProxy

 		/* World Events */
 		//ServerChunkEvents.CHUNK_LOAD.register(this::chunkLoadEvent);
-		#if PRE_MC_1_18_1 // in 1.18+, we use mixin hook in setClientLightReady(true)
 		ClientChunkEvents.CHUNK_LOAD.register(this::chunkLoadEvent);
-		#endif
+
+

 		/* 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 */
@@ -96,8 +97,6 @@ public class ClientProxy
 		ClientTickEvents.END_CLIENT_TICK.register(client -> {
 			if (client.player != null) onKeyInput();
 		});
-		isGenerationThreadChecker = BatchGenerationEnvironment::isCurrentThreadDistantGeneratorThread;
-
 	}


@@ -116,11 +115,10 @@ public class ClientProxy
 	{
 		eventApi.worldSaveEvent();
 	}
-	
+
 	/** This is also called when a new dimension loads */
 	public void worldLoadEvent(Level level)
 	{
-		if (Minecraft.getInstance().screen instanceof TitleScreen) return;
 		if (level != null) {
 			eventApi.worldLoadEvent(WorldWrapper.getWorldWrapper(level));
 		}
@@ -1,8 +1,8 @@
 /*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
 *    licensed under the GNU GPL v3 License.
 *
- *    Copyright (C) 2020-2022  James Seibel
+ *    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
@@ -23,17 +23,15 @@ import com.seibel.lod.common.LodCommonMain;
 import com.seibel.lod.core.ModInfo;
 import com.seibel.lod.core.api.ApiShared;
 import com.seibel.lod.core.api.ClientApi;
+import com.seibel.lod.core.handlers.dependencyInjection.DependencyHandler;
 import com.seibel.lod.core.handlers.dependencyInjection.ModAccessorHandler;
 import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
 import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModChecker;
 import com.seibel.lod.core.wrapperInterfaces.modAccessor.IOptifineAccessor;
 import com.seibel.lod.core.wrapperInterfaces.modAccessor.ISodiumAccessor;
-import com.seibel.lod.core.wrapperInterfaces.modAccessor.IStarlightAccessor;
-import com.seibel.lod.fabric.networking.NetworkHandler;
 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.FabricDependencySetup;

 import net.fabricmc.api.ClientModInitializer;
@@ -42,12 +40,12 @@ import net.fabricmc.api.ClientModInitializer;
 * Initialize and setup the Mod. <br>
 * If you are looking for the real start of the mod
 * check out the ClientProxy.
- * 
+ *
 * @author coolGi2007
 * @author Ran
 * @version 12-1-2021
 */
-public class Main implements ClientModInitializer
+public class FabricMain implements ClientModInitializer
 {
 	// This is a client mod so it should implement ClientModInitializer and in fabric.mod.json it should have "environment": "client"
 	// Once it works on servers change the implement to ModInitializer and in fabric.mod.json it should be "environment": "*"
@@ -65,32 +63,38 @@ public class Main implements ClientModInitializer
 	// This loads the mod after minecraft loads which doesn't causes a lot of issues
 	public static void init() {
 		LodCommonMain.initConfig();
-		LodCommonMain.startup(null, false, new NetworkHandler());
+		LodCommonMain.startup(null, false);
+		
+		ApiShared.LOGGER.info(ModInfo.READABLE_NAME + ", Version: " + ModInfo.VERSION);
+		
+		
+		// make sure the dependencies are set up before the mod needs them
 		FabricDependencySetup.createInitialBindings();
 		FabricDependencySetup.finishBinding();
-		ApiShared.LOGGER.info(ModInfo.READABLE_NAME + ", Version: " + ModInfo.VERSION);
-
-		// Check if this works
-		client_proxy = new ClientProxy();
-		client_proxy.registerEvents();
+		
+		// mod dependencies
 		if (SingletonHandler.get(IModChecker.class).isModLoaded("sodium")) {
 			ModAccessorHandler.bind(ISodiumAccessor.class, new SodiumAccessor());
 		}
-		if (SingletonHandler.get(IModChecker.class).isModLoaded("starlight")) {
-			ModAccessorHandler.bind(IStarlightAccessor.class, new StarlightAccessor());
-		}
 		if (SingletonHandler.get(IModChecker.class).isModLoaded("optifine")) {
 			ModAccessorHandler.bind(IOptifineAccessor.class, new OptifineAccessor());
 		}
-
+		
 		ModAccessorHandler.finishBinding();
+		
+		
+		// Check if this works
+		client_proxy = new ClientProxy();
+		client_proxy.registerEvents();
 	}

 	public static void initServer() {
 		LodCommonMain.initConfig();
-		LodCommonMain.startup(null, true, new NetworkHandler());
+		LodCommonMain.startup(null, true);
+		
+		ApiShared.LOGGER.info(ModInfo.READABLE_NAME + ", Version: " + ModInfo.VERSION);
+		
 		FabricDependencySetup.createInitialBindings();
 		FabricDependencySetup.finishBinding();
-		ApiShared.LOGGER.info(ModInfo.READABLE_NAME + ", Version: " + ModInfo.VERSION);
 	}
 }
@@ -1,28 +1,6 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.fabric.mixins;

 import org.spongepowered.asm.mixin.Mixin;
-import net.minecraft.world.level.chunk.ChunkGenerator;
-
-#if PRE_MC_1_18_1
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;

@@ -30,26 +8,22 @@ 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.class) {
-            biome.generate(structFeatManager, (ChunkGenerator)(Object)this, genRegion, l, random, pos);
-        }
-    }
+	@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);
+		}
+	}
 }
-
-#else
-@Mixin(ChunkGenerator.class)
-public class MixinChunkGenerator {}
-#endif
@@ -1,35 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.fabric.mixins;
-
-import com.seibel.lod.fabric.Main;
-import net.minecraft.server.dedicated.DedicatedServer;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-@Mixin(DedicatedServer.class)
-public class MixinDedicatedServer {
-    @Inject(method = "initServer", at = @At("TAIL"))
-    public void initServer(CallbackInfoReturnable<Boolean> cir) {
-        Main.initServer();
-    }
-}
@@ -1,22 +1,3 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.fabric.mixins;

 import org.spongepowered.asm.mixin.Mixin;
@@ -25,52 +6,42 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

 import com.mojang.blaze3d.systems.RenderSystem;
+import com.seibel.lod.core.api.ClientApi;
 import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
 import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;

 import net.minecraft.client.Camera;
 import net.minecraft.client.renderer.FogRenderer;
 import net.minecraft.client.renderer.FogRenderer.FogMode;
+import net.minecraft.tags.FluidTags;
 import net.minecraft.world.effect.MobEffects;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.LivingEntity;
-#if PRE_MC_1_17_1
 import net.minecraft.world.level.material.FluidState;
-#else
 import net.minecraft.world.level.material.FogType;
-#endif

@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;
-
+	private static final float A_REALLY_REALLY_BIG_VALUE = 4206942069.F;
+	private static final float A_EVEN_LARGER_VALUE = 420694206942069.F;
+	
 	@Inject(at = @At("RETURN"), method = "setupFog(Lnet/minecraft/client/Camera;Lnet/minecraft/client/renderer/FogRenderer$FogMode;FZ)V")
-	private static void disableSetupFog(Camera camera, FogMode fogMode, float f, boolean bl, CallbackInfo callback) {
-		#if PRE_MC_1_17_1
-		FluidState fluidState = camera.getFluidInCamera();
-		boolean cameraNotInFluid = fluidState.isEmpty();
-		#else
-		FogType fogTypes = camera.getFluidInCamera();
-		boolean cameraNotInFluid = fogTypes == FogType.NONE;
-		#endif
-
-		Entity entity = camera.getEntity();
-		boolean isSpecialFog = (entity instanceof LivingEntity) && ((LivingEntity) entity).hasEffect(MobEffects.BLINDNESS);
-		if (!isSpecialFog && cameraNotInFluid && fogMode == FogMode.FOG_TERRAIN
-				&& CONFIG.client().graphics().fogQuality().getDisableVanillaFog())
-		{
-			#if PRE_MC_1_17_1
-			RenderSystem.fogStart(A_REALLY_REALLY_BIG_VALUE);
-			RenderSystem.fogEnd(A_EVEN_LARGER_VALUE);
-			#else
-			RenderSystem.setShaderFogStart(A_REALLY_REALLY_BIG_VALUE);
-			RenderSystem.setShaderFogEnd(A_EVEN_LARGER_VALUE);
-			#endif
-		}
+	private static final void disableSetupFog(Camera camera, FogMode fogMode, float f, boolean bl, CallbackInfo callback) {
+		FogType fogType = camera.getFluidInCamera();
+	    Entity entity = camera.getEntity();
+	    boolean enableFog = (entity instanceof LivingEntity) && ((LivingEntity)entity).hasEffect(MobEffects.BLINDNESS);
+	    enableFog |= fogType.equals(FogType.WATER);
+	    enableFog |= fogType.equals(FogType.LAVA);
+	    enableFog |= fogType.equals(FogType.POWDER_SNOW);
+	    
+	    if (!enableFog) {
+			if (fogMode == FogMode.FOG_TERRAIN && CONFIG.client().graphics().fogQuality().getDisableVanillaFog()) {
+			    RenderSystem.setShaderFogStart(A_REALLY_REALLY_BIG_VALUE);
+			    RenderSystem.setShaderFogEnd(A_EVEN_LARGER_VALUE);
+			}
+	    }
 	}
-
-}
+}
@@ -1,25 +1,6 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.fabric.mixins;

-import com.seibel.lod.fabric.Main;
+import com.seibel.lod.fabric.FabricMain;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.main.GameConfig;
 import org.spongepowered.asm.mixin.Mixin;
@@ -35,6 +16,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 public class MixinMinecraft {
    @Inject(method = "<init>", at = @At("TAIL"))
    private void startMod(GameConfig gameConfig, CallbackInfo ci) {
-        Main.init();
+        FabricMain.init();
    }
 }
@@ -1,22 +1,3 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.fabric.mixins;

 import com.seibel.lod.common.wrappers.config.ConfigGui;
@@ -41,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
@@ -53,20 +34,19 @@ public class MixinOptionsScreen extends Screen {
    @Inject(at = @At("HEAD"),method = "init")
    private void lodconfig$init(CallbackInfo ci) {
        if (SingletonHandler.get(ILodConfigWrapperSingleton.class).client().getOptionsButton())
-            this. #if PRE_MC_1_17_1 addButton #else addRenderableWidget #endif
-                (new TexturedButtonWidget(
-                // Where the button is on the screen
-                this.width / 2 - 180, this.height / 6 - 12,
-                // Width and height of the button
-                20, 20,
-                // Offset
-                0, 0,
-                // Some textuary stuff
-                20, ICON_TEXTURE, 20, 40,
-                // Create the button and tell it where to go
-                // For now it goes to the client option by default
-                (buttonWidget) -> Objects.requireNonNull(minecraft).setScreen(ConfigGui.getScreen(this, "client")),
-                // Add a title to the screen
-                new TranslatableComponent("text.autoconfig." + ModInfo.ID + ".title")));
+            this.addButton(new TexturedButtonWidget(
+                    // Where the button is on the screen
+                    this.width / 2 - 180, this.height / 6 - 12,
+                    // Width and height of the button
+                    20, 20,
+                    // Offset
+                    0, 0,
+                    // Some textuary stuff
+                    20, ICON_TEXTURE, 20, 40,
+                    // Create the button and tell it where to go
+                    // For now it goes to the client option by default
+                    (buttonWidget) -> Objects.requireNonNull(minecraft).setScreen(ConfigGui.getScreen(this, "client")),
+                    // Add a title to the screen
+                    new TranslatableComponent("text.autoconfig." + ModInfo.ID + ".title")));
    }
 }
@@ -1,73 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.fabric.mixins;
-
-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;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
-
-import com.seibel.lod.core.util.DummyRunExecutorService;
-
-import net.minecraft.Util;
-
-@Mixin(Util.class)
-public class MixinUtilBackgroudThread
-{
-	@Inject(method = "backgroundExecutor", at = @At("HEAD"), cancellable = true)
-	private static void overrideUtil$backgroundExecutor(CallbackInfoReturnable<ExecutorService> ci)
-	{
-		if (ClientProxy.isGenerationThreadChecker != null && ClientProxy.isGenerationThreadChecker.get())
-		{
-			//ApiShared.LOGGER.info("util backgroundExecutor triggered");
-			ci.setReturnValue(new DummyRunExecutorService());
-		}
-	}
-
-	#if POST_MC_1_17_1
-	@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())
-		{
-			//ApiShared.LOGGER.info("util wrapThreadWithTaskName(Runnable) triggered");
-			ci.setReturnValue(r);
-		}
-	}
-	#endif
-	#if POST_MC_1_18_1
-	@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())
-		{
-			//ApiShared.LOGGER.info("util wrapThreadWithTaskName(Supplier) triggered");
-			ci.setReturnValue(r);
-		}
-	}
-	#endif
-
-}
@@ -1,8 +1,8 @@
 /*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
 *    licensed under the GNU GPL v3 License.
 *
- *    Copyright (C) 2020-2022  James Seibel
+ *    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
@@ -20,20 +20,19 @@
 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;
-import net.minecraft.client.Camera;
 import net.minecraft.client.renderer.LevelRenderer;
-import net.minecraft.client.renderer.RenderType;
 import org.lwjgl.opengl.GL15;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;

+import com.seibel.lod.core.api.ClientApi;
+import com.seibel.lod.core.objects.math.Mat4f;
+
+import net.minecraft.client.renderer.RenderType;
+
 /**
 * This class is used to mix in my rendering code
 * before Minecraft starts rendering blocks.
@@ -50,16 +49,10 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@Mixin(LevelRenderer.class)
 public class MixinWorldRenderer
 {
+	// TODO: Fix clouds
 	private static float previousPartialTicks = 0;

-	public MixinWorldRenderer() {
-		throw new NullPointerException("Null cannot be cast to non-null type.");
-	}

-
-	// Inject rendering at first call to renderChunkLayer
-	// HEAD or RETURN
-	#if PRE_MC_1_17_1
 	@Inject(at = @At("RETURN"), method = "renderSky(Lcom/mojang/blaze3d/vertex/PoseStack;F)V")
 	private void renderSky(PoseStack matrixStackIn, float partialTicks, CallbackInfo callback)
 	{
@@ -68,9 +61,8 @@ public class MixinWorldRenderer
 		previousPartialTicks = partialTicks;
 	}

-	@Inject(at = @At("HEAD"),
-			method = "renderChunkLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDD)V",
-			cancellable = true)
+	// HEAD or RETURN
+	@Inject(at = @At("HEAD"), method = "renderChunkLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDD)V")
 	private void renderChunkLayer(RenderType renderType, PoseStack matrixStackIn, double xIn, double yIn, double zIn, CallbackInfo callback)
 	{
 		// only render before solid blocks
@@ -80,39 +72,14 @@ public class MixinWorldRenderer
 			float[] mcProjMatrixRaw = new float[16];
 			GL15.glGetFloatv(GL15.GL_PROJECTION_MATRIX, mcProjMatrixRaw);
 			Mat4f mcProjectionMatrix = new Mat4f(mcProjMatrixRaw);
+			// OpenGl outputs their matrices in col,row form instead of row,col
+			// (or maybe vice versa I have no idea :P)
 			mcProjectionMatrix.transpose();
+
+
 			Mat4f mcModelViewMatrix = McObjectConverter.Convert(matrixStackIn.last().pose());

 			ClientApi.INSTANCE.renderLods(mcModelViewMatrix, mcProjectionMatrix, previousPartialTicks);
 		}
-		if (Config.Client.Advanced.lodOnlyMode) {
-			callback.cancel();
-		}
 	}
-	#else
-	@Inject(method = "renderClouds", at = @At("HEAD"), cancellable = true)
-	public void renderClouds(PoseStack poseStack, Matrix4f projectionMatrix, float tickDelta, double cameraX, double cameraY, double cameraZ, CallbackInfo ci) {
-		// get the partial ticks since renderChunkLayer doesn't
-		// have access to them
-		previousPartialTicks = tickDelta;
-	}
-
-	@Inject(at = @At("HEAD"),
-			method = "renderChunkLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDDLcom/mojang/math/Matrix4f;)V",
-			cancellable = true)
-	private void renderChunkLayer(RenderType renderType, PoseStack modelViewMatrixStack, double cameraXBlockPos, double cameraYBlockPos, double cameraZBlockPos, Matrix4f projectionMatrix, CallbackInfo callback)
-	{
-		// only render before solid blocks
-		if (renderType.equals(RenderType.solid()))
-		{
-			Mat4f mcModelViewMatrix = McObjectConverter.Convert(modelViewMatrixStack.last().pose());
-			Mat4f mcProjectionMatrix = McObjectConverter.Convert(projectionMatrix);
-
-			ClientApi.INSTANCE.renderLods(mcModelViewMatrix, mcProjectionMatrix, previousPartialTicks);
-		}
-		if (Config.Client.Advanced.lodOnlyMode) {
-			callback.cancel();
-		}
-	}
-	#endif
 }
@@ -1,25 +1,6 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.fabric.mixins.events;

-import com.seibel.lod.fabric.Main;
+import com.seibel.lod.fabric.FabricMain;
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
 import net.minecraft.network.protocol.game.ClientGamePacketListener;
@@ -37,10 +18,11 @@ 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());
+        FabricMain.client_proxy.blockChangeEvent(Minecraft.getInstance().player.clientLevel, this.getPos());
    }
-}
+}
@@ -1,35 +1,12 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.fabric.mixins.events;

-import com.seibel.lod.fabric.Main;
+import com.seibel.lod.fabric.FabricMain;
 import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.client.multiplayer.ClientPacketListener;
 import net.minecraft.client.renderer.LevelRenderer;
-#if POST_MC_1_18_2
-import net.minecraft.core.Holder;
-#endif
 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;
@@ -41,26 +18,11 @@ import java.util.function.Supplier;
 /**
 * This class is used for world loading events
 * @author Ran
- *
- * FIXME: Why does forge not have the 1.18+ onChunkLightReady mixin?
 */
-
@Mixin(ClientLevel.class)
 public class MixinClientLevel {
    @Inject(method = "<init>", at = @At("TAIL"))
-    private void loadWorldEvent(ClientPacketListener clientPacketListener, ClientLevel.ClientLevelData clientLevelData, ResourceKey resourceKey,
-            #if POST_MC_1_18_2 Holder holder, #else DimensionType dimensionType, #endif int i,
-            #if POST_MC_1_18_1 int j, #endif Supplier supplier, LevelRenderer levelRenderer, boolean bl, long l, CallbackInfo ci) {
-        Main.client_proxy.worldLoadEvent((ClientLevel) (Object) this);
+    private void loadWorldEvent(ClientPacketListener clientPacketListener, ClientLevel.ClientLevelData clientLevelData, ResourceKey<Level> resourceKey, DimensionType dimensionType, int i, Supplier<ProfilerFiller> supplier, LevelRenderer levelRenderer, boolean bl, long l, CallbackInfo ci) {
+        FabricMain.client_proxy.worldLoadEvent((ClientLevel) (Object) this);
    }
-
-	#if POST_MC_1_18_1
-    @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);
-    }
-	#endif
 }
@@ -1,28 +0,0 @@
-package com.seibel.lod.fabric.mixins.events;
-
-
-import com.mojang.blaze3d.platform.NativeImage;
-import com.seibel.lod.common.wrappers.minecraft.MinecraftRenderWrapper;
-import com.seibel.lod.core.api.ApiShared;
-import net.minecraft.client.renderer.LightTexture;
-import org.spongepowered.asm.mixin.Final;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.Shadow;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(LightTexture.class)
-public class MixinLightmap {
-    @Shadow
-    @Final
-    public NativeImage lightPixels;
-
-    @Inject(method="updateLightTexture", at=@At(
-            value="INVOKE",
-            target="Lnet/minecraft/client/renderer/texture/DynamicTexture;upload()V"))
-    public void updateLightTexture(float f, CallbackInfo ci) {
-        //ApiShared.LOGGER.info("Lightmap update");
-        MinecraftRenderWrapper.INSTANCE.updateLightmap(lightPixels);
-    }
-}
@@ -1,28 +1,10 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.fabric.mixins.events;

-import com.seibel.lod.fabric.Main;
+import com.seibel.lod.fabric.FabricMain;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.multiplayer.ClientLevel;
+import net.minecraft.server.level.ServerLevel;

 import org.jetbrains.annotations.Nullable;
 import org.spongepowered.asm.mixin.Mixin;
@@ -41,11 +23,11 @@ public class MixinMinecraft {

    @Inject(method = "setLevel", at = @At("HEAD"))
    private void unloadWorldEvent_sL(ClientLevel clientLevel, CallbackInfo ci) {
-        if (level != null) Main.client_proxy.worldUnloadEvent(level);
+        if (level != null) FabricMain.client_proxy.worldUnloadEvent(level);
    }

    @Inject(method = "clearLevel(Lnet/minecraft/client/gui/screens/Screen;)V", at = @At("HEAD"))
    private void unloadWorldEvent_cL(Screen screen, CallbackInfo ci) {
-        if (this.level != null) Main.client_proxy.worldUnloadEvent(this.level);
+        if (this.level != null) FabricMain.client_proxy.worldUnloadEvent(this.level);
    }
 }
@@ -1,25 +1,6 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.fabric.mixins.events;

-import com.seibel.lod.fabric.Main;
+import com.seibel.lod.fabric.FabricMain;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.util.ProgressListener;
 import org.spongepowered.asm.mixin.Mixin;
@@ -33,19 +14,8 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 */
@Mixin(ServerLevel.class)
 public class MixinServerLevel {
-    #if PRE_MC_1_17_1
    @Inject(method = "save", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerChunkCache;save(Z)V", shift = At.Shift.AFTER))
    private void saveWorldEvent(ProgressListener progressListener, boolean bl, boolean bl2, CallbackInfo ci) {
-        Main.client_proxy.worldSaveEvent();
+        FabricMain.client_proxy.worldSaveEvent();
    }
-    #else
-    @Inject(method = "save", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/entity/PersistentEntitySectionManager;saveAll()V", shift = At.Shift.AFTER))
-    private void saveWorldEvent_sA(ProgressListener progressListener, boolean bl, boolean bl2, CallbackInfo ci) {
-        Main.client_proxy.worldSaveEvent();
-    }
-    @Inject(method = "save", at = @At(value = "INVOKE", target = "Lnet/minecraft/world/level/entity/PersistentEntitySectionManager;autoSave()V", shift = At.Shift.AFTER))
-    private void saveWorldEvent_aS(ProgressListener progressListener, boolean bl, boolean bl2, CallbackInfo ci) {
-        Main.client_proxy.worldSaveEvent();
-    }
-    #endif
 }
@@ -0,0 +1,31 @@
+package com.seibel.lod.fabric.mixins.unsafe;
+
+import net.minecraft.world.level.chunk.PalettedContainer;
+import org.spongepowered.asm.mixin.Final;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Mutable;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
+
+import java.util.concurrent.Semaphore;
+
+/**
+ * NOTE: THIS IS NOT A FIX TO THE PROBLEM.
+ * TODO: Do/Find an actual fix to this
+ *
+ * @author Ran
+ */
+@Mixin(PalettedContainer.class)
+public class MixinPalettedContainer {
+
+    @Inject(method = "acquire", at = @At("HEAD"), cancellable = true)
+    private void acquire_skip(CallbackInfo ci) {
+    	ci.cancel();
+    }
+    @Inject(method = "release", at = @At("HEAD"), cancellable = true)
+    private void release_skip(CallbackInfo ci) {
+    	ci.cancel();
+    }
+}
@@ -1,53 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.fabric.mixins.unsafe;
-
-import net.minecraft.server.level.ServerLevel;
-import org.spongepowered.asm.mixin.Mixin;
-
-#if POST_MC_1_18_1
-
-import net.minecraft.util.ThreadingDetector;
-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);
-    }
-}
-#else
-@Mixin(ServerLevel.class)
-    public class MixinThreadingDectector {} //FIXME: Is there some way to make this file just not be added?
-#endif
@@ -1,44 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.fabric.networking;
-
-import com.seibel.lod.common.networking.NetworkInterface;
-import com.seibel.lod.common.networking.Networking;
-import net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking;
-import net.fabricmc.fabric.api.networking.v1.ServerPlayNetworking;
-
-/**
- * @author Ran
- */
-public class NetworkHandler implements NetworkInterface {
-    @Override
-    public void register_Client() {
-        ClientPlayNetworking.registerGlobalReceiver(Networking.resourceLocation_meow, (client, handler, buf, responseSender) -> {
-            com.seibel.lod.common.networking.NetworkHandler.receivePacketClient(client, handler, buf);
-        });
-    }
-
-    @Override
-    public void register_Server() {
-        ServerPlayNetworking.registerGlobalReceiver(Networking.resourceLocation_meow, (server, player, handler, buf, responseSender) -> {
-            com.seibel.lod.common.networking.NetworkHandler.receivePacketServer(server, player, handler, buf);
-        });
-    }
-}
@@ -1,29 +1,11 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.fabric.wrappers;

+import com.seibel.lod.core.handlers.dependencyInjection.DependencyHandler;
 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;
+import com.seibel.lod.common.wrappers.config.LodConfigWrapperSingleton;

 /**
 * Binds all necessary dependencies, so we
@@ -33,18 +15,18 @@ import com.seibel.lod.fabric.wrappers.modAccessor.ModChecker;
 * 
 * @author James Seibel
 * @author Ran
- * @version 3-5-2022
+ * @version 12-1-2021
 */
 public class FabricDependencySetup
 {
 	public static void createInitialBindings()
 	{
+		SingletonHandler.bind(ILodConfigWrapperSingleton.class, LodConfigWrapperSingleton.INSTANCE);;
 		SingletonHandler.bind(IModChecker.class, ModChecker.INSTANCE);
-
-		SingletonHandler.bind(ILodConfigWrapperSingleton.class, LodConfigWrapperSingleton.INSTANCE);
 	}

-	public static void finishBinding() {
+	public static void finishBinding()
+	{
 		SingletonHandler.finishBinding();
 	}
 }
@@ -1,22 +1,3 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.fabric.wrappers.config;

 import com.seibel.lod.common.wrappers.config.ConfigGui;
@@ -25,6 +6,9 @@ import com.terraformersmc.modmenu.api.ModMenuApi;
 import net.fabricmc.api.EnvType;
 import net.fabricmc.api.Environment;

+import java.util.HashMap;
+import java.util.Map;
+
 /**
 * For making the config show up in modmenu
 */
@@ -1,22 +1,3 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.fabric.wrappers.modAccessor;

 import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModChecker;
@@ -1,22 +1,4 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.fabric.wrappers.modAccessor;

 import java.util.HashSet;
@@ -27,17 +9,17 @@ import com.seibel.lod.core.wrapperInterfaces.modAccessor.IOptifineAccessor;
 public class OptifineAccessor implements IOptifineAccessor
 {

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

-	@Override
-	public HashSet<AbstractChunkPosWrapper> getNormalRenderedChunks()
-	{
-		// TODO: Impl proper methods here
-		return null;
-	}
-	
-}
+    @Override
+    public HashSet<AbstractChunkPosWrapper> getNormalRenderedChunks()
+    {
+        // TODO: Impl proper methods here
+        return null;
+    }
+
+}
@@ -1,80 +1,32 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.fabric.wrappers.modAccessor;

 import java.util.HashSet;
 import java.util.stream.Collectors;

+import com.seibel.lod.core.api.ClientApi;
 import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
-import com.seibel.lod.core.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;
-#if PRE_MC_1_17_1
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.protocol.Packet;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.phys.AABB;
-#else
-import net.minecraft.world.level.LevelHeightAccessor;
-#endif

 public class SodiumAccessor implements ISodiumAccessor {
-	private final IWrapperFactory factory = SingletonHandler.get(IWrapperFactory.class);
 	private final IMinecraftRenderWrapper MC_RENDER = SingletonHandler.get(IMinecraftRenderWrapper.class);
+	
+    @Override
+    public String getModName() {
+    	
+        return "Sodium-Fabric-1.16.5";
+    }

-	@Override
-	public String getModName() {
-		return "Sodium-Fabric";
-	}
-
-	#if POST_MC_1_17_1
-	@Override
-	public HashSet<AbstractChunkPosWrapper> getNormalRenderedChunks() {
-		SodiumWorldRenderer renderer = SodiumWorldRenderer.instance();
-		LevelHeightAccessor height =  Minecraft.getInstance().level;
-
-		#if POST_MC_1_18_1
-		// 0b11 = Lighted chunk & loaded chunk
-		return renderer.getChunkTracker().getChunks(0b00).filter(
-			(long l) -> {
-				return true;
-			}).mapToObj((long l) -> {
-				return (AbstractChunkPosWrapper)factory.createChunkPos(l);
-			}).collect(Collectors.toCollection(HashSet::new));
-		#else
-		// TODO: Maybe use a mixin to make this more efficient, and maybe ignore changes behind the camera
-		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));
-		#endif
-	}
-	#else
 	@Override
 	public HashSet<AbstractChunkPosWrapper> getNormalRenderedChunks() {
 		SodiumWorldRenderer renderer = SodiumWorldRenderer.getInstance();
@@ -85,7 +37,7 @@ public class SodiumAccessor implements ISodiumAccessor {
 			return (renderer.isEntityVisible(AABB));
 		}).collect(Collectors.toCollection(HashSet::new));
 	}
-
+	
 	private static class FakeChunkEntity extends Entity {
 		public int cx;
 		public int cz;
@@ -110,8 +62,6 @@ public class SodiumAccessor implements ISodiumAccessor {
 		@Override
 		public Packet<?> getAddEntityPacket() {
 			throw new UnsupportedOperationException("This is a FAKE CHUNK ENTITY... For tricking the Sodium to check a AABB.");
-		}
-	}
-	#endif
+		}}

 }
@@ -1,35 +0,0 @@
-/*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020-2022  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.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,26 +2,23 @@
  "required": true,
  "minVersion": "0.8",
  "package": "com.seibel.lod.fabric.mixins",
+  "compatibilityLevel": "JAVA_8",
  "mixins": [
-    "unsafe.MixinThreadingDectector",
-    "MixinUtilBackgroudThread",
-    "events.MixinServerLevel"
+    "events.MixinServerLevel",
+    "unsafe.MixinPalettedContainer",
+    "MixinChunkGenerator"
  ],
  "client": [
    "MixinMinecraft",
    "MixinOptionsScreen",
    "MixinWorldRenderer",
    "MixinFogRenderer",
-    "MixinChunkGenerator",
    "events.MixinClientLevel",
    "events.MixinMinecraft",
-    "events.MixinBlockUpdate",
-    "events.MixinLightmap"
-  ],
-  "server": [
-    "MixinDedicatedServer"
+    "events.MixinBlockUpdate"
  ],
+  "server": [],
  "injectors": {
    "defaultRequire": 1
  }
-}
+}
@@ -5,7 +5,7 @@

  "name": "${mod_name}",
  "description": "${description}",
-  "authors": ${authors},
+  "authors": ["${authors}"],

  "contact": {
    "homepage": "${homepage}",
@@ -33,11 +33,12 @@
  "accessWidener" : "lod.accesswidener",
  "depends": {
    "fabricloader": "*",
-    "fabric-lifecycle-events-v1": "*",
-    "fabric-key-binding-api-v1": "*",
-    "fabric-networking-api-v1": "*",
-    "minecraft": ${compatible_minecraft_versions},
-    "java": ">=${java_version}"
+    "fabric": "*",
+    "minecraft": ["1.16.5", "1.16.4", "1.16.3", "1.16.2"],
+    "java": ">=8"
+  },
+  "suggests": {
+    "another-mod": "*"
  },

  "custom": {
@@ -1,10 +1,12 @@
 plugins {
-    id "com.github.johnrengelman.shadow" version "7.1.0"
+    id "com.github.johnrengelman.shadow" version "7.0.0"
 }

 version = rootProject.mod_version+"-"+rootProject.minecraft_version+"-"+new Date().format("yyyy_MM_dd_HH_mm")

 loom {
+    accessWidenerPath.set(project(":common").file("src/main/resources/lod.accesswidener"))
+
    forge {
        convertAccessWideners.set(true)
        extraAccessWideners.add("lod.accesswidener")
@@ -34,12 +36,8 @@ dependencies {
    // Forge loader
    forge "net.minecraftforge:forge:${rootProject.minecraft_version}-${rootProject.forge_version}"

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

@@ -49,15 +47,23 @@ 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'
    shadowMe 'org.apache.commons:commons-compress:1.21'
 }

+task copyCoreResources(type: Copy) {
+    from fileTree(project(":core").file("src/main/resources"))
+    into file("build/resources/main")
+}
+
+task copyCommonResources(type: Copy) {
+    from fileTree(project(":common").file("src/main/resources"))
+    into file("build/resources/main")
+}
+
 processResources {
-    dependsOn(copyAccessWidener)
    dependsOn(copyCoreResources)
    dependsOn(copyCommonResources)
 }
@@ -70,7 +76,7 @@ shadowJar {
    configurations = [project.configurations.shadowMe]
    relocate 'org.tukaani', 'shaded.tukaani'
    relocate 'org.apache.commons.compress', 'shaded.apache.commons.compress'
-    relocate 'com.electronwill.nightconfig', 'shaded.electronwill.nightconfig'    // This is already included with forge
+    relocate 'com.electronwill.nightconfig', 'shaded.electronwill.nightconfig'

    relocate 'com.seibel.lod.common', 'forge.com.seibel.lod.common'

@@ -1,8 +1,8 @@
 /*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
 *    licensed under the GNU GPL v3 License.
 *
- *    Copyright (C) 2020-2022  James Seibel
+ *    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
@@ -23,9 +23,6 @@ import com.seibel.lod.core.api.ClientApi;
 import com.seibel.lod.core.api.EventApi;
 import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper;

-import net.minecraft.client.gui.screens.TitleScreen;
-import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.world.entity.player.Player;
 import org.lwjgl.glfw.GLFW;

 import com.seibel.lod.common.wrappers.chunk.ChunkWrapper;
@@ -43,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
 */
@@ -51,44 +48,43 @@ 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)
 	{
-		if (Minecraft.getInstance().screen instanceof TitleScreen) return;
 		if (event.getWorld() != null) {
 			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)
 	{
@@ -101,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)
 	{
@@ -114,7 +110,7 @@ public class ForgeClientProxy
 		if (event.getAction() != GLFW.GLFW_PRESS) return;
 		clientApi.keyPressedEvent(event.getKey());
 	}
-	
-	
-	
+
+
+
 }
@@ -1,8 +1,8 @@
 /*
- *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
 *    licensed under the GNU GPL v3 License.
 *
- *    Copyright (C) 2020-2022  James Seibel
+ *    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
@@ -25,35 +25,29 @@ import com.seibel.lod.common.wrappers.config.ConfigGui;
 import com.seibel.lod.common.wrappers.minecraft.MinecraftClientWrapper;
 import com.seibel.lod.core.ModInfo;
 import com.seibel.lod.core.api.ApiShared;
-import com.seibel.lod.core.handlers.ReflectionHandler;
+import com.seibel.lod.core.api.ClientApi;
 import com.seibel.lod.core.handlers.dependencyInjection.ModAccessorHandler;
+import com.seibel.lod.core.handlers.ReflectionHandler;
+import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
+import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModChecker;
 import com.seibel.lod.core.wrapperInterfaces.modAccessor.IOptifineAccessor;
-import com.seibel.lod.forge.networking.NetworkHandler;
 import com.seibel.lod.forge.wrappers.ForgeDependencySetup;

+import com.seibel.lod.forge.wrappers.modAccessor.ModChecker;
 import com.seibel.lod.forge.wrappers.modAccessor.OptifineAccessor;
-
 import net.minecraft.client.renderer.block.model.BakedQuad;
 import net.minecraft.core.Direction;
-import net.minecraft.world.level.ColorResolver;
-import net.minecraft.world.level.biome.Biome;
 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.common.MinecraftForge;
+import net.minecraftforge.fml.ExtensionPoint;
 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;
-#if PRE_MC_1_17_1
-import net.minecraftforge.fml.ExtensionPoint;
-#elif MC_1_17_1
-import net.minecraftforge.fmlclient.ConfigGuiHandler;
-#else // 1.18+
-import net.minecraftforge.client.ConfigGuiHandler;
-#endif

 import java.util.List;
 import java.util.Random;
@@ -62,7 +56,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
 */
@@ -70,56 +64,48 @@ 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
+		ApiShared.LOGGER.info("Distant Horizons initializing...");
+		
 		LodCommonMain.initConfig();
-		LodCommonMain.startup(this, !FMLLoader.getDist().isClient(), new NetworkHandler());
+		LodCommonMain.startup(this, !FMLLoader.getDist().isClient());
+		
+		// make sure the dependencies are set up before the mod needs them
 		ForgeDependencySetup.createInitialBindings();
 		ForgeDependencySetup.finishBinding();
-		ApiShared.LOGGER.info("Distant Horizons initializing...");
-	}
-	
-	public ForgeMain()
-	{
-		// Register the methods for server and other game events we are interested in
-		FMLJavaModLoadingContext.get().getModEventBus().addListener(this::init);
-		FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onClientStart);
-	}
-
-	private void onClientStart(final FMLClientSetupEvent event)
-	{
+		
+		// mod dependencies
 		if (ReflectionHandler.instance.optifinePresent()) {
 			ModAccessorHandler.bind(IOptifineAccessor.class, new OptifineAccessor());
 		}
 		
 		ModAccessorHandler.finishBinding();
+	}

-		#if PRE_MC_1_17_1
+
+	public ForgeMain()
+	{
+		// Register the methods
+		FMLJavaModLoadingContext.get().getModEventBus().addListener(this::init);
+		FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onClientStart);
+
+		// Register ourselves for server and other game events we are interested in
+		MinecraftForge.EVENT_BUS.register(this);
+	}
+
+	private void onClientStart(final FMLClientSetupEvent event)
+	{
 		ModLoadingContext.get().registerExtensionPoint(ExtensionPoint.CONFIGGUIFACTORY,
 				() -> (client, parent) -> ConfigGui.getScreen(parent, ""));
-		#else
-		ModLoadingContext.get().registerExtensionPoint(ConfigGuiHandler.ConfigGuiFactory.class,
-				() -> new ConfigGuiHandler.ConfigGuiFactory((client, parent) -> ConfigGui.getScreen(parent, "")));
-		#endif
 		forgeClientProxy = new ForgeClientProxy();
 		MinecraftForge.EVENT_BUS.register(forgeClientProxy);
 	}

-	private final ModelDataMap dataMap = new ModelDataMap.Builder().build();
+	private ModelDataMap dataMap = new ModelDataMap.Builder().build();
 	@Override
 	public List<BakedQuad> getQuads(MinecraftClientWrapper mc, Block block, BlockState blockState, Direction direction, Random random) {
 		return mc.getModelManager().getBlockModelShaper().getBlockModel(block.defaultBlockState()).getQuads(blockState, direction, random, dataMap);
 	}
-
-	@Override
-	public int colorResolverGetColor(ColorResolver resolver, Biome biome, double x, double z) {
-		#if MC_1_17_1
-		return resolver.m_130045_(biome, x, z);
-		#else
-		return resolver.getColor(biome, x, z);
-		#endif
-
-	}
 }
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.seibel.lod.forge.fabric.api.client.networking.v1;
-
-import java.util.List;
-import com.seibel.lod.forge.fabric.api.event.Event;
-import com.seibel.lod.forge.fabric.api.event.EventFactory;
-import com.seibel.lod.forge.fabric.api.networking.v1.PacketSender;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.multiplayer.ClientPacketListener;
-import net.minecraft.resources.ResourceLocation;
-
-/**
- * Offers access to events related to the indication of a connected server's ability to receive packets in certain channels.
- */
-
-public final class C2SPlayChannelEvents {
-	/**
-	 * An event for the client play network handler receiving an update indicating the connected server's ability to receive packets in certain channels.
-	 * This event may be invoked at any time after login and up to disconnection.
-	 */
-	public static final Event<Register> REGISTER = EventFactory.createArrayBacked(Register.class, callbacks -> (handler, sender, client, channels) -> {
-		for (Register callback : callbacks) {
-			callback.onChannelRegister(handler, sender, client, channels);
-		}
-	});
-
-	/**
-	 * An event for the client play network handler receiving an update indicating the connected server's lack of ability to receive packets in certain channels.
-	 * This event may be invoked at any time after login and up to disconnection.
-	 */
-	public static final Event<Unregister> UNREGISTER = EventFactory.createArrayBacked(Unregister.class, callbacks -> (handler, sender, client, channels) -> {
-		for (Unregister callback : callbacks) {
-			callback.onChannelUnregister(handler, sender, client, channels);
-		}
-	});
-
-	private C2SPlayChannelEvents() {
-	}
-
-	/**
-	 * @see C2SPlayChannelEvents#REGISTER
-	 */
-
-	@FunctionalInterface
-	public interface Register {
-		void onChannelRegister(ClientPacketListener handler, PacketSender sender, Minecraft client, List<ResourceLocation> channels);
-	}
-
-	/**
-	 * @see C2SPlayChannelEvents#UNREGISTER
-	 */
-
-	@FunctionalInterface
-	public interface Unregister {
-		void onChannelUnregister(ClientPacketListener handler, PacketSender sender, Minecraft client, List<ResourceLocation> channels);
-	}
-}
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.seibel.lod.forge.fabric.api.client.networking.v1;
-
-import com.seibel.lod.forge.fabric.api.event.Event;
-import com.seibel.lod.forge.fabric.api.event.EventFactory;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.multiplayer.ClientHandshakePacketListenerImpl;
-import net.minecraft.resources.ResourceLocation;
-
-/**
- * Offers access to events related to the connection to a server on the client while the server is processing the client's login request.
- */
-
-public final class ClientLoginConnectionEvents {
-	/**
-	 * Event indicating a connection entered the LOGIN state, ready for registering query request handlers.
-	 * This event may be used by mods to prepare their client side state.
-	 * This event does not guarantee that a login attempt will be successful.
-	 *
-	 * @see ClientLoginNetworking#registerReceiver(ResourceLocation, ClientLoginNetworking.LoginQueryRequestHandler)
-	 */
-	public static final Event<Init> INIT = EventFactory.createArrayBacked(Init.class, callbacks -> (handler, client) -> {
-		for (Init callback : callbacks) {
-			callback.onLoginStart(handler, client);
-		}
-	});
-
-	/**
-	 * An event for when the client has started receiving login queries.
-	 * A client can only start receiving login queries when a server has sent the first login query.
-	 * Vanilla servers will typically never make the client enter this login phase, but it is not a guarantee that the
-	 * connected server is a vanilla server since a modded server or proxy may have no login queries to send to the client
-	 * and therefore bypass the login query phase.
-	 * If this event is fired then it is a sign that a server is not a vanilla server or the server is behind a proxy which
-	 * is capable of handling login queries.
-	 *
-	 * <p>This event may be used to {@link ClientLoginNetworking.LoginQueryRequestHandler register login query handlers}
-	 * which may be used to send a response to a server.
-	 *
-	 * <p>No packets should be sent when this event is invoked.
-	 */
-	public static final Event<QueryStart> QUERY_START = EventFactory.createArrayBacked(QueryStart.class, callbacks -> (handler, client) -> {
-		for (QueryStart callback : callbacks) {
-			callback.onLoginQueryStart(handler, client);
-		}
-	});
-
-	/**
-	 * An event for when the client's login process has ended due to disconnection.
-	 *
-	 * <p>No packets should be sent when this event is invoked.
-	 */
-	public static final Event<Disconnect> DISCONNECT = EventFactory.createArrayBacked(Disconnect.class, callbacks -> (handler, client) -> {
-		for (Disconnect callback : callbacks) {
-			callback.onLoginDisconnect(handler, client);
-		}
-	});
-
-	private ClientLoginConnectionEvents() {
-	}
-
-	/**
-	 * @see ClientLoginConnectionEvents#INIT
-	 */
-
-	@FunctionalInterface
-	public interface Init {
-		void onLoginStart(ClientHandshakePacketListenerImpl handler, Minecraft client);
-	}
-
-	/**
-	 * @see ClientLoginConnectionEvents#QUERY_START
-	 */
-
-	@FunctionalInterface
-	public interface QueryStart {
-		void onLoginQueryStart(ClientHandshakePacketListenerImpl handler, Minecraft client);
-	}
-
-	/**
-	 * @see ClientLoginConnectionEvents#DISCONNECT
-	 */
-
-	@FunctionalInterface
-	public interface Disconnect {
-		void onLoginDisconnect(ClientHandshakePacketListenerImpl handler, Minecraft client);
-	}
-}
@@ -1,161 +0,0 @@
-/*
- * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.seibel.lod.forge.fabric.api.client.networking.v1;
-
-import java.util.Set;
-import java.util.concurrent.CompletableFuture;
-import java.util.function.Consumer;
-
-import io.netty.util.concurrent.Future;
-import io.netty.util.concurrent.GenericFutureListener;
-import org.jetbrains.annotations.Nullable;
-import com.seibel.lod.forge.fabric.api.networking.v1.ServerLoginNetworking;
-import com.seibel.lod.forge.fabric.impl.networking.client.ClientNetworkingImpl;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.multiplayer.ClientHandshakePacketListenerImpl;
-import net.minecraft.network.Connection;
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.network.PacketListener;
-import net.minecraft.resources.ResourceLocation;
-
-/**
- * Offers access to login stage client-side networking functionalities.
- *
- * <p>The Minecraft login protocol only allows the client to respond to a server's request, but not initiate one of its own.
- *
- * @see ClientPlayNetworking
- * @see ServerLoginNetworking
- */
-
-public final class ClientLoginNetworking {
-	/**
-	 * Registers a handler to a query request channel.
-	 * A global receiver is registered to all connections, in the present and future.
-	 *
-	 * <p>If a handler is already registered to the {@code channel}, this method will return {@code false}, and no change will be made.
-	 * Use {@link #unregisterGlobalReceiver(ResourceLocation)} to unregister the existing handler.
-	 *
-	 * @param channelName the id of the channel
-	 * @param queryHandler the handler
-	 * @return false if a handler is already registered to the channel
-	 * @see ClientLoginNetworking#unregisterGlobalReceiver(ResourceLocation)
-	 * @see ClientLoginNetworking#registerReceiver(ResourceLocation, LoginQueryRequestHandler)
-	 */
-	public static boolean registerGlobalReceiver(ResourceLocation channelName, LoginQueryRequestHandler queryHandler) {
-		return ClientNetworkingImpl.LOGIN.registerGlobalReceiver(channelName, queryHandler);
-	}
-
-	/**
-	 * Removes the handler of a query request channel.
-	 * A global receiver is registered to all connections, in the present and future.
-	 *
-	 * <p>The {@code channel} is guaranteed not to have a handler after this call.
-	 *
-	 * @param channelName the id of the channel
-	 * @return the previous handler, or {@code null} if no handler was bound to the channel
-	 * @see ClientLoginNetworking#registerGlobalReceiver(ResourceLocation, LoginQueryRequestHandler)
-	 * @see ClientLoginNetworking#unregisterReceiver(ResourceLocation)
-	 */
-	@Nullable
-	public static ClientLoginNetworking.LoginQueryRequestHandler unregisterGlobalReceiver(ResourceLocation channelName) {
-		return ClientNetworkingImpl.LOGIN.unregisterGlobalReceiver(channelName);
-	}
-
-	/**
-	 * Gets all query request channel names which global receivers are registered for.
-	 * A global receiver is registered to all connections, in the present and future.
-	 *
-	 * @return all channel names which global receivers are registered for.
-	 */
-	public static Set<ResourceLocation> getGlobalReceivers() {
-		return ClientNetworkingImpl.LOGIN.getChannels();
-	}
-
-	/**
-	 * Registers a handler to a query request channel.
-	 *
-	 * <p>If a handler is already registered to the {@code channelName}, this method will return {@code false}, and no change will be made.
-	 * Use {@link #unregisterReceiver(ResourceLocation)} to unregister the existing handler.
-	 *
-	 * @param channelName the id of the channel
-	 * @param queryHandler the handler
-	 * @return false if a handler is already registered to the channel name
-	 * @throws IllegalStateException if the client is not logging in
-	 */
-	public static boolean registerReceiver(ResourceLocation channelName, LoginQueryRequestHandler queryHandler) throws IllegalStateException {
-		final Connection connection = ClientNetworkingImpl.getLoginConnection();
-
-		if (connection != null) {
-			final PacketListener packetListener = connection.getPacketListener();
-
-			if (packetListener instanceof ClientHandshakePacketListenerImpl) {
-				return ClientNetworkingImpl.getAddon(((ClientHandshakePacketListenerImpl) packetListener)).registerChannel(channelName, queryHandler);
-			}
-		}
-
-		throw new IllegalStateException("Cannot register receiver while client is not logging in!");
-	}
-
-	/**
-	 * Removes the handler of a query request channel.
-	 *
-	 * <p>The {@code channelName} is guaranteed not to have a handler after this call.
-	 *
-	 * @param channelName the id of the channel
-	 * @return the previous handler, or {@code null} if no handler was bound to the channel name
-	 * @throws IllegalStateException if the client is not logging in
-	 */
-	@Nullable
-	public static LoginQueryRequestHandler unregisterReceiver(ResourceLocation channelName) throws IllegalStateException {
-		final Connection connection = ClientNetworkingImpl.getLoginConnection();
-
-		if (connection != null) {
-			final PacketListener packetListener = connection.getPacketListener();
-
-			if (packetListener instanceof ClientHandshakePacketListenerImpl) {
-				return ClientNetworkingImpl.getAddon(((ClientHandshakePacketListenerImpl) packetListener)).unregisterChannel(channelName);
-			}
-		}
-
-		throw new IllegalStateException("Cannot unregister receiver while client is not logging in!");
-	}
-
-	private ClientLoginNetworking() {
-	}
-
-	@FunctionalInterface
-	public interface LoginQueryRequestHandler {
-		/**
-		 * Handles an incoming query request from a server.
-		 *
-		 * <p>This method is executed on {@linkplain io.netty.channel.EventLoop netty's event loops}.
-		 * Modification to the game should be {@linkplain net.minecraft.util.thread.BlockableEventLoop#submit(Runnable) scheduled} using the provided Minecraft client instance.
-		 *
-		 * <p>The return value of this method is a completable future that may be used to delay the login process to the server until a task {@link CompletableFuture#isDone() is done}.
-		 * The future should complete in reasonably time to prevent disconnection by the server.
-		 * If your request processes instantly, you may use {@link CompletableFuture#completedFuture(Object)} to wrap your response for immediate sending.
-		 *
-		 * @param client the client
-		 * @param handler the network handler that received this packet
-		 * @param buf the payload of the packet
-		 * @param listenerAdder listeners to be called when the response packet is sent to the server
-		 * @return a completable future which contains the payload to respond to the server with.
-		 * If the future contains {@code null}, then the server will be notified that the client did not understand the query.
-		 */
-		CompletableFuture<@Nullable FriendlyByteBuf> receive(Minecraft client, ClientHandshakePacketListenerImpl handler, FriendlyByteBuf buf, Consumer<GenericFutureListener<? extends Future<? super Void>>> listenerAdder);
-	}
-}
@@ -1,85 +0,0 @@
-/*
- * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.seibel.lod.forge.fabric.api.client.networking.v1;
-
-import com.seibel.lod.forge.fabric.api.event.Event;
-import com.seibel.lod.forge.fabric.api.event.EventFactory;
-import com.seibel.lod.forge.fabric.api.networking.v1.PacketSender;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.multiplayer.ClientPacketListener;
-import net.minecraft.resources.ResourceLocation;
-
-/**
- * Offers access to events related to the connection to a server on a logical client.
- */
-
-public final class ClientPlayConnectionEvents {
-	/**
-	 * Event indicating a connection entered the PLAY state, ready for registering channel handlers.
-	 *
-	 * @see ClientPlayNetworking#registerReceiver(ResourceLocation, ClientPlayNetworking.PlayChannelHandler)
-	 */
-	public static final Event<Init> INIT = EventFactory.createArrayBacked(Init.class, callbacks -> (handler, client) -> {
-		for (Init callback : callbacks) {
-			callback.onPlayInit(handler, client);
-		}
-	});
-
-	/**
-	 * An event for notification when the client play network handler is ready to send packets to the server.
-	 *
-	 * <p>At this stage, the network handler is ready to send packets to the server.
-	 * Since the client's local state has been setup.
-	 */
-	public static final Event<Join> JOIN = EventFactory.createArrayBacked(Join.class, callbacks -> (handler, sender, client) -> {
-		for (Join callback : callbacks) {
-			callback.onPlayReady(handler, sender, client);
-		}
-	});
-
-	/**
-	 * An event for the disconnection of the client play network handler.
-	 *
-	 * <p>No packets should be sent when this event is invoked.
-	 */
-	public static final Event<Disconnect> DISCONNECT = EventFactory.createArrayBacked(Disconnect.class, callbacks -> (handler, client) -> {
-		for (Disconnect callback : callbacks) {
-			callback.onPlayDisconnect(handler, client);
-		}
-	});
-
-	private ClientPlayConnectionEvents() {
-	}
-
-
-	@FunctionalInterface
-	public interface Init {
-		void onPlayInit(ClientPacketListener handler, Minecraft client);
-	}
-
-
-	@FunctionalInterface
-	public interface Join {
-		void onPlayReady(ClientPacketListener handler, PacketSender sender, Minecraft client);
-	}
-
-
-	@FunctionalInterface
-	public interface Disconnect {
-		void onPlayDisconnect(ClientPacketListener handler, Minecraft client);
-	}
-}
@@ -1,256 +0,0 @@
-/*
- * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.seibel.lod.forge.fabric.api.client.networking.v1;
-
-import java.util.Objects;
-import java.util.Set;
-
-import org.jetbrains.annotations.Nullable;
-import com.seibel.lod.forge.fabric.api.networking.v1.PacketSender;
-import com.seibel.lod.forge.fabric.api.networking.v1.ServerPlayNetworking;
-import com.seibel.lod.forge.fabric.impl.networking.client.ClientNetworkingImpl;
-import com.seibel.lod.forge.fabric.impl.networking.client.ClientPlayNetworkAddon;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.multiplayer.ClientPacketListener;
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.network.protocol.Packet;
-import net.minecraft.resources.ResourceLocation;
-
-/**
- * Offers access to play stage client-side networking functionalities.
- *
- * <p>Client-side networking functionalities include receiving clientbound packets,
- * sending serverbound packets, and events related to client-side network handlers.
- *
- * <p>This class should be only used on the physical client and for the logical client.
- *
- * @see ClientLoginNetworking
- * @see ServerPlayNetworking
- */
-
-public final class ClientPlayNetworking {
-	/**
-	 * Registers a handler to a channel.
-	 * A global receiver is registered to all connections, in the present and future.
-	 *
-	 * <p>If a handler is already registered to the {@code channel}, this method will return {@code false}, and no change will be made.
-	 * Use {@link #unregisterGlobalReceiver(ResourceLocation)} to unregister the existing handler.
-	 *
-	 * @param channelName the id of the channel
-	 * @param channelHandler the handler
-	 * @return false if a handler is already registered to the channel
-	 * @see ClientPlayNetworking#unregisterGlobalReceiver(ResourceLocation)
-	 * @see ClientPlayNetworking#registerReceiver(ResourceLocation, PlayChannelHandler)
-	 */
-	public static boolean registerGlobalReceiver(ResourceLocation channelName, PlayChannelHandler channelHandler) {
-		return ClientNetworkingImpl.PLAY.registerGlobalReceiver(channelName, channelHandler);
-	}
-
-	/**
-	 * Removes the handler of a channel.
-	 * A global receiver is registered to all connections, in the present and future.
-	 *
-	 * <p>The {@code channel} is guaranteed not to have a handler after this call.
-	 *
-	 * @param channelName the id of the channel
-	 * @return the previous handler, or {@code null} if no handler was bound to the channel
-	 * @see ClientPlayNetworking#registerGlobalReceiver(ResourceLocation, PlayChannelHandler)
-	 * @see ClientPlayNetworking#unregisterReceiver(ResourceLocation)
-	 */
-	@Nullable
-	public static PlayChannelHandler unregisterGlobalReceiver(ResourceLocation channelName) {
-		return ClientNetworkingImpl.PLAY.unregisterGlobalReceiver(channelName);
-	}
-
-	/**
-	 * Gets all channel names which global receivers are registered for.
-	 * A global receiver is registered to all connections, in the present and future.
-	 *
-	 * @return all channel names which global receivers are registered for.
-	 */
-	public static Set<ResourceLocation> getGlobalReceivers() {
-		return ClientNetworkingImpl.PLAY.getChannels();
-	}
-
-	/**
-	 * Registers a handler to a channel.
-	 *
-	 * <p>If a handler is already registered to the {@code channel}, this method will return {@code false}, and no change will be made.
-	 * Use {@link #unregisterReceiver(ResourceLocation)} to unregister the existing handler.
-	 *
-	 * <p>For example, if you only register a receiver using this method when a {@linkplain ClientLoginNetworking#registerGlobalReceiver(ResourceLocation, ClientLoginNetworking.LoginQueryRequestHandler)}
-	 * login query has been received, you should use {@link ClientPlayConnectionEvents#INIT} to register the channel handler.
-	 *
-	 * @param channelName the id of the channel
-	 * @return false if a handler is already registered to the channel
-	 * @throws IllegalStateException if the client is not connected to a server
-	 * @see ClientPlayConnectionEvents#INIT
-	 */
-	public static boolean registerReceiver(ResourceLocation channelName, PlayChannelHandler channelHandler) {
-		final ClientPlayNetworkAddon addon = ClientNetworkingImpl.getClientPlayAddon();
-
-		if (addon != null) {
-			return addon.registerChannel(channelName, channelHandler);
-		}
-
-		throw new IllegalStateException("Cannot register receiver while not in game!");
-	}
-
-	/**
-	 * Removes the handler of a channel.
-	 *
-	 * <p>The {@code channelName} is guaranteed not to have a handler after this call.
-	 *
-	 * @param channelName the id of the channel
-	 * @return the previous handler, or {@code null} if no handler was bound to the channel
-	 * @throws IllegalStateException if the client is not connected to a server
-	 */
-	@Nullable
-	public static PlayChannelHandler unregisterReceiver(ResourceLocation channelName) throws IllegalStateException {
-		final ClientPlayNetworkAddon addon = ClientNetworkingImpl.getClientPlayAddon();
-
-		if (addon != null) {
-			return addon.unregisterChannel(channelName);
-		}
-
-		throw new IllegalStateException("Cannot unregister receiver while not in game!");
-	}
-
-	/**
-	 * Gets all the channel names that the client can receive packets on.
-	 *
-	 * @return All the channel names that the client can receive packets on
-	 * @throws IllegalStateException if the client is not connected to a server
-	 */
-	public static Set<ResourceLocation> getReceived() throws IllegalStateException {
-		final ClientPlayNetworkAddon addon = ClientNetworkingImpl.getClientPlayAddon();
-
-		if (addon != null) {
-			return addon.getReceivableChannels();
-		}
-
-		throw new IllegalStateException("Cannot get a list of channels the client can receive packets on while not in game!");
-	}
-
-	/**
-	 * Gets all channel names that the connected server declared the ability to receive a packets on.
-	 *
-	 * @return All the channel names the connected server declared the ability to receive a packets on
-	 * @throws IllegalStateException if the client is not connected to a server
-	 */
-	public static Set<ResourceLocation> getSendable() throws IllegalStateException {
-		final ClientPlayNetworkAddon addon = ClientNetworkingImpl.getClientPlayAddon();
-
-		if (addon != null) {
-			return addon.getSendableChannels();
-		}
-
-		throw new IllegalStateException("Cannot get a list of channels the server can receive packets on while not in game!");
-	}
-
-	/**
-	 * Checks if the connected server declared the ability to receive a packet on a specified channel name.
-	 *
-	 * @param channelName the channel name
-	 * @return True if the connected server has declared the ability to receive a packet on the specified channel.
-	 * False if the client is not in game.
-	 */
-	public static boolean canSend(ResourceLocation channelName) throws IllegalArgumentException {
-		// You cant send without a client player, so this is fine
-		if (Minecraft.getInstance().getConnection() != null) {
-			return ClientNetworkingImpl.getAddon(Minecraft.getInstance().getConnection()).getSendableChannels().contains(channelName);
-		}
-
-		return false;
-	}
-
-	/**
-	 * Creates a packet which may be sent to a the connected server.
-	 *
-	 * @param channelName the channel name
-	 * @param buf the packet byte buf which represents the payload of the packet
-	 * @return a new packet
-	 */
-	public static Packet<?> createC2SPacket(ResourceLocation channelName, FriendlyByteBuf buf) {
-		Objects.requireNonNull(channelName, "Channel name cannot be null");
-		Objects.requireNonNull(buf, "Buf cannot be null");
-
-		return ClientNetworkingImpl.createPlayC2SPacket(channelName, buf);
-	}
-
-	/**
-	 * Gets the packet sender which sends packets to the connected server.
-	 *
-	 * @return the client's packet sender
-	 * @throws IllegalStateException if the client is not connected to a server
-	 */
-	public static PacketSender getSender() throws IllegalStateException {
-		// You cant send without a client player, so this is fine
-		if (Minecraft.getInstance().getConnection() != null) {
-			return ClientNetworkingImpl.getAddon(Minecraft.getInstance().getConnection());
-		}
-
-		throw new IllegalStateException("Cannot get packet sender when not in game!");
-	}
-
-	/**
-	 * Sends a packet to the connected server.
-	 *
-	 * @param channelName the channel of the packet
-	 * @param buf the payload of the packet
-	 * @throws IllegalStateException if the client is not connected to a server
-	 */
-	public static void send(ResourceLocation channelName, FriendlyByteBuf buf) throws IllegalStateException {
-		// You cant send without a client player, so this is fine
-		if (Minecraft.getInstance().getConnection() != null) {
-			Minecraft.getInstance().getConnection().send(createC2SPacket(channelName, buf));
-			return;
-		}
-
-		throw new IllegalStateException("Cannot send packets when not in game!");
-	}
-
-	private ClientPlayNetworking() {
-	}
-
-	@FunctionalInterface
-	public interface PlayChannelHandler {
-		/**
-		 * Handles an incoming packet.
-		 *
-		 * <p>This method is executed on {@linkplain io.netty.channel.EventLoop netty's event loops}.
-		 * Modification to the game should be {@linkplain net.minecraft.util.thread.BlockableEventLoop#submit(Runnable) scheduled} using the provided Minecraft client instance.
-		 *
-		 * <p>An example usage of this is to display an overlay message:
-		 * <pre>{@code
-		 * ClientPlayNetworking.registerReceiver(new Identifier("mymod", "overlay"), (client, handler, buf, responseSender) -&rt; {
-		 * 	String message = buf.readString(32767);
-		 *
-		 * 	// All operations on the server or world must be executed on the server thread
-		 * 	client.execute(() -&rt; {
-		 * 		client.inGameHud.setOverlayMessage(message, true);
-		 * 	});
-		 * });
-		 * }</pre>
-		 *  @param client the client
-		 * @param handler the network handler that received this packet
-		 * @param buf the payload of the packet
-		 * @param responseSender the packet sender
-		 */
-		void receive(Minecraft client, ClientPacketListener handler, FriendlyByteBuf buf, PacketSender responseSender);
-	}
-}
@@ -1,29 +0,0 @@
-/*
- * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-/**
- * The Networking API (client side), version 1.
- *
- * <p>For login stage networking see {@link net.fabricmc.fabric.api.client.networking.v1.ClientLoginNetworking}.
- * For play stage networking see {@link net.fabricmc.fabric.api.client.networking.v1.ClientPlayNetworking}.
- *
- * <p>For events related to connection to a server see {@link net.fabricmc.fabric.api.client.networking.v1.ClientLoginConnectionEvents} for login stage
- * or {@link net.fabricmc.fabric.api.client.networking.v1.ClientPlayConnectionEvents} for play stage.
- *
- * <p>For events related to the ability of a server to receive packets on a channel of a specific name see {@link net.fabricmc.fabric.api.client.networking.v1.C2SPlayChannelEvents}.
- */
-
-package com.seibel.lod.forge.fabric.api.client.networking.v1;
@@ -1,55 +0,0 @@
-/*
- * Copyright (c) 2016, 2017, 2018, 2019 FabricMC
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package com.seibel.lod.forge.fabric.api.event;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Indicates that this {@link Event} is auto-invoking:
- * it calls the event callback implemented by a context parameter type automatically and without registration.
- *
- * <p>This means that this event can be listened to in two ways:
- * <ul>
- *     <li>If the consumer is the context parameter and it implements the callback, it will be automatically invoked, don't register manually.
- *     <li>Otherwise, there is no invocation and the listener needs manual registration as usual.
- * </ul>
- *
- * <p>Do note that there may be more than one context parameter.
- *
- * <p>A typical use case is feature augmentation, for example to expose raw clicks to slots.
- * The event callback has a slot parameter - the context parameter - and the event itself is carrying this annotation.
- * All the slot needs to receive slot clicks is to implement {@code SlotClickCallback} on itself.
- * It shouldn't do any explicit event registration like {@code SLOT_CLICK_EVENT.register(this::onSlotClick)},
- * otherwise it will see extraneous callback invocations.
- *
- * <p>In general, an auto-invoking event bridges the gap between the flexibility of an event with global reach,
- * and the convenience of implementing an interface that gets detected automatically.
- *
- * <p>This is a documentation-only annotation, the event factory has to implement the functionality explicitly by checking the parameter type and invoking it.
- * On top of adding this annotation, the event field or method should document which parameters are context parameters,
- * and under which circumstances they are invoked.
- */
-
-@Documented
-@Retention(RetentionPolicy.RUNTIME)
-@Target({ ElementType.FIELD, ElementType.METHOD })
-public @interface AutoInvokingEvent {
-}
--- a/Show More
+++ b/Show More