Update Readme.md

remove a few compiler warnings and update core
Downgraded stuff (removes fabric api) and updated gitlab cd
2022-04-17 17:01:21 +00:00 · 2022-04-01 21:00:33 -05:00 · 2022-04-01 17:35:00 +10:30 · 2022-03-30 17:35:09 +10:30 · 2022-03-10 17:38:07 +10:30 · 2022-03-08 17:24:31 +10:30
113 changed files with 1966 additions and 5996 deletions
@@ -3,11 +3,7 @@ image: gradle:eclipse-temurin

 # all stages need to be defined here
 stages:
-  - build_19
-  - build_18_2
-  - build_18_1
-  - build_17_1
-  - build_16_5
+    - build_17_1

 variables:
    # Pull core when building
@@ -20,134 +16,27 @@ before_script:
    - echo GE_JOB_ID=$CI_JOB_ID >> generate_jars.env


-
-# 1.16.5 build
-build_16_5:
-  stage: build_16_5
-  script:
-    - echo "Building 1.16.5..."
-    - ./gradlew deleteMerged -PmcVer="1.16.5" --gradle-user-home cache/;
-    - ./gradlew clean -PmcVer="1.16.5" --gradle-user-home cache/;
-    - ./gradlew core:build -PmcVer="1.16.5" --gradle-user-home cache/;
-    - ./gradlew build -PmcVer="1.16.5" --gradle-user-home cache/;
-    - ./gradlew mergeJars -PmcVer="1.16.5" --gradle-user-home cache/;
-  image: eclipse-temurin:17
-  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:
-    - echo "Building 1.17.1..."
-    - ./gradlew deleteMerged -PmcVer="1.17.1" --gradle-user-home cache/;
-    - ./gradlew clean -PmcVer="1.17.1" --gradle-user-home cache/;
-    - ./gradlew core:build -PmcVer="1.17.7" --gradle-user-home cache/;
-    - ./gradlew build -PmcVer="1.17.1" --gradle-user-home cache/;
-    - ./gradlew mergeJars -PmcVer="1.17.1" --gradle-user-home cache/;
-  image: eclipse-temurin:17
-  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: 
-    - echo "Building 1.18.1..."
-    - ./gradlew deleteMerged -PmcVer="1.18.1" --gradle-user-home cache/; # make sure any previously merged jars are removed before running this job
-    - ./gradlew clean -PmcVer="1.18.1" --gradle-user-home cache/;
-    - ./gradlew core:build -PmcVer="1.18.1" --gradle-user-home cache/;
-    - ./gradlew build -PmcVer="1.18.1" --gradle-user-home cache/;
-    - ./gradlew mergeJars -PmcVer="1.18.1" --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:
-    - echo "Building 1.18.2..."
-    - ./gradlew deleteMerged -PmcVer="1.18.2" --gradle-user-home cache/;
-    - ./gradlew clean -PmcVer="1.18.2" --gradle-user-home cache/;
-    - ./gradlew core:build -PmcVer="1.18.2" --gradle-user-home cache/;
-    - ./gradlew build -PmcVer="1.18.2" --gradle-user-home cache/;
-    - ./gradlew mergeJars -PmcVer="1.18.2" --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
-
-# 1.19 build
-build_19:
-  stage: build_19
-  script:
-    - echo "Building 1.19..."
-    - ./gradlew deleteMerged -PmcVer="1.19" --gradle-user-home cache/;
-    - ./gradlew clean -PmcVer="1.19" --gradle-user-home cache/;
-    - ./gradlew core:build -PmcVer="1.19" --gradle-user-home cache/;
-    - ./gradlew build -PmcVer="1.19" --gradle-user-home cache/;
-    - ./gradlew mergeJars -PmcVer="1.19" --gradle-user-home cache/;
-  image: eclipse-temurin:17
-  artifacts:
-    name: "Merged_NightlyBuild_1_19-${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
+    stage: build_17_1
+    script:
+        - ./gradlew deleteMerged --gradle-user-home cache/; # make sure any previously merged jars are removed before running this job
+        - ./gradlew build -PmcVer=1.17.1 --gradle-user-home cache/;
+        - ./gradlew merge --gradle-user-home cache/;
+    # build using Java 16
+    image: eclipse-temurin:16
+    artifacts:
+        name: "Merged_NightlyBuild_1_17_1-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
+        paths:
+            # relative to the root directory
+            - Merged
+        expire_in: 1 day
+    cache:
+        key: "gradleCache"
+        policy: pull-push
+        paths:
+            - .gradle
+            - cache/


 # unused deployment stage
@@ -172,5 +61,5 @@ build_19:
 #                - 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,4 @@
 [submodule "core"]
 	path = core
 	url = https://gitlab.com/jeseibel/distant-horizons-core.git
-	branch = main
+    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,9 +1,7 @@
-# 1.17.1 version
+org.gradle.jvmargs=-Xmx2048M

-java_version=16
 minecraft_version=1.17.1
-parchment_version=2021.12.12
-compatible_minecraft_versions=["1.17", "1.17.1"]
+java_version=16

 # Fabric loader
 fabric_loader_version=0.13.2
@@ -11,11 +9,9 @@ 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
@@ -23,21 +19,18 @@ fabric_api_version=0.46.1+1.17
    # 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,43 +0,0 @@
-# 1.18.2 version based stuff
-
-java_version = 17
-minecraft_version=1.19
-parchment_version=2022.03.13
-compatible_minecraft_versions=["1.19"]
-
-# Fabric loader
-fabric_loader_version=0.14.8
-fabric_api_version=0.57.0+1.19
-    # Fabric mod versions
-    modmenu_version=4.0.0
-    starlight_version_fabric=0
-    phosphor_version_fabric=0
-    lithium_version=0
-    sodium_version=3820973
-    iris_version=1.19.x-v1.2.5
-    immersive_portals_version = 0
-    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=41.0.94
-    # 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,165 +0,0 @@
-                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
@@ -1,7 +1,10 @@
+# THIS VERSION IS NO LONGER MAINTAINED! ALL DEVELOPMENT HAVE BEEN MOVED OVER TO THE MAIN BRANCH
+
 # <img src="https://gitlab.com/jeseibel/distant-horizons-core/-/raw/main/_logo%20files/LOD%20logo%20flat%20-%20with%20boarder.png" width="32"> Distant Horizons

 > A mod that adds a Level of Detail System to Minecraft

+
 # What is Distant Horizons?

 This mod adds a Level Of Detail (LOD) system to Minecraft.\
@@ -11,67 +14,22 @@ allowing for an increased view distance without harming performance.
 Or in other words: this mod lets you see farther without turning your game into a slide show.\
 If you want to see a quick demo, check out a video covering the mod here:

-<a href="https://youtu.be/_04BZ8W2bDM" target="_blank">![Minecraft Level Of Detail (LOD) mod - Alpha 1.6.3](https://cdn.ko-fi.com/cdn/useruploads/png_ef4d209d-50d9-462f-b31f-92e42ec3e260cover.jpg?v=c1097a5b-029c-4484-bec3-80ff58c5d239)</a>
+<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.19
- 1.18.2
- 1.18.1 & 1.18
- 1.17.1 & 1.17
- 1.16.5 & 1.16.4
-
 Architectury version: 3.4-SNAPSHOT\
-Architectury loom version: 0.12.0-SNAPSHOT\
 Java Compiler plugin: Manifold Preprocessor

-#### 1.19 mods
-Forge version: 41.0.94\
-Fabric version: 0.14.8\
-Fabric API version: 0.57.0+1.19\
-Modmenu version: 4.0.0
-
-#### 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\
-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.
-

 ## Source Code Installation

-#### Nightlly builds
-This mod has an autobuild system to automatically build the mod on each commit
- 1.19:   https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/1.6.4a_dev/download?job=build_19
- 1.18.2: https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/1.6.4a_dev/download?job=build_18_2
- 1.18.1: https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/1.6.4a_dev/download?job=build_18_1
- 1.17.1: https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/1.6.4a_dev/download?job=build_17_1
- 1.16.5: https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/1.6.4a_dev/download?job=build_16_5
-
 See the Fabric Documentation online for more detailed instructions:\
 https://fabricmc.net/wiki/tutorial:setup

@@ -93,18 +51,14 @@ https://fabricmc.net/wiki/tutorial:setup
 4. Import the project into eclipse

 ## Switching Versions
-This branch support 5 built versions:
- - 1.19
- - 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.4)
+This branch support 1 built versions:
+- 1.17.1 (which also runs on 1.17)

-To switch between active versions, change `mcVer=1.?` in `gradle.properties` file.
+To switch between active versions, change `mcVer=1.17.?` in `gradle.properties` file.

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

 **Using GUI**
@@ -116,12 +70,12 @@ If running on IDE, to ensure IDE pickup the changed versions, you will need to r
 6. The compiled jar file will be in the folder `Merged`

 **If in terminal:**
