update the version number 1.6.7a -> 1.6.8a

41.0.94 is the last version that doesn't work

.gitignore

@@ -51,3 +51,6 @@ Merged/
 
 # file from notepad++
 *.bak
+
+# file genearated via MC version switching using preprocessor
+build.properties

.gitlab-ci.yml

@@ -3,16 +3,14 @@ image: gradle:eclipse-temurin
 
 # all stages need to be defined here
 stages:
-  - gradleSetup
+  - build_19_1
-  - build
+  - build_19
-  - merge
+  - build_18_2
+  - build_18_1
+  - build_17_1
+  - build_16_5
 
 variables:
-    # Disable the Gradle daemon for Continuous Integration servers as correctness
-    # is usually a priority over speed in CI environments. Using a fresh
-    # runtime for each build is more reliable since the runtime is completely
-    # isolated from any previous builds.
-    GRADLE_OPTS: "-Dorg.gradle.daemon=false"
     # Pull core when building
     GIT_SUBMODULE_STRATEGY: recursive
 
@@ -24,90 +22,161 @@ before_script:
 
 
 
+# 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
 
-# first stage
+# 1.17.1 build
-# This prevents us from re-downloading Gradle every stage
+build_17_1:
-gradleSetup:
+  stage: build_17_1
-    stage: gradleSetup
+  script:
-    script: ./gradlew --build-cache --gradle-user-home cache/ check
+    - echo "Building 1.17.1..."
-    # build using Java 17
+    - ./gradlew deleteMerged -PmcVer="1.17.1" --gradle-user-home cache/;
-    image: eclipse-temurin:17
+    - ./gradlew clean -PmcVer="1.17.1" --gradle-user-home cache/;
-    cache:
+    - ./gradlew core:build -PmcVer="1.17.7" --gradle-user-home cache/;
-        key:
+    - ./gradlew build -PmcVer="1.17.1" --gradle-user-home cache/;
-          files:
+    - ./gradlew mergeJars -PmcVer="1.17.1" --gradle-user-home cache/;
-            - gradle/wrapper/gradle-wrapper.properties 
+  image: eclipse-temurin:17
-        policy: push
+  artifacts:
-        paths:
+    name: "Merged_NightlyBuild_1_17_1-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
-          - cache/
+    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
+
+# 1.19.1 build
+build_19_1:
+  stage: build_19_1
+  script:
+    - echo "Building 1.19.1..."
+    - ./gradlew deleteMerged -PmcVer="1.19.1" --gradle-user-home cache/;
+    - ./gradlew clean -PmcVer="1.19.1" --gradle-user-home cache/;
+    - ./gradlew core:build -PmcVer="1.19.1" --gradle-user-home cache/;
+    - ./gradlew build -PmcVer="1.19.1" --gradle-user-home cache/;
+    - ./gradlew mergeJars -PmcVer="1.19.1" --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
 
 
-
+# unused deployment stage
-# second stage
-build:
-    stage: build
-    script: ./gradlew build --gradle-user-home cache/
-    # build using Java 17
-    image: eclipse-temurin:17
-    cache:
-        key: "$CI_COMMIT_REF_NAME"
-        policy: pull-push
-        paths:
-            - .architectury-transformer
-            - .gradle
-            - build
-            - common/.gradle
-            - common/build
-            - core/.gradle
-            - core/build
-            - fabric/.gradle
-            - fabric/src/generated
-            - forge/.gradle
-            - forge/src/generated
-            - build
-            - .gradle
-            - cache/
-    artifacts:
-        name: "NightlyBuild-$CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"  
-        paths:
-            # relative to the root directory
-            - fabric/build/libs
-            - forge/build/libs
-        exclude:
-            - fabric/build/libs/*-dev.jar
-            - fabric/build/libs/*-dev-shadow.jar
-            - fabric/build/libs/*-sources-dev.jar
-            - fabric/build/libs/*-sources.jar
-            - forge/build/libs/*-dev.jar
-            - forge/build/libs/*-dev-shadow.jar
-            - forge/build/libs/*-sources-dev.jar
-            - forge/build/libs/*-sources.jar
-        reports:
-            # To ensure we've access to these files in the next stage
-            dotenv: generate_jars.env
-        expire_in: 1 day
-
-# third stage
-merge:
-    stage: merge
-    script: ./gradlew merge --gradle-user-home cache/ 
-    # build using Java 17
-    image: eclipse-temurin:17
-    cache:
-        key: "$CI_COMMIT_REF_NAME"
-        policy: pull-push
-        paths:
-            - build
-            - .gradle
-            - cache/
-    artifacts:
-        name: "Merged_NightlyBuild-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"  
-        paths:
-            # relative to the root directory
-            - Merged
-        expire_in: 1 day
-
-
-## forth stage
 #deploy:
 #    stage: deploy
 #    image: registry.gitlab.com/gitlab-org/release-cli:latest
@@ -130,3 +199,4 @@ merge:
 #                  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' 
+

.gitmodules

@@ -1,3 +1,4 @@
 [submodule "core"]
 	path = core
 	url = https://gitlab.com/jeseibel/distant-horizons-core.git
+	branch = main

1.16.5.properties

@@ -0,0 +1,43 @@
+# 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.17.1.properties

@@ -0,0 +1,43 @@
+# 1.17.1 version
+
+java_version=16
+minecraft_version=1.17.1
+parchment_version=2021.12.12
+compatible_minecraft_versions=["1.17", "1.17.1"]
+
+# Fabric loader
+fabric_loader_version=0.13.2
+fabric_api_version=0.46.1+1.17
+    # Fabric mod versions
+    modmenu_version=2.0.14
+    starlight_version_fabric=3442770
+    phosphor_version_fabric=
+    lithium_version=mc1.17.1-0.7.5
+    sodium_version=3605275
+    iris_version=1.17.x-v1.1.4
+    bclib_version=
+    immersive_portals_version = 0.14-1.17
+
+    # Fabric mod run
+    # 0 = Dont enable and dont run
+    # 1 = Can be refranced in code but dosnt run
+    # 2 = Can be refranced in code and runs in client
+    enable_starlight=0
+    enable_phosphor=0
+    enable_lithium=0
+    enable_sodium=1
+    enable_iris=0
+    enable_bclib=0
+
+# Forge loader
+forge_version=37.1.1
+    # Forge mod versions
+    starlight_version_forge=3457784
+    terraforged_version=
+
+    # Forge mod run
+    # 0 = Dont enable and dont run
+    # 1 = Can be refranced in code but dosnt run
+    # 2 = Can be refranced in code and runs in client
+    enable_starlight_forge=0
+    enable_terraforged=0

1.18.1.properties

@@ -0,0 +1,43 @@
+# 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.18.2.properties

@@ -0,0 +1,43 @@
+# 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.19.1.properties

@@ -0,0 +1,43 @@
+# 1.18.2 version based stuff
+
+java_version = 17
+minecraft_version=1.19.1
+parchment_version=2022.03.13
+compatible_minecraft_versions=["1.19.1"]
+
+# Fabric loader
+fabric_loader_version=0.14.8
+fabric_api_version=0.58.5+1.19.1
+    # 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.6
+    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=42.0.0
+    # 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.19.properties

@@ -0,0 +1,43 @@
+# 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.6
+    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

LICENSE.LESSER.txt

@@ -0,0 +1,165 @@
+                   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.

Readme.md

@@ -1,4 +1,8 @@
-# Distant Horizons
+# <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.\
 This implementation renders simplified chunks outside the normal render distance\
@@ -7,22 +11,74 @@ 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://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>
+<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>
+
+### Versions
+
+This branch is for these versions of Minecraft
+- 1.19.1
+- 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\
-Forge version: 39.0.5 and 38.0.14\
+Architectury loom version: 0.12.0-SNAPSHOT\
-Fabric version: 0.12.12\
+Java Compiler plugin: Manifold Preprocessor
-Fabric API version: 0.44.0+1.18
+
+#### 1.19.1 mods
+Forge version: 42.0.0\
+Fabric version: 0.14.8\
+Fabric API version: 0.58.5+1.19.1\
+Modmenu version: 4.0.0
+
+#### 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
+
 
-Modmenu version: 3.0.0\
-Sodium version: mc1.18-0.4.0-alpha5
 
 Notes:\
-This version has been confirmed to work in Eclipse and Retail Minecraft.\
+This version has been confirmed to work in IDE and Retail Minecraft with ether the Fabric or Forge mod-loader.
-(Retail running forge version 1.18.1-39.0.5 and fabric version 1.18-0.12.12 and 1.18.1-0.12.12)
 
 
-## source code installation
+## Source Code Installation
+
+#### Nightlly builds
+This mod has an autobuild system to automatically build the mod on each commit
+- 1.19.1:   https://gitlab.com/jeseibel/minecraft-lod-mod/-/jobs/artifacts/1.6.4a_dev/download?job=build_19_1
+- 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
@@ -31,31 +87,50 @@ https://fabricmc.net/wiki/tutorial:setup
 
 * A Java Development Kit (JDK) for Java 17 (recommended) or newer. Visit https://www.oracle.com/java/technologies/downloads/ for installers.
 * Git or someway to clone git projects. Visit https://git-scm.com/ for installers.
-* (Not required) Any Java IDE, for example Intellij IDEA and Eclipse. You may also use any other code editors, such as Visual Studio Code. (Optional)
+* (Not required) Any Java IDE with plugins that support Manifold, for example Intellij IDEA.
-It's better to use IntelliJ IDEA since Eclipse is not supported by Architectury, but it still works.
 
 **If using IntelliJ:**
+0. Install Manifold plugin
 1. open IDEA and import the build.gradle
 2. refresh the Gradle project in IDEA if required
 
-**If using Ecplise:**
+**If using Ecplise: (Note that Eclispe currently doesn't support Manifold's preprocessor!)**
 1. run the command: `./gradlew geneclipseruns`
 2. run the command: `./gradlew eclipse`
 3. Make sure eclipse has the JDK 17 installed. (This is needed so that eclipse can run minecraft)
 4. Import the project into eclipse
 
+## Switching Versions
+This branch support 6 built versions:
+ - 1.19.1
+ - 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)
+
+To switch between active versions, change `mcVer=1.?` in `gradle.properties` file.
+
+If running on IDE, to ensure IDE pickup the changed versions, you will need to run a gradle command again to allow gradle to update all the libs. (In IntellJ you will also need to do a gradle sync again if it didn't start it automatically.)
+>Note: There may be a `java.nio.file.FileSystemException` thrown on running the command after switching versions. To fix it, either restart your IDE (as your IDE is locking up a file) or use tools like LockHunter to unlock the linked file. (Often a lib file under `common\build\lib` or `forge\build\lib` or `fabric\build\lib`). If anyone knows how to solve this issue please comment to this issue: https://gitlab.com/jeseibel/minecraft-lod-mod/-/issues/233
+ 
 ## Compiling
 
 **Using GUI**
-1. Open a command line in the project folder
+1. Download the zip of the project and extract it
-2. Run the command: `./gradlew build`
+2. Download the core from https://gitlab.com/jeseibel/distant-horizons-core and extract into a folder called `core`
-3. The compiled jar file will be in the folder `fabric/build/libs/` and `forge/build/libs/`
+3. Open a command line in the project folder
+4. Run the command: `./gradlew assemble`
+5. Then run command: `./gradlew mergeJars`
+6. The compiled jar file will be in the folder `Merged`
 
 **If in terminal:**
-1. `git clone -b 1.18.X --recurse-submodules https://gitlab.com/jeseibel/minecraft-lod-mod.git`
+1. `git clone -b 1.6.4a_dev --recurse-submodules https://gitlab.com/jeseibel/minecraft-lod-mod.git`
 2. `cd minecraft-lod-mod`
-3. `./gradlew assemble` or `./gradlew build`
+3. `./gradlew assemble`
-4. The build should be in `fabric/build/libs/` and `forge/build/libs/`
+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.
 
 
 ## Other commands
@@ -69,7 +144,12 @@ It's better to use IntelliJ IDEA since Eclipse is not supported by Architectury,
 
 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.
+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
 
 ## Useful commands
 

build.gradle

@@ -8,144 +8,396 @@ buildscript {
 
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "0.10.0-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "0.12.0-SNAPSHOT" 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(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.1"
+    def mcVersion = ""
+    def mcVers = mcVersions.split(",")
+    int mcIndex = -1
+    println "Avalible MC versions: ${mcVersions}"
+    if (project.hasProperty("mcVer")) {
+        mcVersion = mcVer
+        mcIndex = Arrays.asList(mcVers).indexOf(mcVer)
+    }
+    if (mcIndex == -1) {
+        println "No mcVer set or the set mcVer is invalid! Defaulting to ${defaultMcVersion}."
+        println "Tip: Use -PmcVer='${defaultMcVersion}' in cmd arg to set mcVer."
+        mcVersion = defaultMcVersion
+        mcIndex = Arrays.asList(mcVers).indexOf(defaultMcVersion)
+        assert mcIndex != -1
+    }
+
+	println "Loading properties file at " + mcVersion + ".properties"
+	def props = new Properties()
+	props.load(new FileInputStream("$rootProject.rootDir/"+"$mcVersion"+".properties"))
+
+    props.each { prop ->
+      rootProject.ext.set(prop.key, prop.value)
+	  // println "Added prop [key:" + prop.key + ", value:" + prop.value + "]"
+    }
+    writeBuildGradlePredefine(Arrays.asList(mcVers), mcIndex)
+
+    // Stuff for access wideners
+    def mcVersionToAcsessWidenerVersion = [
+            "1.16.5": "1_16",
+            "1.17.1": "1_17",
+            "1.18.1": "1_18",
+            "1.18.2": "1_18",
+            "1.19.1"  : "1_19"
+    ]
+    // Use this as sometimes multiple versions use the same access wideners
+    rootProject.ext.set("acsessWidenerVersion", mcVersionToAcsessWidenerVersion.get(mcVersion))
+}
+loadProperties()
+
 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 ->
-    apply plugin: "dev.architectury.loom"
+    if (p == project(":core")) {
 
-    loom {
+        apply plugin: "java"
-        silentMojangMappingsLicense()
+        apply plugin: "architectury-plugin"
-    }
+        apply plugin: "maven-publish"
+        apply plugin: "dev.architectury.loom"
 
-    configurations {
+        p.archivesBaseName = rootProject.archives_base_name
-        common
+        p.version = rootProject.mod_version
-        shadowMe
+        p.group = rootProject.maven_group
-        implementation.extendsFrom shadowMe
-    }
 
-    dependencies {
+        loom {
-        minecraft "com.mojang:minecraft:${rootProject.minecraft_version}"
+            silentMojangMappingsLicense()
-        // The following line declares the mojmap mappings
+        }
-        mappings loom.officialMojangMappings()
 
-        // Toml
+        configurations {
-        implementation("com.electronwill.night-config:toml:${rootProject.toml_version}")
+            common
+            shadowMe
+            implementation.extendsFrom shadowMe
+        }
+
+        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" && rootProject.minecraft_version != "1.19.1")
+                    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.x or higher doesnt 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}")
 
-        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
-        if (p != project(":core")) {
+        jar {
-            common(project(":core")) { transitive false }
+            manifest {
-            shadowMe(project(":core")) { transitive false }
+                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
-
-allprojects { p ->
-    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' }
-
-        // Required for importing Modrinth mods
-        maven {
-            name = "Modrinth"
-            url = "https://api.modrinth.com/maven"
-            content {
-                includeGroup "maven.modrinth"
             }
         }
 
-        // Required for importing CursedForge mods
+        task printConfigurations {
-        maven {
+            doLast {task ->
-            url "https://www.cursemaven.com"
+                println "Project Name: $p.name configurations:"
-            content {
+                configurations.each {
-                includeGroup "curse.maven"
+                    println "    $it.name"
-            }
-        }
-
-        // 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
-        ]   // The left side is what gets replaced in the mod info and the right side is where to get it from in the gradle.properties
-
-        inputs.properties replaceProperties
-        replaceProperties.put 'project', project
-        filesMatching(resourceTargets) {
-            expand replaceProperties
-        }
-
-        intoTargets.each { target ->
-            if (file(target).exists()) {
-                copy {
-                    from(sourceSets.main.resources) {
-                        include resourceTargets
-                        expand replaceProperties
-                    }
-                    into target
                 }
             }
         }
-    }
 
+        repositories {
+            mavenCentral()
 
-    tasks.withType(JavaCompile) {
+            // For parchment mappings
-        if (p != project(":core")) {
+            maven { url "https://maven.parchmentmc.org" }
-            // Minecraft 1.18 (1.18-pre2) upwards uses Java 17.
+
-            options.release = 17
+            // 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"
+                }
+            }
         }
-    }
 
-    java {
+        processResources {
-        withSourcesJar()
+            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)"
 
-    if (p == project(":core") || p == project(":common")) {
+            inputs.properties replaceProperties
-        runClient.enabled = false
+            replaceProperties.put 'project', project
-        runServer.enabled = false
+            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
     }
 }

common/build.gradle

@@ -1,16 +1,64 @@
-loom {
+apply plugin: "java"
-    accessWidenerPath.set(file("src/main/resources/lod.accesswidener"))
+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
 
 architectury {
-    common()
+    common(rootProject.enabled_platforms.split(","))
 }
 
-afterEvaluate {
+loom {
-    tasks {
+    silentMojangMappingsLicense()
-        remapJar {
+    accessWidenerPath.set(project(":common").file("src/main/resources/${acsessWidenerVersion}.lod.accesswidener"))
-            remapAccessWidener.set(false)
+}
-        }
+
+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" && rootProject.minecraft_version != "1.19.1")
+            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
     }
 }
 
@@ -27,3 +75,144 @@ 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"
+        }
+    }
+}
+
+// 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

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

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

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

@@ -1,11 +1,28 @@
+/*
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020-2022  James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+ 
 package com.seibel.lod.common;
 
 import com.seibel.lod.common.forge.LodForgeMethodCaller;
 import com.seibel.lod.common.networking.NetworkInterface;
 import com.seibel.lod.common.wrappers.DependencySetup;
 import com.seibel.lod.common.wrappers.config.ConfigGui;
-import com.seibel.lod.core.Config;
-import com.seibel.lod.core.config.ConfigBase;
 
 /**
  * This is the common main class
@@ -15,9 +32,6 @@ public class LodCommonMain {
     public static boolean forge = false;
     public static boolean serverSided;
     public static LodForgeMethodCaller forgeMethodCaller;
-    public static NetworkInterface networkInterface;
-
-    public static final boolean IsNewConfig = false;
 
     public static void startup(LodForgeMethodCaller caller, boolean serverSided) {
         LodCommonMain.serverSided = serverSided;
@@ -31,11 +45,6 @@ public class LodCommonMain {
 
 
     public static void initConfig() {
-        if (!IsNewConfig)
+        ConfigGui.init(Config.class);
-            ConfigGui.init(OldConfig.class);
-    }
-
-    public static void registerNetworking(NetworkInterface networkInterface) {
-        LodCommonMain.networkInterface = networkInterface;
     }
 }

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

@@ -1,276 +0,0 @@
-/*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
- *    licensed under the GNU GPL v3 License.
- *
- *    Copyright (C) 2020  James Seibel
- *
- *    This program is free software: you can redistribute it and/or modify
- *    it under the terms of the GNU General Public License as published by
- *    the Free Software Foundation, version 3.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
-
-package com.seibel.lod.common;
-
-import com.seibel.lod.common.wrappers.config.ConfigGui;
-import com.seibel.lod.core.config.*;
-import com.seibel.lod.core.enums.config.*;
-import com.seibel.lod.core.enums.rendering.*;
-import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
-import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IAdvanced.*;
-import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IGraphics.*;
-import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton.IClient.IWorldGenerator;
-
-/**
- * This handles any configuration the user has access to.
- * @author coolGi2007
- * @version 12-12-2021
- */
-public class OldConfig
-//public class Config extends TinyConfig
-{
-	// CONFIG STRUCTURE
-	// 	-> Client
-	//		|
-	//		|-> Graphics
-	//		|		|-> Quality
-	//		|		|-> FogQuality
-	//		|		|-> AdvancedGraphics
-	//		|
-	//		|-> World Generation
-	//		|
-	//		|-> Advanced
-	//				|-> Threads
-	//				|-> Buffers
-	//				|-> Debugging
-
-	// Since the original config system uses forge stuff, that means we have to rewrite the whole config system
-
-	@ConfigAnnotations.ScreenEntry
-	public static Client client;
-
-	@ConfigAnnotations.FileComment
-	public static String _optionsButton = ILodConfigWrapperSingleton.IClient.OPTIONS_BUTTON_DESC;
-	// I know this option should be in Client
-	// This is a hacky method to not show the button in the options screen but show it in the mod menu
-	// Tough it is in client in the wrapper singleton
-	@ConfigAnnotations.Entry
-	public static boolean optionsButton = true;
-
-	public static class Client
-	{
-		@ConfigAnnotations.ScreenEntry
-		public static Graphics graphics;
-
-		@ConfigAnnotations.ScreenEntry
-		public static WorldGenerator worldGenerator;
-
-		@ConfigAnnotations.ScreenEntry
-		public static Advanced advanced;
-
-
-		public static class Graphics
-		{
-			@ConfigAnnotations.ScreenEntry
-			public static Quality quality;
-
-			@ConfigAnnotations.ScreenEntry
-			public static FogQuality fogQuality;
-
-			@ConfigAnnotations.ScreenEntry
-			public static AdvancedGraphics advancedGraphics;
-
-
-			public static class Quality
-			{
-				@ConfigAnnotations.FileComment
-				public static String _drawResolution = IQuality.DRAW_RESOLUTION_DESC;
-				@ConfigAnnotations.Entry
-				public static HorizontalResolution drawResolution = IQuality.DRAW_RESOLUTION_DEFAULT;
-
-				@ConfigAnnotations.FileComment
-				public static String _lodChunkRenderDistance = IQuality.LOD_CHUNK_RENDER_DISTANCE_DESC;
-				@ConfigAnnotations.Entry(minValue = 16, maxValue = 2048)
-				public static int lodChunkRenderDistance = IQuality.LOD_CHUNK_RENDER_DISTANCE_MIN_DEFAULT_MAX.defaultValue;
-
-				@ConfigAnnotations.FileComment
-				public static String _verticalQuality = IQuality.VERTICAL_QUALITY_DESC;
-				@ConfigAnnotations.Entry
-				public static VerticalQuality verticalQuality = IQuality.VERTICAL_QUALITY_DEFAULT;
-
-				@ConfigAnnotations.FileComment
-				public static String _horizontalScale = IQuality.HORIZONTAL_SCALE_DESC;
-				@ConfigAnnotations.Entry(minValue = 2, maxValue = 32)
-				public static int horizontalScale = IQuality.HORIZONTAL_SCALE_MIN_DEFAULT_MAX.defaultValue;
-
-				@ConfigAnnotations.FileComment
-				public static String _horizontalQuality = IQuality.HORIZONTAL_SCALE_DESC;
-				@ConfigAnnotations.Entry
-				public static HorizontalQuality horizontalQuality = IQuality.HORIZONTAL_QUALITY_DEFAULT;
-
-				@ConfigAnnotations.FileComment
-				public static String _dropoffQuality = IQuality.DROPOFF_QUALITY_DESC;
-				@ConfigAnnotations.Entry
-				public static DropoffQuality dropoffQuality = IQuality.DROPOFF_QUALITY_DEFAULT;
-			}
-
-
-			public static class FogQuality
-			{
-				@ConfigAnnotations.FileComment
-				public static String _fogDistance = IFogQuality.FOG_DISTANCE_DESC;
-				@ConfigAnnotations.Entry
-				public static FogDistance fogDistance = IFogQuality.FOG_DISTANCE_DEFAULT;
-
-				@ConfigAnnotations.FileComment
-				public static String _fogDrawMode = IFogQuality.FOG_DRAW_MODE_DESC;
-				@ConfigAnnotations.Entry
-				public static FogDrawMode fogDrawMode = IFogQuality.FOG_DRAW_MODE_DEFAULT;
-
-				@ConfigAnnotations.FileComment
-				public static String _fogColorMode = IFogQuality.FOG_COLOR_MODE_DESC;
-				@ConfigAnnotations.Entry
-				public static FogColorMode fogColorMode = IFogQuality.FOG_COLOR_MODE_DEFAULT;
-
-				@ConfigAnnotations.FileComment
-				public static String _disableVanillaFog = IFogQuality.DISABLE_VANILLA_FOG_DESC;
-				@ConfigAnnotations.Entry
-				public static boolean disableVanillaFog = IFogQuality.DISABLE_VANILLA_FOG_DEFAULT;
-			}
-
-			
-			public static class AdvancedGraphics
-			{
-				@ConfigAnnotations.FileComment
-				public static String _disableDirectionalCulling = IAdvancedGraphics.DISABLE_DIRECTIONAL_CULLING_DESC;
-				@ConfigAnnotations.Entry
-				public static boolean disableDirectionalCulling = IAdvancedGraphics.DISABLE_DIRECTIONAL_CULLING_DEFAULT;
-
-				@ConfigAnnotations.FileComment
-				public static String _vanillaOverdraw = IAdvancedGraphics.VANILLA_OVERDRAW_DESC;
-				@ConfigAnnotations.Entry
-				public static VanillaOverdraw vanillaOverdraw = IAdvancedGraphics.VANILLA_OVERDRAW_DEFAULT;
-
-				@ConfigAnnotations.FileComment
-				public static String _useExtendedNearClipPlane = IAdvancedGraphics.USE_EXTENDED_NEAR_CLIP_PLANE_DESC;
-				@ConfigAnnotations.Entry
-				public static boolean useExtendedNearClipPlane = IAdvancedGraphics.USE_EXTENDED_NEAR_CLIP_PLANE_DEFAULT;
-
-				/*
-				@ConfigAnnotations.FileComment
-				public static String _backsideCullingRange = IAdvancedGraphics.VANILLA_CULLING_RANGE_DESC;
-				@ConfigAnnotations.Entry(minValue = 0, maxValue = 512)
-				public static int backsideCullingRange = IAdvancedGraphics.VANILLA_CULLING_RANGE_MIN_DEFAULT_MAX.defaultValue;
-				*/
-			}
-		}
-
-
-		public static class WorldGenerator
-		{
-			@ConfigAnnotations.FileComment
-			public static String _enableDistantGeneration = IWorldGenerator.ENABLE_DISTANT_GENERATION_DESC;
-			@ConfigAnnotations.Entry
-			public static boolean enableDistantGeneration = IWorldGenerator.ENABLE_DISTANT_GENERATION_DEFAULT;
-
-//			@ConfigAnnotations.FileComment
-//			public static String _distanceGenerationMode = IWorldGenerator.getDistanceGenerationModeDesc();
-			@ConfigAnnotations.Entry
-			public static DistanceGenerationMode distanceGenerationMode = IWorldGenerator.DISTANCE_GENERATION_MODE_DEFAULT;
-			
-			@ConfigAnnotations.FileComment
-			public static String _lightGenerationMode = IWorldGenerator.LIGHT_GENERATION_MODE_DESC;
-			@ConfigAnnotations.Entry
-			public static LightGenerationMode lightGenerationMode = IWorldGenerator.LIGHT_GENERATION_MODE_DEFAULT;
-			
-			@ConfigAnnotations.FileComment
-			public static String _generationPriority = IWorldGenerator.GENERATION_PRIORITY_DESC;
-			@ConfigAnnotations.Entry
-			public static GenerationPriority generationPriority = IWorldGenerator.GENERATION_PRIORITY_DEFAULT;
-
-			/*
-			@ConfigAnnotations.FileComment
-			public static String _allowUnstableFeatureGeneration = IWorldGenerator.ALLOW_UNSTABLE_FEATURE_GENERATION_DESC;
-			// FIXME: Temperary override. In 1.18, the newer Unstable gnerator is more usable
-			@ConfigAnnotations.Entry
-			public static boolean allowUnstableFeatureGeneration = true;//IWorldGenerator.ALLOW_UNSTABLE_FEATURE_GENERATION_DEFAULT;
-			*/
-			
-			@ConfigAnnotations.FileComment
-			public static String _blocksToAvoid = IWorldGenerator.BLOCKS_TO_AVOID_DESC;
-			@ConfigAnnotations.Entry
-			public static BlocksToAvoid blocksToAvoid = IWorldGenerator.BLOCKS_TO_AVOID_DEFAULT;
-		}
-
-		public static class Advanced
-		{
-			@ConfigAnnotations.ScreenEntry
-			public static Threading threading;
-
-			@ConfigAnnotations.ScreenEntry
-			public static Debugging debugging;
-
-			@ConfigAnnotations.ScreenEntry
-			public static Buffers buffers;
-
-
-			public static class Threading
-			{
-				@ConfigAnnotations.FileComment
-				public static String _numberOfWorldGenerationThreads = IThreading.NUMBER_OF_WORLD_GENERATION_THREADS_DESC;
-				@ConfigAnnotations.Entry(minValue = 1, maxValue = 50)
-				public static int numberOfWorldGenerationThreads = IThreading.NUMBER_OF_WORLD_GENERATION_THREADS_DEFAULT.defaultValue;
-
-				@ConfigAnnotations.FileComment
-				public static String _numberOfBufferBuilderThreads = IThreading.NUMBER_OF_BUFFER_BUILDER_THREADS_DESC;
-				@ConfigAnnotations.Entry(minValue = 1, maxValue = 50)
-				public static int numberOfBufferBuilderThreads = IThreading.NUMBER_OF_BUFFER_BUILDER_THREADS_MIN_DEFAULT_MAX.defaultValue;
-			}
-
-
-			public static class Debugging
-			{
-				@ConfigAnnotations.FileComment
-				public static String _drawLods = IDebugging.DRAW_LODS_DESC;
-				@ConfigAnnotations.Entry
-				public static boolean drawLods = IDebugging.DRAW_LODS_DEFAULT;
-
-				@ConfigAnnotations.FileComment
-				public static String _debugMode = IDebugging.DEBUG_MODE_DESC;
-				@ConfigAnnotations.Entry
-				public static DebugMode debugMode = IDebugging.DEBUG_MODE_DEFAULT;
-
-				@ConfigAnnotations.FileComment
-				public static String _enableDebugKeybindings = IDebugging.DEBUG_KEYBINDINGS_ENABLED_DESC;
-				@ConfigAnnotations.Entry
-				public static boolean enableDebugKeybindings = IDebugging.DEBUG_KEYBINDINGS_ENABLED_DEFAULT;
-			}
-
-
-			public static class Buffers
-			{
-				@ConfigAnnotations.FileComment
-				public static String _gpuUploadMethod = IBuffers.GPU_UPLOAD_METHOD_DESC;
-				@ConfigAnnotations.Entry
-				public static GpuUploadMethod gpuUploadMethod = IBuffers.GPU_UPLOAD_METHOD_DEFAULT;
-
-				@ConfigAnnotations.FileComment
-				public static String _gpuUploadPerMegabyteInMilliseconds = IBuffers.GPU_UPLOAD_PER_MEGABYTE_IN_MILLISECONDS_DESC;
-				@ConfigAnnotations.Entry(minValue = 0, maxValue = 50)
-				public static int gpuUploadPerMegabyteInMilliseconds = IBuffers.GPU_UPLOAD_PER_MEGABYTE_IN_MILLISECONDS_DEFAULT.defaultValue;
-
-				@ConfigAnnotations.FileComment
-				public static String _rebuildTimes = IBuffers.REBUILD_TIMES_DESC;
-				@ConfigAnnotations.Entry
-				public static BufferRebuildTimes rebuildTimes = IBuffers.REBUILD_TIMES_DEFAULT;
-			}
-		}
-	}
-}

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

@@ -1,8 +1,32 @@
+/*
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020-2022  James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+ 
 package com.seibel.lod.common.forge;
 
-import com.seibel.lod.common.wrappers.minecraft.MinecraftWrapper;
+import com.seibel.lod.common.wrappers.minecraft.MinecraftClientWrapper;
 import net.minecraft.client.renderer.block.model.BakedQuad;
 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;
 
@@ -15,5 +39,11 @@ import java.util.Random;
  * @author Ran
  */
 public interface LodForgeMethodCaller {
-    List<BakedQuad> getQuads(MinecraftWrapper mc, Block block, BlockState blockState, Direction direction, Random random);
+    #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);
 }

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

@@ -0,0 +1,49 @@
+/*
+ *    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
+    }
+}

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

@@ -1,12 +1,28 @@
-package com.seibel.lod.common.networking;
+/*
+ *    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/>.
+ */
  
-import net.minecraft.network.FriendlyByteBuf;
+package com.seibel.lod.common.networking;
 
 /**
  * @author Ran
  */
 public interface NetworkInterface {
-    void send(FriendlyByteBuf packetByteBuf);
+    void register_Client();
-
+    void register_Server();
-    FriendlyByteBuf receive();
 }

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

@@ -1,20 +1,119 @@
+/*
+ *    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 void example(int packetId) {
+    public static final ResourceLocation resourceLocation_meow = new ResourceLocation("lod", "meow");
-//        FriendlyByteBuf packetByteBuf = Networking.createNew();
-//        packetByteBuf.writeInt(packetId);
-//        LodCommonMain.networkInterface.send(packetByteBuf);
-//    }
 
     public static FriendlyByteBuf createNew() {
-        return new FriendlyByteBuf(Unpooled.buffer());
+        // TODO: Probably replace the Unpooled.buffer()
+        FriendlyByteBuf buf = new FriendlyByteBuf(Unpooled.buffer());
+        buf.writeInt(ModInfo.PROTOCOL_VERSION);
+        return buf;
     }
+
+    /*
+     * 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);
+    }
+
 }

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

@@ -1,17 +1,34 @@
+/*
+ *    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.block.BlockColorSingletonWrapper;
+import com.seibel.lod.common.wrappers.minecraft.MinecraftClientWrapper;
 import com.seibel.lod.common.wrappers.minecraft.MinecraftRenderWrapper;
-import com.seibel.lod.common.wrappers.minecraft.MinecraftWrapper;
 import com.seibel.lod.core.handlers.IReflectionHandler;
 import com.seibel.lod.core.handlers.ReflectionHandler;
-import com.seibel.lod.core.util.SingletonHandler;
+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.block.IBlockColorSingletonWrapper;
+import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
-import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftWrapper;
 
 /**
  * Binds all necessary dependencies, so we
@@ -24,14 +41,15 @@ import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftWrapper;
  * @version 12-1-2021
  */
 public class DependencySetup {
-    public static void createInitialBindings() {
+    public static void createInitialBindings()
-        SingletonHandler.bind(IBlockColorSingletonWrapper.class, BlockColorSingletonWrapper.INSTANCE);
+    {
-        if (!LodCommonMain.serverSided) {
-            SingletonHandler.bind(IMinecraftWrapper.class, MinecraftWrapper.INSTANCE);
-            SingletonHandler.bind(IMinecraftRenderWrapper.class, MinecraftRenderWrapper.INSTANCE);
-            SingletonHandler.bind(IReflectionHandler.class, ReflectionHandler.createSingleton(MinecraftWrapper.INSTANCE.getOptions().getClass().getDeclaredFields(), MinecraftWrapper.INSTANCE.getOptions()));
-        }
         SingletonHandler.bind(IVersionConstants.class, VersionConstants.INSTANCE);
+        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;

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

@@ -1,3 +1,22 @@
+/*
+ *    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;

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

@@ -1,8 +1,8 @@
 /*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
  *    licensed under the GNU GPL v3 License.
  *
- *    Copyright (C) 2020  James Seibel
+ *    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
@@ -22,9 +22,12 @@ package com.seibel.lod.common.wrappers;
 import java.nio.FloatBuffer;
 
 import com.mojang.math.Matrix4f;
+import com.seibel.lod.common.wrappers.block.BlockPosWrapper;
 import com.seibel.lod.core.enums.LodDirection;
 import com.seibel.lod.core.objects.math.Mat4f;
+import com.seibel.lod.core.wrapperInterfaces.block.AbstractBlockPosWrapper;
 
+import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 
 /**
@@ -47,8 +50,33 @@ 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;
+    	}
+    }
+    
+    public static BlockPos Convert(AbstractBlockPosWrapper wrappedPos) {
+    	return new BlockPos(wrappedPos.getX(),wrappedPos.getY(), wrappedPos.getZ());
+    }
+    
+    
     public static Direction Convert(LodDirection lodDirection)
     {
-        return Direction.byName(lodDirection.name());
+        return directions[lodDirection.ordinal()];
+    }
+    public static LodDirection Convert(Direction direction)
+    {
+        return lodDirections[direction.ordinal()];
     }
 }

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

@@ -1,3 +1,21 @@
+/*
+ *    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;
 
@@ -25,37 +43,15 @@ public class VersionConstants implements IVersionConstants
 		return 0;
 	}
 
-	@Override
-	public boolean isWorldGeneratorSingleThreaded(DistanceGenerationMode distanceGenerationMode)
-	{
-		// We are always asking the server to generate the chunk,
-		// so no use running this stuff multithreaded.
-		return true;
-		/*
-		switch (distanceGenerationMode) {
-		    default:
-		    case NONE:
-		    case BIOME_ONLY:
-		    case BIOME_ONLY_SIMULATE_HEIGHT:
-		    case SURFACE:
-		    case FEATURES:
-		        return false;
-		
-		    case FULL:
-		        return true;
-		}*/
-	}
-	
 	@Override
 	public int getWorldGenerationCountPerThread()
 	{
 		return 1;
 	}
 
-	
 	@Override
-	public boolean hasBatchGenerationImplementation()
+	public boolean isVanillaRenderedChunkSquare()
 	{
-		return true;
+		return false;
 	}
 }

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

@@ -1,8 +1,8 @@
 /*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
  *    licensed under the GNU GPL v3 License.
  *
- *    Copyright (C) 2020  James Seibel
+ *    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
@@ -26,11 +26,9 @@ import com.seibel.lod.core.wrapperInterfaces.block.AbstractBlockPosWrapper;
 import com.seibel.lod.core.wrapperInterfaces.chunk.AbstractChunkPosWrapper;
 import com.seibel.lod.core.wrapperInterfaces.world.IWorldWrapper;
 import com.seibel.lod.core.wrapperInterfaces.worldGeneration.AbstractBatchGenerationEnvionmentWrapper;
-import com.seibel.lod.core.wrapperInterfaces.worldGeneration.AbstractWorldGeneratorWrapper;
 import com.seibel.lod.common.wrappers.block.BlockPosWrapper;
 import com.seibel.lod.common.wrappers.chunk.ChunkPosWrapper;
 import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment;
-import com.seibel.lod.common.wrappers.worldGeneration.WorldGeneratorWrapper;
 
 /**
  * This handles creating abstract wrapper objects.
@@ -88,14 +86,6 @@ public class WrapperFactory implements IWrapperFactory
 		return new ChunkPosWrapper(blockPos);
 	}
 	
-	
-	
-	@Override
-	public AbstractWorldGeneratorWrapper createWorldGenerator(LodBuilder newLodBuilder, LodDimension newLodDimension, IWorldWrapper worldWrapper)
-	{
-		return new WorldGeneratorWrapper(newLodBuilder, newLodDimension, worldWrapper);
-	}
-	
 	public AbstractBatchGenerationEnvionmentWrapper createBatchGenerator(LodBuilder newLodBuilder,
 			LodDimension newLodDimension, IWorldWrapper worldWrapper)
 	{

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

@@ -1,8 +1,8 @@
 /*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
  *    licensed under the GNU GPL v3 License.
  *
- *    Copyright (C) 2020  James Seibel
+ *    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

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

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

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

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

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

@@ -0,0 +1,47 @@
+/*
+ *    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;
+
+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;
+	}
+}

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

@@ -0,0 +1,350 @@
+/*
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020-2022  James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+ 
+package com.seibel.lod.common.wrappers.block;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+import java.util.Random;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+
+import com.seibel.lod.common.Config;
+import com.seibel.lod.common.wrappers.McObjectConverter;
+import com.seibel.lod.common.wrappers.chunk.ChunkWrapper;
+import com.seibel.lod.core.api.ApiShared;
+import com.seibel.lod.core.enums.LodDirection;
+import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
+import com.seibel.lod.core.util.ColorUtil;
+import com.seibel.lod.core.wrapperInterfaces.block.AbstractBlockPosWrapper;
+import com.seibel.lod.core.wrapperInterfaces.block.IBlockDetailWrapper;
+import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper;
+
+import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
+import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
+import net.minecraft.Util;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.color.block.BlockTintCache;
+import net.minecraft.client.renderer.BiomeColors;
+import net.minecraft.client.renderer.block.model.BakedQuad;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Cursor3D;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.*;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.FlowerBlock;
+import net.minecraft.world.level.block.LeavesBlock;
+import net.minecraft.world.level.block.RenderShape;
+import net.minecraft.world.level.block.RotatedPillarBlock;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.lighting.LevelLightEngine;
+import net.minecraft.world.level.material.FluidState;
+import net.minecraft.world.phys.AABB;
+import net.minecraft.world.phys.BlockHitResult;
+import net.minecraft.world.phys.Vec3;
+import net.minecraft.world.phys.shapes.VoxelShape;
+import org.jetbrains.annotations.Nullable;
+#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);
+
+	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
+
+	enum ColorMode {
+		Default,
+		Flower,
+		Leaves;
+		static ColorMode getColorMode(Block b) {
+			if (b instanceof LeavesBlock) return Leaves;
+			if (b instanceof FlowerBlock) return Flower;
+			return Default;
+		}
+	}
+	//TODO: Perhaps make this not just use the first frame?
+	private static int calculateColorFromTexture(TextureAtlasSprite texture, ColorMode colorMode) {
+		
+		int count = 0;
+		double alpha = 0;
+		double red = 0;
+		double green = 0;
+		double blue = 0;
+	    int tempColor;
+	    
+	    {
+	        // textures normally use u and v instead of x and y
+	        for (int u = 0; u < texture.getWidth(); u++)
+	        {
+	            for (int v = 0; v < texture.getHeight(); v++)
+	            {
+	            	//note: Minecraft color format is: 0xAA BB GG RR
+	            	//________ DH mod color format is: 0xAA RR GG BB
+	            	//OpenGL RGBA format native order: 0xRR GG BB AA
+	            	//_ OpenGL RGBA format Java Order: 0xAA BB GG RR
+	                tempColor = TextureAtlasSpriteWrapper.getPixelRGBA(texture, 0, u, v);
+	
+	                double r = ((tempColor & 0x000000FF)      )/255.;
+	                double g = ((tempColor & 0x0000FF00) >>> 8)/255.;
+	                double b = ((tempColor & 0x00FF0000) >>> 16)/255.;
+	                double a = ((tempColor & 0xFF000000) >>> 24)/255.;
+	                int scale = 1;
+	                
+	                if (colorMode == ColorMode.Leaves) {
+	                	r *= a;
+	                	g *= a;
+	                	b *= a;
+	                	a = 1.;
+	                } else if (a==0.) {
+	                	continue;
+	                } else if (colorMode == ColorMode.Flower && (g+0.1<b || g+0.1<r)) {
+	                	scale = FLOWER_COLOR_SCALE;
+	                }
+	                
+	                count += scale;
+	                alpha += a*a*scale;
+	                red += r*r*scale;
+	                green += g*g*scale;
+	                blue += b*b*scale;
+	            }
+	        }
+	    }
+	
+	    if (count == 0)
+	        // this block is entirely transparent
+	        tempColor = ColorUtil.rgbToInt(255,255,0,255);
+	    else
+	    {
+	        // determine the average color
+	        tempColor = ColorUtil.rgbToInt(
+	                (int) (Math.sqrt(alpha/count)*255.),
+	                (int) (Math.sqrt(red / count)*255.),
+	                (int) (Math.sqrt(green / count)*255.),
+	                (int) (Math.sqrt(blue / count)*255.));
+	    }
+	    // TODO: Remove this when transparency is added!
+	    double colorAlpha = ColorUtil.getAlpha(tempColor)/255.;
+	    tempColor = ColorUtil.rgbToInt(
+	    		ColorUtil.getAlpha(tempColor),
+	    		(int)(ColorUtil.getRed(tempColor) * colorAlpha),
+	    		(int)(ColorUtil.getGreen(tempColor) * colorAlpha),
+	    		(int)(ColorUtil.getBlue(tempColor) * colorAlpha)
+	    		);
+		return tempColor;
+	}
+
+	private static final Block[] BLOCK_TO_AVOID = {Blocks.AIR, Blocks.CAVE_AIR, Blocks.BARRIER};
+
+	private static final Direction[] DIRECTION_ORDER = {Direction.UP, Direction.NORTH, Direction.EAST, Direction.WEST, Direction.SOUTH, Direction.DOWN};
+	
+	private static boolean isBlockToBeAvoid(Block b) {
+		for (Block bta : BLOCK_TO_AVOID)
+			if (bta==b) return true;
+		return false;
+	}
+	
+	final BlockState state;
+	
+	//boolean isShapeResolved = false;
+	//^ Shapes no longer lazy resolved due to memory leaks from needing
+	// to keep a reference to the block getter
+
+	boolean[] dontOccludeFaces = null;
+	boolean noCollision = false;
+	boolean noFullFace = false;
+	
+	boolean isColorResolved = false;
+	int baseColor = 0; //TODO: Impl per-face color
+	boolean needShade = true;
+	boolean needPostTinting = false;
+	int tintIndex = 0;
+	
+	public static BlockDetailWrapper NULL_BLOCK_DETAIL = new BlockDetailWrapper();
+	
+	public BlockDetailWrapper(BlockState state, BlockPos pos, LevelReader getter) {
+		this.state = state;
+		resolveShapes(getter, pos);
+		//ApiShared.LOGGER.info("Created BlockDetailWrapper for blockstate {} at {}", state, pos);
+	}
+	
+	private BlockDetailWrapper() {
+		this.state = null;
+	}
+
+	static BlockDetailWrapper make(BlockState bs, BlockPos pos, LevelReader getter) {
+		if(!bs.getFluidState().isEmpty()) { // Is a fluidBlock
+			if (isBlockToBeAvoid(bs.getBlock())) return NULL_BLOCK_DETAIL;
+			if (bs.isAir()) return NULL_BLOCK_DETAIL;
+			return new BlockDetailWrapper(bs, pos, getter);
+		} else {
+			if (bs.getRenderShape() != RenderShape.MODEL) return NULL_BLOCK_DETAIL;
+			if (isBlockToBeAvoid(bs.getBlock())) return NULL_BLOCK_DETAIL;
+			return new BlockDetailWrapper(bs, pos, getter);
+		}
+	}
+	
+	private void resolveShapes(LevelReader sampleGetter, BlockPos samplePos) {
+		//if (isShapeResolved) return;
+		if (state.getFluidState().isEmpty()) {
+			noCollision = state.getCollisionShape(sampleGetter, samplePos).isEmpty();
+			dontOccludeFaces = new boolean[6];
+			if (state.canOcclude()) {
+				/* FIXME: Figure out how or if needed to impl per-face culling?
+				for (Direction dir : Direction.values()) {
+					dontOccludeFaces[McObjectConverter.Convert(dir).ordinal()]
+							= state.getFaceOcclusionShape(sampleGetter, samplePos, dir).isEmpty();
+				}*/
+			} else {
+				Arrays.fill(dontOccludeFaces, true);
+			}
+			
+			VoxelShape voxelShape = state.getShape(sampleGetter, samplePos);
+            if (voxelShape.isEmpty()) {
+            	noFullFace = true;
+            } else {
+	            AABB bbox = voxelShape.bounds();
+	            double xWidth = (bbox.maxX - bbox.minX);
+	            double yWidth = (bbox.maxY - bbox.minY);
+	            double zWidth = (bbox.maxZ - bbox.minZ);
+	            noFullFace = xWidth < 1 && zWidth < 1 && yWidth < 1;
+            }
+		} else { // Liquid Block
+			dontOccludeFaces = new boolean[6];
+		}
+	}
+	
+	private void resolveColors() {
+		if (isColorResolved) return;
+		if (state.getFluidState().isEmpty()) {
+			List<BakedQuad> quads = null;
+			for (Direction direction : DIRECTION_ORDER)
+	        {
+	        	quads = Minecraft.getInstance().getModelManager().getBlockModelShaper().
+	        			getBlockModel(state).getQuads(state, direction, random);
+	            if (!quads.isEmpty() &&
+	            	!(state.getBlock() instanceof RotatedPillarBlock && direction == Direction.UP))
+	                break;
+	        };
+			if (quads == null || quads.isEmpty()) {
+				quads = Minecraft.getInstance().getModelManager().getBlockModelShaper().
+						getBlockModel(state).getQuads(state, null, random);
+			}
+	        if (quads != null && !quads.isEmpty()) {
+	        	needPostTinting = quads.get(0).isTinted();
+	        	needShade = quads.get(0).isShade();
+	        	tintIndex = quads.get(0).getTintIndex();
+	        	baseColor = calculateColorFromTexture(
+						#if PRE_MC_1_17_1 quads.get(0).sprite,
+						#else quads.get(0).getSprite(), #endif
+	        		ColorMode.getColorMode(state.getBlock()));
+	        } else { // Backup method.
+				needPostTinting = false;
+				needShade = false;
+				tintIndex = 0;
+				baseColor = calculateColorFromTexture(Minecraft.getInstance().getModelManager().getBlockModelShaper().getParticleIcon(state),
+						ColorMode.getColorMode(state.getBlock()));
+			}
+		} else { // Liquid Block
+			needPostTinting = true;
+			needShade = false;
+			tintIndex = 0;
+			baseColor = calculateColorFromTexture(Minecraft.getInstance().getModelManager().getBlockModelShaper().getParticleIcon(state),
+					ColorMode.getColorMode(state.getBlock()));
+		}
+		isColorResolved = true;
+	}
+	
+	private BlockAndTintGetter wrapColorResolver(LevelReader level) {
+		int blendDistance = CONFIG.client().graphics().quality().getLodBiomeBlending();
+		if (blendDistance == 0) {
+			return new TintGetterOverrideFast(level);
+		} else {
+			return new TintGetterOverrideSmooth(level, blendDistance);
+		}
+	}
+	
+	@Override
+	public int getAndResolveFaceColor(LodDirection dir, IChunkWrapper chunk, AbstractBlockPosWrapper blockPos)
+	{
+		// FIXME: impl per-face colors
+		resolveColors();
+		if (!needPostTinting) return baseColor;
+		int tintColor = Minecraft.getInstance().getBlockColors()
+				.getColor(state, wrapColorResolver(((ChunkWrapper)chunk).getColorResolver()),
+					McObjectConverter.Convert(blockPos), tintIndex);
+		if (tintColor == -1) return baseColor;
+		return ColorUtil.multiplyARGBwithRGB(baseColor, tintColor);
+	}
+
+	@Override
+	public boolean hasFaceCullingFor(LodDirection dir)
+	{
+		//resolveShapes();
+		return !dontOccludeFaces[dir.ordinal()];
+	}
+
+	@Override
+	public boolean hasNoCollision()
+	{
+		//resolveShapes();
+		return noCollision;
+	}
+
+	@Override
+	public boolean noFaceIsFullFace()
+	{
+		//resolveShapes();
+		return noFullFace;
+	}
+
+	@Override
+	public String serialize()
+	{
+		// FIXME: Impl this for the blockState Storage stuff
+		return null;
+	}
+
+	@Override
+	protected boolean isSame(IBlockDetailWrapper iBlockDetail)
+	{
+		return ((BlockDetailWrapper)iBlockDetail).state.getBlock().equals(state.getBlock());
+	}
+
+	public String toString() {
+		return "BlockDetail{" + state + "}";
+	}
+}

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