-1. `git clone -b 1.6.4a_dev --recurse-submodules https://gitlab.com/jeseibel/minecraft-lod-mod.git`
+1. `git clone -b preprocessor_test --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.
+>Note: You can add the arg: `-PmcVer=1.17.?` to tell gradle to build a selected MC version instead of having to manually modify the `gradle.properties` file.


 ## Other commands
@@ -135,12 +89,7 @@ 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

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

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

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

-apply plugin: "java"
-apply plugin: "architectury-plugin"
-apply plugin: "maven-publish"
-apply plugin: JarMergerPlugin
-
-archivesBaseName = rootProject.archives_base_name
-version = rootProject.mod_version
-group = rootProject.maven_group
-
-task printConfigurations {
-    doLast {task ->
-        println "Project Name: $name configurations:"
-        configurations.each {
-            println "    $it.name"
-        }
-    }
+def writeBuildGradlePredefine() {
+    def excapedMCVersion = rootProject.minecraft_version.replace(".", "_")
+    new File(projectDir, "build.properties").text = "MC_VERSION_${excapedMCVersion}=\n"
 }

-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.19"
-    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}."
+    def defaultMcVersion = '1.17.1'
+    if (!project.hasProperty("mcVer")) {
+        println "No mcVer set! Defaulting to ${defaultMcVersion}."
        println "Tip: Use -PmcVer='${defaultMcVersion}' in cmd arg to set mcVer."
-        mcVersion = defaultMcVersion
-        mcIndex = Arrays.asList(mcVers).indexOf(defaultMcVersion)
-        assert mcIndex != -1
    }
+    def mcVersion = project.hasProperty("mcVer") ? mcVer : defaultMcVersion

-	println "Loading properties file at " + mcVersion + ".properties"
-	def props = new Properties()
-	props.load(new FileInputStream("$rootProject.rootDir/"+"$mcVersion"+".properties"))
+    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 + "]"
+        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",
-            "1.19"  : "1_19"
-    ]
-    // Use this as sometimes multiple versions use the same access wideners
-    rootProject.ext.set("acsessWidenerVersion", mcVersionToAcsessWidenerVersion.get(mcVersion))
+    writeBuildGradlePredefine()
 }
 loadProperties()

+apply plugin: JarMergerPlugin
+
 architectury {
    minecraft = rootProject.minecraft_version
 }

-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"
-        url = "https://api.modrinth.com/maven"
-        content {
-            includeGroup "maven.modrinth"
-        }
-    }
-
-    // Required for importing CursedForge mods
-    maven {
-        url "https://www.cursemaven.com"
-        content {
-            includeGroup "curse.maven"
-        }
-    }
-
-    // These 2 are for importing mods that arnt on CursedForge, Modrinth, GitHub, GitLab or anywhere opensource
-    flatDir {
-        dirs "${rootDir}/mods/fabric"
-        content {
-            includeGroup "fabric-mod"
-        }
-    }
-    flatDir {
-        dirs "${rootDir}/mods/forge"
-        content {
-            includeGroup "forge-mod"
-        }
-    }
-}
-
-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,42)"
-
-    inputs.properties replaceProperties
-    replaceProperties.put 'project', project
-    filesMatching(resourceTargets) {
-        expand replaceProperties
-    }
-
-    intoTargets.each { target ->
-        if (file(target).exists()) {
-            copy {
-                from(sourceSets.main.resources) {
-                    include resourceTargets
-                    expand replaceProperties
-                }
-                into target
-            }
-        }
-    }
-}
-
-// Copies the correct accesswidener and renames it
-task copyAccessWidener(type: Copy) {
-    from project(":common").file("src/main/resources/${rootProject.acsessWidenerVersion}.lod.accesswidener")
-    into(file("build/resources/main"))
-    rename "${rootProject.acsessWidenerVersion}.lod.accesswidener", "lod.accesswidener"
-}
-
-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")
-}
-
-java {
-    withSourcesJar()
-}
-
-//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")
-}
-
-
-// ===============================CORE Gradle basically================================
 subprojects { p ->
-    if (p == project(":core")) {
+    apply plugin: "dev.architectury.loom"

-        apply plugin: "java"
-        apply plugin: "architectury-plugin"
-        apply plugin: "maven-publish"
-        apply plugin: "dev.architectury.loom"
+    loom {
+        silentMojangMappingsLicense()
+    }

-        p.archivesBaseName = rootProject.archives_base_name
-        p.version = rootProject.mod_version
-        p.group = rootProject.maven_group
+    configurations {
+        common
+        shadowMe
+        implementation.extendsFrom shadowMe
+    }

-        loom {
-            silentMojangMappingsLicense()
-        }
+    dependencies {
+        minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
+        // The following line declares the mojmap mappings
+        mappings loom.officialMojangMappings()

-        configurations {
-            common
-            shadowMe
-            implementation.extendsFrom shadowMe
-        }
+        //Manifold
+        annotationProcessor "systems.manifold:manifold-preprocessor:${rootProject.manifold_version}"

-        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)
-                if (rootProject.minecraft_version != "1.19")
-                    parchment("org.parchmentmc.data:parchment-${rootProject.minecraft_version}:${rootProject.parchment_version}@zip")
-                else
-                    parchment("org.parchmentmc.data:parchment-1.18.2:${rootProject.parchment_version}@zip") // As 1.19 dosnt have parchment mappings yet, we use 1.18.2 mapping
-            }
-
-            //Manifold
-            annotationProcessor "systems.manifold:manifold-preprocessor:${rootProject.manifold_version}"
-
-            // Toml
-            implementation("com.electronwill.night-config:toml:${rootProject.toml_version}")
+        // Toml
+        implementation("com.electronwill.night-config:toml:${rootProject.toml_version}")

+        if (p != project(":forge")) {
            // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
            // Do NOT use other classes from fabric loader unless working with fabric
            modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
        }

-        // 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
-            }
+
+        if (p != project(":core")) {
+            common(project(":core")) { transitive false }
+            shadowMe(project(":core")) { transitive false }
        }
-
-        task printConfigurations {
-            doLast {task ->
-                println "Project Name: $p.name configurations:"
-                configurations.each {
-                    println "    $it.name"
-                }
-            }
-        }
-
-        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"
-                url = "https://api.modrinth.com/maven"
-                content {
-                    includeGroup "maven.modrinth"
-                }
-            }
-
-            // Required for importing CursedForge mods
-            maven {
-                url "https://www.cursemaven.com"
-                content {
-                    includeGroup "curse.maven"
-                }
-            }
-
-            // These 2 are for importing mods that arnt on CursedForge, Modrinth, GitHub, GitLab or anywhere opensource
-            flatDir {
-                dirs "${rootDir}/mods/fabric"
-                content {
-                    includeGroup "fabric-mod"
-                }
-            }
-            flatDir {
-                dirs "${rootDir}/mods/forge"
-                content {
-                    includeGroup "forge-mod"
-                }
-            }
-        }
-
-        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,42)"
-
-            inputs.properties replaceProperties
-            replaceProperties.put 'project', project
-            filesMatching(resourceTargets) {
-                expand replaceProperties
-            }
-
-            intoTargets.each { target ->
-                if (file(target).exists()) {
-                    copy {
-                        from(sourceSets.main.resources) {
-                            include resourceTargets
-                            expand replaceProperties
-                        }
-                        into target
-                    }
-                }
-            }
-        }
-        // 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")
-        }
-
-        p.tasks.withType(JavaCompile) {
-            // Add Manifold Preprocessor
-//		def excapedMCVersion = rootProject.minecraft_version.replace(".", "_")
-//		options.compilerArgs += ['-Xplugin:Manifold', "-AMC_VERSION_${excapedMCVersion}"]
-//
-            //options.compilerArgs += ['-deprecation']
-            //options.compilerArgs += ['-verbose']
-            //options.compilerArgs += ['-Xlint:unchecked']
-            //options.compilerArgs += ['-Xdiags:verbose']
-            //options.compilerArgs += ['-Xprint']
-            //options.compilerArgs += ['-XprintProcessorInfo']
-            //options.compilerArgs += ['-XprintRounds']
-
-            // println options.compilerArgs
-
-            // Set the java version
-            options.release = 8; // Core should use Java 8 no matter what
-            // TODO: make everything use java 8
-//        options.release = 8 // Use Java 8 for everything so back porting is easier
-        }
-
-        java {
-            withSourcesJar()
-        }
-
-        p.runClient.enabled = false
-        p.runServer.enabled = false
    }
+
+    jar {
+        manifest {
+            attributes 'Implementation-Title': rootProject.archives_base_name,
+                    'Implementation-Version': rootProject.mod_version,
+                    'Main-Class': 'com.seibel.lod.core.JarMain'
+        }
+    }
+}
+
+allprojects {
+    apply plugin: "java"
+    apply plugin: "architectury-plugin"
+    apply plugin: "maven-publish"
+
+    archivesBaseName = rootProject.archives_base_name
+    version = rootProject.mod_version
+    group = rootProject.maven_group
+
+    repositories {
+        mavenCentral()
+        // 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"
+            url = "https://api.modrinth.com/maven"
+            content {
+                includeGroup "maven.modrinth"
+            }
+        }
+
+        // Required for importing CursedForge mods
+        maven {
+            url "https://www.cursemaven.com"
+            content {
+                includeGroup "curse.maven"
+            }
+        }
+
+        // These 2 are for importing mods that arnt on CursedForge, Modrinth, GitHub, GitLab or anywhere opensource
+        flatDir {
+            dirs "${rootDir}/mods/fabric"
+            content {
+                includeGroup "fabric-mod"
+            }
+        }
+        flatDir {
+            dirs "${rootDir}/mods/forge"
+            content {
+                includeGroup "forge-mod"
+            }
+        }
+    }
+
+    // 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,
+                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)"
+
+        inputs.properties replaceProperties
+        replaceProperties.put 'project', project
+        filesMatching(resourceTargets) {
+            expand replaceProperties
+        }
+
+        intoTargets.each { target ->
+            if (file(target).exists()) {
+                copy {
+                    from(sourceSets.main.resources) {
+                        include resourceTargets
+                        expand replaceProperties
+                    }
+                    into target
+                }
+            }
+        }
+    }
+
+    tasks.withType(JavaCompile) {
+//        // Add Manifold Preprocessor
+////		def excapedMCVersion = rootProject.minecraft_version.replace(".", "_")
+////		options.compilerArgs += ['-Xplugin:Manifold', "-AMC_VERSION_${excapedMCVersion}"]
+////
+//        //options.compilerArgs += ['-deprecation']
+//        //options.compilerArgs += ['-verbose']
+//        //options.compilerArgs += ['-Xlint:unchecked']
+//        //options.compilerArgs += ['-Xdiags:verbose']
+//        //options.compilerArgs += ['-Xprint']
+//        //options.compilerArgs += ['-XprintProcessorInfo']
+//        //options.compilerArgs += ['-XprintRounds']
+//
+//        // println options.compilerArgs
+//        if (p != project(":core")) {
+//            options.compilerArgs += ['-Xplugin:Manifold']
+//            options.release = rootProject.java_version as Integer
+//        }
+        options.encoding = "UTF-8"
+        options.release = 16
+    }
+
+    java {
+        withSourcesJar()
+    }
+}
+
+
+// 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,64 +1,16 @@
-apply plugin: "java"
-apply plugin: "architectury-plugin"
-apply plugin: "maven-publish"
-apply plugin: "dev.architectury.loom"
-
-archivesBaseName = rootProject.archives_base_name
-version = rootProject.mod_version
-group = rootProject.maven_group
+loom {
+    accessWidenerPath.set(file("src/main/resources/lod.accesswidener"))
+}

 architectury {
-    common(rootProject.enabled_platforms.split(","))
+    common()
 }

-loom {
-    silentMojangMappingsLicense()
-    accessWidenerPath.set(project(":common").file("src/main/resources/${acsessWidenerVersion}.lod.accesswidener"))
-}
-
-configurations {
-    common
-    shadowMe
-    implementation.extendsFrom shadowMe
-}
-java {
-    withSourcesJar()
-}
-
-
-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)
-        if (rootProject.minecraft_version != "1.19")
-            parchment("org.parchmentmc.data:parchment-${rootProject.minecraft_version}:${rootProject.parchment_version}@zip")
-        else
-            parchment("org.parchmentmc.data:parchment-1.18.2:${rootProject.parchment_version}@zip") // As 1.19 dosnt have parchment mappings yet, we use 1.18.2 mapping
-    }
-
-    //Manifold
-    annotationProcessor "systems.manifold:manifold-preprocessor:${rootProject.manifold_version}"
-
-    // Toml
-    implementation("com.electronwill.night-config:toml:${rootProject.toml_version}")
-
-    // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
-    // Do NOT use other classes from fabric loader unless working with fabric
-    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"\
-
-    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
+afterEvaluate {
+    tasks {
+        remapJar {
+            remapAccessWidener.set(false)
+        }
    }
 }

@@ -74,145 +26,4 @@ publishing {
    repositories {
        // Add repositories to publish to here.
    }
-}
-
-task printConfigurations {
-    doLast {task ->
-        println "Project Name: $name configurations:"
-        configurations.each {
-            println "    $it.name"
-        }
-    }
-}
-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"
-        url = "https://api.modrinth.com/maven"
-        content {
-            includeGroup "maven.modrinth"
-        }
-    }
-
-    // Required for importing CursedForge mods
-    maven {
-        url "https://www.cursemaven.com"
-        content {
-            includeGroup "curse.maven"
-        }
-    }
-
-    // These 2 are for importing mods that arnt on CursedForge, Modrinth, GitHub, GitLab or anywhere opensource
-    flatDir {
-        dirs "${rootDir}/mods/fabric"
-        content {
-            includeGroup "fabric-mod"
-        }
-    }
-    flatDir {
-        dirs "${rootDir}/mods/forge"
-        content {
-            includeGroup "forge-mod"
-        }
-    }
-}
-
-// Copies the correct accesswidener and renames it
-task copyAccessWidener(type: Copy) {
-    from project(":common").file("src/main/resources/${rootProject.acsessWidenerVersion}.lod.accesswidener")
-    into(file("build/resources/main"))
-    rename "${rootProject.acsessWidenerVersion}.lod.accesswidener", "lod.accesswidener"
-}
-
-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 {
-    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,42)"
-
-    inputs.properties replaceProperties
-    replaceProperties.put 'project', project
-    filesMatching(resourceTargets) {
-        expand replaceProperties
-    }
-
-    intoTargets.each { target ->
-        if (file(target).exists()) {
-            copy {
-                from(sourceSets.main.resources) {
-                    include resourceTargets
-                    expand replaceProperties
-                }
-                into target
-            }
-        }
-    }
-}
-
-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']
-
-    // println options.compilerArgs
-
-    // Set the java version
-    options.compilerArgs += ['-Xplugin:Manifold']
-    options.release = rootProject.java_version as Integer
-    // TODO: make everything use java 8
-//        options.release = 8 // Use Java 8 for everything so back porting is easier
-}
-
-sourcesJar {
-}
-
-runClient.enabled = false
-runServer.enabled = 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
@@ -19,6 +19,7 @@

 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.*;
@@ -32,14 +33,12 @@ import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.I
 import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IAdvanced;
 import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IAdvanced.IDebugging.*;

-
 /**
 * This handles any configuration the user has access to.
- * @author coolGi
+ * @author coolGi2007
 * @version 12-12-2021
 */
-
-public class Config
+public class Config extends ConfigGui
 //public class Config extends TinyConfig
 {
 	// CONFIG STRUCTURE
@@ -56,12 +55,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,61 +68,58 @@ public class Config
 	// Tough it is in client in the wrapper singleton
 	@ConfigAnnotations.Entry
 	public static boolean optionsButton = true;
-	
-	public static class Client
-	{
+
+	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
-		{
+
+
+		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
-			{
+
+
+			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
@@ -134,71 +130,70 @@ public class Config
 				@ConfigAnnotations.Entry(minValue = 0, maxValue = 7)
 				public static int lodBiomeBlending = IQuality.LOD_BIOME_BLENDING_MIN_DEFAULT_MAX.defaultValue;
 			}
-			
-			
-			public static class FogQuality
-			{
+
+
+			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
@@ -207,54 +202,52 @@ public class Config
 						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
-			{
+
+
+			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
@@ -269,12 +262,12 @@ public class Config
 				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
@@ -288,12 +281,7 @@ public class Config
 				@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;
+				public static int caveCullingHeight = IAdvancedGraphics.CAVE_CULLING_HEIGHT_MIN_DEFAULT_MAX.defaultValue;

 				/*
 				@ConfigAnnotations.FileComment
@@ -303,60 +291,64 @@ public class Config
 				*/
 			}
 		}
-		
-		
-		public static class WorldGenerator
-		{
+
+
+		public static class WorldGenerator {
 			@ConfigAnnotations.FileComment
 			public static String _enableDistantGeneration = IWorldGenerator.ENABLE_DISTANT_GENERATION_DESC;
 			@ConfigAnnotations.Entry
 			public static boolean enableDistantGeneration = IWorldGenerator.ENABLE_DISTANT_GENERATION_DEFAULT;
-			
+
 			//			@ConfigAnnotations.FileComment
 //			public static String _distanceGenerationMode = IWorldGenerator.getDistanceGenerationModeDesc();
 			@ConfigAnnotations.Entry
 			public static DistanceGenerationMode distanceGenerationMode = IWorldGenerator.DISTANCE_GENERATION_MODE_DEFAULT;
-			
+
 			@ConfigAnnotations.FileComment
 			public static String _lightGenerationMode = IWorldGenerator.LIGHT_GENERATION_MODE_DESC;
 			@ConfigAnnotations.Entry
 			public static LightGenerationMode lightGenerationMode = IWorldGenerator.LIGHT_GENERATION_MODE_DEFAULT;
-			
+
 			@ConfigAnnotations.FileComment
 			public static String _generationPriority = IWorldGenerator.GENERATION_PRIORITY_DESC;
 			@ConfigAnnotations.Entry
 			public static GenerationPriority generationPriority = IWorldGenerator.GENERATION_PRIORITY_DEFAULT;
-			
+
+			/*
+			@ConfigAnnotations.FileComment
+			public static String _allowUnstableFeatureGeneration = IWorldGenerator.ALLOW_UNSTABLE_FEATURE_GENERATION_DESC;
+			// FIXME: Temperary override. In 1.18, the newer Unstable gnerator is more usable
+			@ConfigAnnotations.Entry
+			public static boolean allowUnstableFeatureGeneration = true;//IWorldGenerator.ALLOW_UNSTABLE_FEATURE_GENERATION_DEFAULT;
+			*/
+
 			@ConfigAnnotations.FileComment
 			public static String _blocksToAvoid = IWorldGenerator.BLOCKS_TO_AVOID_DESC;
 			@ConfigAnnotations.Entry
 			public static BlocksToAvoid blocksToAvoid = IWorldGenerator.BLOCKS_TO_AVOID_DEFAULT;
 		}
-		
-		
-		public static class Multiplayer
-		{
+
+
+		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
-		{
+
+
+		public static class Advanced {
 			@ConfigAnnotations.ScreenEntry
 			public static Threading threading;
-			
+
 			@ConfigAnnotations.ScreenEntry
 			public static Debugging debugging;
-			
+
 			@ConfigAnnotations.ScreenEntry
 			public static Buffers buffers;

@@ -366,112 +358,110 @@ public class Config
 			public static boolean lodOnlyMode = IAdvanced.LOD_ONLY_MODE_DEFAULT;


-			public static class Threading
-			{
+			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
-			{
+
+
+			public static class Debugging {
 				@ConfigAnnotations.FileComment
 				public static String _rendererType = IDebugging.RENDERER_TYPE_DESC;
 				@ConfigAnnotations.Entry
 				public static RendererType rendererType = IDebugging.RENDERER_TYPE_DEFAULT;
-				
+
 				@ConfigAnnotations.FileComment
 				public static String _debugMode = IDebugging.DEBUG_MODE_DESC;
 				@ConfigAnnotations.Entry
 				public static DebugMode debugMode = IDebugging.DEBUG_MODE_DEFAULT;
-				
+
 				@ConfigAnnotations.FileComment
 				public static String _enableDebugKeybindings = IDebugging.DEBUG_KEYBINDINGS_ENABLED_DESC;
 				@ConfigAnnotations.Entry
 				public static boolean enableDebugKeybindings = IDebugging.DEBUG_KEYBINDINGS_ENABLED_DEFAULT;
-
-				@ConfigAnnotations.ScreenEntry
-				public static DebugSwitch debugSwitch;
-
-				public static class DebugSwitch {
-					/* The logging switches available:
-					 * WorldGenEvent
-					 * WorldGenPerformance
-					 * WorldGenLoadEvent
-					 * LodBuilderEvent
-					 * RendererBufferEvent
-					 * RendererGLEvent
-					 * FileReadWriteEvent
-					 * FileSubDimEvent
-					 * NetworkEvent //NOT IMPL YET
-					 */
-					@ConfigAnnotations.FileComment
-					public static String _logWorldGenEvent = IDebugSwitch.LOG_WORLDGEN_EVENT_DESC;
-					@ConfigAnnotations.Entry
-					public static LoggerMode logWorldGenEvent = IDebugSwitch.LOG_WORLDGEN_EVENT_DEFAULT;
-
-					@ConfigAnnotations.FileComment
-					public static String _logWorldGenPerformance = IDebugSwitch.LOG_WORLDGEN_PERFORMANCE_DESC;
-					@ConfigAnnotations.Entry
-					public static LoggerMode logWorldGenPerformance = IDebugSwitch.LOG_WORLDGEN_PERFORMANCE_DEFAULT;
-
-					@ConfigAnnotations.FileComment
-					public static String _logWorldGenLoadEvent = IDebugSwitch.LOG_WORLDGEN_LOAD_EVENT_DESC;
-					@ConfigAnnotations.Entry
-					public static LoggerMode logWorldGenLoadEvent = IDebugSwitch.LOG_WORLDGEN_LOAD_EVENT_DEFAULT;
-
-					@ConfigAnnotations.FileComment
-					public static String _logLodBuilderEvent = IDebugSwitch.LOG_LODBUILDER_EVENT_DESC;
-					@ConfigAnnotations.Entry
-					public static LoggerMode logLodBuilderEvent = IDebugSwitch.LOG_LODBUILDER_EVENT_DEFAULT;
-
-					@ConfigAnnotations.FileComment
-					public static String _logRendererBufferEvent = IDebugSwitch.LOG_RENDERER_BUFFER_EVENT_DESC;
-					@ConfigAnnotations.Entry
-					public static LoggerMode logRendererBufferEvent = IDebugSwitch.LOG_RENDERER_BUFFER_EVENT_DEFAULT;
-
-					@ConfigAnnotations.FileComment
-					public static String _logRendererGLEvent = IDebugSwitch.LOG_RENDERER_GL_EVENT_DESC;
-					@ConfigAnnotations.Entry
-					public static LoggerMode logRendererGLEvent = IDebugSwitch.LOG_RENDERER_GL_EVENT_DEFAULT;
-
-					@ConfigAnnotations.FileComment
-					public static String _logFileReadWriteEvent = IDebugSwitch.LOG_FILE_READWRITE_EVENT_DESC;
-					@ConfigAnnotations.Entry
-					public static LoggerMode logFileReadWriteEvent = IDebugSwitch.LOG_FILE_READWRITE_EVENT_DEFAULT;
-
-					@ConfigAnnotations.FileComment
-					public static String _logFileSubDimEvent = IDebugSwitch.LOG_FILE_SUB_DIM_EVENT_DESC;
-					@ConfigAnnotations.Entry
-					public static LoggerMode logFileSubDimEvent = IDebugSwitch.LOG_FILE_SUB_DIM_EVENT_DEFAULT;
-
-					@ConfigAnnotations.FileComment
-					public static String _logNetworkEvent = IDebugSwitch.LOG_NETWORK_EVENT_DESC;
-					@ConfigAnnotations.Entry
-					public static LoggerMode logNetworkEvent = IDebugSwitch.LOG_NETWORK_EVENT_DEFAULT;
-				}
 			}
-			
-			
-			public static class Buffers
-			{
+
+
+			@ConfigAnnotations.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)
+				@ConfigAnnotations.Entry(minValue = 0, maxValue = 5000)
 				public static int gpuUploadPerMegabyteInMilliseconds = IBuffers.GPU_UPLOAD_PER_MEGABYTE_IN_MILLISECONDS_DEFAULT.defaultValue;
-				
+
 				@ConfigAnnotations.FileComment
 				public static String _rebuildTimes = IBuffers.REBUILD_TIMES_DESC;
 				@ConfigAnnotations.Entry
@@ -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;

 import com.seibel.lod.common.forge.LodForgeMethodCaller;
@@ -32,6 +13,7 @@ public class LodCommonMain {
    public static boolean forge = false;
    public static boolean serverSided;
    public static LodForgeMethodCaller forgeMethodCaller;
+    public static NetworkInterface networkInterface;

    public static void startup(LodForgeMethodCaller caller, boolean serverSided) {
        LodCommonMain.serverSided = serverSided;
@@ -43,8 +25,11 @@ public class LodCommonMain {
        DependencySetup.createInitialBindings();
    }

-
    public static void initConfig() {
        ConfigGui.init(Config.class);
    }
+
+    public static void registerNetworking(NetworkInterface networkInterface) {
+        LodCommonMain.networkInterface = networkInterface;
+    }
 }
@@ -1,32 +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.forge;

 import com.seibel.lod.common.wrappers.minecraft.MinecraftClientWrapper;
 import net.minecraft.client.renderer.block.model.BakedQuad;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.core.Direction;
-#if POST_MC_1_19
-import net.minecraft.util.RandomSource;
-#endif
-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;

@@ -39,11 +16,6 @@ import java.util.Random;
 * @author Ran
 */
 public interface LodForgeMethodCaller {
-    #if PRE_MC_1_19
-    List<BakedQuad> getQuads(MinecraftClientWrapper mc, Block block, BlockState blockState, Direction direction, Random random); // FIXME: For 1.19
-    #else
-    List<BakedQuad> getQuads(MinecraftClientWrapper mc, Block block, BlockState blockState, Direction direction, RandomSource random); // FIXME: For 1.19
-    #endif
-
-    int colorResolverGetColor(ColorResolver resolver, Biome biome, double x, double z);
+    List<BakedQuad> getQuads(MinecraftClientWrapper mc, Block block, BlockState blockState, Direction direction, Random random);
+    int getPixelRGBA(TextureAtlasSprite sprite, int frameIndex, int x, int y);
 }
@@ -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,20 @@
-/*
- *    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 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;

 /**
 * 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.IMinecraftClientWrapper;

 /**
 * Binds all necessary dependencies, so we
@@ -41,16 +22,13 @@ 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)
-        {
+        if (!LodCommonMain.serverSided) {
            SingletonHandler.bind(IMinecraftClientWrapper.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(IWrapperFactory.class, WrapperFactory.INSTANCE);
        DependencySetupDoneCheck.isDone = true;
    }
@@ -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.wrappers;

 import java.util.function.Supplier;

-public class DependencySetupDoneCheck
-{
+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,7 +22,6 @@ 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;
@@ -53,24 +52,20 @@ public class McObjectConverter
    static final Direction[] directions;
    static final LodDirection[] lodDirections;
    static {
-    	LodDirection[] lodDirs = LodDirection.values();
-    	directions = new Direction[lodDirs.length];
-    	lodDirections = new LodDirection[lodDirs.length];
-    	for (LodDirection lodDir : lodDirs) {
-    		Direction dir = Enum.valueOf(Direction.class, lodDir.name());
-            if (dir == null) {
-                throw new IllegalArgumentException("Invalid direction on init mapping: " + lodDir);
-            }
-    		directions[lodDir.ordinal()] = dir;
-    		lodDirections[dir.ordinal()] = lodDir;
-    	}
+        LodDirection[] lodDirs = LodDirection.values();
+        directions = new Direction[lodDirs.length];
+        lodDirections = new LodDirection[lodDirs.length];
+        for (LodDirection lodDir : lodDirs) {
+            Direction dir = Direction.byName(lodDir.name());
+            directions[lodDir.ordinal()] = dir;
+            lodDirections[dir.ordinal()] = lodDir;
+        }
    }
-    
+
    public static BlockPos Convert(AbstractBlockPosWrapper wrappedPos) {
-    	return new BlockPos(wrappedPos.getX(),wrappedPos.getY(), wrappedPos.getZ());
+        return new BlockPos(wrappedPos.getX(),wrappedPos.getY(), wrappedPos.getZ());
    }
-    
-    
+
    public static Direction Convert(LodDirection lodDirection)
    {
        return directions[lodDirection.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;
@@ -24,30 +5,26 @@ import com.seibel.lod.core.wrapperInterfaces.IVersionConstants;

 /**
 * @author James Seibel
- * @version 12-11-2021
+ * @version 3-3-2022
 */
-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();

-	@Override
-	public int getWorldGenerationCountPerThread()
-	{
-		return 1;
-	}
+
+    private VersionConstants() {
+
+    }
+
+
+    @Override
+    public int getMinimumWorldHeight() {
+        return 0;
+    }
+
+    @Override
+    public int getWorldGenerationCountPerThread() {
+        return 1;
+    }

 	@Override
 	public boolean isVanillaRenderedChunkSquare()
@@ -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,59 +36,48 @@ 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 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,26 @@
-/*
- *    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.concurrent.ConcurrentHashMap;
-
-import com.seibel.lod.core.api.ApiShared;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.block.state.BlockState;

+import java.util.concurrent.ConcurrentHashMap;
+
 public class BlockDetailMap
 {
-	
-	private static ConcurrentHashMap<BlockState, BlockDetailWrapper> map = new ConcurrentHashMap<BlockState, BlockDetailWrapper>();
-	
-	private BlockDetailMap() {}
-	
-	public static BlockDetailWrapper getOrMakeBlockDetailCache(BlockState bs, BlockPos pos, LevelReader getter) {
-		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;
-	}
+    private static ConcurrentHashMap<BlockState, BlockDetailWrapper> map = new ConcurrentHashMap<BlockState, BlockDetailWrapper>();
+
+    private BlockDetailMap() {}
+
+    public static BlockDetailWrapper getOrMakeBlockDetailCache(BlockState bs, BlockPos pos, LevelReader getter) {
+        BlockDetailWrapper cache = map.get(bs);
+        if (cache != null) return cache;
+        if (bs.getFluidState().isEmpty()) {
+            cache = BlockDetailWrapper.make(bs, pos, getter);
+        } else {
+            cache = BlockDetailWrapper.make(bs.getFluidState().createLegacyBlock(), pos, getter);
+        }
+        BlockDetailWrapper cacheCAS = map.putIfAbsent(bs, cache);
+        return cacheCAS==null ? cache : cacheCAS;
+    }
 }
@@ -1,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.Arrays;
@@ -68,285 +49,278 @@ import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import org.jetbrains.annotations.Nullable;
-#if POST_MC_1_19
-import net.minecraft.util.RandomSource;
-#endif

-/*-- 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);
+    private static final ILodConfigWrapperSingleton CONFIG = SingletonHandler.get(ILodConfigWrapperSingleton.class);

-	public static final int FLOWER_COLOR_SCALE = 5;
+    public static final int FLOWER_COLOR_SCALE = 5;

-	#if PRE_MC_1_19
-	public static final Random random = new Random(0);
-	#else
-	public static final RandomSource random = RandomSource.create();
-	#endif
+    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;
-	}
+    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) {

-	private static final Block[] BLOCK_TO_AVOID = {Blocks.AIR, Blocks.CAVE_AIR, Blocks.BARRIER};
+        int count = 0;
+        double alpha = 0;
+        double red = 0;
+        double green = 0;
+        double blue = 0;
+        int tempColor;

-	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
+        {
+            // 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);

-	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;
-	}
+                    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;

-	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()) {
+                    if (colorMode == ColorMode.Leaves) {
+                        r *= a;
+                        g *= a;
+                        b *= a;
+                        a = 1.;
+                    } else if (a==0.) {
+                        continue;
+                    } else if (colorMode == ColorMode.Flower && (g+0.1<b || g+0.1<r)) {
+                        scale = FLOWER_COLOR_SCALE;
+                    }
+
+                    count += scale;
+                    alpha += a*a*scale;
+                    red += r*r*scale;
+                    green += g*g*scale;
+                    blue += b*b*scale;
+                }
+            }
+        }
+
+        if (count == 0)
+            // this block is entirely transparent
+            tempColor = ColorUtil.rgbToInt(255,255,0,255);
+        else
+        {
+            // determine the average color
+            tempColor = ColorUtil.rgbToInt(
+                    (int) (Math.sqrt(alpha/count)*255.),
+                    (int) (Math.sqrt(red / count)*255.),
+                    (int) (Math.sqrt(green / count)*255.),
+                    (int) (Math.sqrt(blue / count)*255.));
+        }
+        // TODO: Remove this when transparency is added!
+        double colorAlpha = ColorUtil.getAlpha(tempColor)/255.;
+        tempColor = ColorUtil.rgbToInt(
+                ColorUtil.getAlpha(tempColor),
+                (int)(ColorUtil.getRed(tempColor) * colorAlpha),
+                (int)(ColorUtil.getGreen(tempColor) * colorAlpha),
+                (int)(ColorUtil.getBlue(tempColor) * colorAlpha)
+        );
+        return tempColor;
+    }
+
+
+
+
+
+    private static final Block[] BLOCK_TO_AVOID = {Blocks.AIR, Blocks.CAVE_AIR, Blocks.BARRIER};
+
+    private static final Direction[] DIRECTION_ORDER = {Direction.UP, Direction.NORTH, Direction.EAST, Direction.WEST, Direction.SOUTH, Direction.DOWN};
+
+    private static boolean isBlockToBeAvoid(Block b) {
+        for (Block bta : BLOCK_TO_AVOID)
+            if (bta==b) return true;
+        return false;
+    }
+
+    final BlockState state;
+    final BlockPos samplePos;
+    final LevelReader sampleGetter;
+
+    boolean isShapeResolved = false;
+    boolean[] dontOccludeFaces = null;
+    boolean noCollision = false;
+    boolean noFullFace = false;
+
+    boolean isColorResolved = false;
+    int baseColor = 0; //TODO: Impl per-face color
+    boolean needShade = true;
+    boolean needPostTinting = false;
+    int tintIndex = 0;
+
+    public static BlockDetailWrapper NULL_BLOCK_DETAIL = new BlockDetailWrapper();
+
+    public BlockDetailWrapper(BlockState state, BlockPos pos, LevelReader getter) {
+        this.state = state;
+        this.samplePos = pos;
+        this.sampleGetter = getter;
+    }
+
+    private BlockDetailWrapper() {
+        this.state = null;
+        this.samplePos = null;
+        this.sampleGetter = null;
+    }
+
+    static BlockDetailWrapper make(BlockState bs, BlockPos pos, LevelReader getter) {
+        if(!bs.getFluidState().isEmpty()) { // Is a fluidBlock
+            if (isBlockToBeAvoid(bs.getBlock())) return NULL_BLOCK_DETAIL;
+            if (bs.isAir()) return NULL_BLOCK_DETAIL;
+            return new BlockDetailWrapper(bs, pos, getter);
+        } else {
+            if (bs.getRenderShape() != RenderShape.MODEL) return NULL_BLOCK_DETAIL;
+            if (isBlockToBeAvoid(bs.getBlock())) return NULL_BLOCK_DETAIL;
+            return new BlockDetailWrapper(bs, pos, getter);
+        }
+    }
+
+    private void resolveShapes() {
+        if (isShapeResolved) return;
+        if (state.getFluidState().isEmpty()) {
+            noCollision = state.getCollisionShape(sampleGetter, samplePos).isEmpty();
+            dontOccludeFaces = new boolean[6];
+            if (state.canOcclude()) {
 				/* FIXME: Figure out how or if needed to impl per-face culling?
 				for (Direction dir : Direction.values()) {
 					dontOccludeFaces[McObjectConverter.Convert(dir).ordinal()]
 							= state.getFaceOcclusionShape(sampleGetter, samplePos, dir).isEmpty();
 				}*/
-			} else {
-				Arrays.fill(dontOccludeFaces, true);
-			}
-			
-			VoxelShape voxelShape = state.getShape(sampleGetter, samplePos);
-            if (voxelShape.isEmpty()) {
-            	noFullFace = true;
            } else {
-	            AABB bbox = voxelShape.bounds();
-	            double xWidth = (bbox.maxX - bbox.minX);
-	            double yWidth = (bbox.maxY - bbox.minY);
-	            double zWidth = (bbox.maxZ - bbox.minZ);
-	            noFullFace = xWidth < 1 && zWidth < 1 && yWidth < 1;
+                Arrays.fill(dontOccludeFaces, true);
            }
-		} else { // Liquid Block
-			dontOccludeFaces = new boolean[6];
-			Arrays.fill(dontOccludeFaces, true);
-		}
-	}
-	
-	private void resolveColors() {
-		if (isColorResolved) return;
-		if (state.getFluidState().isEmpty()) {
-			List<BakedQuad> quads = null;
-			for (Direction direction : DIRECTION_ORDER)
-	        {
-	        	quads = Minecraft.getInstance().getModelManager().getBlockModelShaper().
-	        			getBlockModel(state).getQuads(state, direction, random);
-	            if (!quads.isEmpty() &&
-	            	!(state.getBlock() instanceof RotatedPillarBlock && direction == Direction.UP))
-	                break;
-	        };
-			if (quads == null || quads.isEmpty()) {
-				quads = Minecraft.getInstance().getModelManager().getBlockModelShaper().
-						getBlockModel(state).getQuads(state, null, random);
-			}
-	        if (quads != null && !quads.isEmpty()) {
-	        	needPostTinting = quads.get(0).isTinted();
-	        	needShade = quads.get(0).isShade();
-	        	tintIndex = quads.get(0).getTintIndex();
-	        	baseColor = calculateColorFromTexture(
-						#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()];
-	}
+            VoxelShape voxelShape = state.getShape(sampleGetter, samplePos);
+            if (voxelShape.isEmpty()) {
+                noFullFace = true;
+            } else {
+                AABB bbox = voxelShape.bounds();
+                double xWidth = (bbox.maxX - bbox.minX);
+                double yWidth = (bbox.maxY - bbox.minY);
+                double zWidth = (bbox.maxZ - bbox.minZ);
+                noFullFace = xWidth < 1 && zWidth < 1 && yWidth < 1;
+            }
+        } else { // Liquid Block
+            dontOccludeFaces = new boolean[6];
+        }
+        isShapeResolved = true;
+    }

-	@Override
-	public boolean hasNoCollision()
-	{
-		//resolveShapes();
-		return noCollision;
-	}
+    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);
+            }

-	@Override
-	public boolean noFaceIsFullFace()
-	{
-		//resolveShapes();
-		return noFullFace;
-	}
+            if (quads != null && !quads.isEmpty()) {
+                needPostTinting = quads.get(0).isTinted();
+                needShade = quads.get(0).isShade();
+                tintIndex = quads.get(0).getTintIndex();
+                baseColor = calculateColorFromTexture(quads.get(0).getSprite(),
+                        ColorMode.getColorMode(state.getBlock()));
+            } else { // Backup method.
+                needPostTinting = false;
+                needShade = false;
+                tintIndex = 0;
+                baseColor = calculateColorFromTexture(Minecraft.getInstance().getModelManager().getBlockModelShaper().getParticleIcon(state),
+                        ColorMode.getColorMode(state.getBlock()));
+            }
+        } else { // Liquid Block

-	@Override
-	public String serialize()
-	{
-		// FIXME: Impl this for the blockState Storage stuff
-		return null;
-	}
+            needPostTinting = true;
+            needShade = false;
+            tintIndex = 0;
+            baseColor = calculateColorFromTexture(Minecraft.getInstance().getModelManager().getBlockModelShaper().getParticleIcon(state),
+                    ColorMode.getColorMode(state.getBlock()));

-	@Override
-	protected boolean isSame(IBlockDetailWrapper iBlockDetail)
-	{
-		return ((BlockDetailWrapper)iBlockDetail).state.getBlock().equals(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,11 @@ 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
    }
 }
@@ -1,25 +1,5 @@
-/*
- *    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;
@@ -47,27 +27,25 @@ import java.util.stream.Stream;

 public class TintGetterOverrideFast implements BlockAndTintGetter {
    LevelReader parent;
+    private final Object2ObjectArrayMap<ColorResolver, ConcurrentHashMap<Biome, Integer>> tintCaches;

    public TintGetterOverrideFast(LevelReader parent) {
        this.parent = parent;
+        this.tintCaches = Util.make(new Object2ObjectArrayMap(3), object2ObjectArrayMap -> {
+            object2ObjectArrayMap.put(BiomeColors.GRASS_COLOR_RESOLVER, new ConcurrentHashMap<Biome, Integer>());
+            object2ObjectArrayMap.put(BiomeColors.FOLIAGE_COLOR_RESOLVER, new ConcurrentHashMap<Biome, Integer>());
+            object2ObjectArrayMap.put(BiomeColors.WATER_COLOR_RESOLVER, new ConcurrentHashMap<Biome, Integer>());
+        });
    }

    private Biome _getBiome(BlockPos pos) {
-		#if POST_MC_1_18_2
-        return parent.getBiome(pos).value();
-		#else
-		return parent.getBiome(pos);
-		#endif
+        return parent.getBiome(pos);
    }

    @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());
-        }
+        Biome b = _getBiome(blockPos);
+        return tintCaches.get(colorResolver).computeIfAbsent(b, (key) -> colorResolver.getColor(b, blockPos.getX(), blockPos.getZ()));
    }

    @Override
@@ -101,6 +79,10 @@ public class TintGetterOverrideFast implements BlockAndTintGetter {
        return parent.getBlockEntity(blockPos);
    }

+    @Override
+    public <T extends BlockEntity> Optional<T> getBlockEntity(BlockPos blockPos, BlockEntityType<T> blockEntityType) {
+        return parent.getBlockEntity(blockPos, blockEntityType);
+    }

    @Override
    public BlockState getBlockState(BlockPos blockPos) {
@@ -127,6 +109,11 @@ public class TintGetterOverrideFast implements BlockAndTintGetter {
        return parent.getBlockStates(aABB);
    }

+    @Override
+    public BlockHitResult isBlockInLine(ClipBlockStateContext clipBlockStateContext) {
+        return parent.isBlockInLine(clipBlockStateContext);
+    }
+
    @Override
    public BlockHitResult clip(ClipContext clipContext) {
        return parent.clip(clipContext);
@@ -148,22 +135,6 @@ public class TintGetterOverrideFast implements BlockAndTintGetter {
        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();
@@ -174,6 +145,11 @@ public class TintGetterOverrideFast implements BlockAndTintGetter {
        return parent.getMinBuildHeight();
    }

+    @Override
+    public int getMaxBuildHeight() {
+        return parent.getMaxBuildHeight();
+    }
+
    @Override
    public int getSectionsCount() {
        return parent.getSectionsCount();
@@ -213,5 +189,4 @@ public class TintGetterOverrideFast implements BlockAndTintGetter {
    public int getSectionYFromSectionIndex(int i) {
        return parent.getSectionYFromSectionIndex(i);
    }
-    #endif
 }
@@ -1,25 +1,5 @@
-/*
- *    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;
@@ -46,19 +26,21 @@ import java.util.stream.Stream;

 public class TintGetterOverrideSmooth implements BlockAndTintGetter {
    LevelReader parent;
+    private final Object2ObjectArrayMap<ColorResolver, BlockTintCache> tintCaches;
    public int smoothingRange;

    public TintGetterOverrideSmooth(LevelReader parent, int smoothingRange) {
        this.parent = parent;
        this.smoothingRange = smoothingRange;
+        this.tintCaches = Util.make(new Object2ObjectArrayMap<>(3), object2ObjectArrayMap -> {
+            object2ObjectArrayMap.put(BiomeColors.GRASS_COLOR_RESOLVER, new BlockTintCache((pos) -> calculateBlockTint(pos, BiomeColors.GRASS_COLOR_RESOLVER)));
+            object2ObjectArrayMap.put(BiomeColors.FOLIAGE_COLOR_RESOLVER, new BlockTintCache((pos) -> calculateBlockTint(pos, BiomeColors.FOLIAGE_COLOR_RESOLVER)));
+            object2ObjectArrayMap.put(BiomeColors.WATER_COLOR_RESOLVER, new BlockTintCache((pos) -> calculateBlockTint(pos, BiomeColors.WATER_COLOR_RESOLVER)));
+        });
    }

    private Biome _getBiome(BlockPos pos) {
-		#if POST_MC_1_18_2
-        return parent.getBiome(pos).value();
-		#else
        return parent.getBiome(pos);
-		#endif
    }

    public int calculateBlockTint(BlockPos blockPos, ColorResolver colorResolver)
@@ -75,14 +57,7 @@ public class TintGetterOverrideSmooth implements BlockAndTintGetter {
        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());
-            }
-
+            int n = colorResolver.getColor(_getBiome(mutableBlockPos), mutableBlockPos.getX(), mutableBlockPos.getZ());
            k += (n & 0xFF0000) >> 16;
            l += (n & 0xFF00) >> 8;
            m += n & 0xFF;
@@ -92,7 +67,8 @@ public class TintGetterOverrideSmooth implements BlockAndTintGetter {

    @Override
    public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver) {
-        return calculateBlockTint(blockPos, colorResolver);
+        BlockTintCache blockTintCache = this.tintCaches.get(colorResolver);
+        return blockTintCache.getColor(blockPos, null); //FIXME
    }

    @Override
@@ -126,6 +102,11 @@ public class TintGetterOverrideSmooth implements BlockAndTintGetter {
        return parent.getBlockEntity(blockPos);
    }

+    @Override
+    public <T extends BlockEntity> Optional<T> getBlockEntity(BlockPos blockPos, BlockEntityType<T> blockEntityType) {
+        return parent.getBlockEntity(blockPos, blockEntityType);
+    }
+
    @Override
    public BlockState getBlockState(BlockPos blockPos) {
        return parent.getBlockState(blockPos);
@@ -151,6 +132,11 @@ public class TintGetterOverrideSmooth implements BlockAndTintGetter {
        return parent.getBlockStates(aABB);
    }

+    @Override
+    public BlockHitResult isBlockInLine(ClipBlockStateContext clipBlockStateContext) {
+        return parent.isBlockInLine(clipBlockStateContext);
+    }
+
    @Override
    public BlockHitResult clip(ClipContext clipContext) {
        return parent.clip(clipContext);
@@ -172,22 +158,6 @@ public class TintGetterOverrideSmooth implements BlockAndTintGetter {
        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();
@@ -198,6 +168,11 @@ public class TintGetterOverrideSmooth implements BlockAndTintGetter {
        return parent.getMinBuildHeight();
    }

+    @Override
+    public int getMaxBuildHeight() {
+        return parent.getMaxBuildHeight();
+    }
+
    @Override
    public int getSectionsCount() {
        return parent.getSectionsCount();
@@ -237,5 +212,4 @@ public class TintGetterOverrideSmooth implements BlockAndTintGetter {
    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()
    {
@@ -64,8 +45,9 @@ 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);
    }


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

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

    @Override
    public boolean equals(Object o)
    {
-		// If the object is compared with itself then return true 
+        // If the object is compared with itself then return true
        if (o == this) {
            return true;
        }
@@ -148,12 +130,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,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 com.seibel.lod.common.wrappers.block.BlockDetailWrapper;
@@ -33,9 +14,7 @@ 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.LevelReader;
 import net.minecraft.world.level.LightLayer;
 import net.minecraft.world.level.block.LiquidBlockContainer;
@@ -54,71 +33,52 @@ import net.minecraft.world.level.levelgen.Heightmap;
 */
 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 final ChunkAccess chunk;
+    private final LevelReader lightSource;
+
+
+    public ChunkWrapper(ChunkAccess chunk, LevelReader lightSource)
+    {
+        this.chunk = chunk;
+        this.lightSource = lightSource;
+    }
+
+    @Override
+    public int getHeight(){
+        return chunk.getHeight();
+    }
+
+    @Override
+    public int getMinBuildHeight()
+    {
+        return chunk.getMinBuildHeight();
+    }
+    @Override
+    public int getMaxBuildHeight()
+    {
+        return chunk.getMaxBuildHeight();
+    }
+
+    @Override
+    public int 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(
+                QuartPos.fromBlock(x), QuartPos.fromBlock(y), QuartPos.fromBlock(z)));
+    }
+
+    @Override
+    public IBlockDetailWrapper getBlockDetail(int x, int y, int z) {
+        BlockPos pos = new BlockPos(x,y,z);
+        BlockState blockState = chunk.getBlockState(pos);
+        IBlockDetailWrapper blockDetail = BlockDetailMap.getOrMakeBlockDetailCache(blockState, pos, lightSource);
+        return blockDetail == BlockDetailWrapper.NULL_BLOCK_DETAIL ? null : blockDetail;
+    }

    @Override
    public IBlockDetailWrapper getBlockDetailAtFace(int x, int y, int z, LodDirection dir) {
@@ -132,120 +92,113 @@ public class ChunkWrapper implements IChunkWrapper
            blockState = lightSource.getBlockState(pos);
        }
        if (blockState == null || blockState.isAir()) return null;
-		IBlockDetailWrapper blockDetail = BlockDetailMap.getOrMakeBlockDetailCache(blockState, pos, lightSource);
+        IBlockDetailWrapper blockDetail = BlockDetailMap.getOrMakeBlockDetailCache(blockState, pos, lightSource);
        return blockDetail == BlockDetailWrapper.NULL_BLOCK_DETAIL ? null : blockDetail;
    }
-	
-	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 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();
-	}
-	
+    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.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 long getLongChunkPos() {
+        return chunk.getPos().toLong();
+    }
+
+    @Override
+    public boolean isLightCorrect(){
+        return true;
+        // TODO
+//        if (chunk instanceof LevelChunk) {
+//            return ((LevelChunk) chunk).isClientLightReady();
+//        }
+//        return 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 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;
+    }
+
 }
@@ -47,14 +47,10 @@ import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.CommonComponents;
 import net.minecraft.network.chat.Component;
-#if PRE_MC_1_19
 import net.minecraft.network.chat.TextComponent;
 import net.minecraft.network.chat.TranslatableComponent;
-#endif
 import net.minecraft.client.resources.language.I18n;	// translation
-#if POST_MC_1_17_1
-import net.minecraft.client.gui.narration.NarratableEntry;
-#endif
+import net.minecraft.client.gui.narration.NarratableEntry; // Remove in 1.16

 /**
 * Based upon TinyConfig
@@ -64,15 +60,29 @@ import net.minecraft.client.gui.narration.NarratableEntry;
 *
 * Credits to Motschen
 *
- * REMOVED IN a1.7
- *
- * @author coolGi
+ * @author coolGi2007
 * @version 1-14-2022
 */
-@Deprecated
@SuppressWarnings("unchecked")
 public abstract class ConfigGui
 {
+	/*
+	        TODO list
+
+		Fix floats not working
+        Make a wiki
+        Make it so you can enable and disable buttons from showing
+        Make min and max not final
+        Move the ConfigScreenConfigs class to the config class that extends this
+     */
+	/*
+		List of hacky things that are done that should be done properly
+
+		The buttons that don't show are still loaded but just not rendered
+		The screen with is set to double so the scroll bar doesn't show
+	 */
+
+
 	private static final Pattern INTEGER_ONLY_REGEX = Pattern.compile("(-?[0-9]*)");
 	private static final Pattern DECIMAL_ONLY_REGEX = Pattern.compile("-?([\\d]+\\.?[\\d]*|[\\d]*\\.?[\\d]+|\\.)");

@@ -111,11 +121,7 @@ public abstract class ConfigGui
 		Object value;
 		String tempValue;
 		boolean inLimits = true;
-		#if PRE_MC_1_19
 		TranslatableComponent name;
-		#else
-		Component name;
-		#endif
 		int index;
 		/** Hides the button */
 		boolean hideOption = false;
@@ -212,11 +218,8 @@ public abstract class ConfigGui
 		if (entry != null)
 		{
 			if (!entry.name().equals(""))
-				#if PRE_MC_1_19
 				info.name = new TranslatableComponent(entry.name());
-				#else
-				info.name = Component.translatable(entry.name());
-				#endif
+

 			if (fieldClass == int.class)
 			{
@@ -237,11 +240,7 @@ public abstract class ConfigGui
 			else if (fieldClass == boolean.class)
 			{
 				// For boolean
-				#if PRE_MC_1_19
 				Function<Object, Component> func = value -> new TextComponent((Boolean) value ? "True" : "False").withStyle((Boolean) value ? ChatFormatting.GREEN : ChatFormatting.RED);
-				#else
-				Function<Object, Component> func = value -> Component.translatable((Boolean) value ? "True" : "False").withStyle((Boolean) value ? ChatFormatting.GREEN : ChatFormatting.RED);
-				#endif
 				info.widget = new AbstractMap.SimpleEntry<Button.OnPress, Function<Object, Component>>(button -> {
 					info.value = !(Boolean) info.value;
 					button.setMessage(func.apply(info.value));
@@ -251,11 +250,7 @@ public abstract class ConfigGui
 			{
 				// For enum
 				List<?> values = Arrays.asList(field.getType().getEnumConstants());
-				#if PRE_MC_1_19
 				Function<Object, Component> func = value -> new TranslatableComponent(MOD_NAME + ".config." + "enum." + fieldClass.getSimpleName() + "." + info.value.toString());
-				#else
-				Function<Object, Component> func = value -> Component.translatable(MOD_NAME + ".config." + "enum." + fieldClass.getSimpleName() + "." + info.value.toString());
-				#endif
 				info.widget = new AbstractMap.SimpleEntry<Button.OnPress, Function<Object, Component>>(button -> {
 					int index = values.indexOf(info.value) + 1;
 					info.value = values.get(index >= values.size() ? 0 : index);
@@ -266,12 +261,7 @@ public abstract class ConfigGui
 		else if (screenEntry != null)
 		{
 			if (!screenEntry.name().equals(""))
-				#if PRE_MC_1_19
 				info.name = new TranslatableComponent(screenEntry.name());
-				#else
-				info.name = Component.translatable(screenEntry.name());
-				#endif
-

 			info.screenButton = true;
 			info.gotoScreen = (!info.category.isEmpty() ? info.category + "." : "") + field.getName();
@@ -299,11 +289,7 @@ public abstract class ConfigGui
 			{
 				value = func.apply(stringValue);
 				inLimits = value.doubleValue() >= minValue && value.doubleValue() <= maxValue;
-				#if PRE_MC_1_19
 				info.error = inLimits ? null : new AbstractMap.SimpleEntry<>(editBox, new TextComponent(value.doubleValue() < minValue ?
-				#else
-				info.error = inLimits ? null : new AbstractMap.SimpleEntry<>(editBox, Component.translatable(value.doubleValue() < minValue ?
-				#endif
 						"§cMinimum " + "length" + (cast ? " is " + (int) minValue : " is " + minValue) :
 						"§cMaximum " + "length" + (cast ? " is " + (int) maxValue : " is " + maxValue)));
 			}
@@ -343,8 +329,6 @@ public abstract class ConfigGui

 		// First try to create a config file
 		try {
-			if (!configFilePath.getParent().toFile().exists())
-				Files.createDirectory(configFilePath.getParent());
 			if (!Files.exists(configFilePath))
 				Files.createFile(configFilePath);
 		}
@@ -357,7 +341,8 @@ public abstract class ConfigGui


 		// Just put this here for the future
-		config.set("_version", 1);
+		config.setComment("_Version", " DONT TOUCH THIS, IF YOU DO THEN CONFIG FILE WOULD BREAK");
+		config.set("_Versions", ModInfo.VERSION);


 		for (EntryInfo info : entries) {
@@ -392,8 +377,9 @@ public abstract class ConfigGui


 		// Just put this here for the future
-		config.set("_version", 1);
-
+		config.setComment("_Version", " DONT TOUCH THIS, IF YOU DO THEN CONFIG FILE WOULD BREAK");
+		config.set("_Versions", ModInfo.VERSION);
+		

 		// Puts everything into its variable
 		for (EntryInfo info : entries) {
@@ -463,13 +449,8 @@ public abstract class ConfigGui
 		{
 			String itemPath = (info.category.isEmpty() ? "" : info.category + ".") + info.field.getName();
 			if (config.contains(itemPath)) {
-				if (info.field.getType().isEnum()) {
-					try {
-						info.value = config.getEnum(itemPath, info.varClass);
-					} catch (IllegalArgumentException ignored) {
-						return;
-					}
-				}
+				if (info.field.getType().isEnum())
+					info.value = config.getEnum(itemPath, info.varClass);
 				else
 					info.value = config.get(itemPath);
 			} else
@@ -515,11 +496,7 @@ public abstract class ConfigGui
 	{
 		protected ConfigScreen(Screen parent, String category)
 		{
-			#if PRE_MC_1_19
 			super(new TranslatableComponent(
-			#else
-			super(Component.translatable(
-			#endif
 					I18n.exists(MOD_NAME + ".config" + (category.isEmpty()? "." + category : "") + ".title") ?
 							MOD_NAME + ".config.title" :
 							MOD_NAME + ".config" + (category.isEmpty() ? "" : "." + category) + ".title")
@@ -551,17 +528,6 @@ public abstract class ConfigGui
 			Objects.requireNonNull(minecraft).setScreen(this.parent);
 		}

-		// addRenderableWidget in 1.17 and over
-		// addButton in 1.16 and below
-		private Button addBtn(Button button) {
-			#if PRE_MC_1_17_1
-			this.addButton(button);
-			#else
-			this.addRenderableWidget(button);
-			#endif
-			return button;
-		}
-
 		@Override
 		protected void init()
 		{
@@ -569,11 +535,14 @@ public abstract class ConfigGui
 			if (!reload)
 				loadFromFile();

-			addBtn(new Button(this.width / 2 - 154, this.height - 28, 150, 20, CommonComponents.GUI_CANCEL, button -> {
+			// addRenderableWidget in 1.17 and over
+			// addButton in 1.16 and below
+			this.addRenderableWidget(new Button(this.width / 2 - 154, this.height - 28, 150, 20, CommonComponents.GUI_CANCEL, button -> {
 				loadFromFile();
 				Objects.requireNonNull(minecraft).setScreen(parent);
 			}));
-			Button done = addBtn(new Button(this.width / 2 + 4, this.height - 28, 150, 20, CommonComponents.GUI_DONE, (button) -> {
+
+			Button done = this.addRenderableWidget(new Button(this.width / 2 + 4, this.height - 28, 150, 20, CommonComponents.GUI_DONE, (button) -> {
 				saveToFile();
 				Objects.requireNonNull(minecraft).setScreen(parent);
 			}));
@@ -586,13 +555,8 @@ public abstract class ConfigGui
 			{
 				if (info.category.matches(category) && !info.hideOption)
 				{
-					#if PRE_MC_1_19
 					TranslatableComponent name = (info.name == null ? new TranslatableComponent(translationPrefix + (!info.category.isEmpty() ? info.category + "." : "") + info.field.getName()) : info.name);
 					Button resetButton = new Button(this.width - ConfigScreenConfigs.SpaceFromRightScreen - info.width - ConfigScreenConfigs.ButtonWidthSpacing - ConfigScreenConfigs.ResetButtonWidth, 0, ConfigScreenConfigs.ResetButtonWidth, 20, new TextComponent("Reset").withStyle(ChatFormatting.RED), (button -> {
-					#else
-					Component name = (info.name == null ? Component.translatable(translationPrefix + (!info.category.isEmpty() ? info.category + "." : "") + info.field.getName()) : info.name);
-					Button resetButton = new Button(this.width - ConfigScreenConfigs.SpaceFromRightScreen - info.width - ConfigScreenConfigs.ButtonWidthSpacing - ConfigScreenConfigs.ResetButtonWidth, 0, ConfigScreenConfigs.ResetButtonWidth, 20, Component.translatable("Reset").withStyle(ChatFormatting.RED), (button -> {
-					#endif
 						info.value = info.defaultValue;
 						info.tempValue = info.defaultValue.toString();
 						info.index = 0;
@@ -604,11 +568,7 @@ public abstract class ConfigGui
 					{
 						Map.Entry<Button.OnPress, Function<Object, Component>> widget = (Map.Entry<Button.OnPress, Function<Object, Component>>) info.widget;
 						if (info.field.getType().isEnum())
-							#if PRE_MC_1_19
 							widget.setValue(value -> new TranslatableComponent(translationPrefix + "enum." + info.field.getType().getSimpleName() + "." + info.value.toString()));
-							#else
-							widget.setValue(value -> Component.translatable(translationPrefix + "enum." + info.field.getType().getSimpleName() + "." + info.value.toString()));
-							#endif
 						this.list.addButton(new Button(this.width - info.width - ConfigScreenConfigs.SpaceFromRightScreen, 0, info.width, 20, widget.getValue().apply(info.value), widget.getKey()), resetButton, null, name);
 					}
 					else if (info.field.getType() == List.class)
@@ -624,13 +584,8 @@ public abstract class ConfigGui
 						Predicate<String> processor = ((BiFunction<EditBox, Button, Predicate<String>>) info.widget).apply(widget, done);
 						widget.setFilter(processor);
 						resetButton.setWidth(20);
-                        #if PRE_MC_1_19
-                        resetButton.setMessage(new TextComponent("R").withStyle(ChatFormatting.RED));
-                        Button cycleButton = new Button(this.width - 185, 0, 20, 20, new TextComponent(String.valueOf(info.index)).withStyle(ChatFormatting.GOLD), (button -> {
-                        #else
-                        resetButton.setMessage(Component.translatable("R").withStyle(ChatFormatting.RED));
-                        Button cycleButton = new Button(this.width - 185, 0, 20, 20, Component.translatable(String.valueOf(info.index)).withStyle(ChatFormatting.GOLD), (button -> {
-                        #endif
+						resetButton.setMessage(new TextComponent("R").withStyle(ChatFormatting.RED));
+						Button cycleButton = new Button(this.width - 185, 0, 20, 20, new TextComponent(String.valueOf(info.index)).withStyle(ChatFormatting.GOLD), (button -> {
 							((List<String>) info.value).remove("");
 							this.reload = true;
 							info.index = info.index + 1;
@@ -679,22 +634,14 @@ public abstract class ConfigGui
 					if (list.getHoveredButton(mouseX,mouseY).isPresent()) {
 						AbstractWidget buttonWidget = list.getHoveredButton(mouseX,mouseY).get();
 						Component text = ButtonEntry.buttonsWithText.get(buttonWidget);
-						#if PRE_MC_1_19
 						TranslatableComponent name = new TranslatableComponent(this.translationPrefix + (info.category.isEmpty() ? "" : info.category + ".") + info.field.getName());
-						#else
-						Component name = Component.translatable(this.translationPrefix + (info.category.isEmpty() ? "" : info.category + ".") + info.field.getName());
-						#endif
 						String key = translationPrefix + (info.category.isEmpty() ? "" : info.category + ".") + info.field.getName() + ".@tooltip";

 						if (info.error != null && text.equals(name)) renderTooltip(matrices, (Component) info.error.getValue(), mouseX, mouseY);
 						else if (I18n.exists(key) && (text != null && text.equals(name))) {
 							List<Component> list = new ArrayList<>();
 							for (String str : I18n.get(key).split("\n"))
-								#if PRE_MC_1_19
 								list.add(new TextComponent(str));
-								#else
-								list.add(Component.translatable(str));
-								#endif
 							renderComponentTooltip(matrices, list, mouseX, mouseY);
 						}
 					}
@@ -806,12 +753,10 @@ public abstract class ConfigGui

 		// Only for 1.17 and over
 		// Remove in 1.16 and below
-		#if POST_MC_1_17_1
-        @Override
-        public List<? extends NarratableEntry> narratables()
-        {
-            return children;
-        }
-		#endif
+		@Override
+		public List<? extends NarratableEntry> narratables()
+		{
+			return children;
+		}
 	}
 }
@@ -15,47 +15,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 +67,8 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 			ConfigGui.editSingleOption.getEntry("optionsButton").value = newOptionsButton;
 			ConfigGui.editSingleOption.saveOption("optionsButton");
 		}
-		
-		
+
+
 		//================//
 		// Client Configs //
 		//================//
@@ -79,8 +79,8 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 			multiplayer = new Multiplayer();
 			advanced = new Advanced();
 		}
-		
-		
+
+
 		//==================//
 		// Graphics Configs //
 		//==================//
@@ -89,36 +89,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 +132,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 +145,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 +158,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 +171,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 +184,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;
@@ -206,8 +206,8 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 					ConfigGui.editSingleOption.saveOption("client.graphics.quality.lodBiomeBlending");
 				}
 			}
-			
-			
+
+
 			public static class FogQuality implements IFogQuality
 			{
 				public final IAdvancedFog advancedFog;
@@ -228,36 +228,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()
 				{
@@ -342,7 +342,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 					public IHeightFog heightFog() {
 						return heightFog;
 					}
-					
+
 					public static class HeightFog implements IHeightFog {

 						@Override
@@ -431,8 +431,8 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				}

 			}
-			
-			
+
+
 			public static class AdvancedGraphics implements IAdvancedGraphics
 			{
 				@Override
@@ -446,8 +446,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()
 				{
@@ -482,7 +482,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,7 +494,7 @@ 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()
 				{
@@ -506,7 +506,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 					ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.brightnessMultiplier").value = newBrightnessMultiplier;
 					ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.brightnessMultiplier");
 				}
-				
+
 				@Override
 				public double getSaturationMultiplier()
 				{
@@ -542,25 +542,12 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 					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 +564,8 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				ConfigGui.editSingleOption.getEntry("client.worldGenerator.generationPriority").value = newGenerationPriority;
 				ConfigGui.editSingleOption.saveOption("client.worldGenerator.generationPriority");
 			}
-			
-			
+
+
 			@Override
 			public DistanceGenerationMode getDistanceGenerationMode()
 			{
@@ -603,8 +590,8 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				ConfigGui.editSingleOption.getEntry("client.worldGenerator.allowUnstableFeatureGeneration").value = newAllowUnstableFeatureGeneration;
 				ConfigGui.editSingleOption.saveOption("client.worldGenerator.allowUnstableFeatureGeneration");
 			}*/
-			
-			
+
+
 			@Override
 			public BlocksToAvoid getBlocksToAvoid()
 			{
@@ -639,9 +626,9 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				ConfigGui.editSingleOption.saveOption("client.worldGenerator.lightGenerationMode");
 			}
 		}
-		
-		
-		
+
+
+
 		//=====================//
 		// Multiplayer Configs //
 		//=====================//
@@ -658,13 +645,13 @@ 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)
 			{
@@ -672,9 +659,9 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				ConfigGui.editSingleOption.saveOption("client.multiplayer.multiDimensionMinimumSimilarityPercent");
 			}
 		}
-		
-		
-		
+
+
+
 		//============================//
 		// AdvancedModOptions Configs //
 		//============================//
@@ -683,22 +670,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 +699,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,10 +727,10 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 					ConfigGui.editSingleOption.saveOption("client.advanced.threading.numberOfBufferBuilderThreads");
 				}
 			}
-			
-			
-			
-			
+
+
+
+
 			//===============//
 			// Debug Options //
 			//===============//
@@ -771,7 +758,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 					ConfigGui.editSingleOption.getEntry("client.advanced.debugging.rendererType").value = newRenderType;
 					ConfigGui.editSingleOption.saveOption("client.advanced.debugging.rendererType");
 				}
-				
+
 				@Override
 				public DebugMode getDebugMode()
 				{
@@ -783,8 +770,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()
 				{
@@ -907,11 +894,11 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 					}
 				}
 			}
-			
-			
+
+
 			public static class Buffers implements IBuffers
 			{
-				
+
 				@Override
 				public GpuUploadMethod getGpuUploadMethod()
 				{
@@ -923,8 +910,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 +922,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()
 				{
@@ -1,27 +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.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;
@@ -31,12 +11,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, int hoveredVOffset, ResourceLocation texture, int textureWidth, int textureHeight, OnPress pressAction) {
        super(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, pressAction);
    }
@@ -51,15 +28,9 @@ public class TexturedButtonWidget extends ImageButton {

    @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
-
        int i = this.getYImage(this.isHovered);
        RenderSystem.enableBlend();
        RenderSystem.defaultBlendFunc();
@@ -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;
@@ -55,22 +56,19 @@ import net.minecraft.client.resources.model.ModelManager;
 import net.minecraft.client.server.IntegratedServer;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
-#if PRE_MC_1_19
 import net.minecraft.network.chat.TextComponent;
-#endif
-import net.minecraft.network.chat.Component;
 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
 {
@@ -167,6 +165,41 @@ 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);
+    }
+
+
+
+
    //=============//
    // Simple gets //
    //=============//
@@ -192,11 +225,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);
    }

@@ -330,14 +359,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();
@@ -368,11 +389,7 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper
    @Override
    public void sendChatMessage(String string)
    {
-        #if PRE_MC_1_19
        getPlayer().sendMessage(new TextComponent(string), getPlayer().getUUID());
-        #else
-        getPlayer().sendSystemMessage(Component.translatable(string));
-        #endif
    }

    /**
@@ -1,26 +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.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;
@@ -35,7 +15,7 @@ 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 it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import net.minecraft.client.renderer.LightTexture;

 import com.mojang.math.Vector3f;
@@ -61,15 +41,9 @@ import net.minecraft.core.BlockPos;
 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;


 /**
@@ -81,121 +55,96 @@ import org.lwjgl.opengl.GL15;
 */
 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 IWrapperFactory 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()
-	{
-		#if PRE_MC_1_19
-		return MC.options.gamma;
-		#else
-		return MC.options.gamma().get();
-		#endif
-	}
-	
-	@Override
-	public Color getFogColor(float partialTicks) {
+    @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)
+    {
+        return McObjectConverter.Convert(GAME_RENDERER.getProjectionMatrix(GAME_RENDERER.getFov(GAME_RENDERER.getMainCamera(), partialTicks, true)));
+    }
+
+    @Override
+    public double getGamma()
+    {
+        return MC.options.gamma;
+    }
+
+    @Override
+    public Color getFogColor(float partialTicks) {
+        FogRenderer.setupColor(GAME_RENDERER.getMainCamera(), partialTicks, MC.level, 1, GAME_RENDERER.getDarkenWorldAmount(partialTicks));
+        float[] colorValues = RenderSystem.getShaderFogColor();
+        return new Color(colorValues[0], colorValues[1], colorValues[2], colorValues[3]);
+    }
+    // getSpecialFogColor() is the same as getFogColor()
+
+    @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();
+    }

-		#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();
@@ -216,87 +165,161 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
        return getRenderTarget().viewHeight;
    }

-	/**
-	 * This method returns the ChunkPos of all chunks that Minecraft
-	 * is going to render this frame. <br><br>
-	 * <p>
-	 */
-	
+    /**
+     * 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) {
-			try {
-				LevelRenderer levelRenderer = MC.levelRenderer;
-				Collection<LevelRenderer.RenderChunkInfo> chunks =
-					#if PRE_MC_1_18_1 levelRenderer.renderChunks;
-					#else levelRenderer.renderChunkStorage.get().renderChunks; #endif
+    @Override
+    public HashSet<AbstractChunkPosWrapper> getVanillaRenderedChunks()
+    {
+        ISodiumAccessor sodium = ModAccessorHandler.get(ISodiumAccessor.class);
+        if (sodium != null)
+        {
+            return sodium.getNormalRenderedChunks();
+        }
+        IOptifineAccessor optifine = ModAccessorHandler.get(IOptifineAccessor.class);
+        if (optifine != null)
+        {
+            HashSet<AbstractChunkPosWrapper> pos = optifine.getNormalRenderedChunks();
+            if (pos == null)
+                pos = getMaximumRenderedChunks();
+            return pos;
+        }
+        if (!usingBackupGetVanillaRenderedChunks) {
+            try {
+                LevelRenderer levelRenderer = MC.levelRenderer;
+                ObjectArrayList<LevelRenderer.RenderChunkInfo> chunks = levelRenderer.renderChunks;
+                return (chunks.stream().map((chunk) -> {
+                    AABB chunkBoundingBox = chunk.chunk.bb;
+                    return FACTORY.createChunkPos(Math.floorDiv((int) chunkBoundingBox.minX, 16),
+                            Math.floorDiv((int) chunkBoundingBox.minZ, 16));
+                }).collect(Collectors.toCollection(HashSet::new)));
+            } catch (LinkageError e) {
+                try {
+                    MinecraftClientWrapper.INSTANCE.sendChatMessage(
+                            "\u00A7e\u00A7l\u00A7uWARNING: Distant Horizons: getVanillaRenderedChunks method failed."
+                                    + " Using Backup Method.");
+                    MinecraftClientWrapper.INSTANCE.sendChatMessage(
+                            "\u00A7eOverdraw prevention will be worse than normal.");
+                } catch (Exception e2) {}
+                ApiShared.LOGGER.error("getVanillaRenderedChunks Error: ", e);
+                usingBackupGetVanillaRenderedChunks = true;
+            }
+        }
+        return getMaximumRenderedChunks();
+    }

-				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)));
-			} catch (LinkageError e) {
-				try {
-					MinecraftClientWrapper.INSTANCE.sendChatMessage(
-							"\u00A7e\u00A7l\u00A7uWARNING: Distant Horizons: getVanillaRenderedChunks method failed."
-									+ " Using Backup Method.");
-					MinecraftClientWrapper.INSTANCE.sendChatMessage(
-							"\u00A7eOverdraw prevention will be worse than normal.");
-				} catch (Exception e2) {
-				}
-				ApiShared.LOGGER.error("getVanillaRenderedChunks Error: ", e);
-				usingBackupGetVanillaRenderedChunks = true;
-			}
-		}
-		return getMaximumRenderedChunks();
-	}
+    @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);

-	@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);
+        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.
+                int col = 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() {
+        Entity entity = GAME_RENDERER.getMainCamera().getEntity();
+        boolean isBlind = (entity instanceof LivingEntity) && ((LivingEntity)entity).hasEffect(MobEffects.BLINDNESS);
+        return GAME_RENDERER.getMainCamera().getFluidInCamera() != FogType.NONE || isBlind;
+    }
+
+    @Override
+    public boolean tryDisableVanillaFog() {
+        return true; // Handled via MixinFogRenderer in both forge and fabric
    }
 }
@@ -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
@@ -20,26 +20,14 @@
 package com.seibel.lod.common.wrappers.world;

 import java.awt.Color;
-import java.util.List;
 import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
-import java.util.function.Function;
-import java.util.function.Supplier;

-import com.google.common.collect.ImmutableBiMap;
-import com.google.common.collect.ImmutableList;
 import com.seibel.lod.core.util.LodUtil;
 import com.seibel.lod.core.wrapperInterfaces.world.IBiomeWrapper;

-import net.minecraft.data.BuiltinRegistries;
-#if POST_MC_1_19
-import net.minecraft.data.worldgen.biome.EndBiomes;
-import net.minecraft.data.worldgen.biome.NetherBiomes;
-#endif
-import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.biome.Biomes;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.material.MaterialColor;

@@ -48,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)
    {
@@ -70,12 +58,13 @@ public class BiomeWrapper implements IBiomeWrapper
        return biomeWrapper;
    }

+
    /** Returns a color int for the given biome. */
-    #if PRE_MC_1_19
    @Override
    public int getColorForBiome(int x, int z)
    {
        int colorInt;
+
        switch (biome.biomeCategory)
        {

@@ -132,145 +121,12 @@ public class BiomeWrapper implements IBiomeWrapper

        return colorInt;
    }
-    #else
-
-
-    private static int _colorEnd(Biome b) {
-        return Blocks.END_STONE.defaultMaterialColor().col;
-    }
-    private static int _colorNether(Biome b) {
-        return Blocks.NETHERRACK.defaultMaterialColor().col;
-    }
-    private static int _colorSand(Biome b) {
-        return Blocks.SAND.defaultMaterialColor().col;
-    }
-    private static int _colorStone(Biome b) {
-        return Blocks.STONE.defaultMaterialColor().col;
-    }
-    private static int _colorGravel(Biome b) {
-        return Blocks.GRAVEL.defaultMaterialColor().col;
-    }
-    private static int _colorDripStone(Biome b) {
-        return Blocks.DRIPSTONE_BLOCK.defaultMaterialColor().col;
-    }
-    private static int _colorMoss(Biome b) {
-        return Blocks.MOSS_BLOCK.defaultMaterialColor().col;
-    }
-    private static int _colorSculk(Biome b) {
-        return Blocks.SCULK.defaultMaterialColor().col;
-    }
-    private static int _colorMushoom(Biome b) {
-        return Blocks.MYCELIUM.defaultMaterialColor().col;
-    }
-    private static int _colorBamboo(Biome b) {
-        return Blocks.BAMBOO.defaultMaterialColor().col;
-    }
-    private static int _colorSnow(Biome b) {
-        return Blocks.SNOW.defaultMaterialColor().col;
-    }
-    private static int _colorIce(Biome b) {
-        return Blocks.ICE.defaultMaterialColor().col;
-    }
-    private static int _colorRedSand(Biome b) {
-        return Blocks.RED_SAND.defaultMaterialColor().col;
-    }
-    private static int _colorSoulSand(Biome b) {
-        return Blocks.SOUL_SAND.defaultMaterialColor().col;
-    }
-    private static int _colorBasalt(Biome b) {
-        return Blocks.BASALT.defaultMaterialColor().col;
-    }
-    private static int _colorWater(Biome b) {
-        return b.getWaterColor();
-    }
-    private static int _colorFoliage(Biome b) {
-        return b.getFoliageColor();
-    }
-
-    private static Biome _get(ResourceKey<Biome> r) {
-        return BuiltinRegistries.BIOME.getOrThrow(r);
-    }
-
-    //FIXME: THIS IS HELL!
-    private static final ImmutableBiMap<Biome, Function<Biome, Integer>> BIOME_COLOR_MAP =
-            ImmutableBiMap.<Biome, Function<Biome, Integer>>builder()
-                    .put(_get(Biomes.SNOWY_PLAINS), BiomeWrapper::_colorSnow)
-                    .put(_get(Biomes.ICE_SPIKES), BiomeWrapper::_colorIce)
-                    .put(_get(Biomes.DESERT), BiomeWrapper::_colorSand)
-                    .put(_get(Biomes.SWAMP), BiomeWrapper::_colorWater)
-                    .put(_get(Biomes.MANGROVE_SWAMP), BiomeWrapper::_colorWater)
-                    .put(_get(Biomes.FOREST), BiomeWrapper::_colorFoliage)
-                    .put(_get(Biomes.FLOWER_FOREST), BiomeWrapper::_colorFoliage)
-                    .put(_get(Biomes.BIRCH_FOREST), BiomeWrapper::_colorFoliage)
-                    .put(_get(Biomes.DARK_FOREST), BiomeWrapper::_colorFoliage)
-                    .put(_get(Biomes.OLD_GROWTH_BIRCH_FOREST), BiomeWrapper::_colorFoliage)
-                    .put(_get(Biomes.OLD_GROWTH_PINE_TAIGA), BiomeWrapper::_colorFoliage)
-                    .put(_get(Biomes.OLD_GROWTH_SPRUCE_TAIGA), BiomeWrapper::_colorFoliage)
-                    .put(_get(Biomes.TAIGA), BiomeWrapper::_colorFoliage)
-                    .put(_get(Biomes.SNOWY_TAIGA), BiomeWrapper::_colorSnow)
-                    .put(_get(Biomes.WINDSWEPT_GRAVELLY_HILLS), BiomeWrapper::_colorGravel)
-                    .put(_get(Biomes.WINDSWEPT_FOREST), BiomeWrapper::_colorFoliage)
-                    .put(_get(Biomes.JUNGLE), BiomeWrapper::_colorFoliage)
-                    .put(_get(Biomes.BAMBOO_JUNGLE), BiomeWrapper::_colorBamboo)
-                    .put(_get(Biomes.BADLANDS), BiomeWrapper::_colorRedSand)
-                    .put(_get(Biomes.ERODED_BADLANDS), BiomeWrapper::_colorRedSand)
-                    .put(_get(Biomes.WOODED_BADLANDS), BiomeWrapper::_colorStone)
-                    .put(_get(Biomes.GROVE), BiomeWrapper::_colorSnow)
-                    .put(_get(Biomes.SNOWY_SLOPES), BiomeWrapper::_colorSnow)
-                    .put(_get(Biomes.FROZEN_PEAKS), BiomeWrapper::_colorIce)
-                    .put(_get(Biomes.JAGGED_PEAKS), BiomeWrapper::_colorSnow)
-                    .put(_get(Biomes.STONY_PEAKS), BiomeWrapper::_colorStone)
-                    .put(_get(Biomes.RIVER), BiomeWrapper::_colorWater)
-                    .put(_get(Biomes.FROZEN_RIVER), BiomeWrapper::_colorIce)
-                    .put(_get(Biomes.BEACH), BiomeWrapper::_colorSand)
-                    .put(_get(Biomes.SNOWY_BEACH), BiomeWrapper::_colorSnow)
-                    .put(_get(Biomes.STONY_SHORE), BiomeWrapper::_colorStone)
-                    .put(_get(Biomes.WARM_OCEAN), BiomeWrapper::_colorWater)
-                    .put(_get(Biomes.LUKEWARM_OCEAN), BiomeWrapper::_colorWater)
-                    .put(_get(Biomes.DEEP_LUKEWARM_OCEAN), BiomeWrapper::_colorWater)
-                    .put(_get(Biomes.OCEAN), BiomeWrapper::_colorWater)
-                    .put(_get(Biomes.DEEP_OCEAN), BiomeWrapper::_colorWater)
-                    .put(_get(Biomes.COLD_OCEAN), BiomeWrapper::_colorWater)
-                    .put(_get(Biomes.DEEP_COLD_OCEAN), BiomeWrapper::_colorWater)
-                    .put(_get(Biomes.FROZEN_OCEAN), BiomeWrapper::_colorIce)
-                    .put(_get(Biomes.DEEP_FROZEN_OCEAN), BiomeWrapper::_colorIce)
-                    .put(_get(Biomes.MUSHROOM_FIELDS), BiomeWrapper::_colorMushoom)
-                    .put(_get(Biomes.DRIPSTONE_CAVES), BiomeWrapper::_colorDripStone)
-                    .put(_get(Biomes.LUSH_CAVES), BiomeWrapper::_colorMoss)
-                    .put(_get(Biomes.DEEP_DARK), BiomeWrapper::_colorSculk)
-                    .put(_get(Biomes.NETHER_WASTES), BiomeWrapper::_colorNether)
-                    .put(_get(Biomes.WARPED_FOREST), BiomeWrapper::_colorNether)
-                    .put(_get(Biomes.CRIMSON_FOREST), BiomeWrapper::_colorNether)
-                    .put(_get(Biomes.SOUL_SAND_VALLEY), BiomeWrapper::_colorSoulSand)
-                    .put(_get(Biomes.BASALT_DELTAS), BiomeWrapper::_colorBasalt)
-                    .put(_get(Biomes.THE_END), BiomeWrapper::_colorEnd)
-                    .put(_get(Biomes.END_HIGHLANDS), BiomeWrapper::_colorEnd)
-                    .put(_get(Biomes.END_MIDLANDS), BiomeWrapper::_colorEnd)
-                    .put(_get(Biomes.SMALL_END_ISLANDS), BiomeWrapper::_colorEnd)
-                    .put(_get(Biomes.END_BARRENS), BiomeWrapper::_colorEnd)
-                    .build();

    @Override
-    public int getColorForBiome(int x, int z)
-    {
-        int colorInt;
-        Function<Biome, Integer> colorFunction = BIOME_COLOR_MAP.get(biome);
-        if (colorFunction != null)
-        {
-            colorInt = colorFunction.apply(biome);
-        }
-        else
-        {
-            colorInt = biome.getGrassColor(x, z);
-        }
-        return colorInt;
-    }
-    #endif
-    @Override public String getName()
-    {
+    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
@@ -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,115 @@ 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) {
        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,25 +16,27 @@
 *    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.logging.ConfigBasedLogger;
+import com.seibel.lod.core.logging.ConfigBasedSpamLogger;
 import com.seibel.lod.core.objects.lod.LodDimension;
-import com.seibel.lod.core.util.gridList.ArrayGridList;
 import com.seibel.lod.core.util.LodThreadFactory;
+import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
+import com.seibel.lod.core.util.gridList.ArrayGridList;
 import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
 import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.lod.core.wrapperInterfaces.world.IWorldWrapper;
 import com.seibel.lod.core.wrapperInterfaces.worldGeneration.AbstractBatchGenerationEnvionmentWrapper;

+import java.io.IOException;
 import java.time.Duration;
 import java.util.Iterator;
 import java.util.LinkedList;
@@ -70,7 +71,6 @@ 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;
@@ -101,7 +101,6 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 	public static final ConfigBasedLogger LOAD_LOGGER =
 			new ConfigBasedLogger(LogManager.getLogger("LodWorldGen"),
 					() -> CONFIG.client().advanced().debugging().debugSwitch().getLogWorldGenLoadEvent());
-
 	//TODO: Make actual proper support for StarLight
 	
 	public static class PrefEvent
@@ -242,7 +241,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 	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<>();
@@ -256,8 +255,8 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 	}
 	
 	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"));
@@ -266,14 +265,14 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 		}
 		return f.join();
 	}
-	
+
 	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)
+	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;
@@ -285,7 +284,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 				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;
 	}
 	
@@ -296,7 +295,6 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 				unknownExceptionCount = 0;
 			}
 		}
-		
 		// Update all current out standing jobs
 		Iterator<GenerationEvent> iter = events.iterator();
 		while (iter.hasNext())
@@ -350,28 +348,20 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 		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.");
-			}
+			EVENT_LOGGER.warn("Unknown Chunk Generator detected: [{}], Distant Generation May Fail!", generator.getClass());
+			EVENT_LOGGER.warn("If it does crash, set Distant Generation to OFF or Generation Mode to None.");
+			ApiShared.LOGGER.warn("Unknown Chunk Generator detected: {}", generator.getClass());
 		}
 		params = new GlobalParameters((ServerLevel) ((WorldWrapper) serverlevel).getWorld(), lodBuilder, lodDim);
 	}
-	
+
 	@SuppressWarnings("resource")
 	public static ChunkAccess loadOrMakeChunk(ChunkPos chunkPos, ServerLevel level, LevelLightEngine lightEngine)
 	{
 		CompoundTag chunkData = null;
 		try
 		{
-			#if POST_MC_1_19
-			chunkData = level.getChunkSource().chunkMap.readChunk(chunkPos).get().orElse(null);
-			#else
 			chunkData = level.getChunkSource().chunkMap.readChunk(chunkPos);
-			#endif
 		}
 		catch (Exception e)
 		{
@@ -379,21 +369,15 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 		}
 		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
-			);
+			return new ProtoChunk(chunkPos, UpgradeData.EMPTY, level);
 		}
 		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
-				);
+				return new ProtoChunk(chunkPos, UpgradeData.EMPTY, level);
 			}
 		}
 		
@@ -412,6 +396,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 		int refRange = e.range + RANGE_TO_RANGE_EMPTY_EXTENSION;
 		int refOffsetX = e.pos.x - refRange;
 		int refOffsetZ = e.pos.z - refRange;
+
 		try
 		{
 			adaptor = new LightGetterAdaptor(params.level);
@@ -431,10 +416,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 					// 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, params.level);
 				return target;
 			};

@@ -481,43 +463,31 @@ 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");
-				}
-				
+				target.setLightCorrect(true);
+				//if (target instanceof LevelChunk)
+				//	((LevelChunk) target).setClientLightReady(true);
 				boolean isFull = target.getStatus() == ChunkStatus.FULL || target instanceof LevelChunk;
-				#if POST_MC_1_18_1
-				boolean isPartial = target.isOldNoiseGeneration();
-				#endif
+				//boolean isPartial = target.isOldNoiseGeneration();
 				if (isFull)
 				{
 					LOAD_LOGGER.info("Detected full existing chunk at {}", target.getPos());
-					params.lodBuilder.generateLodNodeFromChunk(params.lodDim, wrappedChunk,
+					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,
+					params.lodBuilder.generateLodNodeFromChunk(params.lodDim, new ChunkWrapper(target, region),
 							LodBuilderConfig.getFillVoidConfig(), true, e.genAllDetails);
 				}
 				else
 				{
-					params.lodBuilder.generateLodNodeFromChunk(params.lodDim, wrappedChunk,
+					params.lodBuilder.generateLodNodeFromChunk(params.lodDim, new ChunkWrapper(target, region),
 							new LodBuilderConfig(generationMode), true, e.genAllDetails);
 				}
 				if (e.lightMode == LightGenerationMode.FANCY || isFull)
@@ -535,9 +505,9 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 			PREF_LOGGER.infoInc("{}", e.tParam.perf);
 		}
 	}
-	
+
 	public void generateDirect(GenerationEvent e, ArrayGridList<ChunkAccess> subRange, Steps step,
-													 LightedWorldGenRegion region)
+							   LightedWorldGenRegion region)
 	{
 		try
 		{
@@ -581,6 +551,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 			stepFeatures.generateGroup(e.tParam, region, subRange);
 			e.pEvent.featureNano = System.nanoTime();
 			e.refreshTimeout();
+			return;
 		}
 		finally
 		{
@@ -594,12 +565,6 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 				{
 					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;
 			}
@@ -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.common.wrappers.worldGeneration;

 import java.util.concurrent.ExecutionException;
@@ -25,9 +7,9 @@ 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;

@@ -43,19 +25,16 @@ public final class GenerationEvent
 	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)
+	public GenerationEvent(ChunkPos pos, int range, BatchGenerationEnvironment generationGroup, Steps target, boolean genAllDetails)
 	{
-		creationNanotime = System.nanoTime();
+		nanotime = System.nanoTime();
 		this.pos = pos;
 		this.range = range;
 		id = generationFutureDebugIDs++;
@@ -65,24 +44,14 @@ public final class GenerationEvent
 		
 		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) {
-					}
-				}
 			}
 		});
 	}
@@ -95,15 +64,15 @@ public final class GenerationEvent
 	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()
 	{
+		future.cancel(true);
 		ApiShared.LOGGER.info("======================DUMPING ALL THREADS FOR WORLD GEN=======================");
 		BatchGenerationEnvironment.threadFactory.dumpAllThreadStacks();
-		future.cancel(true);
 		return future.isCancelled();
 	}
 	
@@ -130,8 +99,7 @@ public final class GenerationEvent
 	
 	public void refreshTimeout()
 	{
-		creationNanotime = System.nanoTime();
-		LodUtil.checkInterruptsUnchecked();
+		nanotime = System.nanoTime();
 	}
 	
 	@Override
@@ -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.common.wrappers.worldGeneration;

 import com.mojang.datafixers.DataFixer;
@@ -29,29 +11,16 @@ 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;
-#if PRE_MC_1_19
 import net.minecraft.world.level.levelgen.structure.templatesystem.StructureManager;
-#else
-import net.minecraft.world.level.levelgen.RandomState;
-import net.minecraft.world.level.levelgen.structure.templatesystem.StructureTemplateManager;
-#endif
 import net.minecraft.world.level.storage.WorldData;

 public final class GlobalParameters
 {
 	public final ChunkGenerator generator;
-	#if PRE_MC_1_19
 	public final StructureManager structures;
-	#else
-	public final StructureTemplateManager structures;
-	public final RandomState randomState;
-	#endif
+	//public final BiomeManager biomeManager;
 	public final WorldGenSettings worldGenSettings;
 	public final ThreadedLevelLightEngine lightEngine;
 	public final LodBuilder lodBuilder;
@@ -61,10 +30,6 @@ 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)
 	{
@@ -78,15 +43,9 @@ 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();
-		#if POST_MC_1_19
-		randomState = level.getChunkSource().randomState();
-		#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.worldGeneration;

@@ -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;

@@ -25,18 +6,13 @@ import com.seibel.lod.common.wrappers.worldGeneration.mimicObject.WorldGenStruct

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

 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
 	boolean isValid = true;
 	public final PerfCalculator perf = new PerfCalculator();
 	
@@ -58,21 +34,9 @@ public final class ThreadedParameters
 	private ThreadedParameters(GlobalParameters param)
 	{
 		level = param.level;
-		#if PRE_MC_1_18_1
-		structFeat = new WorldGenStructFeatManager(param.worldGenSettings, level);
-		#elif PRE_MC_1_19
-		structCheck = new StructureCheck(param.chunkScanner, param.registry, param.structures,
-				param.level.dimension(), param.generator, level, param.generator.getBiomeSource(), param.worldSeed,
-				param.fixerUpper);
-		#else
-		structCheck = new StructureCheck(param.chunkScanner, param.registry, param.structures,
-				param.level.dimension(), param.generator, param.randomState, level, param.generator.getBiomeSource(), param.worldSeed,
-				param.fixerUpper);
-		#endif
+		structFeat = new WorldGenStructFeatManager(level, param.worldGenSettings);
 	}
-	
-	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, GlobalParameters param) {
+		structFeat = new WorldGenStructFeatManager(param.worldGenSettings, genLevel);
 	}
 }
@@ -1,187 +1,74 @@
-/*
- *    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.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 com.seibel.lod.core.logging.ConfigBasedLogger;
 import net.minecraft.core.Registry;
 import net.minecraft.core.SectionPos;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
-import net.minecraft.nbt.NbtOps;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.level.*;
-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.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;
-#if PRE_MC_1_19
-import net.minecraft.world.level.levelgen.feature.StructureFeature;
-#endif
-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;
-#if PRE_MC_1_19
-import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
-#endif
-#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_19
-	private static final Codec<PalettedContainer<BlockState>> BLOCK_STATE_CODEC = PalettedContainer.codecRW(Block.BLOCK_STATE_REGISTRY, BlockState.CODEC, PalettedContainer.Strategy.SECTION_STATES, Blocks.AIR.defaultBlockState());
-	#elif 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";
+public class ChunkLoader {
 	private static final ConfigBasedLogger LOGGER = BatchGenerationEnvironment.LOAD_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));
-			#elif PRE_MC_1_19
-			Codec<PalettedContainer<Holder<Biome>>> biomeCodec = PalettedContainer.codec(
-					biomes.asHolderIdMap(), biomes.holderByNameCodec(), PalettedContainer.Strategy.SECTION_BIOMES, biomes.getHolderOrThrow(Biomes.PLAINS));
-			#else
-			Codec<PalettedContainer<Holder<Biome>>> biomeCodec = PalettedContainer.codecRW(
-				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);
+        int i = level.getSectionsCount();
+		LevelChunkSection[] levelChunkSections = new LevelChunkSection[i];
+		boolean bl2 = level.getLevel().dimensionType().hasSkyLight();
+		if (isLightOn)
+			lightEngine.retainData(chunkPos, true);
+		for (int j = 0; j < listTag.size(); j++) {
+			CompoundTag compoundTag3 = listTag.getCompound(j);
+			int k = compoundTag3.getByte("Y");
+			if (compoundTag3.contains("Palette", 9) && compoundTag3.contains("BlockStates", 12)) {
+				LevelChunkSection levelChunkSection = new LevelChunkSection(k << 4);
+				levelChunkSection.getStates().read(compoundTag3.getList("Palette", 10),
+						compoundTag3.getLongArray("BlockStates"));
 				levelChunkSection.recalcBlockCounts();
 				if (!levelChunkSection.isEmpty())
-					chunkSections[#if PRE_MC_1_17_1 sectionYPos #else level.getSectionIndexFromSectionY(sectionYPos) #endif]
-							 = levelChunkSection;
+					levelChunkSections[level.getSectionIndexFromSectionY(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));
@@ -189,108 +76,74 @@ 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("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 PRE_MC_1_19
-		if (chunkType == ChunkStatus.ChunkType.PROTOCHUNK && (blendingData == null || !blendingData.oldNoise()))
-			return null;
-		#else
-		if (chunkType == ChunkStatus.ChunkType.PROTOCHUNK && (blendingData == null || level.getChunk(chunkPos.getMiddleBlockX(),chunkPos.getMiddleBlockZ()).isOldNoiseGeneration()))
-			return null;
-		#endif
-		#endif
+		// ====================== Read params for making the LevelChunk
+		// ============================
+		ChunkBiomeContainer chunkBiomeContainer = new ChunkBiomeContainer(
+				level.getLevel().registryAccess().registryOrThrow(Registry.BIOME_REGISTRY), level, chunkPos,
+				level.getLevel().getChunkSource().getGenerator().getBiomeSource(),
+				tagLevel.contains("Biomes", 11) ? tagLevel.getIntArray("Biomes") : null);
+
+		UpgradeData upgradeData = tagLevel.contains("UpgradeData", 10)
+				? new UpgradeData(tagLevel.getCompound("UpgradeData"), level)
+				: UpgradeData.EMPTY;
+
+		TickList<Block> blockTicks = tagLevel.contains("TileTicks", 9)
+				? ChunkTickList.create(tagLevel.getList("TileTicks", 10), Registry.BLOCK::getKey, Registry.BLOCK::get)
+				: new ProtoTickList<Block>(block -> (block == null || block.defaultBlockState().isAir()), chunkPos,
+						tagLevel.getList("ToBeTicked", 9), level);
+
+		TickList<Fluid> liquidTicks = tagLevel.contains("LiquidTicks", 9)
+				? ChunkTickList.create(tagLevel.getList("LiquidTicks", 10), Registry.FLUID::getKey, Registry.FLUID::get)
+				: new ProtoTickList<Fluid>(fluid -> (fluid == null || fluid == Fluids.EMPTY), chunkPos,
+						tagLevel.getList("LiquidsToBeTicked", 9), level);

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

-		//================== 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);
+		// ApiShared.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,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.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 +34,7 @@ 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,30 +1,14 @@
-/*
- *    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.ApiShared;
+import com.seibel.lod.core.api.ClientApi;
 import com.seibel.lod.core.enums.config.LightGenerationMode;

 import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
@@ -42,14 +26,8 @@ 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;
-#if PRE_MC_1_19
 import net.minecraft.world.level.StructureFeatureManager;
-import net.minecraft.world.level.levelgen.feature.StructureFeature;
-#endif
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.entity.BlockEntity;
@@ -59,6 +37,7 @@ import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.ImposterProtoChunk;
 import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.world.level.levelgen.Heightmap;
+import net.minecraft.world.level.levelgen.feature.StructureFeature;
 import net.minecraft.world.level.levelgen.structure.StructureStart;
 import net.minecraft.world.level.lighting.LevelLightEngine;

@@ -71,30 +50,18 @@ public class LightedWorldGenRegion extends WorldGenRegion {
 	private final ChunkPos firstPos;
 	private final List<ChunkAccess> cache;
 	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 ChunkPos getCenter() {
+		return overrideCenterPos==null ? super.getCenter() : overrideCenterPos;
+	}

 	public LightedWorldGenRegion(ServerLevel serverLevel, WorldGenLevelLightEngine lightEngine,
 			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, chunkStatus, i);
 		this.lightMode = lightMode;
 		this.firstPos = list.get(0).getPos();
 		this.generator = generator;
@@ -102,32 +69,27 @@ public class LightedWorldGenRegion extends WorldGenRegion {
 		writeRadius = i;
 		cache = list;
 		size = Mth.floor(Math.sqrt(list.size()));
+
+		this.tintCaches = Util.make(new Object2ObjectArrayMap(3), object2ObjectArrayMap -> {
+			object2ObjectArrayMap.put(BiomeColors.GRASS_COLOR_RESOLVER, new BlockTintCache());
+			object2ObjectArrayMap.put(BiomeColors.FOLIAGE_COLOR_RESOLVER, new BlockTintCache());
+			object2ObjectArrayMap.put(BiomeColors.WATER_COLOR_RESOLVER, new BlockTintCache());
+		});
 	}

-	#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
@@ -212,7 +174,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;
 	}
@@ -276,29 +238,24 @@ public class LightedWorldGenRegion extends WorldGenRegion {
 	public boolean canSeeSky(BlockPos blockPos) {
 		return (getBrightness(LightLayer.SKY, blockPos) >= getMaxLightLevel());
 	}
-	
+
+	private final Object2ObjectArrayMap<ColorResolver, BlockTintCache> tintCaches;
+
 	public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver)
 	{
-		return calculateBlockTint(blockPos, colorResolver);
+		BlockTintCache blockTintCache = (BlockTintCache) this.tintCaches.get(colorResolver);
+		return blockTintCache.getColor(blockPos, null); // FIXME[Generator]: Replace this null with something else
 	}

 	private Biome _getBiome(BlockPos pos) {
-		#if POST_MC_1_18_2
-		return getBiome(pos).value();
-		#else
 		return getBiome(pos);
-		#endif
 	}
-	
+
 	public int calculateBlockTint(BlockPos blockPos, ColorResolver colorResolver)
 	{
-		#if PRE_MC_1_19
 		int i = (Minecraft.getInstance()).options.biomeBlendRadius;
-		#else
-		int i = (Minecraft.getInstance()).options.biomeBlendRadius().get();
-		#endif
 		if (i == 0)
-			return colorResolver.getColor((Biome) _getBiome(blockPos), blockPos.getX(), blockPos.getZ());
+			return colorResolver.getColor((Biome) getBiome(blockPos), blockPos.getX(), blockPos.getZ());
 		int j = (i * 2 + 1) * (i * 2 + 1);
 		int k = 0;
 		int l = 0;
@@ -308,12 +265,11 @@ public class LightedWorldGenRegion extends WorldGenRegion {
 		while (cursor3D.advance())
 		{
 			mutableBlockPos.set(cursor3D.nextX(), cursor3D.nextY(), cursor3D.nextZ());
-			int n = colorResolver.getColor((Biome) _getBiome((BlockPos) mutableBlockPos), mutableBlockPos.getX(), mutableBlockPos.getZ());
+			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,7 @@ 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;
@@ -39,9 +18,7 @@ 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
@@ -49,9 +26,7 @@ public class WorldGenLevelLightEngine extends LevelLightEngine {

    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);
    }
@@ -148,35 +123,19 @@ public class WorldGenLevelLightEngine extends LevelLightEngine {
        chunkAccess.setLightCorrect(false);
        
        LevelChunkSection[] levelChunkSections = chunkAccess.getSections();
-        for (int i = 0; i <
-        #if POST_MC_1_17_1
-            chunkAccess.getSectionsCount()
-        #else
-            16
-        #endif
-        ; ++i) {
+        for (int i = 0; i < chunkAccess.getSectionsCount(); ++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
+			if (!LevelChunkSection.isEmpty(levelChunkSection)) {
+	            int j = this.levelHeightAccessor.getSectionYFromSectionIndex(i);
+				updateSectionStatus(SectionPos.of(chunkPos, j), false);
+			}
        }
        enableLightSources(chunkPos, true);
        if (needLightBlockUpdate) {
            chunkAccess.getLights().forEach(blockPos ->
-                    onBlockEmissionIncrease(blockPos, chunkAccess.getLightEmission(blockPos)));
+            onBlockEmissionIncrease(blockPos, chunkAccess.getLightEmission(blockPos)));
        }
-
+        
        chunkAccess.setLightCorrect(true);
    }

@@ -203,8 +162,6 @@ public class WorldGenLevelLightEngine extends LevelLightEngine {
            this.skyEngine.retainData(chunkPos, bl);
        }
    }
-
-    #if POST_MC_1_17_1
    @Override
    public int getLightSectionCount() {
    	throw new UnsupportedOperationException("This should never be used!");
@@ -217,5 +174,4 @@ public class WorldGenLevelLightEngine extends LevelLightEngine {
    public int getMaxLightSection() {
    	throw new UnsupportedOperationException("This should never be used!");
    }
-    #endif
 }
@@ -1,74 +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.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;
 import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.level.StructureFeatureManager;
 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;
-#if PRE_MC_1_19
-import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 import net.minecraft.world.level.levelgen.feature.StructureFeature;
-import net.minecraft.world.level.StructureFeatureManager;
-#else
-import net.minecraft.world.level.levelgen.structure.Structure;
-import net.minecraft.world.level.StructureManager;
-#endif
-
-#if POST_MC_1_18_1
-import net.minecraft.world.level.levelgen.structure.StructureCheck;
-#endif
 import net.minecraft.world.level.levelgen.structure.StructureStart;

-#if PRE_MC_1_19
 public class WorldGenStructFeatManager extends StructureFeatureManager {
-#else
-public class WorldGenStructFeatManager extends StructureManager {
-#endif
 	final 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);
+			WorldGenLevel genLevel) {
+		super(genLevel, worldGenSettings);
 		this.genLevel = genLevel;
 		this.worldGenSettings = worldGenSettings;
 	}
@@ -77,7 +28,7 @@ public class WorldGenStructFeatManager extends StructureManager {
 	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(worldGenSettings, worldGenRegion);
 	}

 	private ChunkAccess _getChunk(int x, int z, ChunkStatus status) {
@@ -85,144 +36,21 @@ public class WorldGenStructFeatManager extends StructureManager {
 		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
-		#if PRE_MC_1_19
-		@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();
-		}
-		#else
-		@Override
-		public List<StructureStart> startsForStructure(ChunkPos sectionPos, Predicate<Structure> predicate) {
-			ChunkAccess chunk = _getChunk(sectionPos.x, sectionPos.z, ChunkStatus.STRUCTURE_REFERENCES);
-			if (chunk == null) return List.of();
-
-			// Copied from StructureFeatureManager::startsForFeature(...)
-			Map<Structure, LongSet> map = chunk.getAllReferences();
-
-			ImmutableList.Builder<StructureStart> builder = ImmutableList.builder();
-			Iterator<Map.Entry<Structure, LongSet>> var5 = map.entrySet().iterator();
-
-			while(var5.hasNext()) {
-				Map.Entry<Structure, LongSet> entry = var5.next();
-				Structure configuredStructureFeature = entry.getKey();
-				if (predicate.test(configuredStructureFeature)) {
-					LongSet var10002 = (LongSet)entry.getValue();
-					Objects.requireNonNull(builder);
-					this.fillStartsForStructure(configuredStructureFeature, var10002, builder::add);
-				}
-			}
-
-			return builder.build();
-		}
-
-		@Override
-		public List<StructureStart> startsForStructure(SectionPos sectionPos, Structure structure) {
-			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.getReferencesForStructure(structure);
-			ImmutableList.Builder<StructureStart> builder = ImmutableList.builder();
-			Objects.requireNonNull(builder);
-			this.fillStartsForStructure(structure, longSet, builder::add);
-			return builder.build();
-		}
-
-		@Override
-		public Map<Structure, LongSet> getAllStructuresAt(BlockPos blockPos) {
-			SectionPos sectionPos = SectionPos.of(blockPos);
-			ChunkAccess chunk = _getChunk(sectionPos.x(), sectionPos.z(), ChunkStatus.STRUCTURE_REFERENCES);
-			if (chunk == null) return (Map<Structure, LongSet>) Stream.empty();
-			return chunk.getAllReferences();
-		}
-		#endif
-	#endif
-	#endif
-}
+}
@@ -1,85 +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;
-#if PRE_MC_1_19
-import net.minecraft.world.level.StructureFeatureManager;
-#endif
-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);
-			#elif PRE_MC_1_19
-			chunk = environment.joinSync(environment.params.generator.createBiomes(environment.params.biomes, Runnable::run, Blender.of(worldGenRegion),
-					tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk));
-			#else
-			chunk = environment.joinSync(environment.params.generator.createBiomes(environment.params.biomes, Runnable::run, environment.params.randomState, Blender.of(worldGenRegion),
-					tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk));
-			#endif
+			envionment.params.generator.createBiomes(envionment.params.biomes, chunk);
 		}
 	}
 }
@@ -1,83 +1,50 @@
-/*
- *    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 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.ArrayGridList;
 import net.minecraft.ReportedException;
-import net.minecraft.server.level.WorldGenRegion;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.ProtoChunk;
-import net.minecraft.world.level.levelgen.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, ArrayGridList<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,34 +1,14 @@
-/*
- *    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.ArrayGridList;
 import net.minecraft.server.level.ThreadedLevelLightEngine;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.world.level.chunk.ProtoChunk;
-import net.minecraft.world.level.lighting.LevelLightEngine;
 import net.minecraft.world.level.lighting.LightEventListener;

 public final class StepLight {
@@ -47,10 +27,9 @@ public final class StepLight {

 	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(LightEventListener lightEngine,
+							  ArrayGridList<ChunkAccess> chunks) {
+		//ArrayList<ChunkAccess> chunksToDo = new ArrayList<ChunkAccess>();
 		
 		for (ChunkAccess chunk : chunks) {
 			if (chunk.getStatus().isOrAfter(STATUS)) continue;
@@ -73,9 +52,6 @@ public final class StepLight {
 			} 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,51 +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.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.core.util.LodUtil;
+import net.minecraft.core.QuartPos;
 import net.minecraft.server.level.WorldGenRegion;
 import net.minecraft.util.Mth;
-#if POST_MC_1_17_1
-import net.minecraft.world.level.LevelHeightAccessor;
-#endif
-#if PRE_MC_1_19
 import net.minecraft.world.level.StructureFeatureManager;
-#endif
 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 {
 	/**
@@ -76,19 +48,8 @@ public final class StepNoise {
 		
 		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,
+			chunk = environment.joinSync(environment.params.generator.fillFromNoise(Runnable::run, 
 					tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk));
-			#elif PRE_MC_1_19
-			chunk = environment.joinSync(environment.params.generator.fillFromNoise(Runnable::run, Blender.of(worldGenRegion),
-					tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk));
-			#else
-			chunk = environment.joinSync(environment.params.generator.fillFromNoise(Runnable::run, Blender.of(worldGenRegion), environment.params.randomState,
-					tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk));
-			#endif
-			LodUtil.checkInterruptsUnchecked(); // Speed up termination responsiveness
 		}
 	}
 }
@@ -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.step;

 import java.util.ArrayList;
@@ -32,9 +13,7 @@ import net.minecraft.core.Registry;
 import net.minecraft.core.SectionPos;
 import net.minecraft.server.level.WorldGenRegion;
 import net.minecraft.world.level.ChunkPos;
-#if PRE_MC_1_19
 import net.minecraft.world.level.StructureFeatureManager;
-#endif
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.ProtoChunk;
@@ -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.step;

 import java.util.ArrayList;
@@ -66,31 +47,12 @@ public final class StepStructureStart {
 			((ProtoChunk) chunk).setStatus(STATUS);
 			chunksToDo.add(chunk);
 		}
-
-		#if PRE_MC_1_19
+		
 		if (environment.params.worldGenSettings.generateFeatures()) {
-		#elif POST_MC_1_19
-		if (environment.params.worldGenSettings.generateStructures()) {
-		#endif
 			for (ChunkAccess chunk : chunksToDo) {
 				// System.out.println("StepStructureStart: "+chunk.getPos());
-				#if PRE_MC_1_19
 				environment.params.generator.createStructures(environment.params.registry, tParams.structFeat, chunk, environment.params.structures,
 						environment.params.worldSeed);
-				#elif POST_MC_1_19
-				environment.params.generator.createStructures(environment.params.registry, environment.params.randomState, tParams.structFeat, chunk, environment.params.structures,
-						environment.params.worldSeed);
-				#endif
-				#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
 			}
 		}
 	}
@@ -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.step;

 import java.util.ArrayList;
@@ -58,13 +39,7 @@ public final class StepSurface {
 		
 		for (ChunkAccess chunk : chunksToDo) {
 			// System.out.println("StepSurface: "+chunk.getPos());
-			#if PRE_MC_1_18_1
 			environment.params.generator.buildSurfaceAndBedrock(worldGenRegion, chunk);
-			#elif PRE_MC_1_19
-			environment.params.generator.buildSurface(worldGenRegion, tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk);
-			#else
-			environment.params.generator.buildSurface(worldGenRegion, tParams.structFeat.forWorldGenRegion(worldGenRegion), environment.params.randomState, chunk);
-			#endif
 		}
 	}
 }
@@ -1,45 +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 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
-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
-
-# lod generation from save file
-accessible field net/minecraft/server/level/ChunkMap mainThreadExecutor Lnet/minecraft/util/thread/BlockableEventLoop;
-accessible method net/minecraft/server/level/ChunkMap readChunk (Lnet/minecraft/world/level/ChunkPos;)Lnet/minecraft/nbt/CompoundTag;
-
-# grabbing textures
-accessible field net/minecraft/client/renderer/block/model/BakedQuad sprite Lnet/minecraft/client/renderer/texture/TextureAtlasSprite;
-accessible field net/minecraft/client/renderer/texture/TextureAtlasSprite framesX [I
-accessible field net/minecraft/client/renderer/texture/TextureAtlasSprite framesY [I
-accessible field net/minecraft/client/renderer/texture/TextureAtlasSprite mainImage [Lcom/mojang/blaze3d/platform/NativeImage;
-
-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,47 +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 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/levelgen/NoiseBasedChunkGenerator settings Lnet/minecraft/core/Holder;
-accessible method net/minecraft/world/level/lighting/LayerLightEngine queueSectionData (JLnet/minecraft/world/level/chunk/DataLayer;Z)V
-accessible method net/minecraft/server/level/ChunkMap readChunk (Lnet/minecraft/world/level/ChunkPos;)Ljava/util/concurrent/CompletableFuture;
-
-
-# lod generation from save file
-accessible field net/minecraft/server/level/ChunkMap mainThreadExecutor Lnet/minecraft/util/thread/BlockableEventLoop;
-
-
-# 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,6 +1,5 @@
 accessWidener v1 named

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

@@ -20,7 +19,6 @@ accessible field net/minecraft/client/renderer/LevelRenderer$RenderChunkInfo chu

 # 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;

@@ -29,20 +27,26 @@ accessible method net/minecraft/world/level/levelgen/Heightmap setHeight (III)V
 accessible field net/minecraft/world/level/biome/Biome generationSettings Lnet/minecraft/world/level/biome/BiomeGenerationSettings;
 accessible field net/minecraft/world/level/biome/Biome biomeCategory Lnet/minecraft/world/level/biome/Biome$BiomeCategory;
 # accessible field net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator settings Lnet/minecraft/core/Holder;
+accessible field net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator settings Ljava/util/function/Supplier;
 #accessible method net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator doCreateBiomes (Lnet/minecraft/core/Registry;Lnet/minecraft/world/level/levelgen/blending/Blender;Lnet/minecraft/world/level/StructureFeatureManager;Lnet/minecraft/world/level/chunk/ChunkAccess;)V
+accessible method net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator doFill (Lnet/minecraft/world/level/StructureFeatureManager;Lnet/minecraft/world/level/chunk/ChunkAccess;II)Lnet/minecraft/world/level/chunk/ChunkAccess;
+
 accessible method net/minecraft/world/level/lighting/LayerLightEngine queueSectionData (JLnet/minecraft/world/level/chunk/DataLayer;Z)V
+accessible field net/minecraft/world/level/chunk/ChunkGenerator biomeSource Lnet/minecraft/world/level/biome/BiomeSource;

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

-
 # grabbing textures
 accessible field net/minecraft/client/renderer/texture/TextureAtlasSprite animatedTexture Lnet/minecraft/client/renderer/texture/TextureAtlasSprite$AnimatedTexture;
 accessible field net/minecraft/client/renderer/texture/TextureAtlasSprite width I
 accessible field net/minecraft/client/renderer/texture/TextureAtlasSprite height I
 accessible field net/minecraft/client/renderer/texture/TextureAtlasSprite mainImage [Lcom/mojang/blaze3d/platform/NativeImage;
-accessible class net/minecraft/client/renderer/texture/TextureAtlasSprite$AnimatedTexture
 accessible method net/minecraft/client/renderer/texture/TextureAtlasSprite$AnimatedTexture getFrameX (I)I
 accessible method net/minecraft/client/renderer/texture/TextureAtlasSprite$AnimatedTexture getFrameY (I)I
-extendable class com/mojang/math/Matrix4f
+extendable class com/mojang/math/Matrix4f
+
+# hacky stuff
+accessible field net/minecraft/world/level/chunk/PalettedContainer lock Ljava/util/concurrent/Semaphore;
+mutable field net/minecraft/world/level/chunk/PalettedContainer lock Ljava/util/concurrent/Semaphore;
@@ -1,35 +1,19 @@
 plugins {
-    id "com.github.johnrengelman.shadow" version "7.1.0"
+    id "com.github.johnrengelman.shadow" version "7.0.0"
 }

-// From parent
-apply plugin: "java"
-apply plugin: "architectury-plugin"
-apply plugin: "maven-publish"
-apply plugin: "dev.architectury.loom"
-
-archivesBaseName = rootProject.archives_base_name
-version = rootProject.mod_version //FIXME: Redef
-group = rootProject.maven_group
-
 version = rootProject.mod_version+"-"+rootProject.minecraft_version+"-"+new Date().format("yyyy_MM_dd_HH_mm")

 loom {
-    silentMojangMappingsLicense()
-    accessWidenerPath.set(project(":common").file("src/main/resources/${acsessWidenerVersion}.lod.accesswidener"))
+    accessWidenerPath.set(project(":common").file("src/main/resources/lod.accesswidener"))
 }

-
 architectury {
    platformSetupLoomIde()
    fabric()
 }

 configurations {
-    common
-    shadowMe
-    implementation.extendsFrom shadowMe
-
    compileClasspath.extendsFrom common
    runtimeClasspath.extendsFrom common
    developmentFabric.extendsFrom common
@@ -39,58 +23,9 @@ configurations {
    modImplementation.extendsFrom addModJar
 }

-java {
-    withSourcesJar()
-}
-
-jar.dependsOn(project(":core").remapJar)
-remapSourcesJar.dependsOn(project(":core").remapJar)
-
 repositories {
    // Required for ModMenu
    maven { url "https://maven.terraformersmc.com/" }
-
-    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"
-        url = "https://api.modrinth.com/maven"
-        content {
-            includeGroup "maven.modrinth"
-        }
-    }
-
-    // Required for importing CursedForge mods
-    maven {
-        url "https://www.cursemaven.com"
-        content {
-            includeGroup "curse.maven"
-        }
-    }
-
-    // These 2 are for importing mods that arnt on CursedForge, Modrinth, GitHub, GitLab or anywhere opensource
-    flatDir {
-        dirs "${rootDir}/mods/fabric"
-        content {
-            includeGroup "fabric-mod"
-        }
-    }
-    flatDir {
-        dirs "${rootDir}/mods/forge"
-        content {
-            includeGroup "forge-mod"
-        }
-    }
 }

 def addMod(path, enabled) {
@@ -101,64 +36,29 @@ def addMod(path, enabled) {
 }

 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)
-        if (rootProject.minecraft_version != "1.19")
-            parchment("org.parchmentmc.data:parchment-${rootProject.minecraft_version}:${rootProject.parchment_version}@zip")
-        else
-            parchment("org.parchmentmc.data:parchment-1.18.2:${rootProject.parchment_version}@zip") // As 1.19 dosnt have parchment mappings yet, we use 1.18.2 mapping
-    }
-
-    //Manifold
-    annotationProcessor "systems.manifold:manifold-preprocessor:${rootProject.manifold_version}"
-
-    // Toml
-    implementation("com.electronwill.night-config:toml:${rootProject.toml_version}")
-
-    // We depend on fabric loader here to use the fabric @Environment annotations and get the mixin dependencies
-    // Do NOT use other classes from fabric loader unless working with fabric
-    modImplementation "net.fabricmc:fabric-loader:${rootProject.fabric_loader_version}"
-
-    common(project(":core"))
-
    // Fabric loader
    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-resource-loader-v0", 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))
-    addModJar(fabricApi.module("fabric-api-base", 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}") {
@@ -173,14 +73,15 @@ dependencies {
        exclude(group: "net.fabricmc.fabric-api")
        transitive(false)
    }
-    */
+     */
+
+

    // Toml
    shadowMe("com.electronwill.night-config:toml:${rootProject.toml_version}") {}

    common(project(path: ":common", configuration: "namedElements")) { transitive false }
    shadowMe(project(path: ":common", configuration: "transformProductionFabric")) { transitive false }
-    shadowMe files(project(":core").file("build/libs/DistantHorizons-${rootProject.mod_version}.jar"))

    // Compression
    common 'org.tukaani:xz:1.9'
@@ -189,14 +90,10 @@ dependencies {
    shadowMe 'org.apache.commons:commons-compress:1.21'
 }

-task deleteResources(type: Delete) {
-    delete file("build/resources/main")
-}
-// Copies the correct accesswidener and renames it
+// 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/${rootProject.acsessWidenerVersion}.lod.accesswidener")
-    into(file("build/resources/main"))
-    rename "${rootProject.acsessWidenerVersion}.lod.accesswidener", "lod.accesswidener"
+    from project(":common").file("src/main/resources/lod.accesswidener")
+    into file("src/generated/resources")
 }

 task copyCoreResources(type: Copy) {
@@ -204,60 +101,26 @@ task copyCoreResources(type: Copy) {
    into file("build/resources/main")
 }

+task deleteResources(type: Delete) {
+    delete file("build/resources/main")
+}
+
 task copyCommonResources(type: Copy) {
    from fileTree(project(":common").file("src/main/resources"))
    into file("build/resources/main")
 }

-processResources {
-    dependsOn(copyCoreResources)
-    dependsOn(copyCommonResources)
-    dependsOn(copyAccessWidener)
-
-    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,42)"
-
-    inputs.properties replaceProperties
-    replaceProperties.put 'project', project
-    filesMatching(resourceTargets) {
-        expand replaceProperties
-    }
-
-    intoTargets.each { target ->
-        if (file(target).exists()) {
-            copy {
-                from(sourceSets.main.resources) {
-                    include resourceTargets
-                    expand replaceProperties
-                }
-                into target
-            }
-        }
-    }
-}
-
 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'
@@ -276,11 +139,6 @@ remapJar {
 }

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

@@ -309,35 +167,3 @@ publishing {
        // Add repositories to publish to here.
    }
 }
-
-task printConfigurations {
-    doLast {task ->
-        println "Project Name: $name configurations:"
-        configurations.each {
-            println "    $it.name"
-        }
-    }
-}
-
-
-tasks.withType(JavaCompile) {
-    // Add Manifold Preprocessor
-//		def excapedMCVersion = rootProject.minecraft_version.replace(".", "_")
-//		options.compilerArgs += ['-Xplugin:Manifold', "-AMC_VERSION_${excapedMCVersion}"]
-//
-    //options.compilerArgs += ['-deprecation']
-    //options.compilerArgs += ['-verbose']
-    //options.compilerArgs += ['-Xlint:unchecked']
-    //options.compilerArgs += ['-Xdiags:verbose']
-    //options.compilerArgs += ['-Xprint']
-    //options.compilerArgs += ['-XprintProcessorInfo']
-    //options.compilerArgs += ['-XprintRounds']
-
-    // println options.compilerArgs
-
-    // Set the java version
-    options.compilerArgs += ['-Xplugin:Manifold']
-    options.release = rootProject.java_version as Integer
-    // TODO: make everything use java 8
-//        options.release = 8 // Use Java 8 for everything so back porting is easier
-}
@@ -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,23 +22,20 @@ 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.MixinUtilBackgroudThread;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientChunkEvents;
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
-import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerWorldEvents;
-import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screens.TitleScreen;
 import net.minecraft.core.BlockPos;
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.world.level.Level;
@@ -46,7 +43,6 @@ import net.minecraft.world.level.LevelAccessor;
 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;
@@ -54,8 +50,8 @@ import org.lwjgl.glfw.GLFW;
 /**
 * This handles all events sent to the client,
 * and is the starting point for most of the mod.
- * 
- * @author coolGi
+ *
+ * @author coolGi2007
 * @author Ran
 * @version 11-23-2021
 */
@@ -71,6 +67,8 @@ public class ClientProxy
 	 * @author Ran
 	 */
 	public void registerEvents() {
+		// TODO: Fix this if it's wrong
+
 		/* Registor the mod accessor*/

 		/* World Events */
@@ -79,14 +77,12 @@ 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 */
@@ -97,7 +93,6 @@ public class ClientProxy
 			if (client.player != null) onKeyInput();
 		});
 		isGenerationThreadChecker = BatchGenerationEnvironment::isCurrentThreadDistantGeneratorThread;
-
 	}


@@ -116,11 +111,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
@@ -28,12 +28,10 @@ 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.wrappers.FabricDependencySetup;
 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;

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

 	public static ClientProxy client_proxy;
@@ -75,9 +73,6 @@ public class Main implements ClientModInitializer
 		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());
 		}
@@ -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,24 +0,0 @@
-package com.seibel.lod.fabric.mixins;
-
-import com.seibel.lod.core.render.F3Screen;
-import net.minecraft.client.gui.components.DebugScreenOverlay;
-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 java.util.List;
-
-@Mixin(DebugScreenOverlay.class)
-public class MixinDebugScreenOverlay {
-
-    @Inject(method = "getSystemInformation", at = @At("RETURN"))
-    private void addCustomF3(CallbackInfoReturnable<List<String>> cir) {
-        List<String> messages = cir.getReturnValue();
-
-        for (String i: F3Screen.f3List) {
-            messages.add(i);
-        }
-    }
-
-}
@@ -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;
@@ -34,47 +15,26 @@ import net.minecraft.client.renderer.FogRenderer.FogMode;
 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;
-
-	@Inject(at = @At("RETURN"), method = "setupFog")
-	#if PRE_MC_1_19
+	
+	@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) {
-	#else
-	private static void disableSetupFog(Camera camera, FogMode fogMode, float f, boolean bl, float g, CallbackInfo callback) {
-	#endif
-		#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
-		}
+	    FogType fogTypes = camera.getFluidInCamera();
+	    Entity entity = camera.getEntity();
+	    boolean isUnderWater = (entity instanceof LivingEntity) && ((LivingEntity)entity).hasEffect(MobEffects.BLINDNESS);
+	    if (!isUnderWater) {
+			if (fogMode == FogMode.FOG_TERRAIN && fogTypes == FogType.NONE && CONFIG.client().graphics().fogQuality().getDisableVanillaFog()) {
+			    RenderSystem.setShaderFogStart(A_REALLY_REALLY_BIG_VALUE);
+			    RenderSystem.setShaderFogEnd(A_EVEN_LARGER_VALUE);
+			}
+	    }
 	}
-
 }
@@ -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.fabric.Main;
@@ -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;
@@ -27,9 +8,7 @@ import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
 import net.minecraft.client.gui.screens.OptionsScreen;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
-#if PRE_MC_1_19
 import net.minecraft.network.chat.TranslatableComponent;
-#endif
 import net.minecraft.resources.ResourceLocation;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -41,9 +20,9 @@ import java.util.Objects;
 /**
 * Adds a button to the menu to goto the config
 *
- * @author coolGi
+ * @author coolGi2007
 * @version 12-02-2021
-*/
+ */
@Mixin(OptionsScreen.class)
 public class MixinOptionsScreen extends Screen {
    // Get the texture for the button
@@ -55,24 +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
-                #if PRE_MC_1_19
-                new TranslatableComponent("text.autoconfig." + ModInfo.ID + ".title")));
-                #else
-                Component.translatable("text.autoconfig." + ModInfo.ID + ".title")));
-                #endif
+            this.addRenderableWidget(new TexturedButtonWidget(
+                    // Where the button is on the screen
+                    this.width / 2 - 180, this.height / 6 - 12,
+                    // Width and height of the button
+                    20, 20,
+                    // Offset
+                    0, 0,
+                    // Some textuary stuff
+                    20, ICON_TEXTURE, 20, 40,
+                    // Create the button and tell it where to go
+                    // For now it goes to the client option by default
+                    (buttonWidget) -> Objects.requireNonNull(minecraft).setScreen(ConfigGui.getScreen(this, "client")),
+                    // Add a title to the screen
+                    new TranslatableComponent("text.autoconfig." + ModInfo.ID + ".title")));
    }
 }
@@ -1,26 +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 java.util.concurrent.ExecutorService;
-import java.util.function.Supplier;
+import java.util.concurrent.Executor;

 import com.seibel.lod.fabric.ClientProxy;
 import org.spongepowered.asm.mixin.Mixin;
@@ -28,46 +8,42 @@ 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 com.seibel.lod.common.wrappers.DependencySetupDoneCheck;
+import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment;
+import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
+import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory;

 import 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());
+	private static boolean doTriggerOverride() {
+		try {
+			return DependencySetupDoneCheck.getIsCurrentThreadDistantGeneratorThread.get();
+		} catch (NullPointerException e) {
+			return false;
 		}
 	}
-
-	#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");
+			// 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)
+
+	@Inject(method = "backgroundExecutor", at = @At("HEAD"), cancellable = true)
+	private static void overrideUtil$backgroundExecutor(CallbackInfoReturnable<Executor> ci)
 	{
 		if (ClientProxy.isGenerationThreadChecker != null && ClientProxy.isGenerationThreadChecker.get())
 		{
-			//ApiShared.LOGGER.info("util wrapThreadWithTaskName(Supplier) triggered");
-			ci.setReturnValue(r);
+			// ApiShared.LOGGER.info("util backgroundExecutor triggered");
+			ci.setReturnValue(Runnable::run);
 		}
 	}
-	#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
@@ -25,10 +25,8 @@ 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;
@@ -43,7 +41,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 *
 * This is also the mixin for rendering the clouds
 *
- * @author coolGi
+ * @author coolGi2007
 * @author James Seibel
 * @version 12-31-2021
 */
@@ -56,40 +54,6 @@ public class 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)
-	{
-		// get the partial ticks since renderBlockLayer doesn't
-		// have access to them
-		previousPartialTicks = partialTicks;
-	}
-
-	@Inject(at = @At("HEAD"),
-			method = "renderChunkLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDD)V",
-			cancellable = true)
-	private void renderChunkLayer(RenderType renderType, PoseStack matrixStackIn, double xIn, double yIn, double zIn, CallbackInfo callback)
-	{
-		// only render before solid blocks
-		if (renderType.equals(RenderType.solid()))
-		{
-			// get MC's current projection matrix
-			float[] mcProjMatrixRaw = new float[16];
-			GL15.glGetFloatv(GL15.GL_PROJECTION_MATRIX, mcProjMatrixRaw);
-			Mat4f mcProjectionMatrix = new Mat4f(mcProjMatrixRaw);
-			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
@@ -97,6 +61,8 @@ public class MixinWorldRenderer
 		previousPartialTicks = tickDelta;
 	}

+	// Inject rendering at first call to renderChunkLayer
+	// HEAD or RETURN
 	@Inject(at = @At("HEAD"),
 			method = "renderChunkLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDDLcom/mojang/math/Matrix4f;)V",
 			cancellable = true)
@@ -114,5 +80,4 @@ public class MixinWorldRenderer
 			callback.cancel();
 		}
 	}
-	#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.fabric.mixins.events;

 import com.seibel.lod.fabric.Main;
@@ -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());
    }
-}
+}
@@ -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 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) {
+    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) {
        Main.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,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.events;

 import com.seibel.lod.fabric.Main;
@@ -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.events;

 import com.seibel.lod.fabric.Main;
@@ -33,19 +14,13 @@ 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();
-    }
-    #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,27 @@
+package com.seibel.lod.fabric.mixins.unsafe;
+
+import net.minecraft.world.level.chunk.PalettedContainer;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Mutable;
+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 {
+    @Mutable
+    private Semaphore lock;
+
+    @Inject(method = "<init>", at = @At("RETURN"))
+    private void setSemaphore(CallbackInfo ci) {
+        this.lock = new Semaphore(2);
+    }
+}
@@ -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,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;

 import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
@@ -33,7 +14,7 @@ import com.seibel.lod.fabric.wrappers.modAccessor.ModChecker;
 * 
 * @author James Seibel
 * @author Ran
- * @version 3-5-2022
+ * @version 12-1-2021
 */
 public class FabricDependencySetup
 {
@@ -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;
@@ -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 com.seibel.lod.core.wrapperInterfaces.modAccessor.IModChecker;
@@ -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 java.util.HashSet;
@@ -27,17 +8,17 @@ import com.seibel.lod.core.wrapperInterfaces.modAccessor.IOptifineAccessor;
 public class OptifineAccessor implements IOptifineAccessor
 {

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

-	@Override
-	public HashSet<AbstractChunkPosWrapper> getNormalRenderedChunks()
-	{
-		// TODO: Impl proper methods here
-		return null;
-	}
-	
 }
@@ -1,29 +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.fabric.wrappers.modAccessor;

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

 import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
-import com.seibel.lod.core.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;
@@ -31,87 +11,26 @@ 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";
+    @Override
+    public String getModName() {
+    	return "Sodium-Fabric-1.17.1";
 	}

-	#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
+		LevelHeightAccessor height = Minecraft.getInstance().level;
+		
+		// TODO: Maybe use a mixin to make this more efficient
 		return MC_RENDER.getMaximumRenderedChunks().stream().filter((AbstractChunkPosWrapper chunk) -> {
 			return (renderer.isBoxVisible(
 					chunk.getMinBlockX()+1, height.getMinBuildHeight()+1, chunk.getMinBlockZ()+1,
 					chunk.getMinBlockX()+15, height.getMaxBuildHeight()-1, chunk.getMinBlockZ()+15));
 		}).collect(Collectors.toCollection(HashSet::new));
-		#endif
 	}
-	#else
-	@Override
-	public HashSet<AbstractChunkPosWrapper> getNormalRenderedChunks() {
-		SodiumWorldRenderer renderer = SodiumWorldRenderer.getInstance();
-		LevelAccessor height = Minecraft.getInstance().level;
-		// TODO: Maybe use a mixin to make this more efficient
-		return MC_RENDER.getMaximumRenderedChunks().stream().filter((AbstractChunkPosWrapper chunk) -> {
-			FakeChunkEntity AABB = new FakeChunkEntity(chunk.getX(), chunk.getZ(), height.getMaxBuildHeight());
-			return (renderer.isEntityVisible(AABB));
-		}).collect(Collectors.toCollection(HashSet::new));
-	}
-
-	private static class FakeChunkEntity extends Entity {
-		public int cx;
-		public int cz;
-		public int my;
-		public FakeChunkEntity(int chunkX, int chunkZ, int maxHeight) {
-			super(EntityType.AREA_EFFECT_CLOUD, null);
-			cx = chunkX;
-			cz = chunkZ;
-			my = maxHeight;
-		}
-		@Override
-		public AABB getBoundingBoxForCulling() {
-			return new AABB(cx*16+1, 1, cz*16+1,
-					cx*16+15, my-1, cz*16+15);
-		}
-		@Override
-		protected void defineSynchedData() {}
-		@Override
-		protected void readAdditionalSaveData(CompoundTag paramCompoundTag) {}
-		@Override
-		protected void addAdditionalSaveData(CompoundTag paramCompoundTag) {}
-		@Override
-		public Packet<?> getAddEntityPacket() {
-			throw new UnsupportedOperationException("This is a FAKE CHUNK ENTITY... For tricking the Sodium to check a AABB.");
-		}
-	}
-	#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,27 +2,24 @@
  "required": true,
  "minVersion": "0.8",
  "package": "com.seibel.lod.fabric.mixins",
+  "compatibilityLevel": "JAVA_16",
  "mixins": [
-    "unsafe.MixinThreadingDectector",
-    "MixinUtilBackgroudThread",
-    "events.MixinServerLevel"
+    "events.MixinServerLevel",
+    "unsafe.MixinPalettedContainer",
+    "MixinChunkGenerator",
+    "MixinUtilBackgroudThread"
  ],
  "client": [
    "MixinMinecraft",
    "MixinOptionsScreen",
    "MixinWorldRenderer",
    "MixinFogRenderer",
-    "MixinChunkGenerator",
-    "MixinDebugScreenOverlay",
    "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}",
@@ -36,9 +36,12 @@
    "fabric-lifecycle-events-v1": "*",
    "fabric-key-binding-api-v1": "*",
    "fabric-networking-api-v1": "*",
-    "minecraft": $compatible_minecraft_versions,
+    "minecraft": "${minecraft_version}",
    "java": ">=${java_version}"
  },
+  "suggests": {
+    "another-mod": "*"
+  },

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

-apply plugin: "java"
-apply plugin: "architectury-plugin"
-apply plugin: "maven-publish"
-apply plugin: "dev.architectury.loom"
-
-archivesBaseName = rootProject.archives_base_name
-version = rootProject.mod_version //FIXME: HERE repeated def
-group = rootProject.maven_group
-
 version = rootProject.mod_version+"-"+rootProject.minecraft_version+"-"+new Date().format("yyyy_MM_dd_HH_mm")

-
 loom {
-    silentMojangMappingsLicense()
-    accessWidenerPath.set(project(":common").file("src/main/resources/${acsessWidenerVersion}.lod.accesswidener"))
+    accessWidenerPath.set(project(":common").file("src/main/resources/lod.accesswidener"))
+
    forge {
        convertAccessWideners.set(true)
        extraAccessWideners.add("lod.accesswidener")
@@ -30,22 +19,6 @@ architectury {
    forge()
 }

-configurations {
-    common
-    shadowMe
-    implementation.extendsFrom shadowMe
-
-    compileClasspath.extendsFrom common
-    runtimeClasspath.extendsFrom common
-    developmentForge.extendsFrom common
-}
-
-java {
-    withSourcesJar()
-}
-jar.dependsOn(project(":core").remapJar)
-remapSourcesJar.dependsOn(project(":core").remapJar)
-
 def addMod(path, enabled) {
    if (enabled == "2")
        dependencies { modImplementation(path) }
@@ -53,40 +26,21 @@ def addMod(path, enabled) {
        dependencies { modCompileOnly(path) }
 }

+configurations {
+    compileClasspath.extendsFrom common
+    runtimeClasspath.extendsFrom common
+    developmentForge.extendsFrom common
+}
+
 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)
-        if (rootProject.minecraft_version != "1.19")
-            parchment("org.parchmentmc.data:parchment-${rootProject.minecraft_version}:${rootProject.parchment_version}@zip")
-        else
-            parchment("org.parchmentmc.data:parchment-1.18.2:${rootProject.parchment_version}@zip") // As 1.19 dosnt have parchment mappings yet, we use 1.18.2 mapping
-    }
-
-    //Manifold
-    annotationProcessor "systems.manifold:manifold-preprocessor:${rootProject.manifold_version}"
-
-    // Toml
-    implementation("com.electronwill.night-config:toml:${rootProject.toml_version}")
-
-    common(project(":core")) { transitive false }
-
    // 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 }
-    shadowMe files(project(":core").file("build/libs/DistantHorizons-${rootProject.mod_version}.jar"))
+
+    // Starlight
+    addMod("curse.maven:starlight-forge-526854:${rootProject.starlight_version_forge}", rootProject.enable_starlight_forge)

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

@@ -94,20 +48,12 @@ 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'
 }

-// Copies the correct accesswidener and renames it
-task copyAccessWidener(type: Copy) {
-    from project(":common").file("src/main/resources/${rootProject.acsessWidenerVersion}.lod.accesswidener")
-    into(file("build/resources/main"))
-    rename "${rootProject.acsessWidenerVersion}.lod.accesswidener", "lod.accesswidener"
-}
-
 task copyCoreResources(type: Copy) {
    from fileTree(project(":core").file("src/main/resources"))
    into file("build/resources/main")
@@ -118,46 +64,9 @@ task copyCommonResources(type: Copy) {
    into file("build/resources/main")
 }

-// Put stuff from gradle.properties into the mod info
 processResources {
-    dependsOn(copyAccessWidener)
    dependsOn(copyCoreResources)
    dependsOn(copyCommonResources)
-
-    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,42)"
-
-    inputs.properties replaceProperties
-    replaceProperties.put 'project', project
-    filesMatching(resourceTargets) {
-        expand replaceProperties
-    }
-
-    intoTargets.each { target ->
-        if (file(target).exists()) {
-            copy {
-                from(sourceSets.main.resources) {
-                    include resourceTargets
-                    expand replaceProperties
-                }
-                into target
-            }
-        }
-    }
 }

 shadowJar {
@@ -182,11 +91,6 @@ remapJar {
 }

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

@@ -215,79 +119,3 @@ publishing {
        // Add repositories to publish to here.
    }
 }
-
-task printConfigurations {
-    doLast {task ->
-        println "Project Name: $name configurations:"
-        configurations.each {
-            println "    $it.name"
-        }
-    }
-}
-
-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"
-        url = "https://api.modrinth.com/maven"
-        content {
-            includeGroup "maven.modrinth"
-        }
-    }
-
-    // Required for importing CursedForge mods
-    maven {
-        url "https://www.cursemaven.com"
-        content {
-            includeGroup "curse.maven"
-        }
-    }
-
-    // These 2 are for importing mods that arnt on CursedForge, Modrinth, GitHub, GitLab or anywhere opensource
-    flatDir {
-        dirs "${rootDir}/mods/fabric"
-        content {
-            includeGroup "fabric-mod"
-        }
-    }
-    flatDir {
-        dirs "${rootDir}/mods/forge"
-        content {
-            includeGroup "forge-mod"
-        }
-    }
-}
-
-tasks.withType(JavaCompile) {
-    // Add Manifold Preprocessor
-//		def excapedMCVersion = rootProject.minecraft_version.replace(".", "_")
-//		options.compilerArgs += ['-Xplugin:Manifold', "-AMC_VERSION_${excapedMCVersion}"]
-//
-    //options.compilerArgs += ['-deprecation']
-    //options.compilerArgs += ['-verbose']
-    //options.compilerArgs += ['-Xlint:unchecked']
-    //options.compilerArgs += ['-Xdiags:verbose']
-    //options.compilerArgs += ['-Xprint']
-    //options.compilerArgs += ['-XprintProcessorInfo']
-    //options.compilerArgs += ['-XprintRounds']
-
-    // println options.compilerArgs
-
-    // Set the java version
-    options.compilerArgs += ['-Xplugin:Manifold']
-    options.release = rootProject.java_version as Integer //FIXME: This warning??
-
-    // TODO: make everything use java 8
-    //        options.release = 8 // Use Java 8 for everything so back porting is easier?
-}
@@ -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;
@@ -35,21 +32,15 @@ import com.seibel.lod.common.wrappers.world.WorldWrapper;
 import net.minecraft.client.Minecraft;
 import net.minecraftforge.client.event.InputEvent;
 import net.minecraftforge.event.TickEvent;
-#if PRE_MC_1_19
 import net.minecraftforge.event.world.BlockEvent;
 import net.minecraftforge.event.world.ChunkEvent;
 import net.minecraftforge.event.world.WorldEvent;
-#else
-import net.minecraftforge.event.level.BlockEvent;
-import net.minecraftforge.event.level.ChunkEvent;
-import net.minecraftforge.event.level.LevelEvent;
-#endif
 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
 */
@@ -57,69 +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)
 	{
-		#if PRE_MC_1_19
 		clientApi.clientChunkLoadEvent(new ChunkWrapper(event.getChunk(), event.getWorld()), WorldWrapper.getWorldWrapper(event.getWorld()));
-		#else
-		clientApi.clientChunkLoadEvent(new ChunkWrapper(event.getChunk(), event.getLevel()), WorldWrapper.getWorldWrapper(event.getLevel()));
-		#endif
 	}
-	
+
 	@SubscribeEvent
-	#if PRE_MC_1_19
 	public void worldSaveEvent(WorldEvent.Save event)
-	#else
-	public void worldSaveEvent(LevelEvent.Save event)
-	#endif
 	{
 		eventApi.worldSaveEvent();
 	}
-	
+
 	/** This is also called when a new dimension loads */
 	@SubscribeEvent
-	#if PRE_MC_1_19
 	public void worldLoadEvent(WorldEvent.Load event)
-	#else
-	public void worldLoadEvent(LevelEvent.Load event)
-	#endif
 	{
-		if (Minecraft.getInstance().screen instanceof TitleScreen) return;
-		#if PRE_MC_1_19
 		if (event.getWorld() != null) {
 			eventApi.worldLoadEvent(WorldWrapper.getWorldWrapper(event.getWorld()));
 		}
-		#else
-		if (event.getLevel() != null) {
-			eventApi.worldLoadEvent(WorldWrapper.getWorldWrapper(event.getLevel()));
-		}
-		#endif
 	}
-	
+
 	@SubscribeEvent
-	#if PRE_MC_1_19
 	public void worldUnloadEvent(WorldEvent.Unload event)
 	{
 		eventApi.worldUnloadEvent(WorldWrapper.getWorldWrapper(event.getWorld()));
 	}
-	#else
-	public void worldUnloadEvent(LevelEvent.Unload event)
-	{
-		eventApi.worldUnloadEvent(WorldWrapper.getWorldWrapper(event.getLevel()));
-	}
-	#endif
-	
+
 	@SubscribeEvent
 	public void blockChangeEvent(BlockEvent event)
 	{
@@ -130,26 +95,20 @@ public class ForgeClientProxy
 				event.getClass() == BlockEvent.FluidPlaceBlockEvent.class ||
 				event.getClass() == BlockEvent.PortalSpawnEvent.class)
 		{
-			#if PRE_MC_1_19
 			IChunkWrapper chunk = new ChunkWrapper(event.getWorld().getChunk(event.getPos()), event.getWorld());
 			DimensionTypeWrapper dimType = DimensionTypeWrapper.getDimensionTypeWrapper(event.getWorld().dimensionType());
-			#else
-			IChunkWrapper chunk = new ChunkWrapper(event.getLevel().getChunk(event.getPos()), event.getLevel());
-			DimensionTypeWrapper dimType = DimensionTypeWrapper.getDimensionTypeWrapper(event.getLevel().dimensionType());
-			#endif
-			
+
 			// recreate the LOD where the blocks were changed
 			eventApi.blockChangeEvent(chunk, dimType);
 		}
 	}
-	
+
 	@SubscribeEvent
-	public void onKeyInput(#if PRE_MC_1_19 InputEvent.KeyInputEvent event #else InputEvent.Key event #endif)
+	public void onKeyInput(InputEvent.KeyInputEvent event)
 	{
 		if (Minecraft.getInstance().player == null) return;
 		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,19 +25,22 @@ 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.wrappers.ForgeDependencySetup;

+import com.seibel.lod.forge.wrappers.modAccessor.ModChecker;
 import com.seibel.lod.forge.wrappers.modAccessor.OptifineAccessor;
-
 import net.minecraft.client.renderer.block.model.BakedQuad;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.core.Direction;
-import net.minecraft.world.level.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.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
@@ -45,34 +48,16 @@ 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;
-#elif POST_MC_1_19
-import net.minecraftforge.client.ConfigScreenHandler;
-#else // 1.18+ untill 1.19
-import net.minecraftforge.client.ConfigGuiHandler;
-#endif
-
-// these imports change due to forge refactoring classes in 1.19
-#if POST_MC_1_19
-import net.minecraft.util.RandomSource;
-import net.minecraft.client.renderer.RenderType;
-import net.minecraftforge.client.model.data.ModelData;
-#else
-import net.minecraftforge.client.model.data.ModelDataMap;
-import java.util.Random;
-#endif

 import java.util.List;
-
+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
 */
@@ -80,22 +65,25 @@ import java.util.List;
 public class ForgeMain implements LodForgeMethodCaller
 {
 	public static ForgeClientProxy forgeClientProxy;
-	
+
 	private void init(final FMLCommonSetupEvent event)
 	{
-		// make sure the dependencies are set up before the mod needs them
 		LodCommonMain.initConfig();
 		LodCommonMain.startup(this, !FMLLoader.getDist().isClient());
 		ForgeDependencySetup.createInitialBindings();
 		ForgeDependencySetup.finishBinding();
 		ApiShared.LOGGER.info("Distant Horizons initializing...");
 	}
-	
+
+
 	public ForgeMain()
 	{
-		// Register the methods for server and other game events we are interested in
+		// 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)
@@ -103,48 +91,27 @@ public class ForgeMain implements LodForgeMethodCaller
 		if (ReflectionHandler.instance.optifinePresent()) {
 			ModAccessorHandler.bind(IOptifineAccessor.class, new OptifineAccessor());
 		}
-		
+
+		ModAccessorHandler.finishBinding();
+
+
 		ModAccessorHandler.finishBinding();

-		#if PRE_MC_1_17_1
-		ModLoadingContext.get().registerExtensionPoint(ExtensionPoint.CONFIGGUIFACTORY,
-				() -> (client, parent) -> ConfigGui.getScreen(parent, ""));
-		#elif POST_MC_1_19
-		ModLoadingContext.get().registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class,
-				() -> new ConfigScreenHandler.ConfigScreenFactory((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);
 	}

-	#if PRE_MC_1_19
-	private final ModelDataMap modelData = new ModelDataMap.Builder().build();
-	#else
-	private final ModelData modelData = ModelData.EMPTY;
-	#endif
-	
+	private ModelDataMap dataMap = new ModelDataMap.Builder().build();
 	@Override
-	#if PRE_MC_1_19
 	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, modelData);
+		return mc.getModelManager().getBlockModelShaper().getBlockModel(block.defaultBlockState()).getQuads(blockState, direction, random, dataMap);
 	}
-	#else
-	public List<BakedQuad> getQuads(MinecraftClientWrapper mc, Block block, BlockState blockState, Direction direction, RandomSource random)
-	{
-		return mc.getModelManager().getBlockModelShaper().getBlockModel(block.defaultBlockState()).getQuads(blockState, direction, random, modelData #if POST_MC_1_19, RenderType.solid() #endif);
-	}
-	#endif
+

 	@Override
-	public int colorResolverGetColor(ColorResolver resolver, Biome biome, double x, double z) {
-		#if MC_1_17_1_I_THINK_ITS_FIXED?
-		return resolver.m_130045_(biome, x, z);
-		#else
-		return resolver.getColor(biome, x, z);
-		#endif
-
+	public int getPixelRGBA(TextureAtlasSprite sprite, int frameIndex, int x, int y) {
+		return sprite.getPixelRGBA(frameIndex, x, y);
 	}
 }
@@ -1,29 +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.forge.mixins;

-import com.seibel.lod.core.api.ApiShared;
 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;

@@ -31,28 +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) {
-            //ApiShared.LOGGER.info("Generating Biome {} and acquired lock.", biome.getRegistryName());
-            biome.generate(structFeatManager, (ChunkGenerator)(Object)this, genRegion, l, random, pos);
-        }
-        //ApiShared.LOGGER.info("Released lock. Biome {} generated.", biome.getRegistryName());
-    }
+	@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,24 +0,0 @@
-package com.seibel.lod.forge.mixins;
-
-import com.seibel.lod.core.render.F3Screen;
-import net.minecraft.client.gui.components.DebugScreenOverlay;
-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 java.util.List;
-
-@Mixin(DebugScreenOverlay.class)
-public class MixinDebugScreenOverlay {
-
-    @Inject(method = "getSystemInformation", at = @At("RETURN"))
-    private void addCustomF3(CallbackInfoReturnable<List<String>> cir) {
-        List<String> messages = cir.getReturnValue();
-
-        for (String i: F3Screen.f3List) {
-            messages.add(i);
-        }
-    }
-
-}
@@ -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.forge.mixins;

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

 import com.seibel.lod.common.wrappers.config.ConfigGui;
@@ -27,9 +8,7 @@ import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
 import net.minecraft.client.gui.screens.OptionsScreen;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
-#if PRE_MC_1_19
 import net.minecraft.network.chat.TranslatableComponent;
-#endif
 import net.minecraft.resources.ResourceLocation;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -41,7 +20,7 @@ import java.util.Objects;
 /**
 * Adds a button to the menu to goto the config
 *
- * @author coolGi
+ * @author coolGi2007
 * @version 12-02-2021
 */
@Mixin(OptionsScreen.class)
@@ -55,24 +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
-                            #if PRE_MC_1_19
-                            new TranslatableComponent("text.autoconfig." + ModInfo.ID + ".title")));
-                            #else
-                            Component.translatable("text.autoconfig." + ModInfo.ID + ".title")));
-                            #endif
+            this.addRenderableWidget(new TexturedButtonWidget(
+                    // Where the button is on the screen
+                    this.width / 2 - 180, this.height / 6 - 12,
+                    // Width and height of the button
+                    20, 20,
+                    // Offset
+                    0, 0,
+                    // Some textuary stuff
+                    20, ICON_TEXTURE, 20, 40,
+                    // Create the button and tell it where to go
+                    // For now it goes to the client option by default
+                    (buttonWidget) -> Objects.requireNonNull(minecraft).setScreen(ConfigGui.getScreen(this, "client")),
+                    // Add a title to the screen
+                    new TranslatableComponent("text.autoconfig." + ModInfo.ID + ".title")));
    }
 }
@@ -1,56 +0,0 @@
-package com.seibel.lod.forge.mixins;
-
-import net.minecraft.world.level.chunk.ChunkGenerator;
-import org.spongepowered.asm.mixin.Mixin;
-
-#if PRE_MC_1_17_1
-
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Redirect;
-
-import com.terraforged.mod.chunk.generator.FeatureGenerator;
-
-import java.util.Random;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.WorldGenLevel;
-import net.minecraft.world.level.chunk.ChunkGenerator;
-import net.minecraft.world.level.levelgen.feature.ConfiguredFeature;
-
-@Mixin(FeatureGenerator.class)
-public class MixinTFChunkGenerator {
-
-	@Redirect(method = "decorate("
-			+ "Lnet/minecraft/world/level/StructureFeatureManager;"
-			+ "Lnet/minecraft/world/level/WorldGenLevel;"
-			+ "Lnet/minecraft/world/level/chunk/ChunkAccess;"
-			+ "Lnet/minecraft/world/level/biome/Biome;"
-			+ "Lnet/minecraft/core/BlockPos;"
-			+ "Lcom/terraforged/mod/profiler/watchdog/WatchdogContext;)V",
-		at = @At(
-			value = "INVOKE",
-			target = "Lnet/minecraft/world/level/levelgen/feature/ConfiguredFeature;place("
-					+ "Lnet/minecraft/world/level/WorldGenLevel;"
-					+ "Lnet/minecraft/world/level/chunk/ChunkGenerator;"
-					+ "Ljava/util/Random;Lnet/minecraft/core/BlockPos;)Z"
-		))
-	private boolean wrapDecorate$FeaturePlace(ConfiguredFeature<?, ?> feature, WorldGenLevel arg,
-			ChunkGenerator arg2, Random random, BlockPos arg3) {
-		synchronized(FeatureGenerator.class) {
-			//ClientApi.LOGGER.info("wrapDecorate FeaturePlace triggered");
-			return feature.place(arg, arg2, random, arg3);
-		}
-	}
-
-	//METHOD: com.terraforged.mod.chunk.generator.FeatureGenerator.decorate(StructureFeatureManager manager,
-	// WorldGenLevel region, ChunkAccess chunk, Biome biome, BlockPos pos, WatchdogContext context)
-
-	//TARGET: boolean net.minecraft.world.level.levelgen.feature.ConfiguredFeature.place
-	// (WorldGenLevel arg, ChunkGenerator arg2, Random random, BlockPos arg3)
-}
-
-#else
-@Mixin(ChunkGenerator.class)
-class MixinTFChunkGenerator {
-}
-#endif
@@ -1,26 +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.forge.mixins;

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

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

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

 import net.minecraft.Util;

@Mixin(Util.class)
 public class MixinUtilBackgroudThread
 {
-	
-	private static boolean shouldApplyOverride() {
-		return DependencySetupDoneCheck.getIsCurrentThreadDistantGeneratorThread.get();
-	}
-
-	@Inject(method = "backgroundExecutor", at = @At("HEAD"), cancellable = true)
-	private static void overrideUtil$backgroundExecutor(CallbackInfoReturnable<ExecutorService> ci)
-	{
-		if (DependencySetupDoneCheck.isDone && shouldApplyOverride())
-		{
-			//ApiShared.LOGGER.info("util backgroundExecutor triggered");
-			ci.setReturnValue(new DummyRunExecutorService());
+	private static boolean doTriggerOverride() {
+		try {
+			return DependencySetupDoneCheck.getIsCurrentThreadDistantGeneratorThread.get();
+		} catch (NullPointerException e) {
+			return false;
 		}
 	}
-
-	#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 (DependencySetupDoneCheck.isDone && shouldApplyOverride())
+		if (DependencySetupDoneCheck.isDone && doTriggerOverride())
 		{
-			//ApiShared.LOGGER.info("util wrapThreadWithTaskName(Runnable) triggered");
+			// 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 (DependencySetupDoneCheck.isDone && shouldApplyOverride())
-		{
-			//ApiShared.LOGGER.info("util wrapThreadWithTaskName(Supplier) triggered");
-			ci.setReturnValue(r);
-		}
-	}
-	#endif

+	@Inject(method = "backgroundExecutor", at = @At("HEAD"), cancellable = true)
+	private static void overrideUtil$backgroundExecutor(CallbackInfoReturnable<Executor> ci)
+	{
+		if (DependencySetupDoneCheck.isDone && doTriggerOverride())
+		{
+			// ApiShared.LOGGER.info("util backgroundExecutor triggered");
+			ci.setReturnValue(Runnable::run);
+		}
+	}
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ran	865923b0dc	Update Readme.md	2022-04-17 17:01:21 +00:00
James Seibel	b9b023691a	remove a few compiler warnings and update core	2022-04-01 21:00:33 -05:00
coolGi2007	5c7dfc5905	Downgraded stuff (removes fabric api) and updated gitlab cd	2022-04-01 17:35:00 +10:30
coolGi2007	b70fc86516	Downgraded 1.18 to 1.17 (that took a long time) tough still needs some fixing	2022-03-30 17:35:09 +10:30
coolGi2007	9c3ecc6deb	Downgraded stuff from 1.18 to 1.17 and updated core	2022-03-10 17:38:07 +10:30
coolGi2007	d688a53d74	Added the multiplayer folder thing from 1.18	2022-03-08 17:24:31 +10:30
James Seibel	2cf4b42c5c	Rename MinecraftWrapper -> MinecraftClientWrapper	2022-03-05 18:29:37 -06:00
James Seibel	c726a49c82	remove WorldWrapper.isEmpty() It wasn't used and there was a comment saying not to use it	2022-03-05 18:15:17 -06:00
James Seibel	0b0a69aabe	(No Fabric) Update the DependencyHandler to support circular references	2022-03-05 17:41:37 -06:00
James Seibel	96ac022cbf	Merge branch '1.17.X' of gitlab.com:jeseibel/minecraft-lod-mod into 1.17.X	2022-03-03 19:42:07 -06:00
James Seibel	fa325b2eb8	Start updating for changed core	2022-03-03 19:41:31 -06:00
coolGi2007	c87233eb10	Fixed everything	2022-03-03 17:08:17 +10:30
James Seibel	88497593c4	Refactor the dependency injectors	2022-03-01 21:30:40 -06:00
coolGi2007	9817dcf022	Renamed readme to 1.17.X	2022-02-28 11:06:22 +00:00
coolGi2007	898eda7355	Updated the readme and updated the DHJarMerger (now marks the jar as an executable so linux users have an easier time when runnung the jar)	2022-02-22 17:55:03 +10:30
coolGi2007	7363231361	Updated fabric, core, readme and added a way to run jar	2022-02-21 16:30:02 +10:30
cola98765	40fbca33f4	actually fix tint on custom water textures.	2022-02-19 22:32:03 +01:00
cola98765	62712cfab4	actually fix tint on custom water textures.	2022-02-19 22:30:01 +01:00
James Seibel	8d94988be1	Update the version number to 1.6.2a	2022-02-17 20:22:36 -06:00
cola98765	99ce73feee	update BlockColorWrapper, and fix "wraning"	2022-02-15 12:11:29 +01:00
coolGi2007	b7e3db12d9	Fixed some stuff in the modinfo	2022-02-15 05:00:41 +00:00
coolGi2007	e0a7010abf	Updated gradle stuff to be more like 1.18	2022-02-14 17:36:37 +10:30
James Seibel	f1b8616329	Update the forge version	2022-02-13 16:58:52 -06:00
James Seibel	b6a84a454b	Prepare for 1.6.1a	2022-02-12 12:03:23 -06:00
tom lee	b8aabc59cd	Fix forge mixin loading class prematurely	2022-02-12 23:45:08 +08:00
tom lee	66f169bd78	Backport 1.18 changes	2022-02-12 23:20:27 +08:00
tom lee	e038861b7a	Update core	2022-02-12 16:29:14 +08:00
tom lee	c41fd1ab5b	Backport changes from 1.16	2022-02-12 16:28:50 +08:00
James Seibel	a12a55a953	Update the version number to 1.6.1a-pre and re-enable dev code	2022-02-11 22:07:58 -06:00
James Seibel	42068fc152	Update the mod homepage	2022-02-11 20:30:44 -06:00
James Seibel	791d2c881a	Update the version number for 1.6.0a	2022-02-11 20:17:34 -06:00
coolGi2007	9fff802baf	Fixed shadow jar problem with toml in fabric	2022-02-11 13:35:20 +00:00
coolGi2007	d5c0f714fa	Added _Version to config for future me	2022-02-11 13:07:24 +00:00
tom lee	09914af897	Hotfix Forge 1.17.1 non IDE IllegalAccessError	2022-02-11 19:29:36 +08:00
tom lee	7dd57345a4	Update core + Add missing MixinChunkGenerator back. (Which fix crashes)	2022-02-11 15:48:27 +08:00
James Seibel	aff52ce926	Slightly improve the tooltips for the config GUI	2022-02-10 22:08:31 -06:00
tom lee	98ed33e2bf	Update core + Config + fix blindness Fog	2022-02-10 22:16:30 +08:00
tom lee	d4f4e7e24d	Update core	2022-02-10 17:07:33 +08:00
tom lee	cfc5f4cede	Update core	2022-02-10 16:14:39 +08:00
tom lee	e3611b00e1	Update core + Fixed the debug button not working	2022-02-10 14:54:34 +08:00
tom lee	8f6fb9cecc	Update core	2022-02-10 11:40:11 +08:00
tom lee	ba3f1fd0d0	Make chunk return true on isLightCorrect same as 1.16.	2022-02-10 11:12:40 +08:00
coolGi2007	932f3ca19a	Made sodium use cursedforge and added toml to core	2022-02-10 13:10:01 +10:30
tom lee	7eb4339a1b	Update everything up to latest state	2022-02-09 19:04:39 +08:00
James Seibel	21fd19d8d8	Add an expiration to the archives	2022-02-05 15:43:29 +00:00
coolGi2007	cfbca82905	Removed clouds	2022-02-05 09:46:52 +00:00
tom lee	11989b310e	Middle-ported the Batch Generator	2022-02-05 16:08:18 +08:00
coolGi2007	c75f50a29a	Cleaned up some gradle stuff	2022-01-30 16:02:20 +10:30
coolGi2007	3a0deb5111	Down-ported everything from 1.18 to 1.17 (not including world gen)	2022-01-28 19:46:02 +10:30
coolGi2007	c2462846db	Downgraded stuff from 1.18 to 1.17	2022-01-26 05:06:37 +00:00
coolGi2007	66c183ba4f	Added comments to the file	2022-01-25 05:09:31 +00:00
James Seibel	3966c668d9	Delete OptiFine_1.17.1_HD_U_H1.jar	2022-01-25 01:00:04 +00:00
coolGi2007	d1cc7740d3	Fixed accsesswideners	2022-01-24 23:41:22 +10:30
coolGi2007	9586cfe90d	After all these years, the ints show up correctly after restarting (it was literally a 1 line fix)	2022-01-24 19:50:32 +10:30
coolGi2007	5a8194fc0d	Updated everything from 1.18 to 1.17	2022-01-24 17:50:23 +10:30
coolGi2007	15a7678da2	Downgraded stuff from 1.18 to 1.17	2022-01-21 13:12:03 +10:30
cola98765	59f7a8571f	resolved warnings	2022-01-18 14:21:58 +01:00
coolGi2007	e878954763	Added 1 jar thing	2022-01-18 10:09:34 +00:00
jas35484	a07282dd36	Add the missing minor version number 1.6a -> 1.6.0a	2022-01-17 20:35:50 -06:00
jas35484	df5923ea8e	Increment the version from 'a1.5.4' to 'a1.6-pre'	2022-01-17 20:26:04 -06:00
jas35484	19350cc5d4	Add .gitlab-ci.yml	2022-01-17 19:51:19 -06:00
coolGi2007	1fd639a3f7	Escape button saves config	2022-01-14 14:05:44 +10:30
tom lee	69efd93ec3	Update core + Add DisableVanillaFog for Forge	2022-01-14 00:04:20 +08:00
tom lee	c7575887ea	Fixed Sodium Fog	2022-01-13 20:05:04 +08:00
tom lee	7902d483ec	Update core. Port back fix for onChunkLoad light issue	2022-01-12 18:02:02 +08:00
coolGi2007	2bd74d379c	Fixed immersive portals with cloud rendering	2022-01-12 16:31:36 +10:30
coolGi2007	1db8d3599b	Fixes all (hopefully) problems with saving the config file	2022-01-11 17:37:20 +10:30
tom lee	e80ccd38fe	Fixed up SodiumAccessor	2022-01-10 22:05:31 +08:00
coolGi2007	12b7723017	Added cloud warning	2022-01-10 05:12:22 +00:00
coolGi2007	51341f14a3	Updated readme since fabric version was updated	2022-01-10 14:38:49 +10:30
coolGi2007	f07783deb1	Removed forge fog renderer to fix a crash	2022-01-10 14:18:07 +10:30
coolGi2007	c7e41973d3	Update accesswidener to fox something	2022-01-09 10:39:21 +00:00
coolGi2007	f90276d8a1	Fixed everything	2022-01-09 10:18:18 +00:00
tom lee	384fe016cd	Updated common	2022-01-09 17:49:46 +08:00
coolGi2007	06301a42d6	oops	2022-01-09 09:45:59 +00:00
coolGi2007	b13626689b	Updated everything(need to update the sodium stuff)	2022-01-09 20:09:06 +10:30
coolGi2007	ae820320de	Updated everything	2022-01-07 07:15:29 +00:00
coolGi2007	4da96d094e	Update Config.java	2022-01-02 08:58:50 +00:00
coolGi2007	d8196c2069	Removed the need for any config category. The config now guesses the category	2022-01-02 06:06:44 +00:00
coolGi2007	c5e0f35a63	Reordered the forge mixin	2022-01-02 05:15:35 +00:00
coolGi2007	8a76887386	Updated core and fixed config crash	2022-01-02 03:49:50 +00:00
coolGi2007	2d495b981f	Updated core	2022-01-01 22:28:57 +10:30
coolGi2007	95b5d94596	Updated stuff	2021-12-31 21:35:13 +10:30
coolGi2007	b4de7cbd0b	Fixed ConfigGui	2021-12-29 05:47:09 +00:00
coolGi2007	27b4cde1dc	Fixed a broken thing	2021-12-28 11:40:41 +00:00
coolGi2007	ed2b28aa30	More universal config (works with java 8 & 16)	2021-12-28 10:46:13 +00:00
Ran	b43a29a98d	Fix forge's access transformers	2021-12-28 07:00:57 +00:00
coolGi2007	3c3474e66b	Forgot to remove this	2021-12-28 06:17:58 +00:00
coolGi2007	2aee802ca2	Updated everything to latest 1.18.X version	2021-12-28 16:21:50 +10:30
coolGi2007	5cd338392c	Updated to stuff in 1.18.X branch	2021-12-24 17:51:54 +10:30
coolGi2007	fff510f315	Updated stuff	2021-12-23 05:42:51 +00:00
coolGi2007	fbf418e31d	Fixed the config button on forge menu	2021-12-22 07:06:06 +00:00
coolGi2007	e0ac46290c	Updated config to be smaller	2021-12-22 16:05:43 +10:30
coolGi2007	77c21785d1	Updated code (sry i forgot)	2021-12-22 15:50:54 +10:30
coolGi2007	5bcb1fdca3	Updated generator	2021-12-22 15:49:35 +10:30
coolGi2007	1e6167204a	Forgot to make runclient forge	2021-12-17 11:57:55 +00:00
coolGi2007	8c64a33537	Updated core	2021-12-17 08:24:29 +00:00
James Seibel	f3188bfa1f	Remove the Forge server mod requirement and update the credits	2021-12-16 21:41:54 -06:00
coolGi2007	efdceddd7b	Made config more responsive	2021-12-16 03:00:34 +00:00
coolGi2007	be0255ed9e	Updated core	2021-12-15 13:24:50 +00:00
coolGi2007	a2abf0e210	Updated core	2021-12-14 08:19:11 +00:00
coolGi2007	ed41a7e449	Updated generation comments	2021-12-13 12:33:04 +00:00
coolGi2007	56e74a15ba	Updated core	2021-12-13 12:22:43 +00:00
coolGi2007	e7f9c01292	Accidentally imported something	2021-12-13 12:13:35 +00:00
coolGi2007	ca997b8341	Updated config	2021-12-13 12:04:27 +00:00
coolGi2007	3bc6caba26	Updated core	2021-12-12 03:58:07 +00:00
coolGi2007	a533ffc4c9	Updated core	2021-12-12 01:34:24 +00:00
coolGi2007	1c9c091a21	Updated readme to say to install git	2021-12-11 10:28:38 +00:00
coolGi2007	b334a173f9	Fixed build not building	2021-12-11 09:14:40 +00:00
coolGi2007	60c56d5507	Update behind the scenes configs stuff	2021-12-11 06:05:40 +00:00
coolGi2007	ce51dbfc3a	Actually updated the submodule since i forgot	2021-12-11 03:42:13 +00:00
coolGi2007	ccdf57eb3f	Updated core and started work on fixing config	2021-12-11 03:41:43 +00:00
Ran	15f0325343	Make code server safe	2021-12-10 15:14:02 +06:00
coolGi2007	157a21568c	Updated core	2021-12-10 05:20:40 +00:00
coolGi2007	c02abcb4ba	Updated readme & removed stuff from conig	2021-12-10 01:18:36 +00:00
coolGi2007	55f636b2d5	Updated core	2021-12-10 00:50:31 +00:00
Ran	580d17bb24	Merge remote-tracking branch 'origin/1.17.1' into 1.17.1	2021-12-09 21:45:33 +06:00
Ran	f2dd9d7264	This should fix the AW for some builds	2021-12-09 21:44:59 +06:00
Ran	1a22f00c01	Merge remote-tracking branch 'origin/1.17.1' into 1.17.1	2021-12-09 21:20:10 +06:00
Ran	5c44967174	Update Readme.md	2021-12-09 21:19:54 +06:00
Ran	88b967780e	Just straight up remove that line	2021-12-09 20:57:48 +06:00
Ran	5650a85c70	Comment this part out	2021-12-09 20:45:26 +06:00
Ran	cf03cb4576	Update core	2021-12-09 20:37:01 +06:00
Ran	6334c58fa6	Merge remote-tracking branch 'origin/1.17.1' into 1.17.1	2021-12-09 19:10:18 +06:00
Ran	297f53beaf	MixinPalettedContainer	2021-12-09 19:09:55 +06:00
coolGi2007	34256540f0	Fixed forge not building	2021-12-09 10:44:15 +00:00
coolGi2007	2c2a9e05c9	Forgot to update the forge options button. Sry	2021-12-09 05:35:46 +00:00
coolGi2007	69b2b1725b	Updated core	2021-12-09 05:32:48 +00:00
coolGi2007	5dec52e493	Chainged config file to toml and fixed some general config stuff	2021-12-09 05:24:14 +00:00
Ran	56faf3fdb6	Update core	2021-12-08 20:33:33 +06:00
coolGi2007	d2a9edfd2c	Fixed a mixin mistake I made	2021-12-07 05:03:56 +00:00