@@ -1,3 +1,22 @@
+/*
+ *    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;

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

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

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

@@ -1,3 +1,22 @@
+/*
+ *    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;
 
 
@@ -18,11 +37,16 @@ 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
     }
 }

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

@@ -0,0 +1,217 @@
+/*
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020-2022  James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+ 
+package com.seibel.lod.common.wrappers.block;
+
+import com.seibel.lod.common.LodCommonMain;
+import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
+import net.minecraft.Util;
+import net.minecraft.client.color.block.BlockTintCache;
+import net.minecraft.client.renderer.BiomeColors;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Cursor3D;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.*;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.lighting.LevelLightEngine;
+import net.minecraft.world.level.material.FluidState;
+import net.minecraft.world.phys.AABB;
+import net.minecraft.world.phys.BlockHitResult;
+import net.minecraft.world.phys.Vec3;
+import net.minecraft.world.phys.shapes.VoxelShape;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+
+public class TintGetterOverrideFast implements BlockAndTintGetter {
+    LevelReader parent;
+
+    public TintGetterOverrideFast(LevelReader parent) {
+        this.parent = parent;
+    }
+
+    private Biome _getBiome(BlockPos pos) {
+		#if POST_MC_1_18_2
+        return parent.getBiome(pos).value();
+		#else
+		return parent.getBiome(pos);
+		#endif
+    }
+
+    @Override
+    public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver) {
+        if (LodCommonMain.forgeMethodCaller != null) {
+            return LodCommonMain.forgeMethodCaller.colorResolverGetColor(colorResolver, _getBiome(blockPos),
+                    blockPos.getX(), blockPos.getZ());
+        } else {
+            return colorResolver.getColor(_getBiome(blockPos), blockPos.getX(), blockPos.getZ());
+        }
+    }
+
+    @Override
+    public float getShade(Direction direction, boolean bl) {
+        return parent.getShade(direction, bl);
+    }
+
+    @Override
+    public LevelLightEngine getLightEngine() {
+        return parent.getLightEngine();
+    }
+
+    @Override
+    public int getBrightness(LightLayer lightLayer, BlockPos blockPos) {
+        return parent.getBrightness(lightLayer, blockPos);
+    }
+
+    @Override
+    public int getRawBrightness(BlockPos blockPos, int i) {
+        return parent.getRawBrightness(blockPos, i);
+    }
+
+    @Override
+    public boolean canSeeSky(BlockPos blockPos) {
+        return parent.canSeeSky(blockPos);
+    }
+
+    @Override
+    @Nullable
+    public BlockEntity getBlockEntity(BlockPos blockPos) {
+        return parent.getBlockEntity(blockPos);
+    }
+
+
+    @Override
+    public BlockState getBlockState(BlockPos blockPos) {
+        return parent.getBlockState(blockPos);
+    }
+
+    @Override
+    public FluidState getFluidState(BlockPos blockPos) {
+        return parent.getFluidState(blockPos);
+    }
+
+    @Override
+    public int getLightEmission(BlockPos blockPos) {
+        return parent.getLightEmission(blockPos);
+    }
+
+    @Override
+    public int getMaxLightLevel() {
+        return parent.getMaxLightLevel();
+    }
+
+    @Override
+    public Stream<BlockState> getBlockStates(AABB aABB) {
+        return parent.getBlockStates(aABB);
+    }
+
+    @Override
+    public BlockHitResult clip(ClipContext clipContext) {
+        return parent.clip(clipContext);
+    }
+
+    @Override
+    @Nullable
+    public BlockHitResult clipWithInteractionOverride(Vec3 vec3, Vec3 vec32, BlockPos blockPos, VoxelShape voxelShape, BlockState blockState) {
+        return parent.clipWithInteractionOverride(vec3, vec32, blockPos, voxelShape, blockState);
+    }
+
+    @Override
+    public double getBlockFloorHeight(VoxelShape voxelShape, Supplier<VoxelShape> supplier) {
+        return parent.getBlockFloorHeight(voxelShape, supplier);
+    }
+
+    @Override
+    public double getBlockFloorHeight(BlockPos blockPos) {
+        return parent.getBlockFloorHeight(blockPos);
+    }
+
+    @Override
+    public int getMaxBuildHeight() {
+        return parent.getMaxBuildHeight();
+    }
+
+    #if POST_MC_1_17_1
+    @Override
+    public <T extends BlockEntity> Optional<T> getBlockEntity(BlockPos blockPos, BlockEntityType<T> blockEntityType) {
+        return parent.getBlockEntity(blockPos, blockEntityType);
+    }
+
+    @Override
+    public BlockHitResult isBlockInLine(ClipBlockStateContext clipBlockStateContext) {
+        return parent.isBlockInLine(clipBlockStateContext);
+    }
+
+    @Override
+    public int getHeight() {
+        return parent.getHeight();
+    }
+
+    @Override
+    public int getMinBuildHeight() {
+        return parent.getMinBuildHeight();
+    }
+
+    @Override
+    public int getSectionsCount() {
+        return parent.getSectionsCount();
+    }
+
+    @Override
+    public int getMinSection() {
+        return parent.getMinSection();
+    }
+
+    @Override
+    public int getMaxSection() {
+        return parent.getMaxSection();
+    }
+
+    @Override
+    public boolean isOutsideBuildHeight(BlockPos blockPos) {
+        return parent.isOutsideBuildHeight(blockPos);
+    }
+
+    @Override
+    public boolean isOutsideBuildHeight(int i) {
+        return parent.isOutsideBuildHeight(i);
+    }
+
+    @Override
+    public int getSectionIndex(int i) {
+        return parent.getSectionIndex(i);
+    }
+
+    @Override
+    public int getSectionIndexFromSectionY(int i) {
+        return parent.getSectionIndexFromSectionY(i);
+    }
+
+    @Override
+    public int getSectionYFromSectionIndex(int i) {
+        return parent.getSectionYFromSectionIndex(i);
+    }
+    #endif
+}

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

@@ -0,0 +1,241 @@
+/*
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020-2022  James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+ 
+package com.seibel.lod.common.wrappers.block;
+
+import com.seibel.lod.common.LodCommonMain;
+import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
+import net.minecraft.Util;
+import net.minecraft.client.color.block.BlockTintCache;
+import net.minecraft.client.renderer.BiomeColors;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Cursor3D;
+import net.minecraft.core.Direction;
+import net.minecraft.world.level.*;
+import net.minecraft.world.level.biome.Biome;
+import net.minecraft.world.level.block.entity.BlockEntity;
+import net.minecraft.world.level.block.entity.BlockEntityType;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.lighting.LevelLightEngine;
+import net.minecraft.world.level.material.FluidState;
+import net.minecraft.world.phys.AABB;
+import net.minecraft.world.phys.BlockHitResult;
+import net.minecraft.world.phys.Vec3;
+import net.minecraft.world.phys.shapes.VoxelShape;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.Optional;
+import java.util.function.Supplier;
+import java.util.stream.Stream;
+
+public class TintGetterOverrideSmooth implements BlockAndTintGetter {
+    LevelReader parent;
+    public int smoothingRange;
+
+    public TintGetterOverrideSmooth(LevelReader parent, int smoothingRange) {
+        this.parent = parent;
+        this.smoothingRange = smoothingRange;
+    }
+
+    private Biome _getBiome(BlockPos pos) {
+		#if POST_MC_1_18_2
+        return parent.getBiome(pos).value();
+		#else
+        return parent.getBiome(pos);
+		#endif
+    }
+
+    public int calculateBlockTint(BlockPos blockPos, ColorResolver colorResolver)
+    {
+        int i = smoothingRange;
+        if (i == 0)
+            return colorResolver.getColor(_getBiome(blockPos), blockPos.getX(), blockPos.getZ());
+        int j = (i * 2 + 1) * (i * 2 + 1);
+        int k = 0;
+        int l = 0;
+        int m = 0;
+        Cursor3D cursor3D = new Cursor3D(blockPos.getX() - i, blockPos.getY(), blockPos.getZ() - i, blockPos.getX() + i, blockPos.getY(), blockPos.getZ() + i);
+        BlockPos.MutableBlockPos mutableBlockPos = new BlockPos.MutableBlockPos();
+        while (cursor3D.advance())
+        {
+            mutableBlockPos.set(cursor3D.nextX(), cursor3D.nextY(), cursor3D.nextZ());
+            int n;
+            if (LodCommonMain.forgeMethodCaller != null) {
+                n = LodCommonMain.forgeMethodCaller.colorResolverGetColor(colorResolver, _getBiome(mutableBlockPos),
+                        mutableBlockPos.getX(), mutableBlockPos.getZ());
+            } else {
+                n = colorResolver.getColor(_getBiome(mutableBlockPos), mutableBlockPos.getX(), mutableBlockPos.getZ());
+            }
+
+            k += (n & 0xFF0000) >> 16;
+            l += (n & 0xFF00) >> 8;
+            m += n & 0xFF;
+        }
+        return (k / j & 0xFF) << 16 | (l / j & 0xFF) << 8 | m / j & 0xFF;
+    }
+
+    @Override
+    public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver) {
+        return calculateBlockTint(blockPos, colorResolver);
+    }
+
+    @Override
+    public float getShade(Direction direction, boolean bl) {
+        return parent.getShade(direction, bl);
+    }
+
+    @Override
+    public LevelLightEngine getLightEngine() {
+        return parent.getLightEngine();
+    }
+
+    @Override
+    public int getBrightness(LightLayer lightLayer, BlockPos blockPos) {
+        return parent.getBrightness(lightLayer, blockPos);
+    }
+
+    @Override
+    public int getRawBrightness(BlockPos blockPos, int i) {
+        return parent.getRawBrightness(blockPos, i);
+    }
+
+    @Override
+    public boolean canSeeSky(BlockPos blockPos) {
+        return parent.canSeeSky(blockPos);
+    }
+
+    @Override
+    @Nullable
+    public BlockEntity getBlockEntity(BlockPos blockPos) {
+        return parent.getBlockEntity(blockPos);
+    }
+
+    @Override
+    public BlockState getBlockState(BlockPos blockPos) {
+        return parent.getBlockState(blockPos);
+    }
+
+    @Override
+    public FluidState getFluidState(BlockPos blockPos) {
+        return parent.getFluidState(blockPos);
+    }
+
+    @Override
+    public int getLightEmission(BlockPos blockPos) {
+        return parent.getLightEmission(blockPos);
+    }
+
+    @Override
+    public int getMaxLightLevel() {
+        return parent.getMaxLightLevel();
+    }
+
+    @Override
+    public Stream<BlockState> getBlockStates(AABB aABB) {
+        return parent.getBlockStates(aABB);
+    }
+
+    @Override
+    public BlockHitResult clip(ClipContext clipContext) {
+        return parent.clip(clipContext);
+    }
+
+    @Override
+    @Nullable
+    public BlockHitResult clipWithInteractionOverride(Vec3 vec3, Vec3 vec32, BlockPos blockPos, VoxelShape voxelShape, BlockState blockState) {
+        return parent.clipWithInteractionOverride(vec3, vec32, blockPos, voxelShape, blockState);
+    }
+
+    @Override
+    public double getBlockFloorHeight(VoxelShape voxelShape, Supplier<VoxelShape> supplier) {
+        return parent.getBlockFloorHeight(voxelShape, supplier);
+    }
+
+    @Override
+    public double getBlockFloorHeight(BlockPos blockPos) {
+        return parent.getBlockFloorHeight(blockPos);
+    }
+
+    @Override
+    public int getMaxBuildHeight() {
+        return parent.getMaxBuildHeight();
+    }
+
+    #if POST_MC_1_17_1
+    @Override
+    public <T extends BlockEntity> Optional<T> getBlockEntity(BlockPos blockPos, BlockEntityType<T> blockEntityType) {
+        return parent.getBlockEntity(blockPos, blockEntityType);
+    }
+
+    @Override
+    public BlockHitResult isBlockInLine(ClipBlockStateContext clipBlockStateContext) {
+        return parent.isBlockInLine(clipBlockStateContext);
+    }
+
+    @Override
+    public int getHeight() {
+        return parent.getHeight();
+    }
+
+    @Override
+    public int getMinBuildHeight() {
+        return parent.getMinBuildHeight();
+    }
+
+    @Override
+    public int getSectionsCount() {
+        return parent.getSectionsCount();
+    }
+
+    @Override
+    public int getMinSection() {
+        return parent.getMinSection();
+    }
+
+    @Override
+    public int getMaxSection() {
+        return parent.getMaxSection();
+    }
+
+    @Override
+    public boolean isOutsideBuildHeight(BlockPos blockPos) {
+        return parent.isOutsideBuildHeight(blockPos);
+    }
+
+    @Override
+    public boolean isOutsideBuildHeight(int i) {
+        return parent.isOutsideBuildHeight(i);
+    }
+
+    @Override
+    public int getSectionIndex(int i) {
+        return parent.getSectionIndex(i);
+    }
+
+    @Override
+    public int getSectionIndexFromSectionY(int i) {
+        return parent.getSectionIndexFromSectionY(i);
+    }
+
+    @Override
+    public int getSectionYFromSectionIndex(int i) {
+        return parent.getSectionYFromSectionIndex(i);
+    }
+    #endif
+}

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

@@ -1,3 +1,22 @@
+/*
+ *    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;
@@ -129,7 +148,11 @@ 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());
     }
 

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

@@ -1,51 +1,86 @@
+/*
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020-2022  James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+ 
 package com.seibel.lod.common.wrappers.chunk;
 
+import com.seibel.lod.common.wrappers.block.BlockDetailWrapper;
+import com.seibel.lod.core.enums.LodDirection;
 import com.seibel.lod.core.util.LevelPosUtil;
 import com.seibel.lod.core.util.LodUtil;
-import com.seibel.lod.core.wrapperInterfaces.block.IBlockColorWrapper;
+import com.seibel.lod.core.wrapperInterfaces.block.IBlockDetailWrapper;
-import com.seibel.lod.core.wrapperInterfaces.block.IBlockShapeWrapper;
 import com.seibel.lod.core.wrapperInterfaces.chunk.IChunkWrapper;
 import com.seibel.lod.core.wrapperInterfaces.world.IBiomeWrapper;
+
 import com.seibel.lod.common.wrappers.WrapperUtil;
-import com.seibel.lod.common.wrappers.block.BlockColorWrapper;
+import com.seibel.lod.common.wrappers.block.BlockDetailMap;
-import com.seibel.lod.common.wrappers.block.BlockShapeWrapper;
 import com.seibel.lod.common.wrappers.world.BiomeWrapper;
+import com.seibel.lod.common.wrappers.worldGeneration.mimicObject.LightedWorldGenRegion;
 
 import net.minecraft.core.BlockPos;
+#if POST_MC_1_17_1
 import net.minecraft.core.QuartPos;
-import net.minecraft.world.level.BlockAndTintGetter;
+#endif
+import net.minecraft.world.level.LevelReader;
 import net.minecraft.world.level.LightLayer;
-import net.minecraft.world.level.block.AirBlock;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.LiquidBlock;
 import net.minecraft.world.level.block.LiquidBlockContainer;
 import net.minecraft.world.level.block.SimpleWaterloggedBlock;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
 import net.minecraft.world.level.chunk.ChunkAccess;
+import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.LevelChunk;
-import net.minecraft.world.level.chunk.LevelChunkSection;
 import net.minecraft.world.level.levelgen.Heightmap;
 
 /**
  *
  * @author James Seibel
- * @version 11-21-2021
+ * @version 3-5-2022
  */
 public class ChunkWrapper implements IChunkWrapper
 {
-    private final ChunkAccess chunk;
+	private final ChunkAccess chunk;
-    private final BlockAndTintGetter lightSource;
+	private final LevelReader lightSource;
 	
-    @Override
+	
-    public int getHeight(){
+	public ChunkWrapper(ChunkAccess chunk, LevelReader lightSource)
-        return chunk.getHeight();
+	{
-    }
+		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()
@@ -53,132 +88,164 @@ public class ChunkWrapper implements IChunkWrapper
 		return chunk.getMaxBuildHeight();
 	}
 	
-    @Override
+	@Override
-    public int getHeightMapValue(int xRel, int zRel)
+	public int getHeightMapValue(int xRel, int zRel)
-    {
+	{
-        return chunk.getOrCreateHeightmapUnprimed(WrapperUtil.DEFAULT_HEIGHTMAP).getFirstAvailable(xRel, 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;
+	}
 
     @Override
-    public IBiomeWrapper getBiome(int x, int y, int z)
+    public IBlockDetailWrapper getBlockDetailAtFace(int x, int y, int z, LodDirection dir) {
-    {
+        int fy = y+dir.getNormal().y;
-        return BiomeWrapper.getBiomeWrapper(chunk.getNoiseBiome(
+        if (fy < getMinBuildHeight() || fy > getMaxBuildHeight()) return null;
-        		QuartPos.fromBlock(x), QuartPos.fromBlock(y), QuartPos.fromBlock(z)));
+        BlockPos pos = new BlockPos(x+dir.getNormal().x,fy,z+dir.getNormal().z);
+        BlockState blockState;
+        if (blockPosInsideChunk(x,y,z))
+            blockState = chunk.getBlockState(pos);
+        else {
+            blockState = lightSource.getBlockState(pos);
+        }
+        if (blockState == null || blockState.isAir()) return null;
+		IBlockDetailWrapper blockDetail = BlockDetailMap.getOrMakeBlockDetailCache(blockState, pos, lightSource);
+        return blockDetail == BlockDetailWrapper.NULL_BLOCK_DETAIL ? null : blockDetail;
     }
 	
-    @Override
+	public ChunkAccess getChunk() {
-    public IBlockColorWrapper getBlockColorWrapper(int x, int y, int z)
+		return chunk;
-    {
+	}
-        BlockState blockState = chunk.getBlockState(new BlockPos(x,y,z));
-        Block block = blockState.getBlock();
-        return BlockColorWrapper.getBlockColorWrapper(block);
-    }
 	
-    @Override
+	@Override
-    public IBlockShapeWrapper getBlockShapeWrapper(int x, int y, int z)
+	public int getChunkPosX(){
-    {
+		return chunk.getPos().x;
-        BlockState blockState = chunk.getBlockState(new BlockPos(x,y,z));
+	}
-        Block block = blockState.getBlock();
-        return BlockShapeWrapper.getBlockShapeWrapper(block, this, x, y, z);
-    }
 	
-    @Deprecated
+	@Override
-    public ChunkWrapper(ChunkAccess chunk)
+	public int getChunkPosZ(){
-    {
+		return chunk.getPos().z;
-        this.chunk = chunk;
+	}
-        this.lightSource = null;
-    }
-    public ChunkWrapper(ChunkAccess chunk, BlockAndTintGetter lightSource)
-    {
-        this.chunk = chunk;
-        this.lightSource = lightSource;
-    }
 	
-    public ChunkAccess getChunk() {
+	@Override
-        return chunk;
+	public int getRegionPosX(){
-    }
+		return LevelPosUtil.convert(LodUtil.CHUNK_DETAIL_LEVEL, chunk.getPos().x, LodUtil.REGION_DETAIL_LEVEL);
+	}
 	
-    @Override
+	@Override
-    public int getChunkPosX(){
+	public int getRegionPosZ(){
-        return chunk.getPos().x;
+		return LevelPosUtil.convert(LodUtil.CHUNK_DETAIL_LEVEL, chunk.getPos().z, LodUtil.REGION_DETAIL_LEVEL);
-    }
+	}
 	
-    @Override
+	@Override
-    public int getChunkPosZ(){
+	public int getMaxY(int x, int z) {
-        return chunk.getPos().z;
+		return chunk.getHeight(Heightmap.Types.WORLD_SURFACE, Math.floorMod(x, 16), Math.floorMod(z, 16));
-    }
+	}
 	
-    @Override
+	@Override
-    public int getRegionPosX(){
+	public int getMaxX(){
-    	return LevelPosUtil.convert(LodUtil.CHUNK_DETAIL_LEVEL, chunk.getPos().x, LodUtil.REGION_DETAIL_LEVEL);
+		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
+	@Override
-    public int getRegionPosZ(){
+	public long getLongChunkPos() {
-    	return LevelPosUtil.convert(LodUtil.CHUNK_DETAIL_LEVEL, chunk.getPos().z, LodUtil.REGION_DETAIL_LEVEL);
+		return chunk.getPos().toLong();
-    }
+	}
 	
-    @Override
+	@Override
-    public int getMaxY(int x, int z) {
+	public boolean isLightCorrect(){
-        return chunk.getHeight(Heightmap.Types.MOTION_BLOCKING, Math.floorMod(x, 16), Math.floorMod(z, 16));
+		#if PRE_MC_1_18_1
-    }
+		return true;
+		#else
+		if (chunk instanceof LevelChunk) {
+			return ((LevelChunk) chunk).isClientLightReady();
+		}
+		return chunk.isLightCorrect();
+		#endif
+	}
 	
-    @Override
+	public boolean isWaterLogged(int x, int y, int z)
-    public int getMaxX(){
+	{
-        return chunk.getPos().getMaxBlockX();
+		BlockState blockState = chunk.getBlockState(new BlockPos(x,y,z));
-    }
-    @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
+		//This type of block is always in water
-    public long getLongChunkPos() {
+		return (!(blockState.getBlock() instanceof LiquidBlockContainer) && (blockState.getBlock() instanceof SimpleWaterloggedBlock))
-    	return chunk.getPos().toLong();
+				&& (blockState.hasProperty(BlockStateProperties.WATERLOGGED) && blockState.getValue(BlockStateProperties.WATERLOGGED));
-    }
+	}
 	
-    @Override
+	@Override
-    public boolean isLightCorrect(){
+	public int getEmittedBrightness(int x, int y, int z)
-    	//return true;
+	{
-    	if (chunk instanceof LevelChunk) {
+		return chunk.getLightEmission(new BlockPos(x,y,z));
-    		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));
+		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));
+		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();
 	}
 	
 }

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

@@ -47,10 +47,14 @@ 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
-import net.minecraft.client.gui.narration.NarratableEntry; // Remove in 1.16
+#if POST_MC_1_17_1
+import net.minecraft.client.gui.narration.NarratableEntry;
+#endif
 
 /**
  * Based upon TinyConfig
@@ -60,29 +64,15 @@ import net.minecraft.client.gui.narration.NarratableEntry; // Remove in 1.16
  *
  * Credits to Motschen
  *
- * @author coolGi2007
+ * REMOVED IN a1.7
+ *
+ * @author coolGi
  * @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]+|\\.)");
 
@@ -92,7 +82,7 @@ public abstract class ConfigGui
 	// Change these to your own mod
 	private static final String MOD_NAME = ModInfo.NAME;					// For file saving and identifying
 	private static final String MOD_NAME_READABLE = ModInfo.READABLE_NAME;	// For logs
-	//	private static final Logger LOGGER = ClientApi.LOGGER;						// For logs
+	//	private static final Logger LOGGER = ApiShared.LOGGER;						// For logs
 	private static final Logger LOGGER = LogManager.getLogger(ModInfo.NAME);		// For logs (this inits before ClientAPI so this is a temp fix)
 
 
@@ -121,7 +111,11 @@ 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;
@@ -218,8 +212,11 @@ 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)
 			{
@@ -240,7 +237,11 @@ 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));
@@ -250,7 +251,11 @@ 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);
@@ -261,7 +266,12 @@ 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();
@@ -289,7 +299,11 @@ 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)));
 			}
@@ -329,6 +343,8 @@ 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);
 		}
@@ -341,8 +357,7 @@ public abstract class ConfigGui
 
 
 		// Just put this here for the future
-		config.setComment("_Version", " DONT TOUCH THIS, IF YOU DO THEN CONFIG FILE WOULD BREAK");
+		config.set("_version", 1);
-		config.set("_Versions", ModInfo.VERSION);
 
 
 		for (EntryInfo info : entries) {
@@ -377,8 +392,7 @@ public abstract class ConfigGui
 
 
 		// Just put this here for the future
-		config.setComment("_Version", " DONT TOUCH THIS, IF YOU DO THEN CONFIG FILE WOULD BREAK");
+		config.set("_version", 1);
-		config.set("_Versions", ModInfo.VERSION);
 
 
 		// Puts everything into its variable
@@ -449,8 +463,13 @@ public abstract class ConfigGui
 		{
 			String itemPath = (info.category.isEmpty() ? "" : info.category + ".") + info.field.getName();
 			if (config.contains(itemPath)) {
-				if (info.field.getType().isEnum())
+				if (info.field.getType().isEnum()) {
-					info.value = config.getEnum(itemPath, info.varClass);
+					try {
+						info.value = config.getEnum(itemPath, info.varClass);
+					} catch (IllegalArgumentException ignored) {
+						return;
+					}
+				}
 				else
 					info.value = config.get(itemPath);
 			} else
@@ -496,7 +515,11 @@ 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")
@@ -528,6 +551,17 @@ 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()
 		{
@@ -535,14 +569,11 @@ public abstract class ConfigGui
 			if (!reload)
 				loadFromFile();
 
-			// addRenderableWidget in 1.17 and over
+			addBtn(new Button(this.width / 2 - 154, this.height - 28, 150, 20, CommonComponents.GUI_CANCEL, button -> {
-			// 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);
 			}));
@@ -555,8 +586,13 @@ 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;
@@ -568,7 +604,11 @@ 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)
@@ -584,8 +624,13 @@ public abstract class ConfigGui
 						Predicate<String> processor = ((BiFunction<EditBox, Button, Predicate<String>>) info.widget).apply(widget, done);
 						widget.setFilter(processor);
 						resetButton.setWidth(20);
-						resetButton.setMessage(new TextComponent("R").withStyle(ChatFormatting.RED));
+                        #if PRE_MC_1_19
-						Button cycleButton = new Button(this.width - 185, 0, 20, 20, new TextComponent(String.valueOf(info.index)).withStyle(ChatFormatting.GOLD), (button -> {
+                        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
 							((List<String>) info.value).remove("");
 							this.reload = true;
 							info.index = info.index + 1;
@@ -607,6 +652,7 @@ public abstract class ConfigGui
 					else if (info.screenButton)
 					{
 						Button widget = new Button(this.width / 2 - info.width, this.height - 28, info.width * 2, 20, name, (button -> {
+							saveToFile();
 							Objects.requireNonNull(minecraft).setScreen(ConfigGui.getScreen(this, info.gotoScreen));
 						}));
 						this.list.addButton(widget, null, null, null);
@@ -633,14 +679,22 @@ 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);
 						}
 					}
@@ -752,10 +806,12 @@ 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
 	}
 }

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

@@ -3,7 +3,7 @@ package com.seibel.lod.common.wrappers.config;
 import com.seibel.lod.core.enums.config.*;
 import com.seibel.lod.core.enums.rendering.*;
 import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
-import com.seibel.lod.common.OldConfig;
+import com.seibel.lod.common.Config;
 
 /**
  * This holds the config defaults and setters/getters
@@ -28,6 +28,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 	{
 		public final IGraphics graphics;
 		public final IWorldGenerator worldGenerator;
+		public final IMultiplayer multiplayer;
 		public final IAdvanced advanced;
 		
 		
@@ -43,6 +44,11 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 			return worldGenerator;
 		}
 		
+		@Override
+		public IMultiplayer multiplayer() {
+			return multiplayer;
+		}
+		
 		@Override
 		public IAdvanced advanced()
 		{
@@ -53,7 +59,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 		@Override
 		public boolean getOptionsButton()
 		{
-			return OldConfig.optionsButton;
+			return Config.optionsButton;
 		}
 		@Override
 		public void setOptionsButton(boolean newOptionsButton)
@@ -70,6 +76,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 		{
 			graphics = new Graphics();
 			worldGenerator = new WorldGenerator();
+			multiplayer = new Multiplayer();
 			advanced = new Advanced();
 		}
 		
@@ -117,7 +124,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public HorizontalResolution getDrawResolution()
 				{
-					return OldConfig.Client.Graphics.Quality.drawResolution;
+					return Config.Client.Graphics.Quality.drawResolution;
 				}
 				@Override
 				public void setDrawResolution(HorizontalResolution newHorizontalResolution)
@@ -130,7 +137,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public int getLodChunkRenderDistance()
 				{
-					return OldConfig.Client.Graphics.Quality.lodChunkRenderDistance;
+					return Config.Client.Graphics.Quality.lodChunkRenderDistance;
 				}
 				@Override
 				public void setLodChunkRenderDistance(int newLodChunkRenderDistance)
@@ -143,7 +150,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public VerticalQuality getVerticalQuality()
 				{
-					return OldConfig.Client.Graphics.Quality.verticalQuality;
+					return Config.Client.Graphics.Quality.verticalQuality;
 				}
 				@Override
 				public void setVerticalQuality(VerticalQuality newVerticalQuality)
@@ -156,7 +163,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public int getHorizontalScale()
 				{
-					return OldConfig.Client.Graphics.Quality.horizontalScale;
+					return Config.Client.Graphics.Quality.horizontalScale;
 				}
 				@Override
 				public void setHorizontalScale(int newHorizontalScale)
@@ -169,7 +176,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public HorizontalQuality getHorizontalQuality()
 				{
-					return OldConfig.Client.Graphics.Quality.horizontalQuality;
+					return Config.Client.Graphics.Quality.horizontalQuality;
 				}
 				@Override
 				public void setHorizontalQuality(HorizontalQuality newHorizontalQuality)
@@ -180,22 +187,40 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				
 				@Override
 				public DropoffQuality getDropoffQuality() {
-					return OldConfig.Client.Graphics.Quality.dropoffQuality;
+					return Config.Client.Graphics.Quality.dropoffQuality;
 				}
 				@Override
 				public void setDropoffQuality(DropoffQuality newDropoffQuality) {
 					ConfigGui.editSingleOption.getEntry("client.graphics.quality.dropoffQuality").value = newDropoffQuality;
 					ConfigGui.editSingleOption.saveOption("client.graphics.quality.dropoffQuality");
 				}
+
+				@Override
+				public int getLodBiomeBlending() {
+					return Config.Client.Graphics.Quality.lodBiomeBlending;
+				}
+
+				@Override
+				public void setLodBiomeBlending(int newLodBiomeBlending) {
+					ConfigGui.editSingleOption.getEntry("client.graphics.quality.lodBiomeBlending").value = newLodBiomeBlending;
+					ConfigGui.editSingleOption.saveOption("client.graphics.quality.lodBiomeBlending");
+				}
 			}
 			
 			
 			public static class FogQuality implements IFogQuality
 			{
+				public final IAdvancedFog advancedFog;
+
+				FogQuality()
+				{
+					advancedFog = new AdvancedFog();
+				}
+
 				@Override
 				public FogDistance getFogDistance()
 				{
-					return OldConfig.Client.Graphics.FogQuality.fogDistance;
+					return Config.Client.Graphics.FogQuality.fogDistance;
 				}
 				@Override
 				public void setFogDistance(FogDistance newFogDistance)
@@ -208,7 +233,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public FogDrawMode getFogDrawMode()
 				{
-					return OldConfig.Client.Graphics.FogQuality.fogDrawMode;
+					return Config.Client.Graphics.FogQuality.fogDrawMode;
 				}
 				
 				@Override
@@ -222,7 +247,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public FogColorMode getFogColorMode()
 				{
-					return OldConfig.Client.Graphics.FogQuality.fogColorMode;
+					return Config.Client.Graphics.FogQuality.fogColorMode;
 				}
 				
 				@Override
@@ -236,7 +261,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public boolean getDisableVanillaFog()
 				{
-					return OldConfig.Client.Graphics.FogQuality.disableVanillaFog;
+					return Config.Client.Graphics.FogQuality.disableVanillaFog;
 				}
 				@Override
 				public void setDisableVanillaFog(boolean newDisableVanillaFog)
@@ -244,6 +269,167 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 					ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.disableVanillaFog").value = newDisableVanillaFog;
 					ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.disableVanillaFog");
 				}
+
+				@Override
+				public IAdvancedFog advancedFog() {
+					return advancedFog;
+				}
+
+				public static class AdvancedFog implements IAdvancedFog {
+					public final IHeightFog heightFog;
+
+					public AdvancedFog() {
+						heightFog = new HeightFog();
+					}
+
+					@Override
+					public double getFarFogStart() {
+						return Config.Client.Graphics.FogQuality.AdvancedFog.farFogStart;
+					}
+					@Override
+					public double getFarFogEnd() {
+						return Config.Client.Graphics.FogQuality.AdvancedFog.farFogEnd;
+					}
+					@Override
+					public double getFarFogMin() {
+						return Config.Client.Graphics.FogQuality.AdvancedFog.farFogMin;
+					}
+					@Override
+					public double getFarFogMax() {
+						return Config.Client.Graphics.FogQuality.AdvancedFog.farFogMax;
+					}
+					@Override
+					public FogSetting.FogType getFarFogType() {
+						return Config.Client.Graphics.FogQuality.AdvancedFog.farFogType;
+					}
+					@Override
+					public double getFarFogDensity() {
+						return Config.Client.Graphics.FogQuality.AdvancedFog.farFogDensity;
+					}
+
+					@Override
+					public void setFarFogStart(double newFarFogStart) {
+						ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.farFogStart").value = newFarFogStart;
+						ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.farFogStart");
+					}
+					@Override
+					public void setFarFogEnd(double newFarFogEnd) {
+						ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.farFogEnd").value = newFarFogEnd;
+						ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.farFogEnd");
+					}
+					@Override
+					public void setFarFogMin(double newFarFogMin) {
+						ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.farFogMin").value = newFarFogMin;
+						ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.farFogMin");
+					}
+					@Override
+					public void setFarFogMax(double newFarFogMax) {
+						ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.farFogMax").value = newFarFogMax;
+						ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.farFogMax");
+					}
+					@Override
+					public void setFarFogType(FogSetting.FogType newFarFogType) {
+						ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.farFogType").value = newFarFogType;
+						ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.farFogType");
+					}
+					@Override
+					public void setFarFogDensity(double newFarFogDensity) {
+						ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.farFogDensity").value = newFarFogDensity;
+						ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.farFogDensity");
+					}
+
+					@Override
+					public IHeightFog heightFog() {
+						return heightFog;
+					}
+					
+					public static class HeightFog implements IHeightFog {
+
+						@Override
+						public HeightFogMixMode getHeightFogMixMode() {
+							return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogMixMode;
+						}
+						@Override
+						public HeightFogMode getHeightFogMode() {
+							return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogMode;
+						}
+						@Override
+						public double getHeightFogHeight() {
+							return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogHeight;
+						}
+						@Override
+						public double getHeightFogStart() {
+							return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogStart;
+						}
+						@Override
+						public double getHeightFogEnd() {
+							return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogEnd;
+						}
+						@Override
+						public double getHeightFogMin() {
+							return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogMin;
+						}
+						@Override
+						public double getHeightFogMax() {
+							return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogMax;
+						}
+						@Override
+						public FogSetting.FogType getHeightFogType() {
+							return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogType;
+						}
+						@Override
+						public double getHeightFogDensity() {
+							return Config.Client.Graphics.FogQuality.AdvancedFog.heightFog.heightFogDensity;
+						}
+
+						@Override
+						public void setHeightFogMixMode(HeightFogMixMode newHeightFogMixMode) {
+							ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogMixMode").value = newHeightFogMixMode;
+							ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogMixMode");
+						}
+						@Override
+						public void setHeightFogMode(HeightFogMode newHeightFogMode) {
+							ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogMode").value = newHeightFogMode;
+							ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogMode");
+						}
+						@Override
+						public void setHeightFogHeight(double newHeightFogHeight) {
+							ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogHeight").value = newHeightFogHeight;
+							ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogHeight");
+						}
+						@Override
+						public void setHeightFogStart(double newHeightFogStart) {
+							ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogStart").value = newHeightFogStart;
+							ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogStart");
+						}
+						@Override
+						public void setHeightFogEnd(double newHeightFogEnd) {
+							ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogEnd").value = newHeightFogEnd;
+							ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogEnd");
+						}
+						@Override
+						public void setHeightFogMin(double newHeightFogMin) {
+							ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogMin").value = newHeightFogMin;
+							ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogMin");
+						}
+						@Override
+						public void setHeightFogMax(double newHeightFogMax) {
+							ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogMax").value = newHeightFogMax;
+							ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogMax");
+						}
+						@Override
+						public void setHeightFogType(FogSetting.FogType newHeightFogType) {
+							ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogType").value = newHeightFogType;
+							ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogType");
+						}
+						@Override
+						public void setHeightFogDensity(double newHeightFogDensity) {
+							ConfigGui.editSingleOption.getEntry("client.graphics.fogQuality.advancedFog.heightFog.heightFogDensity").value = newHeightFogDensity;
+							ConfigGui.editSingleOption.saveOption("client.graphics.fogQuality.advancedFog.heightFog.heightFogDensity");
+						}
+					}
+				}
+
 			}
 			
 			
@@ -252,7 +438,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public boolean getDisableDirectionalCulling()
 				{
-					return OldConfig.Client.Graphics.AdvancedGraphics.disableDirectionalCulling;
+					return Config.Client.Graphics.AdvancedGraphics.disableDirectionalCulling;
 				}
 				@Override
 				public void setDisableDirectionalCulling(boolean newDisableDirectionalCulling)
@@ -265,7 +451,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public VanillaOverdraw getVanillaOverdraw()
 				{
-					return OldConfig.Client.Graphics.AdvancedGraphics.vanillaOverdraw;
+					return Config.Client.Graphics.AdvancedGraphics.vanillaOverdraw;
 				}
 				@Override
 				public void setVanillaOverdraw(VanillaOverdraw newVanillaOverdraw)
@@ -273,11 +459,22 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 					ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.vanillaOverdraw").value = newVanillaOverdraw;
 					ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.vanillaOverdraw");
 				}
+
+				@Override
+				public int getOverdrawOffset() {
+					return Config.Client.Graphics.AdvancedGraphics.overdrawOffset;
+				}
+
+				@Override
+				public void setOverdrawOffset(int newOverdrawOffset) {
+					ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.overdrawOffset").value = newOverdrawOffset;
+					ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.overdrawOffset");
+				}
 				/*
 				@Override
 				public int getBacksideCullingRange()
 				{
-					return OldConfig.Client.Graphics.AdvancedGraphics.backsideCullingRange;
+					return Config.Client.Graphics.AdvancedGraphics.backsideCullingRange;
 				}
 				@Override
 				public void setBacksideCullingRange(int newBacksideCullingRange)
@@ -289,7 +486,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public boolean getUseExtendedNearClipPlane()
 				{
-					return OldConfig.Client.Graphics.AdvancedGraphics.useExtendedNearClipPlane;
+					return Config.Client.Graphics.AdvancedGraphics.useExtendedNearClipPlane;
 				}
 				@Override
 				public void setUseExtendedNearClipPlane(boolean newUseExtendedNearClipPlane)
@@ -297,6 +494,67 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 					ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.useExtendedNearClipPlane").value = newUseExtendedNearClipPlane;
 					ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.useExtendedNearClipPlane");
 				}
+				
+				@Override
+				public double getBrightnessMultiplier()
+				{
+					return Config.Client.Graphics.AdvancedGraphics.brightnessMultiplier;
+				}
+				@Override
+				public void setBrightnessMultiplier(double newBrightnessMultiplier)
+				{
+					ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.brightnessMultiplier").value = newBrightnessMultiplier;
+					ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.brightnessMultiplier");
+				}
+				
+				@Override
+				public double getSaturationMultiplier()
+				{
+					return Config.Client.Graphics.AdvancedGraphics.saturationMultiplier;
+				}
+				@Override
+				public void setSaturationMultiplier(double newSaturationMultiplier)
+				{
+					ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.saturationMultiplier").value = newSaturationMultiplier;
+					ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.saturationMultiplier");
+				}
+
+				@Override
+				public boolean getEnableCaveCulling() {
+					return Config.Client.Graphics.AdvancedGraphics.enableCaveCulling;
+				}
+
+				@Override
+				public void setEnableCaveCulling(boolean newEnableCaveCulling) {
+					ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.enableCaveCulling").value = newEnableCaveCulling;
+					ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.enableCaveCulling");
+
+				}
+
+				@Override
+				public int getCaveCullingHeight() {
+					return Config.Client.Graphics.AdvancedGraphics.caveCullingHeight;
+				}
+
+				@Override
+				public void setCaveCullingHeight(int newCaveCullingHeight) {
+					ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.caveCullingHeight").value = newCaveCullingHeight;
+					ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.caveCullingHeight");
+
+				}
+
+				@Override
+				public int getEarthCurveRatio()
+				{
+					return (int) ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.earthCurveRatio").value;
+				}
+				@Override
+				public void setEarthCurveRatio(int newEarthCurveRatio)
+				{
+					if (newEarthCurveRatio < 50) newEarthCurveRatio = 0;
+					ConfigGui.editSingleOption.getEntry("client.graphics.advancedGraphics.earthCurveRatio").value = newEarthCurveRatio;
+					ConfigGui.editSingleOption.saveOption("client.graphics.advancedGraphics.earthCurveRatio");
+				}
 			}
 		}
 		
@@ -311,7 +569,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 			@Override
 			public GenerationPriority getGenerationPriority()
 			{
-				return OldConfig.Client.WorldGenerator.generationPriority;
+				return Config.Client.WorldGenerator.generationPriority;
 			}
 			@Override
 			public void setGenerationPriority(GenerationPriority newGenerationPriority)
@@ -324,7 +582,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 			@Override
 			public DistanceGenerationMode getDistanceGenerationMode()
 			{
-				return OldConfig.Client.WorldGenerator.distanceGenerationMode;
+				return Config.Client.WorldGenerator.distanceGenerationMode;
 			}
 			@Override
 			public void setDistanceGenerationMode(DistanceGenerationMode newDistanceGenerationMode)
@@ -337,7 +595,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 			@Override
 			public boolean getAllowUnstableFeatureGeneration()
 			{
-				return OldConfig.Client.WorldGenerator.allowUnstableFeatureGeneration;
+				return Config.Client.WorldGenerator.allowUnstableFeatureGeneration;
 			}
 			@Override
 			public void setAllowUnstableFeatureGeneration(boolean newAllowUnstableFeatureGeneration)
@@ -350,7 +608,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 			@Override
 			public BlocksToAvoid getBlocksToAvoid()
 			{
-				return OldConfig.Client.WorldGenerator.blocksToAvoid;
+				return Config.Client.WorldGenerator.blocksToAvoid;
 			}
 			@Override
 			public void setBlockToAvoid(BlocksToAvoid newBlockToAvoid)
@@ -372,7 +630,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 			@Override
 			public LightGenerationMode getLightGenerationMode()
 			{
-				return OldConfig.Client.WorldGenerator.lightGenerationMode;
+				return Config.Client.WorldGenerator.lightGenerationMode;
 			}
 			@Override
 			public void setLightGenerationMode(LightGenerationMode newLightGenerationMode)
@@ -384,6 +642,38 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 		
 		
 		
+		//=====================//
+		// Multiplayer Configs //
+		//=====================//
+		public static class Multiplayer implements IMultiplayer
+		{
+			@Override
+			public ServerFolderNameMode getServerFolderNameMode()
+			{
+				return Config.Client.Multiplayer.serverFolderNameMode;
+			}
+			@Override
+			public void setServerFolderNameMode(ServerFolderNameMode newServerFolderNameMode)
+			{
+				ConfigGui.editSingleOption.getEntry("client.multiplayer.serverFolderNameMode").value = newServerFolderNameMode;
+				ConfigGui.editSingleOption.saveOption("client.multiplayer.serverFolderNameMode");
+			}
+			
+			@Override
+			public double getMultiDimensionRequiredSimilarity()
+			{
+				return Config.Client.Multiplayer.multiDimensionRequiredSimilarity;
+			}
+			
+			@Override
+			public void setMultiDimensionRequiredSimilarity(double newMultiDimensionMinimumSimilarityPercent)
+			{
+				ConfigGui.editSingleOption.getEntry("client.multiplayer.multiDimensionMinimumSimilarityPercent").value = newMultiDimensionMinimumSimilarityPercent;
+				ConfigGui.editSingleOption.saveOption("client.multiplayer.multiDimensionMinimumSimilarityPercent");
+			}
+		}
+		
+		
 		
 		//============================//
 		// AdvancedModOptions Configs //
@@ -426,12 +716,12 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 			public static class Threading implements IThreading
 			{
 				@Override
-				public int getNumberOfWorldGenerationThreads()
+				public double getNumberOfWorldGenerationThreads()
 				{
-					return OldConfig.Client.Advanced.Threading.numberOfWorldGenerationThreads;
+					return Config.Client.Advanced.Threading.numberOfWorldGenerationThreads;
 				}
 				@Override
-				public void setNumberOfWorldGenerationThreads(int newNumberOfWorldGenerationThreads)
+				public void setNumberOfWorldGenerationThreads(double newNumberOfWorldGenerationThreads)
 				{
 					ConfigGui.editSingleOption.getEntry("client.advanced.threading.numberOfWorldGenerationThreads").value = newNumberOfWorldGenerationThreads;
 					ConfigGui.editSingleOption.saveOption("client.advanced.threading.numberOfWorldGenerationThreads");
@@ -441,7 +731,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public int getNumberOfBufferBuilderThreads()
 				{
-					return OldConfig.Client.Advanced.Threading.numberOfBufferBuilderThreads;
+					return Config.Client.Advanced.Threading.numberOfBufferBuilderThreads;
 				}
 				@Override
 				public void setNumberOfBufferBuilderThreads(int newNumberOfWorldBuilderThreads)
@@ -459,18 +749,28 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 			//===============//
 			public static class Debugging implements IDebugging
 			{
+				public final IDebugSwitch debugSwitch;
+
 				@Override
-				public boolean getDrawLods()
+				public IDebugSwitch debugSwitch()
 				{
-					return (boolean) ConfigGui.editSingleOption.getEntry("client.advanced.debugging.drawLods").value;
+					return debugSwitch;
-				}
-				@Override
-				public void setDrawLods(boolean newDrawLods)
-				{
-					ConfigGui.editSingleOption.getEntry("client.advanced.debugging.drawLods").value = newDrawLods;
-					ConfigGui.editSingleOption.saveOption("client.advanced.debugging.drawLods");
 				}
 
+				/* RendererType:
+				 * DEFAULT
+				 * DEBUG
+				 * DISABLED
+				 * */
+				@Override
+				public RendererType getRendererType() {
+					return (RendererType) ConfigGui.editSingleOption.getEntry("client.advanced.debugging.rendererType").value;
+				}
+				@Override
+				public void setRendererType(RendererType newRenderType) {
+					ConfigGui.editSingleOption.getEntry("client.advanced.debugging.rendererType").value = newRenderType;
+					ConfigGui.editSingleOption.saveOption("client.advanced.debugging.rendererType");
+				}
 				
 				@Override
 				public DebugMode getDebugMode()
@@ -496,6 +796,116 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 					ConfigGui.editSingleOption.getEntry("client.advanced.debugging.enableDebugKeybindings").value = newEnableDebugKeybindings;
 					ConfigGui.editSingleOption.saveOption("client.advanced.debugging.enableDebugKeybindings");
 				}
+
+				public Debugging()
+				{
+					debugSwitch = new DebugSwitch();
+				}
+
+				public static class DebugSwitch implements IDebugSwitch {
+
+					/* The logging switches available:
+					 * WorldGenEvent
+					 * WorldGenPerformance
+					 * WorldGenLoadEvent
+					 * LodBuilderEvent
+					 * RendererBufferEvent
+					 * RendererGLEvent
+					 * FileReadWriteEvent
+					 * FileSubDimEvent
+					 * NetworkEvent //NOT IMPL YET
+					 */
+
+					@Override
+					public LoggerMode getLogWorldGenEvent() {
+						return (LoggerMode) ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logWorldGenEvent").value;
+					}
+					@Override
+					public void setLogWorldGenEvent(LoggerMode newLogWorldGenEvent) {
+						ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logWorldGenEvent").value = newLogWorldGenEvent;
+						ConfigGui.editSingleOption.saveOption("client.advanced.debugging.debugSwitch.logWorldGenEvent");
+					}
+
+					@Override
+					public LoggerMode getLogWorldGenPerformance() {
+						return (LoggerMode) ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logWorldGenPerformance").value;
+					}
+					@Override
+					public void setLogWorldGenPerformance(LoggerMode newLogWorldGenPerformance) {
+						ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logWorldGenPerformance").value = newLogWorldGenPerformance;
+						ConfigGui.editSingleOption.saveOption("client.advanced.debugging.debugSwitch.logWorldGenPerformance");
+					}
+
+					@Override
+					public LoggerMode getLogWorldGenLoadEvent() {
+						return (LoggerMode) ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logWorldGenLoadEvent").value;
+					}
+					@Override
+					public void setLogWorldGenLoadEvent(LoggerMode newLogWorldGenLoadEvent) {
+						ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logWorldGenLoadEvent").value = newLogWorldGenLoadEvent;
+						ConfigGui.editSingleOption.saveOption("client.advanced.debugging.debugSwitch.logWorldGenLoadEvent");
+					}
+
+					@Override
+					public LoggerMode getLogLodBuilderEvent() {
+						return (LoggerMode) ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logLodBuilderEvent").value;
+					}
+					@Override
+					public void setLogLodBuilderEvent(LoggerMode newLogLodBuilderEvent) {
+						ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logLodBuilderEvent").value = newLogLodBuilderEvent;
+						ConfigGui.editSingleOption.saveOption("client.advanced.debugging.debugSwitch.logLodBuilderEvent");
+					}
+
+					@Override
+					public LoggerMode getLogRendererBufferEvent() {
+						return (LoggerMode) ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logRendererBufferEvent").value;
+					}
+					@Override
+					public void setLogRendererBufferEvent(LoggerMode newLogRendererBufferEvent) {
+						ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logRendererBufferEvent").value = newLogRendererBufferEvent;
+						ConfigGui.editSingleOption.saveOption("client.advanced.debugging.debugSwitch.logRendererBufferEvent");
+					}
+
+					@Override
+					public LoggerMode getLogRendererGLEvent() {
+						return (LoggerMode) ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logRendererGLEvent").value;
+					}
+					@Override
+					public void setLogRendererGLEvent(LoggerMode newLogRendererGLEvent) {
+						ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logRendererGLEvent").value = newLogRendererGLEvent;
+						ConfigGui.editSingleOption.saveOption("client.advanced.debugging.debugSwitch.logRendererGLEvent");
+					}
+
+					@Override
+					public LoggerMode getLogFileReadWriteEvent() {
+						return (LoggerMode) ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logFileReadWriteEvent").value;
+					}
+					@Override
+					public void setLogFileReadWriteEvent(LoggerMode newLogFileReadWriteEvent) {
+						ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logFileReadWriteEvent").value = newLogFileReadWriteEvent;
+						ConfigGui.editSingleOption.saveOption("client.advanced.debugging.debugSwitch.logFileReadWriteEvent");
+					}
+
+					@Override
+					public LoggerMode getLogFileSubDimEvent() {
+						return (LoggerMode) ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logFileSubDimEvent").value;
+					}
+					@Override
+					public void setLogFileSubDimEvent(LoggerMode newLogFileSubDimEvent) {
+						ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logFileSubDimEvent").value = newLogFileSubDimEvent;
+						ConfigGui.editSingleOption.saveOption("client.advanced.debugging.debugSwitch.logFileSubDimEvent");
+					}
+
+					@Override
+					public LoggerMode getLogNetworkEvent() {
+						return (LoggerMode) ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logNetworkEvent").value;
+					}
+					@Override
+					public void setLogNetworkEvent(LoggerMode newLogNetworkEvent) {
+						ConfigGui.editSingleOption.getEntry("client.advanced.debugging.debugSwitch.logNetworkEvent").value = newLogNetworkEvent;
+						ConfigGui.editSingleOption.saveOption("client.advanced.debugging.debugSwitch.logNetworkEvent");
+					}
+				}
 			}
 			
 			
@@ -505,7 +915,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public GpuUploadMethod getGpuUploadMethod()
 				{
-					return OldConfig.Client.Advanced.Buffers.gpuUploadMethod;
+					return Config.Client.Advanced.Buffers.gpuUploadMethod;
 				}
 				@Override
 				public void setGpuUploadMethod(GpuUploadMethod newDisableVanillaFog)
@@ -518,7 +928,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public int getGpuUploadPerMegabyteInMilliseconds()
 				{
-					return OldConfig.Client.Advanced.Buffers.gpuUploadPerMegabyteInMilliseconds;
+					return Config.Client.Advanced.Buffers.gpuUploadPerMegabyteInMilliseconds;
 				}
 				@Override
 				public void setGpuUploadPerMegabyteInMilliseconds(int newMilliseconds) {
@@ -530,7 +940,7 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 				@Override
 				public BufferRebuildTimes getRebuildTimes()
 				{
-					return OldConfig.Client.Advanced.Buffers.rebuildTimes;
+					return Config.Client.Advanced.Buffers.rebuildTimes;
 				}
 				@Override
 				public void setRebuildTimes(BufferRebuildTimes newBufferRebuildTimes)
@@ -539,6 +949,18 @@ public class LodConfigWrapperSingleton implements ILodConfigWrapperSingleton
 					ConfigGui.editSingleOption.saveOption("client.advanced.buffers.newBufferRebuildTimes");
 				}
 			}
+
+			@Override
+			public boolean getLodOnlyMode() {
+				return Config.Client.Advanced.lodOnlyMode;
+			}
+
+			@Override
+			public void setLodOnlyMode(boolean newLodOnlyMode) {
+				ConfigGui.editSingleOption.getEntry("client.advanced.buffers.lodOnlyMode").value = newLodOnlyMode;
+				ConfigGui.editSingleOption.saveOption("client.advanced.buffers.lodOnlyMode");
+
+			}
 		}
 	}
 }

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

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

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

@@ -1,7 +1,27 @@
+/*
+ *    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;
@@ -11,9 +31,12 @@ 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);
     }
@@ -28,9 +51,15 @@ 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();

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

@@ -1,8 +1,8 @@
 /*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
  *    licensed under the GNU GPL v3 License.
  *
- *    Copyright (C) 2020  James Seibel
+ *    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
@@ -26,10 +26,10 @@ import java.util.ArrayList;
 import com.mojang.blaze3d.platform.NativeImage;
 import com.mojang.blaze3d.platform.Window;
 import com.seibel.lod.core.ModInfo;
-import com.seibel.lod.core.api.ClientApi;
+import com.seibel.lod.core.api.ApiShared;
 import com.seibel.lod.core.enums.LodDirection;
 import com.seibel.lod.core.util.LodUtil;
-import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftWrapper;
+import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.lod.core.wrapperInterfaces.minecraft.IProfilerWrapper;
 import com.seibel.lod.core.wrapperInterfaces.misc.ILightMapWrapper;
 import com.seibel.lod.core.wrapperInterfaces.world.IDimensionTypeWrapper;
@@ -55,23 +55,26 @@ 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 class
+ * A singleton that wraps the Minecraft object.
- * to allow for easier movement between Minecraft versions.
  *
  * @author James Seibel
- * @version 9-16-2021
+ * @version 3-5-2022
  */
-public class MinecraftWrapper implements IMinecraftWrapper
+public class MinecraftClientWrapper implements IMinecraftClientWrapper
 {
-    public static final MinecraftWrapper INSTANCE = new MinecraftWrapper();
+    public static final MinecraftClientWrapper INSTANCE = new MinecraftClientWrapper();
 
     public final Minecraft mc = Minecraft.getInstance();
 
@@ -84,7 +87,7 @@ public class MinecraftWrapper implements IMinecraftWrapper
     private ProfilerWrapper profilerWrapper;
 
 
-    private MinecraftWrapper()
+    private MinecraftClientWrapper()
     {
 
     }
@@ -164,57 +167,6 @@ public class MinecraftWrapper implements IMinecraftWrapper
         return LodUtil.getDimensionIDFromWorld(WorldWrapper.getWorldWrapper(mc.level));
     }
 
-    /** This texture changes every frame */
-    @Override
-    public ILightMapWrapper getCurrentLightMap()
-    {
-        // get the current lightMap if the cache is empty
-        if (lightMap == null)
-        {
-            LightTexture tex = mc.gameRenderer.lightTexture();
-            lightMap = tex.lightPixels;
-        }
-        return new LightMapWrapper(lightMap);
-    }
-
-    /**
-     * Returns the color int at the given pixel coordinates
-     * from the current lightmap.
-     * @param blockLight x location in texture space
-     * @param skyLight z location in texture space
-     */
-    @Override
-    public int getColorIntFromLightMap(int blockLight, int skyLight)
-    {
-        if (lightMap == null)
-        {
-            sendChatMessage("new");
-            // make sure the lightMap is up-to-date
-            getCurrentLightMap();
-        }
-
-        return lightMap.getPixelRGBA(blockLight, skyLight);
-    }
-
-    /**
-     * Returns the Color at the given pixel coordinates
-     * from the current lightmap.
-     * @param blockLight x location in texture space
-     * @param skyLight z location in texture space
-     */
-    @Override
-    public Color getColorFromLightMap(int blockLight, int skyLight) {
-        if (lightMap == null) {
-            // make sure the lightMap is up-to-date
-            getCurrentLightMap();
-        }
-
-        return LodUtil.intToColor(lightMap.getPixelRGBA(blockLight, skyLight));
-    }
-
-
-
-
     //=============//
     // Simple gets //
     //=============//
@@ -240,7 +192,11 @@ public class MinecraftWrapper implements IMinecraftWrapper
     @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);
     }
 
@@ -374,6 +330,14 @@ public class MinecraftWrapper implements IMinecraftWrapper
         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();
@@ -404,7 +368,11 @@ public class MinecraftWrapper implements IMinecraftWrapper
     @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
     }
 
     /**
@@ -418,7 +386,7 @@ public class MinecraftWrapper implements IMinecraftWrapper
     @Override
     public void crashMinecraft(String errorMessage, Throwable exception)
     {
-        ClientApi.LOGGER.error(ModInfo.READABLE_NAME + " had the following error: [" + errorMessage + "]. Crashing Minecraft...");
+        ApiShared.LOGGER.error(ModInfo.READABLE_NAME + " had the following error: [" + errorMessage + "]. Crashing Minecraft...");
         CrashReport report = new CrashReport(errorMessage, exception);
         Minecraft.crash(report);
     }

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

@@ -1,18 +1,41 @@
+/*
+ *    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.*;
+import java.awt.Color;
+import java.util.Collection;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.stream.Collectors;
 
+import com.mojang.blaze3d.pipeline.RenderTarget;
 import com.mojang.blaze3d.platform.NativeImage;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.seibel.lod.common.wrappers.misc.LightMapWrapper;
+import com.seibel.lod.core.api.ApiShared;
 import com.seibel.lod.core.api.ClientApi;
-import com.seibel.lod.core.api.ModAccessorApi;
+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.util.SingletonHandler;
 
+import com.seibel.lod.core.wrapperInterfaces.misc.ILightMapWrapper;
 import net.minecraft.client.renderer.LightTexture;
 
 import com.mojang.math.Vector3f;
@@ -23,7 +46,6 @@ import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory;
 import com.seibel.lod.core.wrapperInterfaces.block.AbstractBlockPosWrapper;
 import com.seibel.lod.core.wrapperInterfaces.chunk.AbstractChunkPosWrapper;
 import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
-import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftWrapper;
 import com.seibel.lod.core.wrapperInterfaces.modAccessor.IOptifineAccessor;
 import com.seibel.lod.core.wrapperInterfaces.modAccessor.ISodiumAccessor;
 import com.seibel.lod.common.wrappers.McObjectConverter;
@@ -39,9 +61,15 @@ 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;
 
 
 /**
@@ -53,114 +81,156 @@ import net.minecraft.world.phys.Vec3;
  */
 public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 {
-    public static final MinecraftRenderWrapper INSTANCE = new MinecraftRenderWrapper();
+	public static final MinecraftRenderWrapper INSTANCE = new MinecraftRenderWrapper();
 	
-    private static final Minecraft MC = Minecraft.getInstance();
+	private static final Minecraft MC = Minecraft.getInstance();
-    private static final GameRenderer GAME_RENDERER = MC.gameRenderer;
+	private static final GameRenderer GAME_RENDERER = MC.gameRenderer;
-    private static final WrapperFactory FACTORY = WrapperFactory.INSTANCE;
+	private static final IWrapperFactory FACTORY = WrapperFactory.INSTANCE;
 
-    @Override
+	public LightMapWrapper lightmap = null;
-    public Vec3f getLookAtVector()
+
-    {
+	@Override
-        Camera camera = GAME_RENDERER.getMainCamera();
+	public Vec3f getLookAtVector()
-        Vector3f cameraDir = camera.getLookVector();
+	{
-        return new Vec3f(cameraDir.x(), cameraDir.y(), cameraDir.z());
+		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) {
+
+		#if PRE_MC_1_17_1
+		float[] colorValues = new float[4];
+		GL15.glGetFloatv(GL15.GL_FOG_COLOR, colorValues);
+		#else
+		FogRenderer.setupColor(GAME_RENDERER.getMainCamera(), partialTicks, MC.level, 1, GAME_RENDERER.getDarkenWorldAmount(partialTicks));
+		float[] colorValues = RenderSystem.getShaderFogColor();
+		#endif
+		return new Color(colorValues[0], colorValues[1], colorValues[2], colorValues[3]);
+	}
+	// getSpecialFogColor() is the same as getFogColor()
+	
+	@Override
+	public Color getSkyColor() {
+		if (MC.level.dimensionType().hasSkyLight()) {
+			#if PRE_MC_1_17_1
+			Vec3 colorValues = MC.level.getSkyColor(MC.gameRenderer.getMainCamera().getBlockPosition(), MC.getFrameTime());
+			#else
+			Vec3 colorValues = MC.level.getSkyColor(MC.gameRenderer.getMainCamera().getPosition(), MC.getFrameTime());
+			#endif
+			return new Color((float) colorValues.x, (float) colorValues.y, (float) colorValues.z);
+		} else
+			return new Color(0, 0, 0);
+	}
+	
+	@Override
+	public double getFov(float partialTicks)
+	{
+		return GAME_RENDERER.getFov(GAME_RENDERER.getMainCamera(), partialTicks, true);
+	}
+	
+	/** Measured in chunks */
+	@Override
+	public int getRenderDistance()
+	{
+		#if PRE_MC_1_18_1
+		//FIXME: How to resolve this?
+		return MC.options.renderDistance;
+		#else
+		return MC.options.getEffectiveRenderDistance();
+		#endif
+	}
+	
+	@Override
+	public int getScreenWidth()
+	{
+		return MC.getWindow().getWidth();
+	}
+	@Override
+	public int getScreenHeight()
+	{
+		return MC.getWindow().getHeight();
+	}
+	
+    private RenderTarget getRenderTarget() {
+        RenderTarget r = null; //MC.levelRenderer.getCloudsTarget();
+        return r!=null ? r : MC.getMainRenderTarget();
     }
 
     @Override
-    public AbstractBlockPosWrapper getCameraBlockPosition()
+    public int getTargetFrameBuffer() {
-    {
+        return getRenderTarget().frameBufferId;
-        Camera camera = GAME_RENDERER.getMainCamera();
-        BlockPos blockPos = camera.getBlockPosition();
-        return new BlockPosWrapper(blockPos.getX(), blockPos.getY(), blockPos.getZ());
     }
 
     @Override
-    public boolean playerHasBlindnessEffect()
+    public int getTargetFrameBufferViewportWidth() {
-    {
+        return getRenderTarget().viewWidth;
-        return MC.player.getActiveEffectsMap().get(MobEffects.BLINDNESS) != null;
     }
 
     @Override
-    public Vec3d getCameraExactPosition()
+    public int getTargetFrameBufferViewportHeight() {
-    {
+        return getRenderTarget().viewHeight;
-        Camera camera = GAME_RENDERER.getMainCamera();
-        Vec3 projectedView = camera.getPosition();
-
-        return new Vec3d(projectedView.x, projectedView.y, projectedView.z);
     }
 
-    @Override
+	/**
-    public Mat4f getDefaultProjectionMatrix(float partialTicks)
+	 * This method returns the ChunkPos of all chunks that Minecraft
-    {
+	 * is going to render this frame. <br><br>
-        return McObjectConverter.Convert(GAME_RENDERER.getProjectionMatrix(GAME_RENDERER.getFov(GAME_RENDERER.getMainCamera(), partialTicks, true)));
+	 * <p>
-    }
+	 */
-
-    @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();
-    }
-
-    /**
-     * 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()
+	public HashSet<AbstractChunkPosWrapper> getVanillaRenderedChunks() {
-	{
+		ISodiumAccessor sodium = ModAccessorHandler.get(ISodiumAccessor.class);
-		ISodiumAccessor sodium = ModAccessorApi.get(ISodiumAccessor.class);
+		if (sodium != null) {
-		if (sodium != null)
-		{
 			return sodium.getNormalRenderedChunks();
 		}
-		IOptifineAccessor optifine = ModAccessorApi.get(IOptifineAccessor.class);
+		IOptifineAccessor optifine = ModAccessorHandler.get(IOptifineAccessor.class);
-		if (optifine != null)
+		if (optifine != null) {
-		{
 			HashSet<AbstractChunkPosWrapper> pos = optifine.getNormalRenderedChunks();
 			if (pos == null)
 				pos = getMaximumRenderedChunks();
@@ -168,164 +238,65 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 		}
 		if (!usingBackupGetVanillaRenderedChunks) {
 			try {
-			LevelRenderer levelRenderer = MC.levelRenderer;
+				LevelRenderer levelRenderer = MC.levelRenderer;
-			LinkedHashSet<LevelRenderer.RenderChunkInfo> chunks = levelRenderer.renderChunkStorage.get().renderChunks;
+				Collection<LevelRenderer.RenderChunkInfo> chunks =
-			return (chunks.stream().map((chunk) -> {
+					#if PRE_MC_1_18_1 levelRenderer.renderChunks;
-				AABB chunkBoundingBox = chunk.chunk.bb;
+					#else levelRenderer.renderChunkStorage.get().renderChunks; #endif
-				return FACTORY.createChunkPos(Math.floorDiv((int) chunkBoundingBox.minX, 16),
+
-						Math.floorDiv((int) chunkBoundingBox.minZ, 16));
+				return (chunks.stream().map((chunk) -> {
-			}).collect(Collectors.toCollection(HashSet::new)));
+					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 {
-					MinecraftWrapper.INSTANCE.sendChatMessage(
+					MinecraftClientWrapper.INSTANCE.sendChatMessage(
 							"\u00A7e\u00A7l\u00A7uWARNING: Distant Horizons: getVanillaRenderedChunks method failed."
-							+ " Using Backup Method.");
+									+ " Using Backup Method.");
-					MinecraftWrapper.INSTANCE.sendChatMessage(
+					MinecraftClientWrapper.INSTANCE.sendChatMessage(
 							"\u00A7eOverdraw prevention will be worse than normal.");
-				} catch (Exception e2) {}
+				} catch (Exception e2) {
-				ClientApi.LOGGER.error("getVanillaRenderedChunks Error: {}", e);
+				}
+				ApiShared.LOGGER.error("getVanillaRenderedChunks Error: ", e);
 				usingBackupGetVanillaRenderedChunks = true;
 			}
 		}
 		return getMaximumRenderedChunks();
 	}
 
-    @Override
+	@Override
-	public HashSet<AbstractChunkPosWrapper> getMaximumRenderedChunks()
+	public ILightMapWrapper getLightmapWrapper() {
-	{
+		return lightmap;
-    	//TODO: Make this a circle
-		IMinecraftWrapper mcWrapper = SingletonHandler.get(IMinecraftWrapper.class);
-		IWrapperFactory factory = SingletonHandler.get(IWrapperFactory.class);
-		
-		int chunkRenderDist = this.getRenderDistance();
-		
-		AbstractChunkPosWrapper centerChunkPos = mcWrapper.getPlayerChunkPos();
-		int startChunkX = centerChunkPos.getX() - chunkRenderDist;
-		int startChunkZ = centerChunkPos.getZ() - chunkRenderDist;
-		
-		// add every position within render distance
-		HashSet<AbstractChunkPosWrapper> renderedPos = new HashSet<AbstractChunkPosWrapper>();
-		for (int chunkX = 0; chunkX < (chunkRenderDist * 2+1); chunkX++)
-		{
-			for(int chunkZ = 0; chunkZ < (chunkRenderDist * 2+1); chunkZ++)
-			{
-				renderedPos.add(factory.createChunkPos(startChunkX + chunkX, startChunkZ + chunkZ));
-			}
-		}
-		
-		return renderedPos;	
 	}
 	
-
+	@Override
-
+	public boolean isFogStateSpecial() {
-    @Override
+		#if PRE_MC_1_17_1
-    public int[] getLightmapPixels()
+		Camera camera = GAME_RENDERER.getMainCamera();
-    {
+		FluidState fluidState = camera.getFluidInCamera();
-        LightTexture tex = GAME_RENDERER.lightTexture();
+		Entity entity = camera.getEntity();
-        tex.tick(); // This call makes no sense, but it fixes pause menu flicker bug
+		boolean isUnderWater = (entity instanceof LivingEntity) && ((LivingEntity)entity).hasEffect(MobEffects.BLINDNESS);
-        NativeImage lightMapPixels = tex.lightPixels;
+			isUnderWater |= fluidState.is(FluidTags.WATER);
-        LightMapWrapper lightMap = new LightMapWrapper(lightMapPixels);
+			isUnderWater |= fluidState.is(FluidTags.LAVA);
-
+		return isUnderWater;
-
+		#else
-        int lightMapHeight = getLightmapTextureHeight();
+		Entity entity = GAME_RENDERER.getMainCamera().getEntity();
-        int lightMapWidth = getLightmapTextureWidth();
+		boolean isBlind = (entity instanceof LivingEntity) && ((LivingEntity)entity).hasEffect(MobEffects.BLINDNESS);
-
+		return GAME_RENDERER.getMainCamera().getFluidInCamera() != FogType.NONE || isBlind;
-        int[] pixels = new int[lightMapWidth * lightMapHeight];
+		#endif
-        for (int u = 0; u < lightMapWidth; u++)
+	}
-        {
-            for (int v = 0; v < lightMapWidth; v++)
-            {
-                // this could probably be kept as a int, but
-                // it is easier to test and see the colors when debugging this way.
-                // When creating a new release this should be changed to the int version.
-                Color c = LodUtil.intToColor(lightMap.getLightValue(u, v));
-
-                // these should both create a totally white image
-//					int col =
-//							Integer.MAX_VALUE;
-//					int col =
-//							0b11111111 + // red
-//							(0b11111111 << 8) + // green
-//							(0b11111111 << 16) + // blue
-//							(0b11111111 << 24); // blue
-
-                int col =
-                        ((c.getRed() & 0xFF) << 16) | // blue
-                        ((c.getGreen() & 0xFF) << 8) | // green
-                        ((c.getBlue() & 0xFF)) | // red
-                        ((c.getAlpha() & 0xFF) << 24); // alpha
-
-                // 2D array stored in a 1D array.
-                // Thank you Tim from College ;)
-                pixels[u * lightMapWidth + v] = col;
-            }
-        }
-
-        return pixels;
-    }
-
-
-    @Override
-    public int getLightmapTextureHeight()
-    {
-        int height = -1;
-
-        LightTexture lightTexture = GAME_RENDERER.lightTexture();
-        if (lightTexture != null)
-        {
-            NativeImage tex = lightTexture.lightPixels;
-            if (tex != null)
-            {
-                height = tex.getHeight();
-            }
-        }
-
-        return height;
-    }
-
-    @Override
-    public int getLightmapTextureWidth()
-    {
-        int width = -1;
-
-        LightTexture lightTexture = GAME_RENDERER.lightTexture();
-        if (lightTexture != null)
-        {
-            NativeImage tex = lightTexture.lightPixels;
-            if (tex != null)
-            {
-                width = tex.getWidth();
-            }
-        }
-
-        return width;
-    }
-
-
-    @Override
-    public int getLightmapGLFormat() {
-        int glFormat = -1;
-
-        LightTexture lightTexture = GAME_RENDERER.lightTexture();
-        if (lightTexture != null) {
-            NativeImage tex = lightTexture.lightPixels;
-            if (tex != null) {
-                glFormat = tex.format().glFormat();
-            }
-        }
-
-        return glFormat;
-    }
-    
-    @Override
-    public boolean isFogStateSpecial() {
-	    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
 	}
+
+    public void updateLightmap(NativeImage lightPixels) {
+		if (lightmap== null) {
+			lightmap = new LightMapWrapper();
+		}
+		lightmap.uploadLightmap(lightPixels);
+    }
 }

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

@@ -1,3 +1,22 @@
+/*
+ *    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;

common/src/main/java/com/seibel/lod/common/wrappers/misc/LightMapWrapper.java

@@ -1,7 +1,31 @@
+/*
+ *    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
@@ -9,21 +33,39 @@ import com.seibel.lod.core.wrapperInterfaces.misc.ILightMapWrapper;
  */
 public class LightMapWrapper implements ILightMapWrapper
 {
-    static NativeImage lightMap = null;
+    private int textureId = 0;
 
-    public LightMapWrapper(NativeImage newLightMap)
+    public LightMapWrapper()
     {
-        lightMap = newLightMap;
     }
 
-    public static void setLightMap(NativeImage newLightMap)
+    private void createLightmap(NativeImage image)
     {
-        lightMap = 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);
     }
 
     @Override
-    public int getLightValue(int skyLight, int blockLight)
+    public void bind() {
-    {
+        GL32.glBindTexture(GL32.GL_TEXTURE_2D, textureId);
-        return lightMap.getPixelRGBA(skyLight, blockLight);
+    }
+
+    @Override
+    public void unbind() {
+        GL32.glBindTexture(GL32.GL_TEXTURE_2D, 0);
     }
 }

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

@@ -1,8 +1,8 @@
 /*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
  *    licensed under the GNU GPL v3 License.
  *
- *    Copyright (C) 2020  James Seibel
+ *    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
@@ -20,14 +20,26 @@
 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;
 
@@ -58,14 +70,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)
-        switch (biome.getBiomeCategory())
         {
 
             case NETHER:
@@ -110,16 +121,151 @@ public class BiomeWrapper implements IBiomeWrapper
             case SAVANNA:
             case SWAMP:
             default:
-                Color tmp = LodUtil.intToColor(biome.getGrassColor(x, z));
+                colorInt = biome.getGrassColor(x,z);
-                tmp = tmp.darker();
+                //FIXME: Repair what James did - LeeTom
-                colorInt = LodUtil.colorToInt(tmp);
+//                Color tmp = LodUtil.intToColor(biome.getGrassColor(x, z));
+//                tmp = tmp.darker();
+//                colorInt = LodUtil.colorToInt(tmp);
                 break;
 
         }
 
         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()
     {
         return biome.toString();

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

@@ -1,8 +1,8 @@
 /*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
  *    licensed under the GNU GPL v3 License.
  *
- *    Copyright (C) 2020  James Seibel
+ *    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

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

@@ -1,8 +1,8 @@
 /*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
  *    licensed under the GNU GPL v3 License.
  *
- *    Copyright (C) 2020  James Seibel
+ *    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
@@ -36,6 +36,7 @@ import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.level.LightLayer;
 import net.minecraft.world.level.chunk.ChunkAccess;
+import net.minecraft.world.level.chunk.ChunkSource;
 import net.minecraft.world.level.chunk.ChunkStatus;
 
 import org.jetbrains.annotations.Nullable;
@@ -128,12 +129,6 @@ public class WorldWrapper implements IWorldWrapper
         return world.dimensionType().hasSkyLight();
     }
     
-    @Override
-    public boolean isEmpty()
-    {
-        return world == null;
-    }
-
     @Override
     public int getHeight()
     {
@@ -143,7 +138,11 @@ public class WorldWrapper implements IWorldWrapper
     @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 */
@@ -175,11 +174,16 @@ public class WorldWrapper implements IWorldWrapper
     }
     
     @Override
-	public IChunkWrapper tryGetChunk(AbstractChunkPosWrapper pos) {
+    public IChunkWrapper tryGetChunk(AbstractChunkPosWrapper pos) {
-    	ChunkAccess chunk = world.getChunk(pos.getX(), pos.getZ(), ChunkStatus.EMPTY, false);
+        ChunkAccess chunk = world.getChunk(pos.getX(), pos.getZ(), ChunkStatus.EMPTY, false);
-    	if (chunk == null) return null;
+        if (chunk == null) return null;
-    	return new ChunkWrapper(chunk, world);
+        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);
+    }
 }

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

@@ -1,8 +1,9 @@
 /*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
  *    licensed under the GNU GPL v3 License.
  *
- *    Copyright (C) 2021 Tom Lee (TomTheFurry)
+ *    Copyright (C) 2021  Tom Lee (TomTheFurry)
+ *    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
@@ -17,19 +18,21 @@
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
  
+
 package com.seibel.lod.common.wrappers.worldGeneration;
 
-import com.seibel.lod.core.api.ClientApi;
+import com.seibel.lod.core.logging.ConfigBasedLogger;
+import com.seibel.lod.core.logging.ConfigBasedSpamLogger;
 import com.seibel.lod.core.builders.lodBuilding.LodBuilder;
 import com.seibel.lod.core.builders.lodBuilding.LodBuilderConfig;
 import com.seibel.lod.core.enums.config.DistanceGenerationMode;
 import com.seibel.lod.core.enums.config.LightGenerationMode;
+import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
 import com.seibel.lod.core.objects.lod.LodDimension;
-import com.seibel.lod.core.util.GridList;
+import com.seibel.lod.core.util.gridList.ArrayGridList;
 import com.seibel.lod.core.util.LodThreadFactory;
-import com.seibel.lod.core.util.SingletonHandler;
 import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
-import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftWrapper;
+import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
 import com.seibel.lod.core.wrapperInterfaces.world.IWorldWrapper;
 import com.seibel.lod.core.wrapperInterfaces.worldGeneration.AbstractBatchGenerationEnvionmentWrapper;
 
@@ -70,6 +73,7 @@ import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator;
 import net.minecraft.core.Registry;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.lighting.LevelLightEngine;
+import org.apache.logging.log4j.LogManager;
 
 /*
 Total:                   3.135214124s
@@ -87,9 +91,17 @@ Lod Generation:          0.269023348s
 
 public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnvionmentWrapper
 {
-	public static final boolean ENABLE_PERF_LOGGING = false;
+	private static final ILodConfigWrapperSingleton CONFIG = SingletonHandler.get(ILodConfigWrapperSingleton.class);
-	public static final boolean ENABLE_EVENT_LOGGING = false;
+	public static final ConfigBasedSpamLogger PREF_LOGGER =
-	public static final boolean ENABLE_LOAD_EVENT_LOGGING = false;
+			new ConfigBasedSpamLogger(LogManager.getLogger("LodWorldGen"),
+					() -> CONFIG.client().advanced().debugging().debugSwitch().getLogWorldGenPerformance(),1);
+	public static final ConfigBasedLogger EVENT_LOGGER =
+			new ConfigBasedLogger(LogManager.getLogger("LodWorldGen"),
+					() -> CONFIG.client().advanced().debugging().debugSwitch().getLogWorldGenEvent());
+	public static final ConfigBasedLogger LOAD_LOGGER =
+			new ConfigBasedLogger(LogManager.getLogger("LodWorldGen"),
+					() -> CONFIG.client().advanced().debugging().debugSwitch().getLogWorldGenLoadEvent());
+
 	//TODO: Make actual proper support for StarLight
 	
 	public static class PrefEvent
@@ -190,7 +202,6 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 			if (e.endNano != 0)
 			{
 				lodTime.add(e.endNano - preTime);
-				preTime = e.endNano;
 			}
 		}
 		
@@ -214,7 +225,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 	
 	//=================Generation Step===================
 	
-	public final LinkedList<GenerationEvent> events = new LinkedList<GenerationEvent>();
+	public final LinkedList<GenerationEvent> events = new LinkedList<>();
 	public final GlobalParameters params;
 	public final StepStructureStart stepStructureStart = new StepStructureStart(this);
 	public final StepStructureReference stepStructureReference = new StepStructureReference(this);
@@ -225,16 +236,16 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 	public final StepLight stepLight = new StepLight(this);
 	public boolean unsafeThreadingRecorded = false;
 	//public boolean safeMode = false;
-	private static final ILodConfigWrapperSingleton CONFIG = SingletonHandler.get(ILodConfigWrapperSingleton.class);
+	private static final IMinecraftClientWrapper MC = SingletonHandler.get(IMinecraftClientWrapper.class);
-	private static final IMinecraftWrapper MC = SingletonHandler.get(IMinecraftWrapper.class);
 	public static final long EXCEPTION_TIMER_RESET_TIME = TimeUnit.NANOSECONDS.convert(1, TimeUnit.SECONDS);
 	public static final int EXCEPTION_COUNTER_TRIGGER = 20;
+	public static final int RANGE_TO_RANGE_EMPTY_EXTENSION = 1;
 	public int unknownExceptionCount = 0;
 	public long lastExceptionTriggerTime = 0;
 	
 	public static final LodThreadFactory threadFactory = new LodThreadFactory("Gen-Worker-Thread", Thread.MIN_PRIORITY);
 	
-	public static ThreadLocal<Boolean> isDistantGeneratorThread = new ThreadLocal<Boolean>();
+	public static ThreadLocal<Boolean> isDistantGeneratorThread = new ThreadLocal<>();
 	
 	public static boolean isCurrentThreadDistantGeneratorThread() {
 		return (isDistantGeneratorThread.get() != null);
@@ -245,13 +256,12 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 	}
 	
 	public ExecutorService executors = Executors.newFixedThreadPool(
-			CONFIG.client().advanced().threading().getNumberOfWorldGenerationThreads(), threadFactory);
+			CONFIG.client().advanced().threading()._getWorldGenerationThreadPoolSize(), threadFactory);
 
 	public <T> T joinSync(CompletableFuture<T> f) {
 		if (!unsafeThreadingRecorded && !f.isDone()) {
-			MC.sendChatMessage("\u00A74\u00A7l\u00A7uERROR: Distant Horizons: Unsafe Threading in Chunk Generator Detected!");
+			EVENT_LOGGER.error("Unsafe Threading in Chunk Generator: ", new RuntimeException("Concurrent future"));
-			MC.sendChatMessage("\u00A7eTo increase stability, it is recommended to set world generation threads count to 1.");
+			EVENT_LOGGER.error("To increase stability, it is recommended to set world generation threads count to 1.");
-			ClientApi.LOGGER.error("Unsafe Threading in Chunk Generator: ", new RuntimeException("Concurrent future"));
 			unsafeThreadingRecorded = true;
 		}
 		return f.join();
@@ -263,7 +273,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 				new LodThreadFactory("Gen-Worker-Thread", Thread.MIN_PRIORITY));
 	}
 	
-	public boolean tryAddPoint(int px, int pz, int range, Steps target, boolean genAllDetails)
+	public boolean tryAddPoint(int px, int pz, int range, Steps target, boolean genAllDetails, double runTimeRatio)
 	{
 		int boxSize = range * 2 + 1;
 		int x = Math.floorDiv(px, boxSize) * boxSize + range;
@@ -275,7 +285,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));
+		events.add(new GenerationEvent(new ChunkPos(x, z), range, this, target, genAllDetails, runTimeRatio));
 		return true;
 	}
 	
@@ -300,8 +310,8 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 				}
 				catch (Throwable e)
 				{
-					ClientApi.LOGGER.error("Batching World Generator: Event {} gotten an exception", event);
+					EVENT_LOGGER.error("Batching World Generator: Event {} gotten an exception", event);
-					ClientApi.LOGGER.error("Exception: ", e);
+					EVENT_LOGGER.error("Exception: ", e);
 					unknownExceptionCount++;
 					lastExceptionTriggerTime = System.nanoTime();
 				}
@@ -312,12 +322,12 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 			}
 			else if (event.hasTimeout(TIMEOUT_SECONDS, TimeUnit.SECONDS))
 			{
-				ClientApi.LOGGER.error("Batching World Generator: " + event + " timed out and terminated!");
+				EVENT_LOGGER.error("Batching World Generator: " + event + " timed out and terminated!");
-				ClientApi.LOGGER.info("Dump PrefEvent: " + event.pEvent);
+				EVENT_LOGGER.info("Dump PrefEvent: " + event.pEvent);
 				try
 				{
 					if (!event.terminate())
-						ClientApi.LOGGER.error("Failed to terminate the stuck generation event!");
+						EVENT_LOGGER.error("Failed to terminate the stuck generation event!");
 				}
 				finally
 				{
@@ -326,10 +336,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 			}
 		}
 		if (unknownExceptionCount > EXCEPTION_COUNTER_TRIGGER) {
-			try {
+			EVENT_LOGGER.error("Too many exceptions in Batching World Generator! Disabling the generator.");
-				MC.sendChatMessage("\u00A74\u00A7l\u00A7uERROR: Distant Horizons: Too many exceptions in Batching World Generator! Disabling the generator.");
-			} catch (Exception e) {}
-			ClientApi.LOGGER.error("Too many exceptions in Batching World Generator! Now disabling.");
 			unknownExceptionCount = 0;
 			CONFIG.client().worldGenerator().setEnableDistantGeneration(false);
 		}
@@ -338,14 +345,18 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 	public BatchGenerationEnvironment(IWorldWrapper serverlevel, LodBuilder lodBuilder, LodDimension lodDim)
 	{
 		super(serverlevel, lodBuilder, lodDim);
-		ClientApi.LOGGER.info("================WORLD_GEN_STEP_INITING=============");
+		EVENT_LOGGER.info("================WORLD_GEN_STEP_INITING=============");
 		ChunkGenerator generator =  ((WorldWrapper) serverlevel).getServerWorld().getChunkSource().getGenerator();
 		if (!(generator instanceof NoiseBasedChunkGenerator ||
 				generator instanceof DebugLevelSource ||
 				generator instanceof FlatLevelSource)) {
-			MC.sendChatMessage("\u00A74\u00A7l\u00A7uWARNING: Distant Horizons: Unknown Chunk Generator Detected! Distant Generation May Fail!");
+			if (generator.getClass().toString().equals("class com.terraforged.mod.chunk.TFChunkGenerator")) {
-			MC.sendChatMessage("\u00A7eIf it does crash, set Distant Generation to OFF or Generation Mode to None.");
+				EVENT_LOGGER.info("TerraForge Chunk Generator detected: [{}], Distant Generation will try its best to support it.", generator.getClass());
-			ClientApi.LOGGER.warn("Unknown Chunk Generator detected: {}", 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.");
+			}
 		}
 		params = new GlobalParameters((ServerLevel) ((WorldWrapper) serverlevel).getWorld(), lodBuilder, lodDim);
 	}
@@ -356,23 +367,33 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 		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)
 		{
-			ClientApi.LOGGER.error("DistantHorizons: Couldn't load chunk {}", chunkPos, e);
+			LOAD_LOGGER.error("DistantHorizons: Couldn't load chunk {}", chunkPos, e);
 		}
 		if (chunkData == null)
 		{
-			return new ProtoChunk(chunkPos, UpgradeData.EMPTY, level, level.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY), null);
+			return new ProtoChunk(chunkPos, UpgradeData.EMPTY
+							#if POST_MC_1_17_1, level #endif
+							#if POST_MC_1_18_1, level.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY), null #endif
+			);
 		}
 		else
 		{
 			try {
 			return ChunkLoader.read(level, lightEngine, chunkPos, chunkData);
 			} catch (Exception e) {
-				ClientApi.LOGGER.error("DistantHorizons: Couldn't load chunk {}", chunkPos, e);
+				LOAD_LOGGER.error("DistantHorizons: Couldn't load chunk {}", chunkPos, e);
-				return new ProtoChunk(chunkPos, UpgradeData.EMPTY, level, level.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY), 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
+				);
 			}
 		}
 		
@@ -380,25 +401,22 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 	
 	public void generateLodFromList(GenerationEvent e)
 	{
-		if (ENABLE_EVENT_LOGGING)
+		EVENT_LOGGER.debug("Lod Generate Event: " + e.pos);
-			ClientApi.LOGGER.info("Lod Generate Event: " + e.pos);
 		e.pEvent.beginNano = System.nanoTime();
-		GridList<ChunkAccess> referencedChunks;
+		ArrayGridList<ChunkAccess> referencedChunks;
+		ArrayGridList<ChunkAccess> genChunks;
 		DistanceGenerationMode generationMode;
 		LightedWorldGenRegion region;
 		WorldGenLevelLightEngine lightEngine;
 		LightGetterAdaptor adaptor;
-		
+		int refRange = e.range + RANGE_TO_RANGE_EMPTY_EXTENSION;
+		int refOffsetX = e.pos.x - refRange;
+		int refOffsetZ = e.pos.z - refRange;
 		try
 		{
 			adaptor = new LightGetterAdaptor(params.level);
 			lightEngine = new WorldGenLevelLightEngine(adaptor);
 
-			int cx = e.pos.x;
-			int cy = e.pos.z;
-			int rangeEmpty = e.range + 1;
-			GridList<ChunkAccess> chunks = new GridList<ChunkAccess>(rangeEmpty);
-			
 			@SuppressWarnings("resource")
 			EmptyChunkGenerator generator = (int x, int z) ->
 			{
@@ -413,27 +431,25 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 					// Continue...
 				}
 				if (target == null)
-					target = new ProtoChunk(chunkPos, UpgradeData.EMPTY, params.level,
+					target = new ProtoChunk(chunkPos, UpgradeData.EMPTY
-							params.biomes, null);
+							#if POST_MC_1_17_1, params.level #endif
+							#if POST_MC_1_18_1, params.biomes, null #endif
+					);
 				return target;
 			};
 
-			for (int oy = -rangeEmpty; oy <= rangeEmpty; oy++)
+			referencedChunks = new ArrayGridList<>(refRange*2+1,
-			{
+					(x,z) -> generator.generate(x + refOffsetX,z + refOffsetZ)
-				for (int ox = -rangeEmpty; ox <= rangeEmpty; ox++)
+			);
-				{
-					ChunkAccess target = generator.generate(cx + ox, cy + oy);
-					chunks.add(target);
-				}
-			}
 			e.pEvent.emptyNano = System.nanoTime();
 			e.refreshTimeout();
-			region = new LightedWorldGenRegion(params.level, lightEngine, e.tParam.structFeat, chunks, ChunkStatus.STRUCTURE_STARTS, rangeEmpty, e.lightMode, generator);
+			region = new LightedWorldGenRegion(params.level, lightEngine, referencedChunks,
+					ChunkStatus.STRUCTURE_STARTS, refRange, e.lightMode, generator);
 			adaptor.setRegion(region);
-			e.tParam.makeStructFeat(region);
+			e.tParam.makeStructFeat(region, params);
-			referencedChunks = chunks.subGrid(e.range);
+			genChunks = new ArrayGridList<>(referencedChunks, RANGE_TO_RANGE_EMPTY_EXTENSION,
-			referencedChunks = generateDirect(e, referencedChunks, e.target, region);
+					referencedChunks.gridSize - RANGE_TO_RANGE_EMPTY_EXTENSION);
-			
+			generateDirect(e, genChunks, e.target, region);
 		}
 		catch (StepStructureStart.StructStartCorruptedException f)
 		{
@@ -465,35 +481,35 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 		default:
 			return;
 		}
-		int centreIndex = referencedChunks.size() / 2;
 		
-		for (int oy = -e.range; oy <= e.range; oy++)
+		for (int oy = 0; oy < genChunks.gridSize; oy++)
 		{
-			for (int ox = -e.range; ox <= e.range; ox++)
+			for (int ox = 0; ox < genChunks.gridSize; ox++)
 			{
-				int targetIndex = referencedChunks.offsetOf(centreIndex, ox, oy);
+				ChunkAccess target = genChunks.get(ox, oy);
-				ChunkAccess target = referencedChunks.get(targetIndex);
 				ChunkWrapper wrappedChunk = new ChunkWrapper(target, region);
 				if (!wrappedChunk.isLightCorrect()) {
 					throw new RuntimeException("The generated chunk somehow has isLightCorrect() returning false");
 				}
 				
 				boolean isFull = target.getStatus() == ChunkStatus.FULL || target instanceof LevelChunk;
+				#if POST_MC_1_18_1
 				boolean isPartial = target.isOldNoiseGeneration();
+				#endif
 				if (isFull)
 				{
-					if (ENABLE_LOAD_EVENT_LOGGING)
+					LOAD_LOGGER.info("Detected full existing chunk at {}", target.getPos());
-						ClientApi.LOGGER.info("Detected full existing chunk at {}", target.getPos());
 					params.lodBuilder.generateLodNodeFromChunk(params.lodDim, wrappedChunk,
 							new LodBuilderConfig(DistanceGenerationMode.FULL), true, e.genAllDetails);
 				}
+				#if POST_MC_1_18_1
 				else if (isPartial)
 				{
-					if (ENABLE_LOAD_EVENT_LOGGING)
+					LOAD_LOGGER.info("Detected old existing chunk at {}", target.getPos());
-						ClientApi.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,
@@ -513,15 +529,15 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 		}
 		e.pEvent.endNano = System.nanoTime();
 		e.refreshTimeout();
-		if (ENABLE_PERF_LOGGING)
+		if (PREF_LOGGER.canMaybeLog())
 		{
 			e.tParam.perf.recordEvent(e.pEvent);
-			ClientApi.LOGGER.info(e.tParam.perf);
+			PREF_LOGGER.infoInc("{}", e.tParam.perf);
 		}
 	}
 	
-	public GridList<ChunkAccess> generateDirect(GenerationEvent e, GridList<ChunkAccess> subRange, Steps step,
+	public void generateDirect(GenerationEvent e, ArrayGridList<ChunkAccess> subRange, Steps step,
-			LightedWorldGenRegion region)
+													 LightedWorldGenRegion region)
 	{
 		try
 		{
@@ -534,38 +550,37 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 				}
 			});
 			if (step == Steps.Empty)
-				return subRange;
+				return;
 			stepStructureStart.generateGroup(e.tParam, region, subRange);
 			e.pEvent.structStartNano = System.nanoTime();
 			e.refreshTimeout();
 			if (step == Steps.StructureStart)
-				return subRange;
+				return;
 			stepStructureReference.generateGroup(e.tParam, region, subRange);
 			e.pEvent.structRefNano = System.nanoTime();
 			e.refreshTimeout();
 			if (step == Steps.StructureReference)
-				return subRange;
+				return;
 			stepBiomes.generateGroup(e.tParam, region, subRange);
 			e.pEvent.biomeNano = System.nanoTime();
 			e.refreshTimeout();
 			if (step == Steps.Biomes)
-				return subRange;
+				return;
 			stepNoise.generateGroup(e.tParam, region, subRange);
 			e.pEvent.noiseNano = System.nanoTime();
 			e.refreshTimeout();
 			if (step == Steps.Noise)
-				return subRange;
+				return;
 			stepSurface.generateGroup(e.tParam, region, subRange);
 			e.pEvent.surfaceNano = System.nanoTime();
 			e.refreshTimeout();
 			if (step == Steps.Surface)
-				return subRange;
+				return;
 			if (step == Steps.Carvers)
-				return subRange;
+				return;
 			stepFeatures.generateGroup(e.tParam, region, subRange);
 			e.pEvent.featureNano = System.nanoTime();
 			e.refreshTimeout();
-			return subRange;
 		}
 		finally
 		{
@@ -579,10 +594,12 @@ 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;
 			}
@@ -603,14 +620,14 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv
 
 	@Override
 	public void stop(boolean blocking) {
-		ClientApi.LOGGER.info("Batch Chunk Generator shutting down...");
+		EVENT_LOGGER.info("Batch Chunk Generator shutting down...");
 		executors.shutdownNow();
 		if (blocking) try {
 			if (!executors.awaitTermination(10, TimeUnit.SECONDS)) {
-				ClientApi.LOGGER.error("Batch Chunk Generator shutdown failed! Ignoring child threads...");
+				EVENT_LOGGER.error("Batch Chunk Generator shutdown failed! Ignoring child threads...");
 			}
 		} catch (InterruptedException e) {
-			ClientApi.LOGGER.error("Batch Chunk Generator shutdown failed! Ignoring child threads...", e);
+			EVENT_LOGGER.error("Batch Chunk Generator shutdown failed! Ignoring child threads...", e);
 		}
 	}
 }

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

@@ -1,3 +1,21 @@
+/*
+ *    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;
 
@@ -6,9 +24,10 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 
 import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment.PrefEvent;
-import com.seibel.lod.core.api.ClientApi;
+import com.seibel.lod.core.api.ApiShared;
 import com.seibel.lod.core.enums.config.LightGenerationMode;
-import com.seibel.lod.core.util.SingletonHandler;
+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;
 
@@ -24,16 +43,19 @@ public final class GenerationEvent
 	final ChunkPos pos;
 	final int range;
 	final Future<?> future;
-	long nanotime;
+	long creationNanotime;
 	final int id;
 	final Steps target;
 	final LightGenerationMode lightMode;
 	final PrefEvent pEvent = new PrefEvent();
 	final boolean genAllDetails;
 
-	public GenerationEvent(ChunkPos pos, int range, BatchGenerationEnvironment generationGroup, Steps target, boolean genAllDetails)
+	final double runTimeRatio;
+	
+	public GenerationEvent(ChunkPos pos, int range, BatchGenerationEnvironment generationGroup,
+						   Steps target, boolean genAllDetails, double runTimeRatio)
 	{
-		nanotime = System.nanoTime();
+		creationNanotime = System.nanoTime();
 		this.pos = pos;
 		this.range = range;
 		id = generationFutureDebugIDs++;
@@ -43,14 +65,24 @@ 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) {
+					}
+				}
 			}
 		});
 	}
@@ -63,15 +95,15 @@ public final class GenerationEvent
 	public boolean hasTimeout(int duration, TimeUnit unit)
 	{
 		long currentTime = System.nanoTime();
-		long delta = currentTime - nanotime;
+		long delta = currentTime - creationNanotime;
 		return (delta > TimeUnit.NANOSECONDS.convert(duration, unit));
 	}
 	
 	public boolean terminate()
 	{
-		future.cancel(true);
+		ApiShared.LOGGER.info("======================DUMPING ALL THREADS FOR WORLD GEN=======================");
-		ClientApi.LOGGER.info("======================DUMPING ALL THREADS FOR WORLD GEN=======================");
 		BatchGenerationEnvironment.threadFactory.dumpAllThreadStacks();
+		future.cancel(true);
 		return future.isCancelled();
 	}
 	
@@ -98,7 +130,8 @@ public final class GenerationEvent
 	
 	public void refreshTimeout()
 	{
-		nanotime = System.nanoTime();
+		creationNanotime = System.nanoTime();
+		LodUtil.checkInterruptsUnchecked();
 	}
 	
 	@Override

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

@@ -1,11 +1,27 @@
+/*
+ *    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;
 import com.seibel.lod.core.builders.lodBuilding.LodBuilder;
 import com.seibel.lod.core.objects.lod.LodDimension;
-import com.seibel.lod.core.util.SingletonHandler;
-import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftWrapper;
 
 import net.minecraft.core.Registry;
 import net.minecraft.core.RegistryAccess;
@@ -15,19 +31,27 @@ 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;
-import net.minecraft.world.level.levelgen.DebugLevelSource;
+#endif
-import net.minecraft.world.level.levelgen.FlatLevelSource;
-import net.minecraft.world.level.levelgen.NoiseBasedChunkGenerator;
 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;
-	public final BiomeManager biomeManager;
+	#else
+	public final StructureTemplateManager structures;
+	public final RandomState randomState;
+	#endif
 	public final WorldGenSettings worldGenSettings;
 	public final ThreadedLevelLightEngine lightEngine;
 	public final LodBuilder lodBuilder;
@@ -35,9 +59,12 @@ public final class GlobalParameters
 	public final Registry<Biome> biomes;
 	public final RegistryAccess registry;
 	public final long worldSeed;
-	public final ChunkScanAccess chunkScanner;
 	public final ServerLevel level; // TODO: Figure out a way to remove this. Maybe ClientLevel also works?
 	public final DataFixer fixerUpper;
+	#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)
 	{
@@ -51,10 +78,15 @@ 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
 		structures = server.getStructureManager();
 		generator = level.getChunkSource().getGenerator();
-		chunkScanner = level.getChunkSource().chunkScanner();
 		fixerUpper = server.getFixerUpper();
+		#if POST_MC_1_19
+		randomState = level.getChunkSource().randomState();
+		#endif
 	}
 }

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

@@ -1,3 +1,22 @@
+/*
+ *    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;
 

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

@@ -1,3 +1,22 @@
+/*
+ *    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;
 
@@ -6,14 +25,18 @@ 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
 
 public final class ThreadedParameters
 {
 	private static final ThreadLocal<ThreadedParameters> localParam = new ThreadLocal<ThreadedParameters>();
 	final ServerLevel level;
-	public final WorldGenStructFeatManager structFeat;
+	public WorldGenStructFeatManager structFeat = null;
+	#if POST_MC_1_18_1
 	public final StructureCheck structCheck;
+	#endif
 	boolean isValid = true;
 	public final PerfCalculator perf = new PerfCalculator();
 	
@@ -35,14 +58,21 @@ 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);
-		structFeat = new WorldGenStructFeatManager(level, param.worldGenSettings, null, structCheck);
+		#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
 	}
 	
-	public void makeStructFeat(WorldGenLevel genLevel)
+	public void makeStructFeat(WorldGenLevel genLevel, GlobalParameters param)
 	{
-		structFeat.setGenLevel(genLevel);
+		structFeat = new WorldGenStructFeatManager(param.worldGenSettings, genLevel #if POST_MC_1_18_1, structCheck #endif);
 	}
 }

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

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

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

@@ -1,11 +1,31 @@
+/*
+ *    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.core.api.ClientApi;
+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;
@@ -14,46 +34,59 @@ import java.util.Locale;
 import java.util.Map;
 import java.util.Objects;
 
+
 import net.minecraft.core.Registry;
 import net.minecraft.core.SectionPos;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.NbtOps;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.*;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.world.level.LightLayer;
-import net.minecraft.world.level.WorldGenLevel;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.biome.Biomes;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.chunk.ChunkStatus;
+import net.minecraft.world.level.chunk.*;
-import net.minecraft.world.level.chunk.DataLayer;
+import net.minecraft.world.level.chunk.storage.ChunkSerializer;
-import net.minecraft.world.level.chunk.LevelChunk;
-import net.minecraft.world.level.chunk.LevelChunkSection;
-import net.minecraft.world.level.chunk.PalettedContainer;
-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.ticks.LevelChunkTicks;
+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());
-	private static final Logger LOGGER = ClientApi.LOGGER;
+	#endif
 	private static final String TAG_UPGRADE_DATA = "UpgradeData";
-	private static final String BLOCK_TICKS_TAG = "block_ticks";
+	private static final String BLOCK_TICKS_TAG_18 = "block_ticks";
-	private static final String FLUID_TICKS_TAG = "fluid_ticks";
+	private static final String FLUID_TICKS_TAG_18 = "fluid_ticks";
+	private static final String BLOCK_TICKS_TAG_PRE18 = "TileTicks";
+	private static final String FLUID_TICKS_TAG_PRE18 = "LiquidTicks";
+	private static final ConfigBasedLogger LOGGER = BatchGenerationEnvironment.LOAD_LOGGER;
 
+	#if POST_MC_1_18_1
 	private static BlendingData readBlendingData(CompoundTag chunkData)
 	{
 		BlendingData blendingData = null;
@@ -65,48 +98,81 @@ public class ChunkLoader
 		}
 		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);
-		Codec<PalettedContainer<Biome>> biomeCodec = PalettedContainer.codec(
+			#if PRE_MC_1_18_2
-				biomes, biomes.byNameCodec(), PalettedContainer.Strategy.SECTION_BIOMES, biomes.getOrThrow(Biomes.PLAINS));
+			Codec<PalettedContainer<Biome>> biomeCodec = PalettedContainer.codec(
-		
+					biomes, biomes.byNameCodec(), PalettedContainer.Strategy.SECTION_BIOMES, biomes.getOrThrow(Biomes.PLAINS));
-		int i = level.getSectionsCount();
+			#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);
+		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);
-			byte sectionYPos = tagSection.getByte("Y");
+			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"));
+				levelChunkSection.recalcBlockCounts();
+				if (!levelChunkSection.isEmpty())
+					chunkSections[#if PRE_MC_1_17_1 sectionYPos #else level.getSectionIndexFromSectionY(sectionYPos) #endif]
+							 = 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);
 			}
+			#endif
 
-			if (!isLightOn)
+			if (!isLightOn) continue;
-				continue;
-			
 			if (tagSection.contains("BlockLight", 7))
-				lightEngine.queueSectionData(LightLayer.BLOCK, SectionPos.of(chunkPos, sectionYPos), new DataLayer(tagSection.getByteArray("BlockLight")), true);
+				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);
+				lightEngine.queueSectionData(LightLayer.SKY, SectionPos.of(chunkPos, sectionYPos),
+						new DataLayer(tagSection.getByteArray("SkyLight")), true);
 		}
 		return chunkSections;
 	}
@@ -123,62 +189,6 @@ public class ChunkLoader
 		Heightmap.primeHeightmaps(chunk, ChunkStatus.FULL.heightmapsAfter());
 	}
 
-	private static Map<StructureFeature<?>, StructureStart<?>> unpackStructureStart(StructurePieceSerializationContext structurePieceSerializationContext, CompoundTag compoundTag, long l)
-	{
-		HashMap<StructureFeature<?>, StructureStart<?>> map = Maps.newHashMap();
-		CompoundTag compoundTag2 = compoundTag.getCompound("starts");
-		for (String string : compoundTag2.getAllKeys())
-		{
-			String string2 = string.toLowerCase(Locale.ROOT);
-			StructureFeature<?> structureFeature = StructureFeature.STRUCTURES_REGISTRY.get(string2);
-			if (structureFeature == null)
-			{
-				LOGGER.error("Unknown structure start: {}", (Object) string2);
-				continue;
-			}
-			StructureStart<?> structureStart = StructureFeature.loadStaticStart(structurePieceSerializationContext, compoundTag2.getCompound(string), l);
-			if (structureStart == null)
-				continue;
-			map.put(structureFeature, structureStart);
-		}
-		return map;
-	}
-	
-	private static Map<StructureFeature<?>, LongSet> unpackStructureReferences(ChunkPos chunkPos, CompoundTag compoundTag)
-	{
-		HashMap<StructureFeature<?>, LongSet> map = Maps.newHashMap();
-		CompoundTag compoundTag2 = compoundTag.getCompound("References");
-		for (String string : compoundTag2.getAllKeys())
-		{
-			String string2 = string.toLowerCase(Locale.ROOT);
-			StructureFeature<?> structureFeature = StructureFeature.STRUCTURES_REGISTRY.get(string2);
-			if (structureFeature == null)
-			{
-				LOGGER.warn("Found reference to unknown structure '{}' in chunk {}, discarding", (Object) string2, (Object) chunkPos);
-				continue;
-			}
-			map.put(structureFeature, new LongOpenHashSet(Arrays.stream(compoundTag2.getLongArray(string)).filter(l ->
-			{
-				ChunkPos chunkPos2 = new ChunkPos(l);
-				if (chunkPos2.getChessboardDistance(chunkPos) > 8)
-				{
-					LOGGER.warn("Found invalid structure reference [ {} @ {} ] for chunk {}.", (Object) string2, (Object) chunkPos2, (Object) chunkPos);
-					return false;
-				}
-				return true;
-			}).toArray()));
-		}
-		return map;
-	}
-	
-	private static void readStructures(WorldGenLevel level, LevelChunk chunk, CompoundTag chunkData)
-	{
-		CompoundTag tagStructures = chunkData.getCompound("structures");
-		chunk.setAllStarts(
-				unpackStructureStart(StructurePieceSerializationContext.fromLevel(level.getLevel()), tagStructures, level.getSeed()));
-		chunk.setAllReferences(unpackStructureReferences(chunk.getPos(), tagStructures));
-	}
-	
 	private static void readPostPocessings(LevelChunk chunk, CompoundTag chunkData)
 	{
 		ListTag tagPostProcessings = chunkData.getList("PostProcessing", 9);
@@ -192,49 +202,88 @@ public class ChunkLoader
 		}
 	}
 	
-	public static ChunkStatus.ChunkType readChunkType(CompoundTag compoundTag)
+	public static ChunkStatus.ChunkType readChunkType(CompoundTag tagLevel)
 	{
-		return ChunkStatus.byName(compoundTag.getString("Status")).getChunkType();
+		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
+		CompoundTag tagLevel = chunkData.getCompound("Level");
+		#else
+		CompoundTag tagLevel = chunkData;
+		#endif
 
-		ChunkPos actualPos = new ChunkPos(chunkData.getInt("xPos"), chunkData.getInt("zPos"));
+		ChunkPos actualPos = new ChunkPos(tagLevel.getInt("xPos"), tagLevel.getInt("zPos"));
-		if (!Objects.equals(chunkPos, actualPos))
+		if (!Objects.equals(chunkPos, actualPos)) {
-		{
+			LOGGER.error("Chunk file at {} is in the wrong location; Ignoring. (Expected {}, got {})", chunkPos, chunkPos, actualPos);
-			LOGGER.error("Distant Horizons: Chunk file at {} is in the wrong location; Ignoring. (Expected {}, got {})", (Object) chunkPos, (Object) chunkPos, (Object) actualPos);
 			return null;
 		}
 
-		ChunkStatus.ChunkType chunkType = readChunkType(chunkData);
+		ChunkStatus.ChunkType chunkType = readChunkType(tagLevel);
-		BlendingData blendingData = readBlendingData(chunkData);
+		#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
 
-		// Prepare the light engine
+		long inhabitedTime = tagLevel.getLong("InhabitedTime");
-		boolean isLightOn = chunkData.getBoolean("isLightOn");
-		if (isLightOn)
-			level.getLightEngine().retainData(chunkPos, true);
 
-		// Read params for making the LevelChunk
+		//================== Read params for making the LevelChunk ==================
-		UpgradeData upgradeData = chunkData.contains(TAG_UPGRADE_DATA, 10)
+		UpgradeData upgradeData = tagLevel.contains(TAG_UPGRADE_DATA, 10)
-				? new UpgradeData(chunkData.getCompound(TAG_UPGRADE_DATA), level)
+				? new UpgradeData(tagLevel.getCompound(TAG_UPGRADE_DATA)#if POST_MC_1_17_1, level #endif)
 				: UpgradeData.EMPTY;
-		LevelChunkTicks<Block> blockTicks = LevelChunkTicks.load(chunkData.getList(BLOCK_TICKS_TAG, 10),
+
+		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(chunkData.getList(FLUID_TICKS_TAG, 10),
+		LevelChunkTicks<Fluid> fluidTicks = LevelChunkTicks.load(tagLevel.getList(FLUID_TICKS_TAG_18, 10),
 				string -> Registry.FLUID.getOptional(ResourceLocation.tryParse(string)), chunkPos);
-		long inhabitedTime = chunkData.getLong("InhabitedTime");
+		#endif
-		LevelChunkSection[] chunkSections = readSections(level, lightEngine, actualPos, chunkData);
 
-		// Make chunk
+		LevelChunkSection[] levelChunkSections = readSections(level, lightEngine, chunkPos, tagLevel);
-		LevelChunk chunk = new LevelChunk((Level) level, chunkPos, upgradeData, blockTicks, fluidTicks, inhabitedTime, chunkSections, null, blendingData);
 
+		// ====================== 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);
-		readStructures(level, chunk, chunkData);
 		readPostPocessings(chunk, chunkData);
 		return chunk;
 	}

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

@@ -1,10 +1,31 @@
+/*
+ *    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.api.ModAccessorApi;
+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;
 
@@ -15,7 +36,7 @@ public class LightGetterAdaptor implements LightChunkGetter {
 
 	public LightGetterAdaptor(BlockGetter heightAccessor) {
 		this.heightGetter = heightAccessor;
-		shouldReturnNull = ModAccessorApi.get(IStarlightAccessor.class) != null;
+		shouldReturnNull = ModAccessorHandler.get(IStarlightAccessor.class) != null;
 	}
 
 	public void setRegion(LightedWorldGenRegion region) {
@@ -34,7 +55,10 @@ 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
 }

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

@@ -1,24 +1,56 @@
+/*
+ *    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 com.seibel.lod.core.api.ApiShared;
 import org.jetbrains.annotations.Nullable;
 
 import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment.EmptyChunkGenerator;
-import com.seibel.lod.core.api.ClientApi;
 import com.seibel.lod.core.enums.config.LightGenerationMode;
 
 import it.unimi.dsi.fastutil.longs.Long2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.objects.Object2ObjectArrayMap;
+import net.minecraft.Util;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.color.block.BlockTintCache;
+import net.minecraft.client.renderer.BiomeColors;
 import net.minecraft.core.BlockPos;
+import net.minecraft.core.Cursor3D;
 import net.minecraft.core.SectionPos;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.server.level.WorldGenRegion;
 import net.minecraft.util.Mth;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.level.ChunkPos;
+import net.minecraft.world.level.ColorResolver;
+#if POST_MC_1_17_1
 import net.minecraft.world.level.LevelHeightAccessor;
+#endif
 import net.minecraft.world.level.LightLayer;
+#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;
 import net.minecraft.world.level.block.state.BlockState;
@@ -27,7 +59,6 @@ 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;
 
@@ -39,23 +70,41 @@ public class LightedWorldGenRegion extends WorldGenRegion {
 	public final int size;
 	private final ChunkPos firstPos;
 	private final List<ChunkAccess> cache;
-	private final StructureFeatureManager structFeat;
 	Long2ObjectOpenHashMap<ChunkAccess> chunkMap = new Long2ObjectOpenHashMap<ChunkAccess>();
+	#if PRE_MC_1_18_1
+	private ChunkPos overrideCenterPos = null;
+	public void setOverrideCenter(ChunkPos pos) {overrideCenterPos = pos;}
+		#if PRE_MC_1_17_1
+		@Override
+		public int getCenterX() {
+			return overrideCenterPos==null ? super.getCenterX() : overrideCenterPos.x;
+		}
+		@Override
+		public int getCenterZ() {
+			return overrideCenterPos==null ? super.getCenterX() : overrideCenterPos.z;
+		}
+		#else
+		@Override
+		public ChunkPos getCenter() {
+			return overrideCenterPos==null ? super.getCenter() : overrideCenterPos;
+		}
+		#endif
+	#endif
 
 	public LightedWorldGenRegion(ServerLevel serverLevel, WorldGenLevelLightEngine lightEngine,
-			StructureFeatureManager structFeat, List<ChunkAccess> list, ChunkStatus chunkStatus, int i,
+			List<ChunkAccess> list, ChunkStatus chunkStatus, int i,
 			LightGenerationMode lightMode, EmptyChunkGenerator generator) {
-		super(serverLevel, list, chunkStatus, i);
+		super(serverLevel, list #if POST_MC_1_17_1, chunkStatus, i #endif);
 		this.lightMode = lightMode;
 		this.firstPos = list.get(0).getPos();
 		this.generator = generator;
-		this.structFeat = structFeat;
 		light = lightEngine;
 		writeRadius = i;
 		cache = list;
 		size = Mth.floor(Math.sqrt(list.size()));
 	}
 
+	#if POST_MC_1_17_1
 	// Bypass BCLib mixin overrides.
     @Override
     public boolean ensureCanWrite(BlockPos blockPos) {
@@ -68,20 +117,24 @@ public class LightedWorldGenRegion extends WorldGenRegion {
         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
 
-	@Override
+	// TODO Check this
-	public List<? extends StructureStart<?>> startsForFeature(SectionPos sectionPos,
+//	@Override
-			StructureFeature<?> structureFeature) {
+//	public List<? extends StructureStart<?>> startsForFeature(SectionPos sectionPos,
-		return structFeat.startsForFeature(sectionPos, structureFeature);
+//			StructureFeature<?> structureFeature) {
-	}
+//		return structFeat.startsForFeature(sectionPos, structureFeature);
+//	}
 
 	// Skip updating the related tile entities
 	@Override
@@ -159,7 +212,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, true);
+			chunk = new ImposterProtoChunk((LevelChunk) chunk #if POST_MC_1_18_1, true #endif);
 		}
 		return chunk;
 	}
@@ -183,7 +236,7 @@ public class LightedWorldGenRegion extends WorldGenRegion {
 			}
 		}
 		if (chunkStatus != ChunkStatus.EMPTY && chunkStatus != debugTriggeredForStatus) {
-			ClientApi.LOGGER.info("WorldGen requiring " + chunkStatus
+			ApiShared.LOGGER.info("WorldGen requiring " + chunkStatus
 					+ " outside expected range detected. Force passing EMPTY chunk and seeing if it works.");
 			debugTriggeredForStatus = chunkStatus;
 		}
@@ -224,4 +277,43 @@ public class LightedWorldGenRegion extends WorldGenRegion {
 		return (getBrightness(LightLayer.SKY, blockPos) >= getMaxLightLevel());
 	}
 	
+	public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver)
+	{
+		return calculateBlockTint(blockPos, colorResolver);
+	}
+
+	private Biome _getBiome(BlockPos pos) {
+		#if POST_MC_1_18_2
+		return getBiome(pos).value();
+		#else
+		return getBiome(pos);
+		#endif
+	}
+	
+	public int calculateBlockTint(BlockPos blockPos, ColorResolver colorResolver)
+	{
+		#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());
+		int j = (i * 2 + 1) * (i * 2 + 1);
+		int k = 0;
+		int l = 0;
+		int m = 0;
+		Cursor3D cursor3D = new Cursor3D(blockPos.getX() - i, blockPos.getY(), blockPos.getZ() - i, blockPos.getX() + i, blockPos.getY(), blockPos.getZ() + i);
+		BlockPos.MutableBlockPos mutableBlockPos = new BlockPos.MutableBlockPos();
+		while (cursor3D.advance())
+		{
+			mutableBlockPos.set(cursor3D.nextX(), cursor3D.nextY(), cursor3D.nextZ());
+			int n = colorResolver.getColor((Biome) _getBiome((BlockPos) mutableBlockPos), mutableBlockPos.getX(), mutableBlockPos.getZ());
+			k += (n & 0xFF0000) >> 16;
+			l += (n & 0xFF00) >> 8;
+			m += n & 0xFF;
+		}
+		return (k / j & 0xFF) << 16 | (l / j & 0xFF) << 8 | m / j & 0xFF;
+	}
+
 }

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

@@ -1,3 +1,22 @@
+/*
+ *    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;
@@ -5,7 +24,9 @@ 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;
@@ -18,7 +39,9 @@ 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
@@ -26,7 +49,9 @@ 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);
     }
@@ -123,16 +148,33 @@ public class WorldGenLevelLightEngine extends LevelLightEngine {
         chunkAccess.setLightCorrect(false);
         
         LevelChunkSection[] levelChunkSections = chunkAccess.getSections();
-        for (int i = 0; i < chunkAccess.getSectionsCount(); ++i) {
+        for (int i = 0; i <
+        #if POST_MC_1_17_1
+            chunkAccess.getSectionsCount()
+        #else
+            16
+        #endif
+        ; ++i) {
             LevelChunkSection levelChunkSection = levelChunkSections[i];
+            #if PRE_MC_1_17_1
+            if (!LevelChunkSection.isEmpty(levelChunkSection)) {
+                updateSectionStatus(SectionPos.of(chunkPos, i), false);
+            }
+            #elif PRE_MC_1_18_1
+            if (!LevelChunkSection.isEmpty(levelChunkSection)) {
+                int j = this.levelHeightAccessor.getSectionYFromSectionIndex(i);
+                updateSectionStatus(SectionPos.of(chunkPos, j), false);
+            }
+            #else
             if (levelChunkSection.hasOnlyAir()) continue;
             int j = this.levelHeightAccessor.getSectionYFromSectionIndex(i);
             updateSectionStatus(SectionPos.of(chunkPos, j), false);
+            #endif
         }
         enableLightSources(chunkPos, true);
         if (needLightBlockUpdate) {
             chunkAccess.getLights().forEach(blockPos ->
-            onBlockEmissionIncrease(blockPos, chunkAccess.getLightEmission(blockPos)));
+                    onBlockEmissionIncrease(blockPos, chunkAccess.getLightEmission(blockPos)));
         }
 
         chunkAccess.setLightCorrect(true);
@@ -161,6 +203,8 @@ 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!");
@@ -173,4 +217,5 @@ public class WorldGenLevelLightEngine extends LevelLightEngine {
     public int getMaxLightSection() {
     	throw new UnsupportedOperationException("This should never be used!");
     }
+    #endif
 }

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

@@ -1,6 +1,31 @@
+/*
+ *    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;
@@ -12,68 +37,192 @@ 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 {
-	WorldGenLevel genLevel;
+#else
+public class WorldGenStructFeatManager extends StructureManager {
+#endif
+	final WorldGenLevel genLevel;
 	WorldGenSettings worldGenSettings;
+	#if POST_MC_1_18_1
 	StructureCheck structureCheck;
-	public WorldGenStructFeatManager(LevelAccessor levelAccessor, WorldGenSettings worldGenSettings,
+	#endif
-			WorldGenLevel genLevel, StructureCheck structureCheck) {
+	public WorldGenStructFeatManager(WorldGenSettings worldGenSettings,
-		super(levelAccessor, worldGenSettings, structureCheck);
+			WorldGenLevel genLevel #if POST_MC_1_18_1, StructureCheck structureCheck #endif) {
+
+		super(genLevel, worldGenSettings #if POST_MC_1_18_1, structureCheck #endif);
 		this.genLevel = genLevel;
 		this.worldGenSettings = worldGenSettings;
 	}
 
-	public void setGenLevel(WorldGenLevel genLevel) {
-		this.genLevel = genLevel;
-	}
-
 	@Override
 	public WorldGenStructFeatManager forWorldGenRegion(WorldGenRegion worldGenRegion) {
 		if (worldGenRegion == genLevel)
 			return this;
-		return new WorldGenStructFeatManager(worldGenRegion, worldGenSettings, worldGenRegion, structureCheck);
+		return new WorldGenStructFeatManager(worldGenSettings, worldGenRegion #if POST_MC_1_18_1, structureCheck #endif);
 	}
 
+	private ChunkAccess _getChunk(int x, int z, ChunkStatus status) {
+		if (genLevel == null) return null;
+		return genLevel.getChunk(x, z, status, false);
+	}
+
+	#if PRE_MC_1_18_1
 	@Override
-    public boolean hasAnyStructureAt(BlockPos blockPos) {
+	public Stream<? extends StructureStart<?>> startsForFeature(SectionPos sectionPos2,
-        SectionPos sectionPos = SectionPos.of(blockPos);
+																StructureFeature<?> structureFeature) {
-		ChunkAccess chunk = genLevel.getChunk(sectionPos.x(), sectionPos.z(), ChunkStatus.STRUCTURE_REFERENCES,
+		ChunkAccess chunk = _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;
+			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();
+		return chunk.hasAnyStructureReferences();
-    }
-    
-	@Override
-    @SuppressWarnings({ "rawtypes", "unchecked" })
-	public List<? extends StructureStart<?>> startsForFeature(SectionPos sectionPos,
-			StructureFeature<?> structureFeature) {
-		if (genLevel == null)
-			return List.of();
-		ChunkAccess chunk = genLevel.getChunk(sectionPos.x(), sectionPos.z(), ChunkStatus.STRUCTURE_REFERENCES,
-				false);
-		if (chunk == null)
-			return List.of();
-		LongSet longSet = chunk.getReferencesForFeature(structureFeature);
-			ImmutableList.Builder builder = ImmutableList.builder();
-	        LongIterator longIterator = longSet.iterator();
-	        while (longIterator.hasNext()) {
-	            long l = (Long)longIterator.next();
-	            SectionPos sectPos = SectionPos.of(new ChunkPos(l), genLevel.getMinSection());
-	            ChunkAccess startChunk = genLevel.getChunk(sectPos.x(), sectPos.z(), ChunkStatus.STRUCTURE_STARTS, false);
-	            if (startChunk == null) continue;
-	            StructureStart<?> structureStart = this.getStartForFeature(sectPos, structureFeature, startChunk);
-	            if (structureStart == null || !structureStart.isValid()) continue;
-	            builder.add(structureStart);
-	        }
-	        return builder.build();
 	}
+		#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
 }

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

@@ -1,3 +1,22 @@
+/*
+ *    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;
@@ -8,7 +27,9 @@ import com.seibel.lod.common.wrappers.worldGeneration.ThreadedParameters;
 
 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;
@@ -17,7 +38,9 @@ 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 {
 	/**
@@ -48,8 +71,15 @@ public final class StepBiomes {
 		
 		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
 		}
 	}
 }

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

@@ -1,17 +1,40 @@
+/*
+ *    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.core.util.GridList;
+import com.seibel.lod.common.wrappers.worldGeneration.mimicObject.LightedWorldGenRegion;
+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 {
 	/**
@@ -29,8 +52,8 @@ public final class StepFeatures {
 
 	public final ChunkStatus STATUS = ChunkStatus.FEATURES;
 
-	public void generateGroup(ThreadedParameters tParams, WorldGenRegion worldGenRegion,
+	public void generateGroup(ThreadedParameters tParams, LightedWorldGenRegion worldGenRegion,
-			GridList<ChunkAccess> chunks) {
+			ArrayGridList<ChunkAccess> chunks) {
 		ArrayList<ChunkAccess> chunksToDo = new ArrayList<ChunkAccess>();
 		
 		for (ChunkAccess chunk : chunks) {
@@ -41,20 +64,20 @@ public final class StepFeatures {
 		
 		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));
-				Blender.generateBorderTicks(worldGenRegion, chunk);
+				#endif
 			} catch (ReportedException e) {
 				e.printStackTrace();
-				// FIXME: Features concurrent modification issue. Something about cocobeans just
+				// FIXME: Features concurrent modification issue. Something about cocobeans might just
-				// aren't happy
+				// error out. For now just retry.
-				// For now just retry.
 			}
-		}/*
+		}
-		for (ChunkAccess chunk : chunks) {
-			Heightmap.primeHeightmaps(chunk,
-					EnumSet.of(Heightmap.Types.MOTION_BLOCKING, Heightmap.Types.MOTION_BLOCKING_NO_LEAVES,
-							Heightmap.Types.OCEAN_FLOOR, Heightmap.Types.WORLD_SURFACE));
-		}*/
 	}
 }

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

@@ -1,14 +1,34 @@
+/*
+ *    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;
+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 {
@@ -27,9 +47,10 @@ public final class StepLight {
 
 	public final ChunkStatus STATUS = ChunkStatus.LIGHT;
 	
-	public void generateGroup(LightEventListener lightEngine,
+	public void generateGroup(
-			GridList<ChunkAccess> chunks) {
+			#if PRE_MC_1_17_1 LevelLightEngine lightEngine,
-		//ArrayList<ChunkAccess> chunksToDo = new ArrayList<ChunkAccess>();
+			#else LightEventListener lightEngine, #endif
+			ArrayGridList<ChunkAccess> chunks) {
 		
 		for (ChunkAccess chunk : chunks) {
 			if (chunk.getStatus().isOrAfter(STATUS)) continue;
@@ -52,7 +73,9 @@ 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);

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

@@ -1,3 +1,22 @@
+/*
+ *    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;
@@ -9,17 +28,24 @@ 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.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 {
 	/**
@@ -50,8 +76,19 @@ 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,
+					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));
+					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
 		}
 	}
 }

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

@@ -1,3 +1,22 @@
+/*
+ *    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;
@@ -13,7 +32,9 @@ 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;

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

@@ -1,3 +1,22 @@
+/*
+ *    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;
@@ -48,11 +67,21 @@ public final class StepStructureStart {
 			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) {
@@ -61,6 +90,7 @@ public final class StepStructureStart {
 					// TODO: Figure out in the future why this happens even though I am using new structFeat
 					throw new StepStructureStart.StructStartCorruptedException(e);
 				}
+				#endif
 			}
 		}
 	}

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

@@ -1,3 +1,22 @@
+/*
+ *    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;
@@ -39,8 +58,13 @@ public final class StepSurface {
 		
 		for (ChunkAccess chunk : chunksToDo) {
 			// System.out.println("StepSurface: "+chunk.getPos());
-			environment.params.generator.buildSurface(worldGenRegion, tParams.structFeat.forWorldGenRegion(worldGenRegion),
+			#if PRE_MC_1_18_1
-					chunk);
+			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
 		}
 	}
 }

common/src/main/resources/1_16.lod.accesswidener

@@ -0,0 +1,45 @@
+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

common/src/main/resources/1_17.lod.accesswidener

@@ -0,0 +1,48 @@
+accessWidener v1 named
+
+
+# used when determining where to save files to
+accessible field net/minecraft/world/level/storage/DimensionDataStorage dataFolder Ljava/io/File;
+
+# used when rendering
+accessible field com/mojang/blaze3d/vertex/VertexBuffer indexCount I
+accessible field com/mojang/blaze3d/vertex/VertexBuffer vertextBufferId I
+accessible method net/minecraft/client/renderer/GameRenderer getFov (Lnet/minecraft/client/Camera;FZ)D
+
+# pre-render setup
+accessible field net/minecraft/client/renderer/LevelRenderer renderChunks Lit/unimi/dsi/fastutil/objects/ObjectArrayList;
+accessible class net/minecraft/client/renderer/LevelRenderer$RenderChunkInfo
+accessible field net/minecraft/client/renderer/LevelRenderer$RenderChunkInfo chunk Lnet/minecraft/client/renderer/chunk/ChunkRenderDispatcher$RenderChunk;
+
+# used for grabbing vanilla rendered chunks
+accessible class net/minecraft/client/renderer/LevelRenderer$RenderChunkInfo
+accessible field net/minecraft/client/renderer/LevelRenderer$RenderChunkInfo chunk Lnet/minecraft/client/renderer/chunk/ChunkRenderDispatcher$RenderChunk;
+
+# lighting
+accessible field net/minecraft/client/renderer/LightTexture lightPixels Lcom/mojang/blaze3d/platform/NativeImage;
+accessible field net/minecraft/client/renderer/LightTexture lightTexture Lnet/minecraft/client/renderer/texture/DynamicTexture;
+accessible field net/minecraft/world/level/lighting/LevelLightEngine blockEngine Lnet/minecraft/world/level/lighting/LayerLightEngine;
+accessible field net/minecraft/world/level/lighting/LevelLightEngine skyEngine Lnet/minecraft/world/level/lighting/LayerLightEngine;
+
+# world generation
+accessible method net/minecraft/world/level/levelgen/Heightmap setHeight (III)V
+accessible field net/minecraft/world/level/biome/Biome generationSettings Lnet/minecraft/world/level/biome/BiomeGenerationSettings;
+accessible field net/minecraft/world/level/biome/Biome biomeCategory Lnet/minecraft/world/level/biome/Biome$BiomeCategory;
+# accessible field net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator settings Lnet/minecraft/core/Holder;
+#accessible method net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator doCreateBiomes (Lnet/minecraft/core/Registry;Lnet/minecraft/world/level/levelgen/blending/Blender;Lnet/minecraft/world/level/StructureFeatureManager;Lnet/minecraft/world/level/chunk/ChunkAccess;)V
+accessible method net/minecraft/world/level/lighting/LayerLightEngine queueSectionData (JLnet/minecraft/world/level/chunk/DataLayer;Z)V
+
+# lod generation from save file
+accessible field net/minecraft/server/level/ChunkMap mainThreadExecutor Lnet/minecraft/util/thread/BlockableEventLoop;
+accessible method net/minecraft/server/level/ChunkMap readChunk (Lnet/minecraft/world/level/ChunkPos;)Lnet/minecraft/nbt/CompoundTag;
+
+
+# grabbing textures
+accessible field net/minecraft/client/renderer/texture/TextureAtlasSprite animatedTexture Lnet/minecraft/client/renderer/texture/TextureAtlasSprite$AnimatedTexture;
+accessible field net/minecraft/client/renderer/texture/TextureAtlasSprite width I
+accessible field net/minecraft/client/renderer/texture/TextureAtlasSprite height I
+accessible field net/minecraft/client/renderer/texture/TextureAtlasSprite mainImage [Lcom/mojang/blaze3d/platform/NativeImage;
+accessible class net/minecraft/client/renderer/texture/TextureAtlasSprite$AnimatedTexture
+accessible method net/minecraft/client/renderer/texture/TextureAtlasSprite$AnimatedTexture getFrameX (I)I
+accessible method net/minecraft/client/renderer/texture/TextureAtlasSprite$AnimatedTexture getFrameY (I)I
+extendable class com/mojang/math/Matrix4f

common/src/main/resources/1_18.lod.accesswidener

@@ -1,6 +1,7 @@
 accessWidener v1 named
 
-# used when determining where to save files too
+
+# used when determining where to save files to
 accessible field net/minecraft/world/level/storage/DimensionDataStorage dataFolder Ljava/io/File;
 
 # used when rendering
@@ -16,15 +17,17 @@ 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;
 
 # world generation
 accessible method net/minecraft/world/level/levelgen/Heightmap setHeight (III)V
 accessible field net/minecraft/world/level/biome/Biome generationSettings Lnet/minecraft/world/level/biome/BiomeGenerationSettings;
-accessible field net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator settings Ljava/util/function/Supplier;
+accessible 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/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

common/src/main/resources/1_19.lod.accesswidener

@@ -0,0 +1,47 @@
+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;

fabric/build.gradle

@@ -2,26 +2,95 @@ plugins {
     id "com.github.johnrengelman.shadow" version "7.1.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 {
-    accessWidenerPath.set(project(":common").file("src/main/resources/lod.accesswidener"))
+    silentMojangMappingsLicense()
+    accessWidenerPath.set(project(":common").file("src/main/resources/${acsessWidenerVersion}.lod.accesswidener"))
 }
 
+
 architectury {
     platformSetupLoomIde()
     fabric()
 }
 
 configurations {
+    common
+    shadowMe
+    implementation.extendsFrom shadowMe
+
     compileClasspath.extendsFrom common
     runtimeClasspath.extendsFrom common
     developmentFabric.extendsFrom common
+
+    addModJar
+    include.extendsFrom addModJar
+    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) {
@@ -32,23 +101,54 @@ 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" && rootProject.minecraft_version != "1.19.1")
+            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
-    modApi "net.fabricmc.fabric-api:fabric-api:${rootProject.fabric_api_version}"
+    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}") {
+    modImplementation("com.terraformersmc:modmenu:${rootProject.modmenu_version}")
-        exclude(group: "net.fabricmc.fabric-api")
-    }
 
     // Starlight
     addMod("curse.maven:starlight-521783:${rootProject.starlight_version_fabric}", rootProject.enable_starlight)
 
+    // Phosphor
+    addMod("curse.maven:phosphor-372124:${rootProject.phosphor_version_fabric}", rootProject.enable_phosphor)
+
     // 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
     addMod("maven.modrinth:lithium:${rootProject.lithium_version}", rootProject.enable_lithium)
@@ -75,13 +175,12 @@ dependencies {
     }
     */
 
-
-
     // 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'
@@ -90,10 +189,14 @@ dependencies {
     shadowMe 'org.apache.commons:commons-compress:1.21'
 }
 
-// This method copies the access wideners from the common project to the fabric project. And it was generated by Github Copilot
+task deleteResources(type: Delete) {
+    delete file("build/resources/main")
+}
+// Copies the correct accesswidener and renames it
 task copyAccessWidener(type: Copy) {
-    from project(":common").file("src/main/resources/lod.accesswidener")
+    from project(":common").file("src/main/resources/${rootProject.acsessWidenerVersion}.lod.accesswidener")
-    into file("src/generated/resources")
+    into(file("build/resources/main"))
+    rename "${rootProject.acsessWidenerVersion}.lod.accesswidener", "lod.accesswidener"
 }
 
 task copyCoreResources(type: Copy) {
@@ -101,26 +204,60 @@ 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'
@@ -139,6 +276,11 @@ 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"
 }
 
@@ -167,3 +309,35 @@ 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
+}

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

@@ -1,8 +1,8 @@
 /*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
  *    licensed under the GNU GPL v3 License.
  *
- *    Copyright (C) 2020  James Seibel
+ *    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
@@ -19,23 +19,26 @@
 
 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.util.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;
@@ -44,6 +47,7 @@ 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;
 
@@ -51,7 +55,7 @@ import org.lwjgl.glfw.GLFW;
  * This handles all events sent to the client,
  * and is the starting point for most of the mod.
  * 
- * @author coolGi2007
+ * @author coolGi
  * @author Ran
  * @version 11-23-2021
  */
@@ -60,14 +64,13 @@ public class ClientProxy
 	private final EventApi eventApi = EventApi.INSTANCE;
 	private final ClientApi clientApi = ClientApi.INSTANCE;
 
+	public static Supplier<Boolean> isGenerationThreadChecker = null;
 
 	/**
 	 * Registers Fabric Events
 	 * @author Ran
 	 */
 	public void registerEvents() {
-		// TODO: Fix this if it's wrong
-		
 		/* Registor the mod accessor*/
 
 		/* World Events */
@@ -76,7 +79,9 @@ public class ClientProxy
 
 		/* World Events */
 		//ServerChunkEvents.CHUNK_LOAD.register(this::chunkLoadEvent);
-		//ClientChunkEvents.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));
@@ -91,6 +96,8 @@ public class ClientProxy
 		ClientTickEvents.END_CLIENT_TICK.register(client -> {
 			if (client.player != null) onKeyInput();
 		});
+		isGenerationThreadChecker = BatchGenerationEnvironment::isCurrentThreadDistantGeneratorThread;
+
 	}
 
 
@@ -113,6 +120,7 @@ public class ClientProxy
 	/** 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));
 		}
@@ -153,7 +161,7 @@ public class ClientProxy
 		eventApi.blockChangeEvent(chunk, dimType);
 	}
 
-	private static final List<Integer> KEY_TO_CHECK_FOR = List.of(GLFW.GLFW_KEY_F6, GLFW.GLFW_KEY_F8);
+	private static final int[] KEY_TO_CHECK_FOR = {GLFW.GLFW_KEY_F6, GLFW.GLFW_KEY_F8};
 	
 	HashSet<Integer> previousKeyDown = new HashSet<Integer>();
 	
@@ -166,7 +174,7 @@ public class ClientProxy
 			// Note: Minecraft's InputConstants is same as GLFW Key values
 			//TODO: Use mixin to hook directly into the GLFW Keyboard event in minecraft KeyboardHandler
 			// Check all keys we need
-			for (int i = InputConstants.KEY_A; i <= InputConstants.KEY_Z; i++) {
+			for (int i = GLFW.GLFW_KEY_A; i <= GLFW.GLFW_KEY_Z; i++) {
 				if (InputConstants.isKeyDown(Minecraft.getInstance().getWindow().getWindow(), i)) {
 					currectKeyDown.add(i);
 				}

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

@@ -1,8 +1,8 @@
 /*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
  *    licensed under the GNU GPL v3 License.
  *
- *    Copyright (C) 2020  James Seibel
+ *    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
@@ -21,9 +21,10 @@ package com.seibel.lod.fabric;
 
 import com.seibel.lod.common.LodCommonMain;
 import com.seibel.lod.core.ModInfo;
+import com.seibel.lod.core.api.ApiShared;
 import com.seibel.lod.core.api.ClientApi;
-import com.seibel.lod.core.api.ModAccessorApi;
+import com.seibel.lod.core.handlers.dependencyInjection.ModAccessorHandler;
-import com.seibel.lod.core.util.SingletonHandler;
+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;
@@ -32,7 +33,7 @@ import com.seibel.lod.fabric.wrappers.modAccessor.ModChecker;
 import com.seibel.lod.fabric.wrappers.modAccessor.OptifineAccessor;
 import com.seibel.lod.fabric.wrappers.modAccessor.SodiumAccessor;
 import com.seibel.lod.fabric.wrappers.modAccessor.StarlightAccessor;
-import com.seibel.lod.fabric.wrappers.DependencySetup;
+import com.seibel.lod.fabric.wrappers.FabricDependencySetup;
 
 import net.fabricmc.api.ClientModInitializer;
 
@@ -41,7 +42,7 @@ import net.fabricmc.api.ClientModInitializer;
  * If you are looking for the real start of the mod
  * check out the ClientProxy.
  * 
- * @author coolGi2007
+ * @author coolGi
  * @author Ran
  * @version 12-1-2021
  */
@@ -64,28 +65,31 @@ public class Main implements ClientModInitializer
 	public static void init() {
 		LodCommonMain.initConfig();
 		LodCommonMain.startup(null, false);
-		DependencySetup.createInitialBindings();
+		FabricDependencySetup.createInitialBindings();
-		SingletonHandler.bind(IModChecker.class, ModChecker.INSTANCE);
+		FabricDependencySetup.finishBinding();
-		ClientApi.LOGGER.info(ModInfo.READABLE_NAME + ", Version: " + ModInfo.VERSION);
+		ApiShared.LOGGER.info(ModInfo.READABLE_NAME + ", Version: " + ModInfo.VERSION);
 
 		// Check if this works
 		client_proxy = new ClientProxy();
 		client_proxy.registerEvents();
 		if (SingletonHandler.get(IModChecker.class).isModLoaded("sodium")) {
-			ModAccessorApi.bind(ISodiumAccessor.class, new SodiumAccessor());
+			ModAccessorHandler.bind(ISodiumAccessor.class, new SodiumAccessor());
 		}
 		if (SingletonHandler.get(IModChecker.class).isModLoaded("starlight")) {
-			ModAccessorApi.bind(IStarlightAccessor.class, new StarlightAccessor());
+			ModAccessorHandler.bind(IStarlightAccessor.class, new StarlightAccessor());
 		}
 		if (SingletonHandler.get(IModChecker.class).isModLoaded("optifine")) {
-			ModAccessorApi.bind(IOptifineAccessor.class, new OptifineAccessor());
+			ModAccessorHandler.bind(IOptifineAccessor.class, new OptifineAccessor());
 		}
+
+		ModAccessorHandler.finishBinding();
 	}
 
 	public static void initServer() {
 		LodCommonMain.initConfig();
 		LodCommonMain.startup(null, true);
-		DependencySetup.createInitialBindings();
+		FabricDependencySetup.createInitialBindings();
-		ClientApi.LOGGER.info(ModInfo.READABLE_NAME + ", Version: " + ModInfo.VERSION);
+		FabricDependencySetup.finishBinding();
+		ApiShared.LOGGER.info(ModInfo.READABLE_NAME + ", Version: " + ModInfo.VERSION);
 	}
 }

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

@@ -0,0 +1,55 @@
+/*
+ *    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;
+
+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.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);
+        }
+    }
+}
+
+#else
+@Mixin(ChunkGenerator.class)
+public class MixinChunkGenerator {}
+#endif

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

@@ -0,0 +1,24 @@
+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);
+        }
+    }
+
+}

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

@@ -0,0 +1,35 @@
+/*
+ *    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();
+    }
+}

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

@@ -1,3 +1,22 @@
+/*
+ *    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;
@@ -6,7 +25,7 @@ import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.seibel.lod.core.util.SingletonHandler;
+import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
 import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
 
 import net.minecraft.client.Camera;
@@ -15,7 +34,11 @@ 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 {
@@ -25,16 +48,33 @@ public class MixinFogRenderer {
 	private static final float A_REALLY_REALLY_BIG_VALUE = 420694206942069.F;
 	private static final float A_EVEN_LARGER_VALUE = 42069420694206942069.F;
 
-	@Inject(at = @At("RETURN"), method = "setupFog(Lnet/minecraft/client/Camera;Lnet/minecraft/client/renderer/FogRenderer$FogMode;FZ)V")
+	@Inject(at = @At("RETURN"), method = "setupFog")
+	#if PRE_MC_1_19_1
 	private static void disableSetupFog(Camera camera, FogMode fogMode, float f, boolean bl, CallbackInfo callback) {
-	    FogType fogTypes = camera.getFluidInCamera();
+	#else
-	    Entity entity = camera.getEntity();
+	private static void disableSetupFog(Camera camera, FogMode fogMode, float f, boolean bl, float g, CallbackInfo callback) {
-	    boolean isUnderWater = (entity instanceof LivingEntity) && ((LivingEntity)entity).hasEffect(MobEffects.BLINDNESS);
+	#endif
-	    if (!isUnderWater) {
+		#if PRE_MC_1_17_1
-			if (fogMode == FogMode.FOG_TERRAIN && fogTypes == FogType.NONE && CONFIG.client().graphics().fogQuality().getDisableVanillaFog()) {
+		FluidState fluidState = camera.getFluidInCamera();
-			    RenderSystem.setShaderFogStart(A_REALLY_REALLY_BIG_VALUE);
+		boolean cameraNotInFluid = fluidState.isEmpty();
-			    RenderSystem.setShaderFogEnd(A_EVEN_LARGER_VALUE);
+		#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
+		}
 	}
+
 }

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

@@ -1,3 +1,22 @@
+/*
+ *    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;

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

@@ -1,14 +1,35 @@
+/*
+ *    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;
 import com.seibel.lod.common.wrappers.config.TexturedButtonWidget;
 import com.seibel.lod.core.ModInfo;
-import com.seibel.lod.core.util.SingletonHandler;
+import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
 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_1
 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;
@@ -20,7 +41,7 @@ import java.util.Objects;
 /**
  * Adds a button to the menu to goto the config
  *
- * @author coolGi2007
+ * @author coolGi
  * @version 12-02-2021
 */
 @Mixin(OptionsScreen.class)
@@ -34,7 +55,8 @@ 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.addRenderableWidget(new TexturedButtonWidget(
+            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
@@ -47,6 +69,10 @@ public class MixinOptionsScreen extends Screen {
                 // 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_1
                 new TranslatableComponent("text.autoconfig." + ModInfo.ID + ".title")));
+                #else
+                Component.translatable("text.autoconfig." + ModInfo.ID + ".title")));
+                #endif
     }
 }

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

@@ -1,16 +1,33 @@
+/*
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
+ *    licensed under the GNU GPL v3 License.
+ *
+ *    Copyright (C) 2020-2022  James Seibel
+ *
+ *    This program is free software: you can redistribute it and/or modify
+ *    it under the terms of the GNU General Public License as published by
+ *    the Free Software Foundation, version 3.
+ *
+ *    This program is distributed in the hope that it will be useful,
+ *    but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *    GNU General Public License for more details.
+ *
+ *    You should have received a copy of the GNU General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+ 
 package com.seibel.lod.fabric.mixins;
 
 import java.util.concurrent.ExecutorService;
 import java.util.function.Supplier;
 
+import com.seibel.lod.fabric.ClientProxy;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import com.seibel.lod.common.wrappers.DependencySetupDoneCheck;
-import com.seibel.lod.common.wrappers.worldGeneration.BatchGenerationEnvironment;
-import com.seibel.lod.core.api.ClientApi;
 import com.seibel.lod.core.util.DummyRunExecutorService;
 
 import net.minecraft.Util;
@@ -18,35 +35,39 @@ import net.minecraft.Util;
 @Mixin(Util.class)
 public class MixinUtilBackgroudThread
 {
+	@Inject(method = "backgroundExecutor", at = @At("HEAD"), cancellable = true)
+	private static void overrideUtil$backgroundExecutor(CallbackInfoReturnable<ExecutorService> ci)
+	{
+		if (ClientProxy.isGenerationThreadChecker != null && ClientProxy.isGenerationThreadChecker.get())
+		{
+			//ApiShared.LOGGER.info("util backgroundExecutor triggered");
+			ci.setReturnValue(new DummyRunExecutorService());
+		}
+	}
 
+	#if POST_MC_1_17_1
 	@Inject(method = "wrapThreadWithTaskName(Ljava/lang/String;Ljava/lang/Runnable;)Ljava/lang/Runnable;",
 			at = @At("HEAD"), cancellable = true)
 	private static void overrideUtil$wrapThreadWithTaskName(String string, Runnable r, CallbackInfoReturnable<Runnable> ci)
 	{
-		if (DependencySetupDoneCheck.isDone && BatchGenerationEnvironment.isCurrentThreadDistantGeneratorThread())
+		if (ClientProxy.isGenerationThreadChecker != null && ClientProxy.isGenerationThreadChecker.get())
 		{
-			//ClientApi.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 && BatchGenerationEnvironment.isCurrentThreadDistantGeneratorThread())
+		if (ClientProxy.isGenerationThreadChecker != null && ClientProxy.isGenerationThreadChecker.get())
 		{
-			//ClientApi.LOGGER.info("util wrapThreadWithTaskName(Supplier) triggered");
+			//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<ExecutorService> ci)
-	{
-		if (DependencySetupDoneCheck.isDone && BatchGenerationEnvironment.isCurrentThreadDistantGeneratorThread())
-		{
-			//ClientApi.LOGGER.info("util backgroundExecutor triggered");
-			ci.setReturnValue(new DummyRunExecutorService());
-		}
-	}
 }

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

@@ -1,8 +1,8 @@
 /*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
  *    licensed under the GNU GPL v3 License.
  *
- *    Copyright (C) 2020  James Seibel
+ *    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
@@ -21,11 +21,14 @@ package com.seibel.lod.fabric.mixins;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.math.Matrix4f;
+import com.seibel.lod.common.Config;
 import com.seibel.lod.common.wrappers.McObjectConverter;
 import com.seibel.lod.core.api.ClientApi;
 import com.seibel.lod.core.objects.math.Mat4f;
+import net.minecraft.client.Camera;
 import net.minecraft.client.renderer.LevelRenderer;
 import net.minecraft.client.renderer.RenderType;
+import org.lwjgl.opengl.GL15;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -40,7 +43,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
  *
  * This is also the mixin for rendering the clouds
  *
- * @author coolGi2007
+ * @author coolGi
  * @author James Seibel
  * @version 12-31-2021
  */
@@ -53,6 +56,40 @@ 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
@@ -60,8 +97,9 @@ public class MixinWorldRenderer
 		previousPartialTicks = tickDelta;
 	}
 
-	// HEAD or RETURN
+	@Inject(at = @At("HEAD"),
-	@Inject(at = @At("HEAD"), method = "renderChunkLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDDLcom/mojang/math/Matrix4f;)V")
+			method = "renderChunkLayer(Lnet/minecraft/client/renderer/RenderType;Lcom/mojang/blaze3d/vertex/PoseStack;DDDLcom/mojang/math/Matrix4f;)V",
+			cancellable = true)
 	private void renderChunkLayer(RenderType renderType, PoseStack modelViewMatrixStack, double cameraXBlockPos, double cameraYBlockPos, double cameraZBlockPos, Matrix4f projectionMatrix, CallbackInfo callback)
 	{
 		// only render before solid blocks
@@ -72,5 +110,9 @@ public class MixinWorldRenderer
 
 			ClientApi.INSTANCE.renderLods(mcModelViewMatrix, mcProjectionMatrix, previousPartialTicks);
 		}
+		if (Config.Client.Advanced.lodOnlyMode) {
+			callback.cancel();
+		}
 	}
+	#endif
 }

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

@@ -1,3 +1,22 @@
+/*
+ *    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;

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

@@ -1,10 +1,34 @@
+/*
+ *    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;
@@ -17,18 +41,26 @@ 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, DimensionType dimensionType, int i, int j, Supplier supplier, LevelRenderer levelRenderer, boolean bl, long l, CallbackInfo ci) {
+    private void loadWorldEvent(ClientPacketListener clientPacketListener, ClientLevel.ClientLevelData clientLevelData, ResourceKey resourceKey,
+            #if POST_MC_1_18_2 Holder holder, #else DimensionType dimensionType, #endif int i,
+            #if POST_MC_1_18_1 int j, #endif Supplier supplier, LevelRenderer levelRenderer, boolean bl, long l, CallbackInfo ci) {
         Main.client_proxy.worldLoadEvent((ClientLevel) (Object) this);
     }
+
+	#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())
+    	if (chunk!=null&& !chunk.isClientLightReady())
     		Main.client_proxy.chunkLoadEvent(l, chunk);
     }
+	#endif
 }

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

@@ -0,0 +1,28 @@
+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);
+    }
+}

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

@@ -1,3 +1,22 @@
+/*
+ *    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;

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

@@ -1,3 +1,22 @@
+/*
+ *    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;
@@ -14,13 +33,19 @@ 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
 }

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

@@ -1,7 +1,30 @@
+/*
+ *    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.util.ThreadingDetector;
+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;
@@ -24,3 +47,7 @@ public class MixinThreadingDectector {
         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

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

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

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

@@ -0,0 +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.fabric.wrappers;
+
+import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
+import com.seibel.lod.core.wrapperInterfaces.config.ILodConfigWrapperSingleton;
+import com.seibel.lod.common.wrappers.config.LodConfigWrapperSingleton;
+import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModChecker;
+import com.seibel.lod.fabric.wrappers.modAccessor.ModChecker;
+
+/**
+ * Binds all necessary dependencies, so we
+ * can access them in Core. <br>
+ * This needs to be called before any Core classes
+ * are loaded.
+ * 
+ * @author James Seibel
+ * @author Ran
+ * @version 3-5-2022
+ */
+public class FabricDependencySetup
+{
+	public static void createInitialBindings()
+	{
+		SingletonHandler.bind(IModChecker.class, ModChecker.INSTANCE);
+
+		SingletonHandler.bind(ILodConfigWrapperSingleton.class, LodConfigWrapperSingleton.INSTANCE);
+	}
+
+	public static void finishBinding() {
+		SingletonHandler.finishBinding();
+	}
+}

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

@@ -1,3 +1,22 @@
+/*
+ *    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;

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

@@ -1,3 +1,22 @@
+/*
+ *    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;

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

@@ -1,3 +1,22 @@
+/*
+ *    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;

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

@@ -1,42 +1,117 @@
+/*
+ *    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.util.SingletonHandler;
+import com.seibel.lod.core.handlers.dependencyInjection.SingletonHandler;
 import com.seibel.lod.core.wrapperInterfaces.IWrapperFactory;
 import com.seibel.lod.core.wrapperInterfaces.chunk.AbstractChunkPosWrapper;
+import com.seibel.lod.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
 import com.seibel.lod.core.wrapperInterfaces.modAccessor.ISodiumAccessor;
 
+
 import me.jellysquid.mods.sodium.client.render.SodiumWorldRenderer;
 import net.minecraft.client.Minecraft;
+#if PRE_MC_1_17_1
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.network.protocol.Packet;
+import net.minecraft.world.entity.Entity;
+import net.minecraft.world.entity.EntityType;
+import net.minecraft.world.level.LevelAccessor;
+import net.minecraft.world.phys.AABB;
+#else
 import net.minecraft.world.level.LevelHeightAccessor;
+#endif
 
 public class SodiumAccessor implements ISodiumAccessor {
-	IWrapperFactory factory = SingletonHandler.get(IWrapperFactory.class);
+	private final IWrapperFactory factory = SingletonHandler.get(IWrapperFactory.class);
+	private final IMinecraftRenderWrapper MC_RENDER = SingletonHandler.get(IMinecraftRenderWrapper.class);
 
 	@Override
 	public String getModName() {
-		return "Sodium-Fabric-1.18.X";
+		return "Sodium-Fabric";
 	}
 
+	#if POST_MC_1_17_1
 	@Override
 	public HashSet<AbstractChunkPosWrapper> getNormalRenderedChunks() {
 		SodiumWorldRenderer renderer = SodiumWorldRenderer.instance();
 		LevelHeightAccessor height =  Minecraft.getInstance().level;
+
+		#if POST_MC_1_18_1
 		// 0b11 = Lighted chunk & loaded chunk
 		return renderer.getChunkTracker().getChunks(0b00).filter(
 			(long l) -> {
 				return true;
-				//for (int i = height.getMinSection(); i<height.getMaxSection(); i++) {
-				//	SectionPos p = SectionPos.of(new ChunkPos(l), i);
-				//	if (renderer.isBoxVisible(p.minBlockX()+1, p.minBlockY()+1, p.minBlockZ()+1,
-				//			p.maxBlockX()-1, p.maxBlockY()-1, p.maxBlockZ()-1)) return true;
-				//}
-				//return false;
 			}).mapToObj((long l) -> {
 				return (AbstractChunkPosWrapper)factory.createChunkPos(l);
 			}).collect(Collectors.toCollection(HashSet::new));
+		#else
+		// TODO: Maybe use a mixin to make this more efficient, and maybe ignore changes behind the camera
+		return MC_RENDER.getMaximumRenderedChunks().stream().filter((AbstractChunkPosWrapper chunk) -> {
+			return (renderer.isBoxVisible(
+					chunk.getMinBlockX()+1, height.getMinBuildHeight()+1, chunk.getMinBlockZ()+1,
+					chunk.getMinBlockX()+15, height.getMaxBuildHeight()-1, chunk.getMinBlockZ()+15));
+		}).collect(Collectors.toCollection(HashSet::new));
+		#endif
+	}
+	#else
+	@Override
+	public HashSet<AbstractChunkPosWrapper> getNormalRenderedChunks() {
+		SodiumWorldRenderer renderer = SodiumWorldRenderer.getInstance();
+		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
+
 }

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

@@ -1,3 +1,22 @@
+/*
+ *    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;

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

@@ -2,7 +2,6 @@
   "required": true,
   "minVersion": "0.8",
   "package": "com.seibel.lod.fabric.mixins",
-  "compatibilityLevel": "JAVA_17",
   "mixins": [
     "unsafe.MixinThreadingDectector",
     "MixinUtilBackgroudThread",
@@ -13,11 +12,16 @@
     "MixinOptionsScreen",
     "MixinWorldRenderer",
     "MixinFogRenderer",
+    "MixinChunkGenerator",
+    "MixinDebugScreenOverlay",
     "events.MixinClientLevel",
     "events.MixinMinecraft",
-    "events.MixinBlockUpdate"
+    "events.MixinBlockUpdate",
+    "events.MixinLightmap"
+  ],
+  "server": [
+    "MixinDedicatedServer"
   ],
-  "server": [],
   "injectors": {
     "defaultRequire": 1
   }

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

@@ -5,7 +5,7 @@
 
   "name": "${mod_name}",
   "description": "${description}",
-  "authors": ["${authors}"],
+  "authors": $authors,
 
   "contact": {
     "homepage": "${homepage}",
@@ -33,12 +33,11 @@
   "accessWidener" : "lod.accesswidener",
   "depends": {
     "fabricloader": "*",
-    "fabric": "*",
+    "fabric-lifecycle-events-v1": "*",
-    "minecraft": "1.18.x",
+    "fabric-key-binding-api-v1": "*",
-    "java": ">=17"
+    "fabric-networking-api-v1": "*",
-  },
+    "minecraft": $compatible_minecraft_versions,
-  "suggests": {
+    "java": ">=${java_version}"
-    "another-mod": "*"
   },
 
   "custom": {

forge/build.gradle

@@ -1,12 +1,23 @@
+
 plugins {
     id "com.github.johnrengelman.shadow" version "7.1.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 {
-    accessWidenerPath.set(project(":common").file("src/main/resources/lod.accesswidener"))
 
+loom {
+    silentMojangMappingsLicense()
+    accessWidenerPath.set(project(":common").file("src/main/resources/${acsessWidenerVersion}.lod.accesswidener"))
     forge {
         convertAccessWideners.set(true)
         extraAccessWideners.add("lod.accesswidener")
@@ -20,11 +31,21 @@ architectury {
 }
 
 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) }
@@ -33,6 +54,27 @@ 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" && rootProject.minecraft_version != "1.19.1")
+            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}"
 
@@ -40,8 +82,11 @@ dependencies {
     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"))
 
 //    forgeDependencies(project(":core")) { transitive false }
 
@@ -56,6 +101,13 @@ dependencies {
     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")
@@ -66,9 +118,46 @@ 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 {
@@ -93,6 +182,11 @@ 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"
 }
 
@@ -121,3 +215,79 @@ 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?
+}

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

@@ -1,8 +1,8 @@
 /*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
  *    licensed under the GNU GPL v3 License.
  *
- *    Copyright (C) 2020  James Seibel
+ *    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
@@ -23,6 +23,9 @@ 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;
@@ -32,9 +35,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_1
 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;
 
 /**
@@ -61,29 +70,55 @@ public class ForgeClientProxy
 	@SubscribeEvent
 	public void chunkLoadEvent(ChunkEvent.Load event)
 	{
+		#if PRE_MC_1_19_1
 		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_1
 	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_1
 	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_1
 		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_1
 	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)
@@ -95,8 +130,13 @@ public class ForgeClientProxy
 				event.getClass() == BlockEvent.FluidPlaceBlockEvent.class ||
 				event.getClass() == BlockEvent.PortalSpawnEvent.class)
 		{
+			#if PRE_MC_1_19_1
 			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);
@@ -104,7 +144,7 @@ public class ForgeClientProxy
 	}
 	
 	@SubscribeEvent
-	public void onKeyInput(InputEvent.KeyInputEvent event)
+	public void onKeyInput(#if PRE_MC_1_19_1 InputEvent.KeyInputEvent event #else InputEvent.Key event #endif)
 	{
 		if (Minecraft.getInstance().player == null) return;
 		if (event.getAction() != GLFW.GLFW_PRESS) return;
@@ -112,5 +152,4 @@ public class ForgeClientProxy
 	}
 	
 	
-	
 }

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

@@ -1,8 +1,8 @@
 /*
- *    This file is part of the Distant Horizon mod (formerly the LOD Mod),
+ *    This file is part of the Distant Horizons mod (formerly the LOD Mod),
  *    licensed under the GNU GPL v3 License.
  *
- *    Copyright (C) 2020  James Seibel
+ *    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
@@ -22,37 +22,51 @@ package com.seibel.lod.forge;
 import com.seibel.lod.common.LodCommonMain;
 import com.seibel.lod.common.forge.LodForgeMethodCaller;
 import com.seibel.lod.common.wrappers.config.ConfigGui;
-import com.seibel.lod.common.wrappers.minecraft.MinecraftWrapper;
+import com.seibel.lod.common.wrappers.minecraft.MinecraftClientWrapper;
 import com.seibel.lod.core.ModInfo;
-import com.seibel.lod.core.api.ClientApi;
+import com.seibel.lod.core.api.ApiShared;
-import com.seibel.lod.core.api.ModAccessorApi;
 import com.seibel.lod.core.handlers.ReflectionHandler;
-import com.seibel.lod.core.util.SingletonHandler;
+import com.seibel.lod.core.handlers.dependencyInjection.ModAccessorHandler;
-import com.seibel.lod.core.wrapperInterfaces.modAccessor.IModChecker;
 import com.seibel.lod.core.wrapperInterfaces.modAccessor.IOptifineAccessor;
 import com.seibel.lod.forge.wrappers.ForgeDependencySetup;
 
-import com.seibel.lod.forge.wrappers.modAccessor.ModChecker;
 import com.seibel.lod.forge.wrappers.modAccessor.OptifineAccessor;
 
 import net.minecraft.client.renderer.block.model.BakedQuad;
 import net.minecraft.core.Direction;
+import net.minecraft.world.level.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.client.ConfigGuiHandler;
 import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fml.ModList;
 import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import net.minecraftforge.fml.loading.FMLLoader;
-import net.minecraftforge.forgespi.language.IModInfo;
+#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_1
+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_1
+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>
@@ -73,36 +87,64 @@ public class ForgeMain implements LodForgeMethodCaller
 		LodCommonMain.initConfig();
 		LodCommonMain.startup(this, !FMLLoader.getDist().isClient());
 		ForgeDependencySetup.createInitialBindings();
-		ClientApi.LOGGER.info("Distant Horizons initializing...");
+		ForgeDependencySetup.finishBinding();
-		SingletonHandler.bind(IModChecker.class, ModChecker.INSTANCE);
+		ApiShared.LOGGER.info("Distant Horizons initializing...");
-
-		if (ReflectionHandler.instance.optifinePresent()) {
-			ModAccessorApi.bind(IOptifineAccessor.class, new OptifineAccessor());
-		}
 	}
 	
-	
 	public ForgeMain()
 	{
-		// Register the methods
+		// Register the methods for server and other game events we are interested in
 		FMLJavaModLoadingContext.get().getModEventBus().addListener(this::init);
 		FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onClientStart);
-		
-		// Register ourselves for server and other game events we are interested in
-		MinecraftForge.EVENT_BUS.register(this);
 	}
 
 	private void onClientStart(final FMLClientSetupEvent event)
 	{
+		if (ReflectionHandler.instance.optifinePresent()) {
+			ModAccessorHandler.bind(IOptifineAccessor.class, new OptifineAccessor());
+		}
+		
+		ModAccessorHandler.finishBinding();
+
+		#if PRE_MC_1_17_1
+		ModLoadingContext.get().registerExtensionPoint(ExtensionPoint.CONFIGGUIFACTORY,
+				() -> (client, parent) -> ConfigGui.getScreen(parent, ""));
+		#elif POST_MC_1_19_1
+		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);
 	}
 
-	private final ModelDataMap dataMap = new ModelDataMap.Builder().build();
+	#if PRE_MC_1_19_1
+	private final ModelDataMap modelData = new ModelDataMap.Builder().build();
+	#else
+	private final ModelData modelData = ModelData.EMPTY;
+	#endif
+	
 	@Override
-	public List<BakedQuad> getQuads(MinecraftWrapper mc, Block block, BlockState blockState, Direction direction, Random random) {
+	#if PRE_MC_1_19_1
-		return mc.getModelManager().getBlockModelShaper().getBlockModel(block.defaultBlockState()).getQuads(blockState, direction, random, dataMap);
+	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);
+	}
+	#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_1, 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
+
 	}
 }