Update Forgix

fixes a critical bug

.editorconfig

@@ -688,7 +688,7 @@ ij_markdown_wrap_text_inside_blockquotes = true
 ij_toml_keep_indents_on_empty_lines = false
 
 [{*.yaml,*.yml}]
-indent_size = 4
+indent_size = 2
 ij_yaml_align_values_properties = do_not_align
 ij_yaml_autoinsert_sequence_marker = true
 ij_yaml_block_mapping_on_new_line = false

.gitignore

@@ -26,6 +26,10 @@ Merged/
 # Folder created by the buildAll scripts
 buildAllJars/
 
+relocate_natives/.venv/
+relocate_natives/__pycache__/
+relocate_natives/apple-codesign/
+
 # file from notepad++
 *.bak
 

.gitlab-ci.yml

@@ -6,6 +6,7 @@ image: eclipse-temurin:21
 # TODO: Make stages depend on what is in versionProperties
 stages:
   - build
+  - multiversion
   - api
   - pages
 
@@ -18,7 +19,7 @@ variables:
 .build_java:
   #image: eclipse-temurin:17
   cache:
-    key: "gradleCache"
+    key: "gradleCache_$CI_JOB_NAME_SLUG"
     policy: pull-push
     paths:
       - .gradle
@@ -35,39 +36,49 @@ build:
   stage: build
   parallel:
     matrix:
-      - MC_VER: ["1.16.5", "1.17.1", "1.18.2", "1.19.2", "1.19.4", "1.20.1", "1.20.2", "1.20.4", "1.20.6", "1.21.1"]
+      - MC_VER: ["1.16.5", "1.17.1", "1.18.2", "1.19.2", "1.19.4", "1.20.1", "1.20.2", "1.20.4", "1.20.6", "1.21.1", "1.21.3", "1.21.4", "1.21.5"]
   script:
     # this both runs the unit tests and assembles the code
-    - ./gradlew clean -PmcVer="${MC_VER}" -PinfoGitCommit="${CI_COMMIT_SHA}" -PinfoGitBranch="${CI_COMMIT_BRANCH}" -PinfoBuildSource="GitLab CI (${CI_PIPELINE_ID})" --gradle-user-home cache/;
     - ./gradlew build -PmcVer="${MC_VER}" -PinfoGitCommit="${CI_COMMIT_SHA}" -PinfoGitBranch="${CI_COMMIT_BRANCH}" -PinfoBuildSource="GitLab CI (${CI_PIPELINE_ID})" --gradle-user-home cache/;
     - ./gradlew mergeJars -PmcVer="${MC_VER}" -PinfoGitCommit="${CI_COMMIT_SHA}" -PinfoGitBranch="${CI_COMMIT_BRANCH}" -PinfoBuildSource="GitLab CI (${CI_PIPELINE_ID})" --gradle-user-home cache/;
+    - cp ./build/forgix/* . || true
+    - mkdir -p ./builds
+    - cp ./fabric/build/libs/* ./forge/build/libs/* ./neoforge/build/libs/* ./builds || true
+    # When the archive is created, the merged jar will be the main jar and a subfolder named "builds" will contain the other jars
   artifacts:
     name: "NightlyBuild_${MC_VER}-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
     paths:
-      - Merged/*.jar
+      - ./*.jar
-      - quilt/build/libs/*.jar
+      - ./builds/*.jar
-      - fabric/build/libs/*.jar
-      - forge/build/libs/*.jar
-      - neoforge/build/libs/*.jar
     exclude:
-      # TODO: There is a lot of duplicate stuff here, try to maybe make it smaller
+      - ./builds/*-all.jar
-      - fabric/build/libs/*-all.jar
+      - ./builds/*-dev.jar
-      - fabric/build/libs/*-dev.jar
+      - ./builds/*-sources.jar
-      - fabric/build/libs/*-sources.jar
-      - quilt/build/libs/*-all.jar
-      - quilt/build/libs/*-dev.jar
-      - quilt/build/libs/*-sources.jar
-      - forge/build/libs/*-all.jar
-      - forge/build/libs/*-dev.jar
-      - forge/build/libs/*-sources.jar
-      - neoforge/build/libs/*-all.jar
-      - neoforge/build/libs/*-dev.jar
-      - neoforge/build/libs/*-sources.jar
     expire_in: 14 days
     when: always
   extends: .build_java
 
 
+multiversion:
+  stage: multiversion
+  needs: [build]
+  script:
+    # Create a semicolon-separated list of jar paths
+    - MC_VER_PATHS=$(find . -maxdepth 1 -name "*.jar" -type f | tr '\n' ';')
+    # Run the mergeVersions task
+    - ./gradlew mergeVersions -PmergeVersions="${MC_VER_PATHS}" -PinfoGitCommit="${CI_COMMIT_SHA}" -PinfoGitBranch="${CI_COMMIT_BRANCH}" -PinfoBuildSource="GitLab CI (${CI_PIPELINE_ID})" --gradle-user-home cache/;
+    # Clean up existing jars and make sure only the multiversion jar remains which will be uploaded
+    - rm -f ./*.jar
+    - cp ./build/forgix/multiversion/* .
+  artifacts:
+    name: "NightlyBuild_Multiversion-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
+    paths:
+      - ./*.jar
+    expire_in: 30 days
+    when: always
+  extends: .build_java
+
+
 api:
   stage: api
   needs: []
@@ -77,15 +88,15 @@ api:
     # this also runs unit tests
     - ./gradlew api:build --gradle-user-home cache/;
     - ./gradlew api:addSourcesToCompiledJar --gradle-user-home cache/;
+    - cp ./coreSubProjects/api/build/libs/merged/* .
   artifacts:
-    name: "Api_NightlyBuild-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
+    name: "NightlyBuild_Api-${CI_COMMIT_SHORT_SHA}-${CI_COMMIT_TIMESTAMP}"
     paths:
-      - coreSubProjects/api/build/libs/merged/*.jar
+      - ./*.jar
-      # can be uncommented if we don't want a jar with the source code
-      # - coreSubProjects/api/build/libs/*.jar
     exclude:
-      - coreSubProjects/api/build/libs/merged/*-all.jar
+      - ./*-all.jar
-      - coreSubProjects/api/build/libs/merged/*-sources.jar
+      - ./*-dev.jar
+      - ./*-sources.jar
     expire_in: 1 day
     when: always
   extends: .build_java

.gitlab/issue_templates/Bug.md

@@ -6,13 +6,13 @@ Or click the checkbox once the issue has been created.
 -->
 
 1. [ ] Check the FAQ to see if your issue has already been reported and has a solution:
-    [Problems-and-solutions](https://gitlab.com/jeseibel/distant-horizons/-/wikis/2-frequently-asked-questions/2-problems-and-solutions/Problems-and-Solutions)
+    [Problems-and-solutions](https://gitlab.com/distant-horizons-team/distant-horizons/-/wikis/1-user-guide/1-frequently-asked-questions/2-problems-and-solutions/Problems-and-Solutions)
 
 2. [ ] Make sure you are not using any mods on the incompatible list:
-    [Mod support FAQ](https://gitlab.com/jeseibel/distant-horizons/-/wikis/2-frequently-asked-questions/4-mod-support/Mod-Support)
+    [Mod support FAQ](https://gitlab.com/distant-horizons-team/distant-horizons/-/wikis/1-user-guide/1-frequently-asked-questions/4-mod-support/Mod-Support)
 
 3. [ ] Check the existing issues to verify that your bug hasn't already been submitted: 
-    [Issues](https://gitlab.com/jeseibel/distant-horizons/-/issues/)
+    [Issues](https://gitlab.com/distant-horizons-team/distant-horizons/-/issues)
 
 4. [ ] Upload Minecraft's crash report and/or log. \
    Minecraft crash reports are located in: `.minecraft/crash-reports` \

.gitlab/issue_templates/FeatureRequest.md

@@ -1,4 +1,4 @@
-- [ ] Check the existing [feature requests](https://gitlab.com/jeseibel/distant-horizons/-/issues/?sort=updated_desc&state=opened&label_name%5B%5D=Feature) to verify that your feature hasn't already been suggested.
+- [ ] Check the existing [feature requests](https://gitlab.com/distant-horizons-team/distant-horizons/-/issues?sort=updated_desc&state=opened&label_name%5B%5D=Feature) to verify that your feature hasn't already been suggested.
 
 1. **Describe the feature**:
 

.gitlab/issue_templates/ImprovementRequest.md

@@ -1,3 +1,3 @@
-1. Check the existing [improvement requests](https://gitlab.com/jeseibel/distant-horizons/-/issues/?sort=updated_desc&state=all&label_name%5B%5D=Improvement) to verify that your improvement hasn't already been suggested.
+1. Check the existing [improvement requests](https://gitlab.com/distant-horizons-team/distant-horizons/-/issues?sort=updated_desc&state=all&label_name%5B%5D=Improvement) to verify that your improvement hasn't already been suggested.
 
 2. **Describe the improvement**:

.run/distant-horizons [build].run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="distant-horizons [build]" type="GradleRunConfiguration" factoryName="Gradle" nameIsGenerated="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="build" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>

.run/distant-horizons [clean].run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="distant-horizons [clean]" type="GradleRunConfiguration" factoryName="Gradle" nameIsGenerated="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="clean" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>

.run/distant-horizons [core_build].run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="distant-horizons [core:build]" type="GradleRunConfiguration" factoryName="Gradle" nameIsGenerated="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="core:build" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>

.run/distant-horizons [fabric_runClient].run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="distant-horizons [fabric:runClient]" type="GradleRunConfiguration" factoryName="Gradle" nameIsGenerated="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="fabric:runClient" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>

.run/distant-horizons [forge_runClient].run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="distant-horizons [forge:runClient]" type="GradleRunConfiguration" factoryName="Gradle" nameIsGenerated="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="forge:runClient" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>

.run/distant-horizons [mergeJars].run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="distant-horizons [mergeJars]" type="GradleRunConfiguration" factoryName="Gradle" nameIsGenerated="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="mergeJars" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>

.run/distant-horizons [neoforge_runClient].run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="distant-horizons [neoforge:runClient]" type="GradleRunConfiguration" factoryName="Gradle" nameIsGenerated="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="neoforge:runClient" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>

.run/distant-horizons [test].run.xml

@@ -0,0 +1,24 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="distant-horizons [test]" type="GradleRunConfiguration" factoryName="Gradle" nameIsGenerated="true">
+    <ExternalSystemSettings>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="test" />
+        </list>
+      </option>
+      <option name="vmOptions" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <RunAsTest>false</RunAsTest>
+    <method v="2" />
+  </configuration>
+</component>

LICENSE-LOGOS.txt

@@ -0,0 +1 @@
+Distant Horizons logos © 2024 by Pankakes are licensed under CC BY-SA 4.0 

Readme.md

@@ -1,4 +1,4 @@
-# <img src="https://gitlab.com/jeseibel/distant-horizons-core/-/raw/main/_Misc%20Files/logo%20files/LOD%20logo%20flat%20-%20with%20boarder.png" width="32"> Distant Horizons
+# <img src="https://gitlab.com/distant-horizons-team/distant-horizons-core/-/raw/main/_Misc%20Files/logo%20files/new/SVG/Distant-Horizons.svg" height="128px"> 
 _See farther without turning your game into a slide show._
 
 <br>
@@ -131,14 +131,14 @@ Prerequisites:
 
 From the File Explorer:
 1. Download and extract the project zip
-2. Download the core from https://gitlab.com/jeseibel/distant-horizons-core and extract into a folder called `coreSubProjects`
+2. Download the core from https://gitlab.com/distant-horizons-team/distant-horizons-core and extract into a folder called `coreSubProjects`
 3. Open a terminal emulator in the project folder (On Windows you can type `cmd` in the title bar)
 4. Run the commands: `./gradlew assemble` (You may need to use a `.\` on Windows)
 5. Merge the jars with `./gradlew mergeJars`
 6. The compiled jar file will be in the folder `Merged`
 
 From the command line:
-1. `git clone --recurse-submodules https://gitlab.com/jeseibel/distant-horizons.git`
+1. `git clone --recurse-submodules https://gitlab.com/distant-horizons-team/distant-horizons.git`
 2. `cd distant-horizons`
 3. `./gradlew assemble`
 4. `./gradlew mergeJars`

build.gradle

@@ -1,3 +1,11 @@
+import com.github.jengelman.gradle.plugins.shadow.transformers.Transformer
+import com.github.jengelman.gradle.plugins.shadow.transformers.TransformerContext
+import org.apache.tools.zip.ZipEntry
+
+import javax.annotation.Nonnull
+import org.apache.tools.zip.ZipOutputStream
+
+
 plugins {
     id "java"
 
@@ -5,15 +13,23 @@ plugins {
     id "com.github.johnrengelman.shadow" version '8.1.1' apply false
 
     // Plugin to create merged jars
-    id "io.github.pacifistmc.forgix" version "1.2.9"
+    id "io.github.pacifistmc.forgix" version "2.0.0-SNAPSHOT.2"
 
     // Manifold preprocessor
     id "systems.manifold.manifold-gradle-plugin" version "0.0.2-alpha"
 
     // Architectury is used here only as a replacement for forge's own loom
-    id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.10-SNAPSHOT" apply false
 }
 
+// Sets up Forgix for multiversion merging
+forgix {
+    if (project.hasProperty('mergeVersions')) { // This is set using -PmergeVersions by the GitLab CI
+        multiversion {
+            inputJars = project.files(project.property('mergeVersions').toString().split(';'))
+        }
+    }
+}
 
 /**
  * Creates the list of preprocessors to use.
@@ -59,38 +75,64 @@ project.gradle.ext.getProperties().each { prop ->
 // Sets up manifold stuff
 writeBuildGradlePredefine(rootProject.mcVers, rootProject.mcIndex)
 
-
-
-
 // Sets up the version string (the name we use for our jar)
 rootProject.versionStr = rootProject.mod_version + "-" + rootProject.minecraft_version // + "-" + new Date().format("yyyy_MM_dd_HH_mm")
-// Forgix settings (used for merging jars)
-forgix {
-    group = "com.seibel.distanthorizons"
-    mergedJarName = "DistantHorizons-${rootProject.versionStr}.jar"
 
-    if (findProject(":forge"))
+class NativeTransformer implements Transformer {
-        forge {
+    private final HashMap<String, String> replacements = new HashMap()
-            jarLocation = "build/libs/DistantHorizons-forge-${rootProject.versionStr}.jar"
+    private final HashMap<String, byte[]> rewrittenFiles = new HashMap()
-        }
+    private var nativeRelocator
-    
+
-    if (findProject(":neoforge"))
+    public File rootDir
-        custom {
+
-            projectName = "neoforge"
+    void relocateNative(String target, String replacement) {
-            jarLocation = "build/libs/DistantHorizons-neoforge-${rootProject.versionStr}.jar"
+        if (replacement.length() > target.length()) {
+            throw new GradleException("Length of value \"${replacement}\" exceeds the length of \"${target}\": ${replacement.length()} > ${target.length()}")
         }
 
-    if (findProject(":fabric"))
+        replacements.put(target, replacement)
-        fabric {
+    }
-            jarLocation = "build/libs/DistantHorizons-fabric-${rootProject.versionStr}.jar"
+
+    @Override
+    boolean canTransformResource(@Nonnull FileTreeElement element) {
+        return replacements.keySet().stream().anyMatch {
+            element.name.startsWith(it as String)
+        }
+    }
+
+    @Override
+    void transform(@Nonnull TransformerContext context) {
+        byte[] content = context.is.readAllBytes()
+
+        if (nativeRelocator == null) {
+            nativeRelocator = new NativeRelocator(rootDir.toPath().resolve("relocate_natives"))
         }
 
-    if (findProject(":quilt"))
+        try {
-        quilt {
+            Map.Entry<String, String> pathReplacement = replacements.entrySet().stream().filter {
-            jarLocation = "build/libs/DistantHorizons-quilt-${rootProject.versionStr}.jar"
+                context.path.startsWith(it.key as String)
-        }
+            }.findFirst().orElseThrow()
 
-    removeDuplicate "com.seibel.distanthorizons"
+            String path = context.path.replace(pathReplacement.key as String, pathReplacement.value as String)
+            content = nativeRelocator.processBinary(path, content, replacements)
+
+            rewrittenFiles.put(path, content)
+        }
+        catch (Throwable e) {
+            throw new GradleException("Failed to relocate", e)
+        }
+    }
+
+    @Override
+    boolean hasTransformedResource() { return !rewrittenFiles.isEmpty() }
+
+    @Override
+    void modifyOutputStream(@Nonnull ZipOutputStream os, boolean preserveFileTimestamps) {
+        for (Map.Entry<String, byte[]> rewrittenFile : rewrittenFiles.entrySet()) {
+            os.putNextEntry(new ZipEntry(rewrittenFile.key))
+            os.write(rewrittenFile.value)
+        }
+    }
 }
 
 subprojects { p ->
@@ -159,6 +201,7 @@ subprojects { p ->
             if (findProject(":neoforge"))
                 developmentNeoForge.extendsFrom coreProjects
 
+            // TODO remove unused fabricLike
             if (findProject(":fabricLike") && p != project(":fabricLike")) {
                 // Shadow fabricLike
                 fabricLike
@@ -179,12 +222,21 @@ subprojects { p ->
         if (isMinecraftSubProject) {
             annotationProcessor("systems.manifold:manifold-preprocessor:${rootProject.manifold_version}")
         }
-        
+
         // Log4j
-        // TODO: Change to shadowMe later to work in the standalone jar
+        if (p == project(":core"))
-        // We cannot do this now as it would break Quilt
+        {
-        implementation("org.apache.logging.log4j:log4j-api:${rootProject.log4j_version}")
+            // the standalone core jar needs logging shaded otherwise it won't run
-        implementation("org.apache.logging.log4j:log4j-core:${rootProject.log4j_version}")
+            forgeShadowMe("org.apache.logging.log4j:log4j-api:${rootProject.log4j_version}")
+            forgeShadowMe("org.apache.logging.log4j:log4j-core:${rootProject.log4j_version}")
+        }
+        else
+        {
+            // When running in MC, MC already includes logging
+            implementation("org.apache.logging.log4j:log4j-api:${rootProject.log4j_version}")
+            implementation("org.apache.logging.log4j:log4j-core:${rootProject.log4j_version}")
+        }
+        
 
         // JOML
         if (project.hasProperty("embed_joml") && embed_joml == "true")
@@ -291,9 +343,23 @@ subprojects { p ->
         // Compression (LZ4)
         relocate "net.jpountz", "${librariesLocation}.jpountz"
         
+        // Logging
+        relocate "org.slf4j", "${librariesLocation}.slf4j"
+
         // Sqlite Database
-        //At the moment, there is a bug in this library which doesnt allow it to be relocated
+        // librariesLocation isn't used because it's too long for replacing paths in native libraries
-//        relocate "org.sqlite", "${librariesLocation}.sqlite"
+        // Allowing strings larger than the original string would require shifting the entire binary's contents
+        relocate "org.sqlite", "dh_sqlite", {
+            exclude "org/sqlite/native/**"
+        }
+        relocate "jdbc:sqlite", "jdbc:dh_sqlite"
+
+        transform(NativeTransformer) {
+            rootDir = project.rootDir
+            relocateNative "org/sqlite", "dh_sqlite"
+            relocateNative "org_sqlite", "dh_1sqlite"
+        }
+        
         
         // JOML
         if (project.hasProperty("embed_joml") && embed_joml == "true")
@@ -386,7 +452,7 @@ subprojects { p ->
                 info_build_source            : infoBuildSource,
 
                 fabric_incompatibility_list  : fabric_incompatibility_list,
-                fabric_recommend_list  : fabric_recommend_list,
+                fabric_recommend_list        : fabric_recommend_list,
         ]
         
         // replace any properties in the sub-projects with the values defined here
@@ -434,7 +500,8 @@ subprojects { p ->
             attributes( 
                 'Implementation-Title': rootProject.mod_name,
                 'Implementation-Version': rootProject.mod_version,
-                'Main-Class': 'com.seibel.distanthorizons.core.jar.JarMain' // When changing the main of the jar change this line
+                'Multi-Release': true, // needed for logging in the standalone core jar
+                'Main-Class': 'com.seibel.distanthorizons.core.jar.JarMain', // When changing the main of the jar change this line
             )
         }
     }
@@ -466,8 +533,9 @@ allprojects { p ->
     apply plugin: "java"
     apply plugin: "maven-publish"
     
+    // Sets the name of the jar, the version will contain the name of the project if it isn't the root project
     archivesBaseName = rootProject.mod_name
-    version = project.name + "-" + rootProject.versionStr
+    version = (project == rootProject ? "" : project.name + "-") + rootProject.versionStr
     group = rootProject.maven_group
     
     // this is the text that appears at the top of the overview (home) page
@@ -489,6 +557,9 @@ allprojects { p ->
 
 
     repositories {
+        // Mojang overrides (added to fix downloading the wrong LWJGL libs on M1 Mac's and potentially other arm64 based machines)
+        maven { url "https://libraries.minecraft.net/" }
+
         // The central repo
         mavenCentral()
 
@@ -496,6 +567,7 @@ allprojects { p ->
         maven { url "https://repo.enonic.com/public/" }
 
         // For parchment mappings
+        // versions can be found here: https://ldtteam.jfrog.io/ui/native/parchmentmc-public/org/parchmentmc/data/
         maven { url "https://maven.parchmentmc.org" }
 
         // For Architectury API
@@ -617,7 +689,6 @@ allprojects { p ->
     tasks.withType(JavaCompile) {
         if (isMinecraftSubProject) {
             options.release = rootProject.java_version as Integer
-            options.compilerArgs += ["-Xplugin:Manifold"]
         } else {
             options.release = 8; // Core & Api should use Java 8 no matter what
             //options.release = rootProject.java_version as Integer // But if you want to test some stuff, then this can be enabled
@@ -629,14 +700,3 @@ allprojects { p ->
         withSourcesJar()
     }
 }
-
-
-// Delete the merged folder when running clean
-task cleanMergedJars() {
-    def mergedFolder = file("Merged")
-    if (mergedFolder.exists()) {
-        delete(mergedFolder)
-    }
-}
-// add cleanMergedJars to the end of the "clean" task
-tasks["clean"].finalizedBy(cleanMergedJars)

buildAll.bat

@@ -14,7 +14,7 @@ for %%f in (versionProperties\*) do (
 
     @rem Clean out the folders, build it, and merge it
     echo ==================== Cleaning workspace to build !version! ====================
-    call .\gradlew.bat clean -PmcVer="!version!"
+    call .\gradlew.bat clean
     echo ==================== Building !version! ====================
     call .\gradlew.bat build -PmcVer="!version!"
     echo ==================== Merging !version! ====================

buildSrc/src/main/java/NativeRelocator.java

@@ -0,0 +1,211 @@
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.Map;
+import java.util.concurrent.CompletableFuture;
+
+class NativeRelocator
+{
+	private final Path rootDirectory;
+	private final Path cacheRoot;
+	
+	/**
+	 * Initializes the NativeRelocator by preparing the environment if necessary.
+	 * Executes the appropriate preparation script based on the OS.
+	 */
+	NativeRelocator(Path rootDirectory)
+	{
+		this.rootDirectory = rootDirectory;
+		this.cacheRoot = this.rootDirectory.resolve("cache");
+	}
+	
+	private void prepare() throws Exception
+	{
+		if (this.rootDirectory.resolve(".venv").toFile().exists())
+		{
+			return;
+		}
+		
+		ProcessBuilder processBuilder = new ProcessBuilder();
+		processBuilder.directory(this.rootDirectory.toFile());
+		
+		String os = System.getProperty("os.name").toLowerCase();
+		if (os.contains("win"))
+		{
+			processBuilder.command("powershell", "-ExecutionPolicy", "Bypass", "./prepare.ps1");
+		}
+		else if (os.contains("nix") || os.contains("nux") || os.contains("mac"))
+		{
+			processBuilder.command("./prepare.sh");
+		}
+		else
+		{
+			throw new IllegalStateException("Unsupported operating system: " + os);
+		}
+		
+		Process process = processBuilder.start();
+		CompletableFuture<Void> outputFuture = readOutputStreams(process);
+		
+		int exitCode = process.waitFor();
+		outputFuture.get();
+		
+		if (exitCode != 0)
+		{
+			throw new Exception("Prepare failed: " + exitCode);
+		}
+	}
+	
+	/**
+	 * Reads and prints the output and error streams of a process asynchronously.
+	 *
+	 * @param process The process whose streams should be read.
+	 * @return A CompletableFuture that completes once all output has been processed.
+	 */
+	private static CompletableFuture<Void> readOutputStreams(Process process)
+	{
+		return CompletableFuture.runAsync(() -> {
+			try
+			{
+				while (process.isAlive() || process.getInputStream().available() > 0 || process.getErrorStream().available() > 0)
+				{
+					if (process.getInputStream().available() > 0)
+					{
+						byte[] data = new byte[process.getInputStream().available()];
+						//noinspection ResultOfMethodCallIgnored
+						process.getInputStream().read(data);
+						System.out.write(data);
+					}
+					if (process.getErrorStream().available() > 0)
+					{
+						byte[] data = new byte[process.getErrorStream().available()];
+						//noinspection ResultOfMethodCallIgnored
+						process.getErrorStream().read(data);
+						System.err.write(data);
+					}
+					
+					//noinspection BusyWait
+					Thread.sleep(100);
+				}
+			}
+			catch (Throwable ignored)
+			{
+			}
+		});
+	}
+	
+	/**
+	 * Replaces occurrences of a target string in a byte array, ensuring null termination.
+	 *
+	 * @param byteArray The byte array where replacements should occur.
+	 * @param target The string to replace.
+	 * @param replacement The replacement string (must not be longer than the target).
+	 * @throws IllegalArgumentException if the replacement is longer than the target.
+	 */
+	private void replaceInNullTerminatedStrings(byte[] byteArray, String target, String replacement)
+	{
+		if (target.length() < replacement.length())
+		{
+			throw new IllegalArgumentException("Replacement must be the same length or shorter than the target.");
+		}
+		
+		byte[] targetBytes = target.getBytes(StandardCharsets.US_ASCII);
+		byte[] replacementBytes = replacement.getBytes(StandardCharsets.US_ASCII);
+		
+		byte nullByte = 0;
+		
+		for (int endPos = 0; endPos < byteArray.length - targetBytes.length - 1; endPos++)
+		{
+			int startPos = endPos;
+			int targetPos = 0;
+			while (targetPos < targetBytes.length && byteArray[endPos] == targetBytes[targetPos])
+			{
+				targetPos++;
+				endPos++;
+			}
+			
+			if (targetPos == targetBytes.length)
+			{
+				System.arraycopy(replacementBytes, 0, byteArray, startPos, replacementBytes.length);
+				
+				startPos = startPos + replacementBytes.length;
+				while (byteArray[endPos] != nullByte)
+				{
+					byteArray[startPos] = byteArray[endPos];
+					endPos++;
+					startPos++;
+				}
+				byteArray[startPos] = nullByte;
+			}
+		}
+	}
+	
+	/**
+	 * Runs an external script to fix a modified binary and returns the processed content.
+	 *
+	 * @param outputFilePath Path to store the processed binary.
+	 * @param content The original binary content.
+	 * @return The modified binary content.
+	 * @throws Exception if the process execution fails.
+	 */
+	public byte[] fixModifiedBinary(Path outputFilePath, byte[] content) throws Exception
+	{
+		ProcessBuilder processBuilder = new ProcessBuilder();
+		processBuilder.directory(this.rootDirectory.toFile());
+		
+		processBuilder.command(
+				this.rootDirectory.resolve(".venv/Scripts").toFile().exists()
+						? this.rootDirectory.resolve(".venv/Scripts/python.exe").toString()
+						: this.rootDirectory.resolve(".venv/bin/python").toString(),
+				"./fix_modified_binary.py",
+				outputFilePath.toString()
+		);
+		
+		Process process = processBuilder.start();
+		CompletableFuture<Void> outputFuture = readOutputStreams(process);
+		
+		process.getOutputStream().write(content);
+		process.getOutputStream().close();
+		
+		int exitCode = process.waitFor();
+		outputFuture.get();
+		
+		if (exitCode != 0)
+		{
+			throw new Exception("Process failed: " + exitCode);
+		}
+		
+		return Files.readAllBytes(outputFilePath);
+	}
+	
+	/**
+	 * Processes a binary file, applying string replacements and fixing modifications.
+	 *
+	 * @param outputPath The output file path relative to the cache directory.
+	 * @param content The binary content to process.
+	 * @param replacements A map of string replacements to apply.
+	 * @return The modified binary content.
+	 * @throws Exception if processing fails.
+	 */
+	public byte[] processBinary(String outputPath, byte[] content, Map<String, String> replacements) throws Exception
+	{
+		Path outputFilePath = this.cacheRoot.resolve(outputPath);
+		//noinspection ResultOfMethodCallIgnored
+		outputFilePath.getParent().toFile().mkdirs();
+		
+		if (outputFilePath.toFile().exists())
+		{
+			return Files.readAllBytes(outputFilePath);
+		}
+		
+		System.out.println("Relocating to " + outputPath + "...");
+		this.prepare();
+		
+		for (Map.Entry<String, String> replacement : replacements.entrySet())
+		{
+			this.replaceInNullTerminatedStrings(content, replacement.getKey(), replacement.getValue());
+		}
+		
+		return this.fixModifiedBinary(outputFilePath, content);
+	}
+	
+}

common/build.gradle

@@ -1,17 +1,11 @@
-// TODO can this be removed?
-//buildscript {
-//    configurations.configureEach {
-//        resolutionStrategy {
-//            force 'org.spongepowered:vanillagradle:0.2.1-20240507.024226-82'
-//        }
-//    }
-//}
 
 // temporary fix for broken spongepowered version
 buildscript {
     configurations.configureEach {
         resolutionStrategy {
             force 'org.spongepowered:vanillagradle:0.2.1-20240507.024226-82'
+            // newer versions can be found by going to the link:
+            // https://repo.spongepowered.org/#browse/browse:maven-public:org%2Fspongepowered%2Fvanillagradle%2F0.2.1-SNAPSHOT
         }
     }
 }

common/src/main/java/com/seibel/distanthorizons/common/AbstractModInitializer.java

@@ -1,28 +1,21 @@
 package com.seibel.distanthorizons.common;
 
-import com.mojang.brigadier.Command;
 import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.arguments.*;
-import com.mojang.brigadier.builder.LiteralArgumentBuilder;
-import com.mojang.brigadier.context.CommandContext;
 import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiAfterDhInitEvent;
 import com.seibel.distanthorizons.api.methods.events.abstractEvents.DhApiBeforeDhInitEvent;
+import com.seibel.distanthorizons.common.commands.CommandInitializer;
 import com.seibel.distanthorizons.common.wrappers.DependencySetup;
 import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftServerWrapper;
-import com.seibel.distanthorizons.common.wrappers.misc.ServerPlayerWrapper;
+import com.seibel.distanthorizons.core.api.internal.ClientApi;
 import com.seibel.distanthorizons.core.api.internal.SharedApi;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.config.ConfigBase;
 import com.seibel.distanthorizons.core.config.eventHandlers.presets.ThreadPresetConfigEventHandler;
-import com.seibel.distanthorizons.core.config.types.AbstractConfigType;
-import com.seibel.distanthorizons.core.config.types.ConfigEntry;
 import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.jar.ModJarInfo;
+import com.seibel.distanthorizons.core.jar.updater.SelfUpdater;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
-import com.seibel.distanthorizons.core.network.messages.base.CodecCrashMessage;
-import com.seibel.distanthorizons.core.util.objects.Pair;
-import com.seibel.distanthorizons.core.world.DhServerWorld;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IModAccessor;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.IModChecker;
 import com.seibel.distanthorizons.coreapi.DependencyInjection.ApiEventInjector;
@@ -33,25 +26,9 @@ import net.minecraft.server.dedicated.DedicatedServer;
 import org.apache.logging.log4j.Logger;
 
 import java.lang.invoke.MethodHandles;
-import java.util.HashMap;
-import java.util.Objects;
-import java.util.function.BiFunction;
 import java.util.function.Consumer;
-import java.util.function.Function;
 import java.util.function.Supplier;
 
-import static com.mojang.brigadier.arguments.DoubleArgumentType.doubleArg;
-import static com.mojang.brigadier.arguments.IntegerArgumentType.integer;
-import static com.seibel.distanthorizons.core.network.messages.MessageRegistry.DEBUG_CODEC_CRASH_MESSAGE;
-import static net.minecraft.commands.Commands.argument;
-import static net.minecraft.commands.Commands.literal;
-
-#if MC_VER >= MC_1_19_2
-import net.minecraft.network.chat.Component;
-#else // < 1.19.2
-import net.minecraft.network.chat.TranslatableComponent;
-#endif
-
 /**
  * Base for all mod loader initializers 
  * and handles most setup. 
@@ -60,7 +37,7 @@ public abstract class AbstractModInitializer
 {
 	protected static final Logger LOGGER = DhLoggerBuilder.getLogger(MethodHandles.lookup().lookupClass().getSimpleName());
 	
-	private CommandDispatcher<CommandSourceStack> commandDispatcher;
+	private CommandInitializer commandInitializer;
 	
 	
 	
@@ -89,7 +66,7 @@ public abstract class AbstractModInitializer
 	{
 		DependencySetup.createClientBindings();
 		
-		LOGGER.info("Initializing " + ModInfo.READABLE_NAME);
+		LOGGER.info("Initializing " + ModInfo.READABLE_NAME + " client.");
 		ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeDhInitEvent.class, null);
 		
 		this.startup();
@@ -100,11 +77,12 @@ public abstract class AbstractModInitializer
 		
 		this.initializeModCompat();
 		
-		LOGGER.info(ModInfo.READABLE_NAME + " Initialized");
+		LOGGER.info(ModInfo.READABLE_NAME + " client Initialized.");
 		ApiEventInjector.INSTANCE.fireAllEvents(DhApiAfterDhInitEvent.class, null);
 		
 		// Client uses config for auto-updater, so it's initialized here instead of post-init stage
 		this.initConfig();
+		logModIncompatibilityWarnings(); // needs to be called after config loading
 		
 		this.subscribeClientStartedEvent(this::postInit);
 	}
@@ -113,7 +91,7 @@ public abstract class AbstractModInitializer
 	{
 		DependencySetup.createServerBindings();
 		
-		LOGGER.info("Initializing " + ModInfo.READABLE_NAME);
+		LOGGER.info("Initializing " + ModInfo.READABLE_NAME + " server.");
 		ApiEventInjector.INSTANCE.fireAllEvents(DhApiBeforeDhInitEvent.class, null);
 		
 		this.startup();
@@ -128,10 +106,10 @@ public abstract class AbstractModInitializer
 		
 		this.initializeModCompat();
 		
-		LOGGER.info(ModInfo.READABLE_NAME + " Initialized");
+		LOGGER.info(ModInfo.READABLE_NAME + " server Initialized.");
 		ApiEventInjector.INSTANCE.fireAllEvents(DhApiAfterDhInitEvent.class, null);
 		
-		this.subscribeRegisterCommandsEvent(dispatcher -> { this.commandDispatcher = dispatcher; });
+		this.subscribeRegisterCommandsEvent(dispatcher -> { this.commandInitializer = new CommandInitializer(dispatcher); });
 		
 		this.subscribeServerStartingEvent(server -> 
 		{
@@ -139,7 +117,9 @@ public abstract class AbstractModInitializer
 			
 			this.initConfig();
 			this.postInit();
-			this.initCommands();
+			this.commandInitializer.initCommands();
+			
+			this.checkForUpdates();
 			
 			LOGGER.info("Dedicated server initialized at " + server.getServerDirectory());
 		});
@@ -183,10 +163,24 @@ public abstract class AbstractModInitializer
 	
 	private void initConfig()
 	{
-		ConfigBase.INSTANCE = new ConfigBase(ModInfo.ID, ModInfo.NAME, Config.class, 2);
+		ConfigBase.INSTANCE = new ConfigBase(ModInfo.ID, ModInfo.NAME, Config.class, ModInfo.CONFIG_FILE_VERSION);
 		Config.completeDelayedSetup();
 	}
 	
+	private void checkForUpdates()
+	{
+		if (Config.Client.Advanced.AutoUpdater.enableAutoUpdater.get())
+		{
+			if (Config.Client.Advanced.AutoUpdater.enableSilentUpdates.get())
+			{
+				LOGGER.info("Silent updates are not allowed for dedicated servers; force disabling.");
+				Config.Client.Advanced.AutoUpdater.enableSilentUpdates.set(false);
+			}
+			
+			SelfUpdater.onStart();
+		}
+	}
+	
 	private void postInit()
 	{
 		LOGGER.info("Post-Initializing Mod");
@@ -194,135 +188,100 @@ public abstract class AbstractModInitializer
 		LOGGER.info("Mod Post-Initialized");
 	}
 	
-	@SuppressWarnings({"rawtypes", "unchecked"})
+	
-	private void initCommands()
+	
+	//==================================//
+	// mod partial compatibility checks //
+	//==================================//
+	
+	/** 
+	 * Some mods will work with a few tweaks
+	 * or will partially work but have some known issues we can't solve.
+	 * This method will log (and display to chat if enabled)
+	 * these warnings and potential fixes.
+	 */
+	private static void logModIncompatibilityWarnings()
 	{
-		LiteralArgumentBuilder<CommandSourceStack> builder = literal("dhconfig")
+		boolean showChatWarnings = Config.Common.Logging.Warning.showModCompatibilityWarningsOnStartup.get();
-				.requires(source -> source.hasPermission(4));
+		IModChecker modChecker = SingletonInjector.INSTANCE.get(IModChecker.class);
 		
-		for (AbstractConfigType<?, ?> type : ConfigBase.INSTANCE.entries)
+		String startingString = "Partially Incompatible Distant Horizons mod detected: ";
+		
+		
+		
+		// Alex's caves
+		if (modChecker.isModLoaded("alexscaves"))
 		{
-			if (!(type instanceof ConfigEntry))
+			// There've been a few reports about this mod breaking DH at a few different points in time
+			// the fixes for said breakage changes depending on the version so unfortunately
+			// all we can do is log a warning so the user can handle it.
+			
+			if (showChatWarnings)
 			{
-				continue;
+				String message =
-			}
+						// orange text
-			//noinspection PatternVariableCanBeUsed
+						"\u00A76" + "Distant Horizons: Alex's Cave detected." + "\u00A7r\n" +
-			ConfigEntry configEntry = (ConfigEntry) type;
+								"You may have to change Alex's config for DH to render. ";
-			if (configEntry.getServersideShortName() == null)
+				ClientApi.INSTANCE.showChatMessageNextFrame(message);
-			{
-				continue;
 			}
 			
-			Function<
+			LOGGER.warn(startingString + "[Alex's Caves] may require some config changes in order to render Distant Horizons correctly.");
-					Function<CommandContext<CommandSourceStack>, Object>,
-					Command<CommandSourceStack>
-					> makeConfigUpdater = (getter) -> (commandContext) -> {
-				Object value = getter.apply(commandContext);
-				
-				commandContext.getSource().sendSuccess(
-						#if MC_VER >= MC_1_20_1
-						() -> Component.literal("Changed the value of "+configEntry.getServersideShortName()+" to "+value),
-						#elif MC_VER >= MC_1_19_2
-						Component.literal("Changed the value of "+configEntry.getServersideShortName()+" to "+value),
-						#else
-						new TranslatableComponent("Changed the value of "+configEntry.getServersideShortName()+" to "+value),
-						#endif
-						true);
-				configEntry.set(value);
-				return 1;
-			};
-			
-			LiteralArgumentBuilder<CommandSourceStack> subcommand = literal(configEntry.getServersideShortName())
-					.executes((commandContext) -> {
-						#if MC_VER >= MC_1_20_1
-						commandContext.getSource().sendSuccess(() -> Component.literal("Current value of "+configEntry.getServersideShortName()+" is "+configEntry.get()), true);
-						#elif MC_VER >= MC_1_19_2
-						commandContext.getSource().sendSuccess(Component.literal("Current value of "+configEntry.getServersideShortName()+" is "+configEntry.get()), true);
-						#else // < 1.19.2
-						commandContext.getSource().sendSuccess(new TranslatableComponent("Current value of "+configEntry.getServersideShortName()+" is "+configEntry.get()), true);
-						#endif
-						return 1;
-					});
-			
-			if (Enum.class.isAssignableFrom(configEntry.getType()))
-			{
-				for (Object choice : configEntry.getType().getEnumConstants())
-				{
-					subcommand.then(
-							literal(choice.toString())
-									.executes(makeConfigUpdater.apply(c -> choice))
-					);
-				}
-			}
-			else
-			{
-				boolean setterAdded = false;
-				
-				for (java.util.Map.Entry<Class<?>, Pair<Supplier<ArgumentType<?>>, BiFunction<CommandContext<?>, String, ?>>> pair : new HashMap<
-						Class<?>,
-						Pair<
-								Supplier<ArgumentType<?>>,
-								BiFunction<CommandContext<?>, String, ?>>
-						>() {{
-					this.put(Integer.class, new Pair<>(() -> integer((int) configEntry.getMin(), (int) configEntry.getMax()), IntegerArgumentType::getInteger));
-					this.put(Double.class, new Pair<>(() -> doubleArg((double) configEntry.getMin(), (double) configEntry.getMax()), DoubleArgumentType::getDouble));
-					this.put(Boolean.class, new Pair<>(BoolArgumentType::bool, BoolArgumentType::getBool));
-					this.put(String.class, new Pair<>(StringArgumentType::string, StringArgumentType::getString));
-				}}.entrySet())
-				{
-					if (!pair.getKey().isAssignableFrom(configEntry.getType()))
-					{
-						continue;
-					}
-					
-					subcommand.then(argument("value", pair.getValue().first.get())
-							.executes(makeConfigUpdater.apply(c -> pair.getValue().second.apply(c, "value"))));
-					
-					setterAdded = true;
-					break;
-				}
-				
-				if (!setterAdded)
-				{
-					throw new RuntimeException("Config type of "+type.getName()+" is not supported: "+configEntry.getType().getSimpleName());
-				}
-			}
-			
-			builder.then(subcommand);
 		}
 		
-		this.commandDispatcher.register(builder);
+		// William Wythers' Overhauled Overworld (WWOO)
-		
+		if (modChecker.isModLoaded("wwoo"))
-		if (DEBUG_CODEC_CRASH_MESSAGE)
 		{
-			LiteralArgumentBuilder<CommandSourceStack> dhcrash = literal("dhcrash")
+			// WWOO has a bug with it's world gen that can't be fixed by DH or WWOO
-					.requires(source -> source.hasPermission(4))
+			// (at least that is what James learned after talking with WWOO)
-					.then(literal("encode")
+			// WWOO will cause grid lines to appear in the world when DH generates the chunks
-							.executes(c -> {
+			// this might be due to how WWOO uses features for everything when generating
-								assert SharedApi.getIDhServerWorld() != null;
+			// and said features don't always get to the edge of said chunks.
-								((DhServerWorld) SharedApi.getIDhServerWorld()).remotePlayerConnectionHandler
+			
-										#if MC_VER >= MC_1_19_2
+			String wwooWarning = "LODs generated by DH may have grid lines between sections. Disabling either WWOO or DH's distant generator will fix the problem.";
-										.getConnectedPlayer(ServerPlayerWrapper.getWrapper(Objects.requireNonNull(c.getSource().getPlayer())))
+			
-										#else
+			if (showChatWarnings)
-										.getConnectedPlayer(ServerPlayerWrapper.getWrapper(Objects.requireNonNull(c.getSource().getPlayerOrException())))
+			{
-										#endif
+				String message =
-										.networkSession.sendMessage(new CodecCrashMessage(CodecCrashMessage.ECrashPhase.ENCODE));
+						// orange text
-								return 1;
+						"\u00A76" + "Distant Horizons: WWOO detected." + "\u00A7r\n" +
-							}))
+								wwooWarning;
-					.then(literal("decode")
+				ClientApi.INSTANCE.showChatMessageNextFrame(message);
-							.executes(c -> {
+			}
-								assert SharedApi.getIDhServerWorld() != null;
+			
-								((DhServerWorld) SharedApi.getIDhServerWorld()).remotePlayerConnectionHandler
+			LOGGER.warn(startingString + "[WWOO] "+ wwooWarning);
-										#if MC_VER >= MC_1_19_2
-										.getConnectedPlayer(ServerPlayerWrapper.getWrapper(Objects.requireNonNull(c.getSource().getPlayer())))
-										#else
-										.getConnectedPlayer(ServerPlayerWrapper.getWrapper(Objects.requireNonNull(c.getSource().getPlayerOrException())))
-										#endif
-										.networkSession.sendMessage(new CodecCrashMessage(CodecCrashMessage.ECrashPhase.DECODE));
-								return 1;
-							}));
-			this.commandDispatcher.register(dhcrash);
 		}
+		
+		// Chunky
+		boolean chunkyPresent = false;
+		try
+		{
+			Class.forName("org.popcraft.chunky.api.ChunkyAPI");
+			chunkyPresent = true;
+		}
+		catch (ClassNotFoundException ignore) { }
+		
+		if (chunkyPresent)
+		{
+			// Chunky can generate chunks faster than DH can process them,
+			// causing holes in the LODs.
+			// Generally it's better and faster to use DH's world generator.
+			
+			String chunkyWarning = "Chunky can cause DH LODs to have holes " +
+					"since Chunky can generate chunks faster than DH can process them. \n" +
+					"Using DH's distant generator instead of chunky or increasing DH's CPU thread count can resolve the issue.";
+			
+			if (showChatWarnings)
+			{
+				String message =
+						// orange text
+						"\u00A76" + "Distant Horizons: Chunky detected." + "\u00A7r\n" +
+								chunkyWarning;
+				ClientApi.INSTANCE.showChatMessageNextFrame(message);
+			}
+			
+			LOGGER.warn(startingString + "[Chunky] "+ chunkyWarning);
+		}
+		
 	}
 	
 	

common/src/main/java/com/seibel/distanthorizons/common/AbstractPluginPacketSender.java

@@ -1,6 +1,7 @@
 package com.seibel.distanthorizons.common;
 
 import com.seibel.distanthorizons.core.config.Config;
+import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.logging.ConfigBasedLogger;
 import com.seibel.distanthorizons.core.network.event.internal.IncompatibleMessageInternalEvent;
 import com.seibel.distanthorizons.core.network.event.internal.ProtocolErrorInternalEvent;
@@ -15,7 +16,6 @@ import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.level.ServerPlayer;
 import org.apache.logging.log4j.LogManager;
-import org.jetbrains.annotations.Nullable;
 
 import java.io.IOException;
 import java.util.Objects;
@@ -23,7 +23,7 @@ import java.util.Objects;
 public abstract class AbstractPluginPacketSender implements IPluginPacketSender
 {
 	private static final ConfigBasedLogger LOGGER = new ConfigBasedLogger(LogManager.getLogger(),
-			() -> Config.Client.Advanced.Logging.logNetworkEvent.get());
+			() -> Config.Common.Logging.logNetworkEvent.get());
 	
 	#if MC_VER >= MC_1_21_1
 	public static final ResourceLocation WRAPPER_PACKET_RESOURCE = ResourceLocation.fromNamespaceAndPath(ModInfo.RESOURCE_NAMESPACE, ModInfo.WRAPPER_PACKET_PATH);
@@ -31,6 +31,16 @@ public abstract class AbstractPluginPacketSender implements IPluginPacketSender
 	public static final ResourceLocation WRAPPER_PACKET_RESOURCE = new ResourceLocation(ModInfo.RESOURCE_NAMESPACE, ModInfo.WRAPPER_PACKET_PATH);
 	#endif
 	
+	// "Forge byte" is an unused packet ID. We have our own system which works with all mod loaders,
+	// so we're just accounting for it by reading the protocol version as a byte instead of a short in Forge, to keep cross-loader compatibility
+	private final boolean forgeByteInProtocolVersion;
+	
+	
+	public AbstractPluginPacketSender() { this(false); }
+	public AbstractPluginPacketSender(boolean forgeByteInProtocolVersion)
+	{
+		this.forgeByteInProtocolVersion = forgeByteInProtocolVersion;
+	}
 	
 	@Override
 	public final void sendToClient(IServerPlayerWrapper serverPlayer, AbstractNetworkMessage message)
@@ -42,7 +52,7 @@ public abstract class AbstractPluginPacketSender implements IPluginPacketSender
 	@Override
 	public abstract void sendToServer(AbstractNetworkMessage message);
 	
-	public static AbstractNetworkMessage decodeMessage(FriendlyByteBuf in)
+	public AbstractNetworkMessage decodeMessage(FriendlyByteBuf in)
 	{
 		AbstractNetworkMessage message = null;
 		
@@ -50,7 +60,7 @@ public abstract class AbstractPluginPacketSender implements IPluginPacketSender
 		{
 			in.markReaderIndex();
 			
-			int protocolVersion = in.readShort();
+			int protocolVersion = this.forgeByteInProtocolVersion ? in.readByte() : in.readShort();
 			if (protocolVersion != ModInfo.PROTOCOL_VERSION)
 			{
 				return new IncompatibleMessageInternalEvent(protocolVersion);
@@ -83,11 +93,19 @@ public abstract class AbstractPluginPacketSender implements IPluginPacketSender
 		}
 	}
 	
-	public static void encodeMessage(FriendlyByteBuf out, AbstractNetworkMessage message)
+	public void encodeMessage(FriendlyByteBuf out, AbstractNetworkMessage message)
 	{
 		// This is intentionally unhandled, because errors related to this are unlikely to appear in wild
 		Objects.requireNonNull(message);
-		out.writeShort(ModInfo.PROTOCOL_VERSION);
+		
+		if (this.forgeByteInProtocolVersion)
+		{
+			out.writeByte(ModInfo.PROTOCOL_VERSION);
+		}
+		else
+		{
+			out.writeShort(ModInfo.PROTOCOL_VERSION);
+		}
 		
 		try
 		{

common/src/main/java/com/seibel/distanthorizons/common/CommonPacketPayload.java

@@ -2,7 +2,9 @@ package com.seibel.distanthorizons.common;
 
 #if MC_VER >= MC_1_20_6
 
+import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.network.messages.AbstractNetworkMessage;
+import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IPluginPacketSender;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.network.codec.StreamCodec;
 import net.minecraft.network.protocol.common.custom.CustomPacketPayload;
@@ -12,6 +14,7 @@ import org.jetbrains.annotations.Nullable;
 public record CommonPacketPayload(@Nullable AbstractNetworkMessage message) implements CustomPacketPayload
 {
 	public static final Type<CommonPacketPayload> TYPE = new Type<>(AbstractPluginPacketSender.WRAPPER_PACKET_RESOURCE);
+	private static final AbstractPluginPacketSender PACKET_SENDER = (AbstractPluginPacketSender) SingletonInjector.INSTANCE.get(IPluginPacketSender.class);
 	
 	@NotNull
 	@Override
@@ -23,11 +26,11 @@ public record CommonPacketPayload(@Nullable AbstractNetworkMessage message) impl
 		@NotNull
 		@Override
 		public CommonPacketPayload decode(@NotNull FriendlyByteBuf in)
-		{ return new CommonPacketPayload(AbstractPluginPacketSender.decodeMessage(in)); }
+		{ return new CommonPacketPayload(PACKET_SENDER.decodeMessage(in)); }
 		
 		@Override
 		public void encode(@NotNull FriendlyByteBuf out, CommonPacketPayload payload)
-		{ AbstractPluginPacketSender.encodeMessage(out, payload.message()); }
+		{ PACKET_SENDER.encodeMessage(out, payload.message()); }
 		
 	}
 	

common/src/main/java/com/seibel/distanthorizons/common/commands/AbstractCommand.java

@@ -0,0 +1,102 @@
+package com.seibel.distanthorizons.common.commands;
+
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import com.mojang.brigadier.context.CommandContext;
+import com.seibel.distanthorizons.common.wrappers.misc.ServerPlayerWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IServerPlayerWrapper;
+import net.minecraft.commands.CommandSourceStack;
+
+#if MC_VER >= MC_1_19_2
+import net.minecraft.network.chat.Component;
+
+import java.util.Objects;
+#else // < 1.19.2
+import net.minecraft.network.chat.TranslatableComponent;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+#endif
+
+/**
+ * Abstract class providing common functionality for DH's commands.
+ */
+public abstract class AbstractCommand
+{
+	public abstract LiteralArgumentBuilder<CommandSourceStack> buildCommand();
+	
+	
+	/**
+	 * Sends a success response to the player with the given text.
+	 *
+	 * @param commandContext The command context to send the response to.
+	 * @param text The text to display in the success message.
+	 * @return 1, indicating that the command was successful.
+	 */
+	protected int sendSuccessResponse(CommandContext<CommandSourceStack> commandContext, String text, boolean notifyAdmins)
+	{
+		#if MC_VER >= MC_1_20_1
+		commandContext.getSource().sendSuccess(() -> Component.literal(text), notifyAdmins);
+		#elif MC_VER >= MC_1_19_2
+		commandContext.getSource().sendSuccess(Component.literal(text), notifyAdmins);
+		#else
+		commandContext.getSource().sendSuccess(new TranslatableComponent(text), notifyAdmins);
+		#endif
+		return 1;
+	}
+	
+	/**
+	 * Sends a failure response to the player with the given text.
+	 *
+	 * @param commandContext The command context to send the response to.
+	 * @param text The text to display in the failure message.
+	 * @return 1, indicating that the command was successful.
+	 */
+	protected int sendFailureResponse(CommandContext<CommandSourceStack> commandContext, String text)
+	{
+		#if MC_VER >= MC_1_20_1
+		commandContext.getSource().sendFailure(Component.literal(text));
+		#elif MC_VER >= MC_1_19_2
+		commandContext.getSource().sendFailure(Component.literal(text));
+		#else
+		commandContext.getSource().sendFailure(new TranslatableComponent(text));
+		#endif
+		return 1;
+	}
+	
+	/**
+	 * Gets the server player from a command context.
+	 *
+	 * @param commandContext The command context to get the server player from.
+	 * @return The server player wrapper for the player who sent the command.
+	 */
+	protected IServerPlayerWrapper getSourcePlayer(CommandContext<CommandSourceStack> commandContext) #if MC_VER < MC_1_19_2 throws CommandSyntaxException #endif
+	{
+		#if MC_VER >= MC_1_19_2
+		return ServerPlayerWrapper.getWrapper(Objects.requireNonNull(commandContext.getSource().getPlayer()));
+		#else
+		return ServerPlayerWrapper.getWrapper(commandContext.getSource().getPlayerOrException());
+		#endif
+	}
+	
+	/**
+	 * Checks if the source of a command is a player.
+	 *
+	 * @param source The source of the command to check.
+	 * @return True if the source is a player, false otherwise.
+	 */
+	protected boolean isPlayerSource(CommandSourceStack source)
+	{
+		#if MC_VER >= MC_1_19_2
+		return source.isPlayer();
+		#else
+		try
+		{
+			source.getPlayerOrException();
+			return true;
+		}
+		catch (CommandSyntaxException e)
+		{
+			return false;
+		}
+		#endif
+	}
+	
+}

common/src/main/java/com/seibel/distanthorizons/common/commands/CommandInitializer.java

@@ -0,0 +1,49 @@
+package com.seibel.distanthorizons.common.commands;
+
+import com.mojang.brigadier.CommandDispatcher;
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import net.minecraft.commands.CommandSourceStack;
+
+import static com.seibel.distanthorizons.core.network.messages.MessageRegistry.DEBUG_CODEC_CRASH_MESSAGE;
+import static net.minecraft.commands.Commands.literal;
+
+/**
+ * Initializes commands of the mod.
+ */
+public class CommandInitializer
+{
+	private final CommandDispatcher<CommandSourceStack> commandDispatcher;
+	
+	/**
+	 * Constructs a new instance of this class.
+	 *
+	 * @param commandDispatcher The dispatcher to use for registering commands.
+	 */
+	public CommandInitializer(CommandDispatcher<CommandSourceStack> commandDispatcher)
+	{
+		this.commandDispatcher = commandDispatcher;
+	}
+	
+	
+	
+	/**
+	 * Initializes all available commands.
+	 */
+	public void initCommands()
+	{
+		LiteralArgumentBuilder<CommandSourceStack> builder = literal("dh")
+				.requires(source -> source.hasPermission(4));
+		
+		builder.then(new ConfigCommand().buildCommand());
+		builder.then(new DebugCommand().buildCommand());
+		builder.then(new PregenCommand().buildCommand());
+		
+		if (DEBUG_CODEC_CRASH_MESSAGE)
+		{
+			builder.then(new CrashCommand().buildCommand());
+		}
+		
+		this.commandDispatcher.register(builder);
+	}
+	
+}

common/src/main/java/com/seibel/distanthorizons/common/commands/ConfigCommand.java

@@ -0,0 +1,154 @@
+package com.seibel.distanthorizons.common.commands;
+
+import com.mojang.brigadier.arguments.*;
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import com.mojang.brigadier.context.CommandContext;
+import com.seibel.distanthorizons.core.config.ConfigBase;
+import com.seibel.distanthorizons.core.config.types.AbstractConfigType;
+import com.seibel.distanthorizons.core.config.types.ConfigEntry;
+import net.minecraft.commands.CommandSourceStack;
+
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.function.BiFunction;
+import java.util.function.Function;
+import java.util.function.Supplier;
+import java.util.function.ToIntBiFunction;
+
+import static com.mojang.brigadier.arguments.DoubleArgumentType.doubleArg;
+import static com.mojang.brigadier.arguments.IntegerArgumentType.integer;
+import static net.minecraft.commands.Commands.argument;
+import static net.minecraft.commands.Commands.literal;
+
+/**
+ * Command for managing config.
+ */
+public class ConfigCommand extends AbstractCommand
+{
+	private static final List<CommandArgumentData<?>> commandArguments = Arrays.asList(
+			new CommandArgumentData<>(Integer.class, configEntry -> integer(configEntry.getMin(), configEntry.getMax()), IntegerArgumentType::getInteger),
+			new CommandArgumentData<>(Double.class, configEntry -> doubleArg(configEntry.getMin(), configEntry.getMax()), DoubleArgumentType::getDouble),
+			new CommandArgumentData<>(Boolean.class, BoolArgumentType::bool, BoolArgumentType::getBool),
+			new CommandArgumentData<>(String.class, StringArgumentType::string, StringArgumentType::getString)
+	);
+	
+	/**
+	 * Builds a command tree.
+	 */
+	@Override
+	@SuppressWarnings({"rawtypes", "unchecked"})
+	public LiteralArgumentBuilder<CommandSourceStack> buildCommand()
+	{
+		LiteralArgumentBuilder<CommandSourceStack> builder = literal("config");
+		HashSet<String> addedCommands = new HashSet<>();
+		
+		for (AbstractConfigType<?, ?> type : ConfigBase.INSTANCE.entries)
+		{
+			// Skip non-config entries
+			if (!(type instanceof ConfigEntry))
+			{
+				continue;
+			}
+			
+			//noinspection PatternVariableCanBeUsed
+			ConfigEntry configEntry = (ConfigEntry) type;
+			if (configEntry.getChatCommandName() == null)
+			{
+				continue;
+			}
+			
+			if (!addedCommands.add(configEntry.getChatCommandName()))
+			{
+				throw new IllegalStateException("Duplicate command name: " + configEntry.getChatCommandName());
+			}
+			
+			LiteralArgumentBuilder<CommandSourceStack> subcommand = literal(configEntry.getChatCommandName())
+					.executes(commandContext -> this.sendSuccessResponse(commandContext,
+							"\n" +
+									"Description of §l" + configEntry.getChatCommandName() + "§r:\n" +
+									"§o" + configEntry.getComment().trim() + "§r\n" +
+									"§7Config file name: §f" + configEntry.name + "§7, category: §f" + configEntry.category + "\n" +
+									"\n" +
+									"Current value of " + configEntry.getChatCommandName() + " is §n" + configEntry.get() + "§r",
+							false
+					));
+			
+			ToIntBiFunction<CommandContext<CommandSourceStack>, Object> updateConfigValue = (commandContext, value) -> {
+				configEntry.set(value);
+				return this.sendSuccessResponse(commandContext, "Changed the value of [" + configEntry.getChatCommandName() + "] to [" + value + "]", true);
+			};
+			
+			// Enum type needs a special case since enums aren't represented by existing argument type
+			// and need literals for each individual value
+			if (Enum.class.isAssignableFrom(configEntry.getType()))
+			{
+				for (Object choice : configEntry.getType().getEnumConstants())
+				{
+					subcommand.then(
+							literal(choice.toString())
+									.executes(c -> updateConfigValue.applyAsInt(c, choice))
+					);
+				}
+			}
+			else
+			{
+				boolean setterAdded = false;
+				for (CommandArgumentData<?> commandArgumentData : commandArguments)
+				{
+					if (!commandArgumentData.argumentClass.isAssignableFrom(configEntry.getType()))
+					{
+						continue;
+					}
+					
+					subcommand.then(argument("value", commandArgumentData.getArgumentType(configEntry))
+							.executes(c -> updateConfigValue.applyAsInt(c, commandArgumentData.getValue(c, "value"))));
+					
+					setterAdded = true;
+					break;
+				}
+				
+				if (!setterAdded)
+				{
+					throw new RuntimeException("Config type of " + type.getName() + " is not supported: " + configEntry.getType().getSimpleName());
+				}
+			}
+			
+			builder.then(subcommand);
+		}
+		
+		return builder;
+	}
+	
+	
+	
+	private static class CommandArgumentData<T>
+	{
+		public final Class<T> argumentClass;
+		public final Function<ConfigEntry<T>, ArgumentType<T>> argumentTypeFunction;
+		private final BiFunction<CommandContext<CommandSourceStack>, String, T> valueGetter;
+		
+		public CommandArgumentData(Class<T> argumentClass, Supplier<ArgumentType<T>> argumentTypeSupplier, BiFunction<CommandContext<CommandSourceStack>, String, T> valueGetter)
+		{
+			this(argumentClass, configEntry -> argumentTypeSupplier.get(), valueGetter);
+		}
+		public CommandArgumentData(Class<T> argumentClass, Function<ConfigEntry<T>, ArgumentType<T>> argumentTypeFunction, BiFunction<CommandContext<CommandSourceStack>, String, T> valueGetter)
+		{
+			this.argumentClass = argumentClass;
+			this.argumentTypeFunction = argumentTypeFunction;
+			this.valueGetter = valueGetter;
+		}
+		
+		public ArgumentType<T> getArgumentType(ConfigEntry<T> configEntry)
+		{
+			return this.argumentTypeFunction.apply(configEntry);
+		}
+		
+		public T getValue(CommandContext<CommandSourceStack> commandContext, String argumentName)
+		{
+			return this.valueGetter.apply(commandContext, argumentName);
+		}
+		
+	}
+	
+}

common/src/main/java/com/seibel/distanthorizons/common/commands/CrashCommand.java

@@ -0,0 +1,44 @@
+package com.seibel.distanthorizons.common.commands;
+
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import com.seibel.distanthorizons.core.api.internal.SharedApi;
+import com.seibel.distanthorizons.core.multiplayer.server.ServerPlayerState;
+import com.seibel.distanthorizons.core.network.messages.base.CodecCrashMessage;
+import net.minecraft.commands.CommandSourceStack;
+
+import static net.minecraft.commands.Commands.literal;
+
+public class CrashCommand extends AbstractCommand
+{
+	@Override
+	public LiteralArgumentBuilder<CommandSourceStack> buildCommand()
+	{
+		return literal("crash")
+				.requires(this::isPlayerSource)
+				.then(literal("encode")
+						.executes(c -> {
+							assert SharedApi.getIDhServerWorld() != null;
+							
+							ServerPlayerState serverPlayerState = SharedApi.getIDhServerWorld().getServerPlayerStateManager()
+									.getConnectedPlayer(this.getSourcePlayer(c));
+							if (serverPlayerState != null)
+							{
+								serverPlayerState.networkSession.sendMessage(new CodecCrashMessage(CodecCrashMessage.ECrashPhase.ENCODE));
+							}
+							return 1;
+						}))
+				.then(literal("decode")
+						.executes(c -> {
+							assert SharedApi.getIDhServerWorld() != null;
+							
+							ServerPlayerState serverPlayerState = SharedApi.getIDhServerWorld().getServerPlayerStateManager()
+									.getConnectedPlayer(this.getSourcePlayer(c));
+							if (serverPlayerState != null)
+							{
+								serverPlayerState.networkSession.sendMessage(new CodecCrashMessage(CodecCrashMessage.ECrashPhase.DECODE));
+							}
+							return 1;
+						}));
+	}
+	
+}

common/src/main/java/com/seibel/distanthorizons/common/commands/DebugCommand.java

@@ -0,0 +1,25 @@
+package com.seibel.distanthorizons.common.commands;
+
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import com.seibel.distanthorizons.core.logging.f3.F3Screen;
+import net.minecraft.commands.CommandSourceStack;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import static net.minecraft.commands.Commands.literal;
+
+public class DebugCommand extends AbstractCommand
+{
+	@Override
+	public LiteralArgumentBuilder<CommandSourceStack> buildCommand()
+	{
+		return literal("debug")
+				.executes(c -> {
+					List<String> lines = new ArrayList<>();
+					F3Screen.addStringToDisplay(lines);
+					return this.sendSuccessResponse(c, String.join("\n", lines), false);
+				});
+	}
+	
+}

common/src/main/java/com/seibel/distanthorizons/common/commands/PregenCommand.java

@@ -0,0 +1,107 @@
+package com.seibel.distanthorizons.common.commands;
+
+import com.mojang.brigadier.builder.LiteralArgumentBuilder;
+import com.mojang.brigadier.context.CommandContext;
+import com.mojang.brigadier.exceptions.CommandSyntaxException;
+import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper;
+import com.seibel.distanthorizons.core.generation.PregenManager;
+import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos2D;
+import net.minecraft.commands.CommandSourceStack;
+import net.minecraft.commands.arguments.DimensionArgument;
+import net.minecraft.commands.arguments.coordinates.ColumnPosArgument;
+import net.minecraft.server.level.ColumnPos;
+import net.minecraft.server.level.ServerLevel;
+
+import java.util.concurrent.CancellationException;
+import java.util.concurrent.CompletableFuture;
+
+import static com.mojang.brigadier.arguments.IntegerArgumentType.getInteger;
+import static com.mojang.brigadier.arguments.IntegerArgumentType.integer;
+import static net.minecraft.commands.Commands.argument;
+import static net.minecraft.commands.Commands.literal;
+
+public class PregenCommand extends AbstractCommand
+{
+	private final PregenManager pregenManager = new PregenManager();
+	
+	@Override
+	public LiteralArgumentBuilder<CommandSourceStack> buildCommand()
+	{
+		LiteralArgumentBuilder<CommandSourceStack> statusCommand = literal("status")
+				.executes(this::pregenStatus);
+		
+		LiteralArgumentBuilder<CommandSourceStack> startCommand = literal("start")
+				.then(argument("dimension", DimensionArgument.dimension())
+						.then(argument("origin", ColumnPosArgument.columnPos())
+								.then(argument("chunkRadius", integer(32))
+										.executes(this::pregenStart))));
+		
+		LiteralArgumentBuilder<CommandSourceStack> stopCommand = literal("stop")
+				.executes(this::pregenStop);
+		
+		return literal("pregen")
+				.then(statusCommand)
+				.then(startCommand)
+				.then(stopCommand);
+	}
+	
+	
+	private int pregenStatus(CommandContext<CommandSourceStack> c)
+	{
+		String statusString = this.pregenManager.getStatusString();
+		//noinspection ReplaceNullCheck
+		if (statusString != null)
+		{
+			return this.sendSuccessResponse(c, statusString, false);
+		}
+		else
+		{
+			return this.sendSuccessResponse(c, "Pregen is not running", false);
+		}
+	}
+	
+	private int pregenStart(CommandContext<CommandSourceStack> c) throws CommandSyntaxException
+	{
+		this.sendSuccessResponse(c, "Starting pregen. Progress will be in the server console.", true);
+		
+		ServerLevel level = DimensionArgument.getDimension(c, "dimension");
+		ColumnPos origin = ColumnPosArgument.getColumnPos(c, "origin");
+		int chunkRadius = getInteger(c, "chunkRadius");
+		
+		CompletableFuture<Void> future = this.pregenManager.startPregen(
+				ServerLevelWrapper.getWrapper(level),
+				new DhBlockPos2D(#if MC_VER >= MC_1_19_2 origin.x(), origin.z() #else origin.x, origin.z #endif),
+				chunkRadius
+		);
+		
+		future.whenComplete((result, throwable) -> {
+			if (throwable instanceof CancellationException)
+			{
+				this.sendSuccessResponse(c, "Pregen is cancelled", true);
+				return;
+			}
+			else if (throwable != null)
+			{
+				this.sendFailureResponse(c, "Pregen failed: " + throwable.getMessage() + "\n Check the logs for more details.");
+				return;
+			}
+			
+			this.sendSuccessResponse(c, "Pregen is complete", true);
+		});
+		
+		return 1;
+	}
+	
+	private int pregenStop(CommandContext<CommandSourceStack> c)
+	{
+		CompletableFuture<Void> runningPregen = this.pregenManager.getRunningPregen();
+		if (runningPregen == null)
+		{
+			return this.sendFailureResponse(c, "Pregen is not running");
+		}
+		
+		runningPregen.cancel(true);
+		return 1;
+	}
+	
+}

common/src/main/java/com/seibel/distanthorizons/common/commonMixins/MixinChunkMapCommon.java

@@ -77,7 +77,7 @@ public class MixinChunkMapCommon
 		
 		// submit the update event
 		ServerApi.INSTANCE.serverChunkSaveEvent(
-				new ChunkWrapper(chunk, level, ServerLevelWrapper.getWrapper(level)),
+				new ChunkWrapper(chunk, ServerLevelWrapper.getWrapper(level)),
 				ServerLevelWrapper.getWrapper(level)
 		);
 	}

common/src/main/java/com/seibel/distanthorizons/common/util/ILightTextureMarker.java

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by

common/src/main/java/com/seibel/distanthorizons/common/util/ProxyUtil.java

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by

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

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by
@@ -22,6 +22,7 @@ package com.seibel.distanthorizons.common.wrappers;
 import com.seibel.distanthorizons.common.wrappers.gui.ClassicConfigGUI;
 import com.seibel.distanthorizons.common.wrappers.gui.LangWrapper;
 import com.seibel.distanthorizons.common.wrappers.level.KeyedClientLevelManager;
+import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftGLWrapper;
 import com.seibel.distanthorizons.common.wrappers.minecraft.MinecraftServerWrapper;
 import com.seibel.distanthorizons.core.level.IKeyedClientLevelManager;
 import com.seibel.distanthorizons.core.wrapperInterfaces.config.IConfigGui;
@@ -32,6 +33,7 @@ import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.wrapperInterfaces.IVersionConstants;
 import com.seibel.distanthorizons.core.wrapperInterfaces.IWrapperFactory;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftGLWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftSharedWrapper;
 
@@ -69,6 +71,7 @@ public class DependencySetup
 		SingletonInjector.INSTANCE.bind(IMinecraftClientWrapper.class, MinecraftClientWrapper.INSTANCE);
 		SingletonInjector.INSTANCE.bind(IMinecraftSharedWrapper.class, MinecraftClientWrapper.INSTANCE);
 		SingletonInjector.INSTANCE.bind(IMinecraftRenderWrapper.class, MinecraftRenderWrapper.INSTANCE);
+		SingletonInjector.INSTANCE.bind(IMinecraftGLWrapper.class, MinecraftGLWrapper.INSTANCE);
 		SingletonInjector.INSTANCE.bind(IConfigGui.class, ClassicConfigGUI.CONFIG_CORE_INTERFACE);
 	}
 	

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

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by
@@ -25,7 +25,12 @@ public class DependencySetupDoneCheck
 {
 	// TODO move to DependencySetup
 	public static boolean isDone = false;
-	// TODO why is this here and what is its purpose?
+	/** 
+	 * This is used so we can override some MC logic when running
+	 * in DH's world generator.
+	 * Specifically so we can redirect threads to run on DH threads instead
+	 * of MC threads.
+	 */
 	public static Supplier<Boolean> getIsCurrentThreadDistantGeneratorThread = (() -> { return false; });
 	
 }

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

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by

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

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by
@@ -20,8 +20,6 @@
 package com.seibel.distanthorizons.common.wrappers;
 
 import com.seibel.distanthorizons.core.wrapperInterfaces.IVersionConstants;
-import net.minecraft.SharedConstants;
-import net.minecraft.client.Minecraft;
 
 /**
  * @author James Seibel
@@ -38,32 +36,48 @@ public class VersionConstants implements IVersionConstants
 	}
 	
 	
-	@Override
-	public int getMinimumWorldHeight()
-	{
-		return 0;
-	}
-	
-	@Override
-	public int getWorldGenerationCountPerThread()
-	{
-		return 1;
-	}
-	
-	@Override
-	public boolean isVanillaRenderedChunkSquare()
-	{
-		return false;
-	}
-	
 	@Override
 	public String getMinecraftVersion()
 	{
-		#if MC_VER < MC_1_19_2
+		// these values are hard-coded to prevent an issue with Forge (specifically 1.18.2) where
-		return Minecraft.getInstance().getGame().getVersion().getId();
+		// it can't load client classes when running as a dedicated server,
+		// which was how we were dynamically accessing the MC version string
+		
+		#if MC_VER == MC_1_16_5
+			return "1.16.5";
+		
+		#elif MC_VER == MC_1_17_1
+			return "1.17.1";
+		
+		#elif MC_VER == MC_1_18_2
+			return "1.18.2";
+		
+		#elif MC_VER == MC_1_19_2
+			return "1.19.2";
+		#elif MC_VER == MC_1_19_4
+			return "1.19.4";
+		
+		#elif MC_VER == MC_1_20_1
+			return "1.20.1";
+		#elif MC_VER == MC_1_20_2
+			return "1.20.2";
+		#elif MC_VER == MC_1_20_4
+			return "1.20.4";
+		#elif MC_VER == MC_1_20_6
+			return "1.20.6";
+		
+		#elif MC_VER == MC_1_21_1
+			return "1.21.1";
+		#elif MC_VER == MC_1_21_3
+			return "1.21.3";
+		#elif MC_VER == MC_1_21_4
+			return "1.21.4";
+		#elif MC_VER == MC_1_21_5
+			return "1.21.5";
 		#else
-		return SharedConstants.getCurrentVersion().getId();
+			ERROR MC version constant missing
 		#endif
+		
 	}
 	
 }

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

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by
@@ -174,8 +174,6 @@ public class WrapperFactory implements IWrapperFactory
 			}
 			// the level is needed for the DH level wrapper...
 			Level level = (Level) objectArray[1];
-			// ...the LevelReader is needed for chunk lighting
-			LevelReader lightSource = level;
 			
 			
 			// level wrapper
@@ -184,7 +182,7 @@ public class WrapperFactory implements IWrapperFactory
 					: ServerLevelWrapper.getWrapper((ServerLevel)level);
 			
 			
-			return new ChunkWrapper(chunk, lightSource, levelWrapper);
+			return new ChunkWrapper(chunk, levelWrapper);
 		}
 		// incorrect number of parameters from the API
 		else

common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by
@@ -22,6 +22,7 @@ package com.seibel.distanthorizons.common.wrappers.block;
 import java.io.IOException;
 import java.util.HashSet;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
@@ -226,8 +227,10 @@ public class BiomeWrapper implements IBiomeWrapper
 		resourceLocation = registryAccess.registryOrThrow(Registry.BIOME_REGISTRY).getKey(this.biome);
 		#elif MC_VER == MC_1_18_2 || MC_VER == MC_1_19_2
 		resourceLocation = registryAccess.registryOrThrow(Registry.BIOME_REGISTRY).getKey(this.biome.value());
-		#else
+		#elif MC_VER < MC_1_21_3
 		resourceLocation = registryAccess.registryOrThrow(Registries.BIOME).getKey(this.biome.value());
+		#else
+		resourceLocation = registryAccess.lookupOrThrow(Registries.BIOME).getKey(this.biome.value());
 		#endif
 		
 		if (resourceLocation == null)
@@ -318,10 +321,24 @@ public class BiomeWrapper implements IBiomeWrapper
 				Biome unwrappedBiome = registryAccess.registryOrThrow(Registry.BIOME_REGISTRY).get(resourceLocation);
 				success = (unwrappedBiome != null);
 				Holder<Biome> biome = new Holder.Direct<>(unwrappedBiome);
-				#else
+				#elif MC_VER < MC_1_21_3
 				Biome unwrappedBiome = registryAccess.registryOrThrow(Registries.BIOME).get(resourceLocation);
 				success = (unwrappedBiome != null);
 				Holder<Biome> biome = new Holder.Direct<>(unwrappedBiome);
+				#else
+				Holder<Biome> biome;
+				Optional<Holder.Reference<Biome>> optionalBiomeHolder = registryAccess.lookupOrThrow(Registries.BIOME).get(resourceLocation);
+				if (optionalBiomeHolder.isPresent())
+				{
+					Biome unwrappedBiome = optionalBiomeHolder.get().value();
+					success = (unwrappedBiome != null);
+					biome = new Holder.Direct<>(unwrappedBiome);
+				}
+				else
+				{
+					success = false;
+					biome = null;
+				}
 				#endif
 				
 				

common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by
@@ -43,6 +43,8 @@ import java.util.*;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
 
+import org.jetbrains.annotations.Nullable;
+
 #if MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1
 import net.minecraft.core.Registry;
 import net.minecraft.core.BlockPos;
@@ -58,6 +60,7 @@ import net.minecraft.world.level.Level;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.registries.Registries;
 import net.minecraft.world.level.EmptyBlockGetter;
+import net.minecraft.core.Holder;
 #endif
 
 public class BlockStateWrapper implements IBlockStateWrapper
@@ -83,26 +86,25 @@ public class BlockStateWrapper implements IBlockStateWrapper
 	public static HashSet<IBlockStateWrapper> rendererIgnoredCaveBlocks = null;
 	
 	/** keep track of broken blocks so we don't log every time */
-	private static final HashSet<ResourceLocation> BrokenResourceLocations = new HashSet<>();
+	private static final HashSet<ResourceLocation> BROKEN_RESOURCE_LOCATIONS = new HashSet<>();
 	
 	
 	
 	// properties //
 	
+	@Nullable
 	public final BlockState blockState;
 	/** technically final, but since it requires a method call to generate it can't be marked as such */
 	private String serialString;
 	private final int hashCode;
-	/** 
+	/** Should be between {@link LodUtil#BLOCK_FULLY_OPAQUE} and {@link LodUtil#BLOCK_FULLY_OPAQUE} */
-	 * Cached opacity value, -1 if not populated. <br>
+	private final int opacity;
-	 * Should be between {@link LodUtil#BLOCK_FULLY_OPAQUE} and {@link LodUtil#BLOCK_FULLY_OPAQUE}
-	 */
-	private int opacity = -1;
 	/** used by the Iris shader mod to determine how each LOD should be rendered */
 	private byte blockMaterialId = 0;
 	
 	private final boolean isBeaconBlock; 
 	private final boolean isBeaconBaseBlock;
+	private final boolean allowsBeaconBeamPassage;
 	/** null if this block can't tint beacons */
 	private final Color beaconTintColor; 
 	private final Color mapColor;
@@ -142,10 +144,10 @@ public class BlockStateWrapper implements IBlockStateWrapper
 		BlockState guessBlockState = (guess == null || guess.isAir()) ? null : (BlockState) guess.getWrappedMcObject();
 		BlockState inputBlockState = (blockState == null || blockState.isAir()) ? null : blockState;
 		
-		if (guess instanceof BlockStateWrapper guessWrapper
+		if (guess instanceof BlockStateWrapper
-				&& guessBlockState == inputBlockState)
+			&& guessBlockState == inputBlockState)
 		{
-			return guessWrapper;
+			return (BlockStateWrapper) guess;
 		}
 		else
 		{
@@ -159,9 +161,12 @@ public class BlockStateWrapper implements IBlockStateWrapper
 		this.serialString = this.serialize(levelWrapper);
 		this.hashCode = Objects.hash(this.serialString);
 		this.blockMaterialId = this.calculateEDhApiBlockMaterialId().index;
+		this.opacity = this.calculateOpacity();
+		
+		String lowercaseSerial = this.serialString.toLowerCase();
+		
 		
 		// beacon blocks
-		String lowercaseSerial = this.serialString.toLowerCase();
 		boolean isBeaconBaseBlock = false;
 		for (int i = 0; i < LodUtil.BEACON_BASE_BLOCK_NAME_LIST.size(); i++)
 		{
@@ -197,6 +202,39 @@ public class BlockStateWrapper implements IBlockStateWrapper
 		this.beaconTintColor = beaconTintColor;
 		
 		
+		// allow/deny beacon beam passage 
+		boolean allowsBeaconBeamPassage;
+		if (this.blockState != null)
+		{
+			// get block properties (defaults to the values used by air)
+			boolean canOcclude = this.getCanOcclude();
+			boolean propagatesSkyLightDown = this.getPropagatesSkyLightDown();
+			
+			if (lowercaseSerial.contains("minecraft:bedrock"))
+			{
+				// bedrock is a special case fully opaque block that does allow beacons through
+				allowsBeaconBeamPassage = true;
+			}
+			else if (propagatesSkyLightDown || !canOcclude)
+			{
+				// stairs, cake, fences, etc.
+				allowsBeaconBeamPassage = true;
+			}
+			else
+			{
+				// non-opaque blocks (glass, mob spawners, etc.)
+				// all allow beacons through
+				allowsBeaconBeamPassage = (this.opacity != LodUtil.BLOCK_FULLY_OPAQUE);
+			}
+		}
+		else
+		{
+			// air allows beacons through
+			allowsBeaconBeamPassage = true;
+		}
+		this.allowsBeaconBeamPassage = allowsBeaconBeamPassage;
+		
+		
 		int mcColor = 0;
 		if (this.blockState != null)
 		{
@@ -235,7 +273,7 @@ public class BlockStateWrapper implements IBlockStateWrapper
 		
 		HashSet<String> baseIgnoredBlock = new HashSet<>();
 		baseIgnoredBlock.add(AIR_STRING);
-		rendererIgnoredBlocks = getBlockWrappers(Config.Client.Advanced.LodBuilding.ignoredRenderBlockCsv, baseIgnoredBlock, levelWrapper);
+		rendererIgnoredBlocks = getBlockWrappers(Config.Client.Advanced.Graphics.Culling.ignoredRenderBlockCsv, baseIgnoredBlock, levelWrapper);
 		return rendererIgnoredBlocks;
 	}
 	/**
@@ -252,7 +290,7 @@ public class BlockStateWrapper implements IBlockStateWrapper
 		
 		HashSet<String> baseIgnoredBlock = new HashSet<>();
 		baseIgnoredBlock.add(AIR_STRING);
-		rendererIgnoredCaveBlocks = getBlockWrappers(Config.Client.Advanced.LodBuilding.ignoredRenderCaveBlockCsv, baseIgnoredBlock, levelWrapper);
+		rendererIgnoredCaveBlocks = getBlockWrappers(Config.Client.Advanced.Graphics.Culling.ignoredRenderCaveBlockCsv, baseIgnoredBlock, levelWrapper);
 		return rendererIgnoredCaveBlocks;
 	}
 	
@@ -340,13 +378,13 @@ public class BlockStateWrapper implements IBlockStateWrapper
 	//=================//
 	
 	@Override
-	public int getOpacity()
+	public int getOpacity() { return this.opacity; }
+	private int calculateOpacity()
 	{
-		// use the cached opacity value if possible
+		// get block properties (defaults to the values used by air)
-		if (this.opacity != -1)
+		boolean canOcclude = this.getCanOcclude();
-		{
+		boolean propagatesSkyLightDown = this.getPropagatesSkyLightDown();
-			return this.opacity;
+		
-		}
 		
 		
 		// this method isn't perfect, but works well enough for our use case
@@ -355,15 +393,20 @@ public class BlockStateWrapper implements IBlockStateWrapper
 		{
 			opacity = LodUtil.BLOCK_FULLY_TRANSPARENT;
 		}
-		else if (this.isLiquid() && !this.blockState.canOcclude())
+		else if (this.isLiquid() && !canOcclude)
 		{
 			// probably not a waterlogged block (which should block light entirely)
 			
 			// +1 to indicate that the block is translucent (in between transparent and opaque) 
 			opacity = LodUtil.BLOCK_FULLY_TRANSPARENT + 1;
 		}
-		else if (this.blockState.propagatesSkylightDown(EmptyBlockGetter.INSTANCE, BlockPos.ZERO))
+		else if (propagatesSkyLightDown && !canOcclude)
 		{
+			// probably glass or some other fully transparent block
+			
+			// !canOcclude is required to ignore stairs and slabs since
+			// propagateSkyLightDown is true for them, but they're solid and don't actually let light through
+			
 			opacity = LodUtil.BLOCK_FULLY_TRANSPARENT;
 		}
 		else
@@ -373,9 +416,37 @@ public class BlockStateWrapper implements IBlockStateWrapper
 		}
 		
 		
-		this.opacity = opacity;
+		return opacity;
-		return this.opacity;
 	}
+	private boolean getCanOcclude()
+	{
+		// defaults to the value used by air
+		boolean canOcclude = false;
+		if (this.blockState != null)
+		{
+			canOcclude = this.blockState.canOcclude();
+		}
+		
+		return canOcclude;
+	}
+	private boolean getPropagatesSkyLightDown()
+	{
+		// defaults to the value used by air
+		boolean propagatesSkyLightDown = true;
+		if (this.blockState != null)
+		{
+			#if MC_VER < MC_1_21_3
+			propagatesSkyLightDown = this.blockState.propagatesSkylightDown(EmptyBlockGetter.INSTANCE, BlockPos.ZERO);
+			#else
+			propagatesSkyLightDown = this.blockState.propagatesSkylightDown();
+			#endif
+		}
+		
+		return propagatesSkyLightDown;
+	}
+	
+	
+	
 	
 	@Override
 	public int getLightEmission() { return (this.blockState != null) ? this.blockState.getLightEmission() : 0; }
@@ -415,6 +486,11 @@ public class BlockStateWrapper implements IBlockStateWrapper
 	@Override
 	public boolean isSolid()
 	{
+		if (this.isAir())
+		{
+			return false;
+		}
+		
         #if MC_VER < MC_1_20_1
 		return this.blockState.getMaterial().isSolid();
         #else
@@ -443,6 +519,8 @@ public class BlockStateWrapper implements IBlockStateWrapper
 	public boolean isBeaconBaseBlock() { return this.isBeaconBaseBlock; }
 	@Override
 	public boolean isBeaconTintBlock() { return this.beaconTintColor != null; }
+	@Override
+	public boolean allowsBeaconBeamPassage() { return this.allowsBeaconBeamPassage; }
 	
 	@Override
 	public Color getMapColor() { return this.mapColor; }
@@ -481,8 +559,10 @@ public class BlockStateWrapper implements IBlockStateWrapper
 		resourceLocation = Registry.BLOCK.getKey(this.blockState.getBlock());
 		#elif MC_VER == MC_1_18_2 || MC_VER == MC_1_19_2
 		resourceLocation = registryAccess.registryOrThrow(Registry.BLOCK_REGISTRY).getKey(this.blockState.getBlock());
-		#else
+		#elif MC_VER < MC_1_21_3
 		resourceLocation = registryAccess.registryOrThrow(Registries.BLOCK).getKey(this.blockState.getBlock());
+		#else
+		resourceLocation = registryAccess.lookupOrThrow(Registries.BLOCK).getKey(this.blockState.getBlock());
 		#endif
 		
 		
@@ -571,18 +651,22 @@ public class BlockStateWrapper implements IBlockStateWrapper
 				#elif MC_VER == MC_1_18_2 || MC_VER == MC_1_19_2
 				net.minecraft.core.RegistryAccess registryAccess = level.registryAccess();
 				block = registryAccess.registryOrThrow(Registry.BLOCK_REGISTRY).get(resourceLocation);
-				#else
+				#elif MC_VER < MC_1_21_3
 				net.minecraft.core.RegistryAccess registryAccess = level.registryAccess();
 				block = registryAccess.registryOrThrow(Registries.BLOCK).get(resourceLocation);
+				#else
+				net.minecraft.core.RegistryAccess registryAccess = level.registryAccess();
+				Optional<Holder.Reference<Block>> optionalBlockHolder = registryAccess.lookupOrThrow(Registries.BLOCK).get(resourceLocation);
+				block = optionalBlockHolder.isPresent() ? optionalBlockHolder.get().value() : null;
 				#endif
 				
 				
 				if (block == null)
 				{
 					// shouldn't normally happen, but here to make the compiler happy
-					if (!BrokenResourceLocations.contains(resourceLocation))
+					if (!BROKEN_RESOURCE_LOCATIONS.contains(resourceLocation))
 					{
-						BrokenResourceLocations.add(resourceLocation);
+						BROKEN_RESOURCE_LOCATIONS.add(resourceLocation);
 						LOGGER.warn("Unable to find BlockState with the resourceLocation [" + resourceLocation + "] and properties: [" + blockStatePropertiesString + "]. Air will be used instead, some data may be lost.");
 					}
 					
@@ -612,9 +696,9 @@ public class BlockStateWrapper implements IBlockStateWrapper
 					if (blockStatePropertiesString != null)
 					{
 						// we should have found a blockstate, but didn't
-						if (!BrokenResourceLocations.contains(resourceLocation))
+						if (!BROKEN_RESOURCE_LOCATIONS.contains(resourceLocation))
 						{
-							BrokenResourceLocations.add(resourceLocation);
+							BROKEN_RESOURCE_LOCATIONS.add(resourceLocation);
 							LOGGER.warn("Unable to find BlockState for Block [" + resourceLocation + "] with properties: [" + blockStatePropertiesString + "]. Using the default block state.");
 						}
 					}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/ClientBlockStateColorCache.java

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by
@@ -40,11 +40,18 @@ import java.util.Random;
 #endif
 import net.minecraft.world.level.block.state.BlockState;
 import org.apache.logging.log4j.Logger;
+import org.jetbrains.annotations.Nullable;
 
+import java.util.ArrayList;
 import java.util.HashSet;
 import java.util.List;
 import java.util.concurrent.locks.ReentrantLock;
 
+#if MC_VER < MC_1_21_5
+#else
+import net.minecraft.client.renderer.block.model.BlockModelPart;
+#endif
+
 /**
  * This stores and calculates the colors
  * the given {@link BlockState} should have based
@@ -196,9 +203,7 @@ public class ClientBlockStateColorCache
 				List<BakedQuad> quads = null;
 				for (Direction direction : COLOR_RESOLUTION_DIRECTION_ORDER)
 				{
-					quads = Minecraft.getInstance().getModelManager().getBlockModelShaper().
+					quads = this.getQuadsForDirection(direction);
-							getBlockModel(this.blockState).getQuads(this.blockState, direction, RANDOM);
-					
 					if (quads != null && !quads.isEmpty()
 						&& !(
 							this.blockState.getBlock() instanceof RotatedPillarBlock
@@ -212,19 +217,37 @@ public class ClientBlockStateColorCache
 				
 				if (quads == null || quads.isEmpty())
 				{
-					quads = Minecraft.getInstance().getModelManager().getBlockModelShaper().
+					quads = this.getUnculledQuads();
-							getBlockModel(this.blockState).getQuads(this.blockState, null, RANDOM);
 				}
 				
-				if (quads != null && !quads.isEmpty())
+				if (quads != null 
+					&& !quads.isEmpty() 
+					&& quads.get(0) != null)
 				{
-					this.needPostTinting = quads.get(0).isTinted();
+					BakedQuad firstQuad = quads.get(0);
-					this.needShade = quads.get(0).isShade();
+					
-					this.tintIndex = quads.get(0).getTintIndex();
+					this.needPostTinting = firstQuad.isTinted();
+					#if MC_VER <= MC_1_21_4
+					this.needShade = firstQuad.isShade();
+					this.tintIndex = firstQuad.getTintIndex();
+					#else
+					this.needShade = firstQuad.shade();
+					this.tintIndex = firstQuad.tintIndex();
+					#endif
+					
+					#if MC_VER < MC_1_17_1
 					this.baseColor = calculateColorFromTexture(
-	                        #if MC_VER < MC_1_17_1 quads.get(0).sprite,
+                        firstQuad.sprite,
-							#else quads.get(0).getSprite(), #endif
+						ColorMode.getColorMode(this.blockState.getBlock()));
-							ColorMode.getColorMode(this.blockState.getBlock()));
+					#elif MC_VER < MC_1_21_5
+					this.baseColor = calculateColorFromTexture(
+                        firstQuad.getSprite(),
+						ColorMode.getColorMode(this.blockState.getBlock()));
+					#else
+					this.baseColor = calculateColorFromTexture(
+						firstQuad.sprite(),
+						ColorMode.getColorMode(this.blockState.getBlock()));
+					#endif
 				}
 				else
 				{
@@ -232,8 +255,7 @@ public class ClientBlockStateColorCache
 					this.needPostTinting = false;
 					this.needShade = false;
 					this.tintIndex = 0;
-					this.baseColor = calculateColorFromTexture(Minecraft.getInstance().getModelManager().getBlockModelShaper().getParticleIcon(this.blockState),
+					this.baseColor = this.getParticleIconColor();
-							ColorMode.getColorMode(this.blockState.getBlock()));
 				}
 			}
 			else
@@ -242,8 +264,7 @@ public class ClientBlockStateColorCache
 				this.needPostTinting = true;
 				this.needShade = false;
 				this.tintIndex = 0;
-				this.baseColor = calculateColorFromTexture(Minecraft.getInstance().getModelManager().getBlockModelShaper().getParticleIcon(this.blockState),
+				this.baseColor = this.getParticleIconColor();
-						ColorMode.getColorMode(this.blockState.getBlock()));
 			}
 			
 			this.isColorResolved = true;
@@ -253,6 +274,35 @@ public class ClientBlockStateColorCache
 			RESOLVE_LOCK.unlock();
 		}
 	}
+	
+	@Nullable
+	private List<BakedQuad> getUnculledQuads() { return this.getQuadsForDirection(null); }
+	@Nullable
+	private List<BakedQuad> getQuadsForDirection(@Nullable Direction direction)
+	{
+		List<BakedQuad> quads = null;
+		
+		#if MC_VER < MC_1_21_5
+		quads = Minecraft.getInstance().getModelManager().getBlockModelShaper().
+				getBlockModel(this.blockState).getQuads(this.blockState, direction, RANDOM);
+		#else
+		List<BlockModelPart> blockModelPartList = Minecraft.getInstance().getModelManager().getBlockModelShaper().
+				getBlockModel(this.blockState).collectParts(RANDOM);
+		
+		quads = new ArrayList<>();
+		if (blockModelPartList != null)
+		{
+			for (int i = 0; i < blockModelPartList.size(); i++)
+			{
+				// if direction is null this will return the unculled quads
+				quads.addAll(blockModelPartList.get(i).getQuads(direction));
+			}
+		}
+		#endif
+		
+		return quads;
+	}
+	
 	//TODO: Perhaps make this not just use the first frame?
 	private static int calculateColorFromTexture(TextureAtlasSprite texture, ColorMode colorMode)
 	{
@@ -324,12 +374,12 @@ public class ClientBlockStateColorCache
 		if (count == 0)
 		{
 			// this block is entirely transparent
-			tempColor = ColorUtil.rgbToInt(0, 255, 255, 255);
+			tempColor = ColorUtil.argbToInt(0, 255, 255, 255);
 		}
 		else
 		{
 			// determine the average color
-			tempColor = ColorUtil.rgbToInt(
+			tempColor = ColorUtil.argbToInt(
 					alpha / count,
 					linearToSrgb((float) (red / (double) alpha)),
 					linearToSrgb((float) (green / (double) alpha)),
@@ -337,10 +387,10 @@ public class ClientBlockStateColorCache
 		}
 		
 		//check if not missing texture
-		if (tempColor == ColorUtil.rgbToInt(255, 182, 0, 182))
+		if (tempColor == ColorUtil.argbToInt(255, 182, 0, 182))
 		{
 			//make it not render at all
-			tempColor = ColorUtil.rgbToInt(0, 255, 255, 255);
+			tempColor = ColorUtil.argbToInt(0, 255, 255, 255);
 		}
 		return tempColor;
 	}
@@ -383,6 +433,13 @@ public class ClientBlockStateColorCache
 		return (bias + (scale * t)) >>> 16;
 	}
 	
+	private int getParticleIconColor()
+	{
+		return calculateColorFromTexture(
+				Minecraft.getInstance().getModelManager().getBlockModelShaper().getParticleIcon(this.blockState),
+				ColorMode.getColorMode(this.blockState.getBlock()));
+	}
+	
 	
 	
 	//===============//

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

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by
@@ -19,9 +19,15 @@
 
 package com.seibel.distanthorizons.common.wrappers.block;
 
-
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 
+#if MC_VER < MC_1_17_1
+#elif MC_VER < MC_1_21_3
+#else
+import com.seibel.distanthorizons.core.util.ColorUtil;
+import net.minecraft.client.renderer.texture.SpriteContents;
+#endif
+
 /**
  * For wrapping/utilizing around TextureAtlasSprite
  *
@@ -29,15 +35,6 @@ import net.minecraft.client.renderer.texture.TextureAtlasSprite;
  */
 public class TextureAtlasSpriteWrapper
 {
-	
-	/**
-	 * This code is from Minecraft Forge
-	 * Which is licensed under the terms of GNU Lesser General Public License
-	 * as published by the Free Software Foundation version 2.1
-	 * of the License.
-	 *
-	 * The code has been modified to use TextureAtlasSprite
-	 */
 	public static int getPixelRGBA(TextureAtlasSprite sprite, int frameIndex, int x, int y)
 	{
         #if MC_VER < MC_1_17_1
@@ -51,13 +48,29 @@ public class TextureAtlasSpriteWrapper
 			y += sprite.animatedTexture.getFrameY(frameIndex) * sprite.height;
 		}
 		return sprite.mainImage[0].getPixelRGBA(x, y);
-        #else
+		#elif MC_VER < MC_1_21_3
 		if (sprite.contents().animatedTexture != null)
 		{
 			x += sprite.contents().animatedTexture.getFrameX(frameIndex) * sprite.contents().width();
 			y += sprite.contents().animatedTexture.getFrameY(frameIndex) * sprite.contents().width();
 		}
 		return sprite.contents().originalImage.getPixelRGBA(x, y);
+        #else
+		
+		SpriteContents content = sprite.contents(); // don't close, otherwise MC will be corrupted and you won't be able to re-access the texture
+		if (content.animatedTexture != null)
+		{
+			x += content.animatedTexture.getFrameX(frameIndex) * content.width();
+			y += content.animatedTexture.getFrameY(frameIndex) * content.width();
+		}
+		
+		int abgr = content.originalImage.getPixel(x, y);
+		// re-pack the color so we can access it normally
+		int a = (abgr & 0xFF000000) >>> 24;
+		int b = (abgr & 0x00FF0000) >>> 16;
+		int g = (abgr & 0x0000FF00) >>> 8;
+		int r = (abgr & 0x000000FF);
+		return ColorUtil.argbToInt(a, r, g, b);
         #endif
 		
 	}

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

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by
@@ -42,15 +42,24 @@ public class TintGetterOverrideFast implements BlockAndTintGetter
 {
 	LevelReader parent;
 	
-	public TintGetterOverrideFast(LevelReader parent)
+	
-	{
+	
-		this.parent = parent;
+	//=============//
-	}
+	// constructor //
+	//=============//
+	
+	public TintGetterOverrideFast(LevelReader parent) { this.parent = parent; }
+	
+	
+	
+	//=========//
+	// methods //
+	//=========//
 	
 	private Biome _getBiome(BlockPos pos)
 	{
 		#if MC_VER >= MC_1_18_2
-		return parent.getBiome(pos).value();
+		return this.parent.getBiome(pos).value();
 		#else
 		return parent.getBiome(pos);
 		#endif
@@ -63,169 +72,123 @@ public class TintGetterOverrideFast implements BlockAndTintGetter
 	public float getShade(Direction direction, boolean bl) { return this.parent.getShade(direction, bl); }
 	
 	@Override
-	public LevelLightEngine getLightEngine()
+	public LevelLightEngine getLightEngine() { return this.parent.getLightEngine(); }
-	{
-		return parent.getLightEngine();
-	}
 	
 	@Override
-	public int getBrightness(LightLayer lightLayer, BlockPos blockPos)
+	public int getBrightness(LightLayer lightLayer, BlockPos blockPos) { return this.parent.getBrightness(lightLayer, blockPos); }
-	{
-		return parent.getBrightness(lightLayer, blockPos);
-	}
 	
 	@Override
-	public int getRawBrightness(BlockPos blockPos, int i)
+	public int getRawBrightness(BlockPos blockPos, int i) { return this.parent.getRawBrightness(blockPos, i); }
-	{
-		return parent.getRawBrightness(blockPos, i);
-	}
 	
 	@Override
-	public boolean canSeeSky(BlockPos blockPos)
+	public boolean canSeeSky(BlockPos blockPos) { return this.parent.canSeeSky(blockPos); }
-	{
-		return parent.canSeeSky(blockPos);
-	}
 	
 	@Override
 	@Nullable
-	public BlockEntity getBlockEntity(BlockPos blockPos)
+	public BlockEntity getBlockEntity(BlockPos blockPos) { return this.parent.getBlockEntity(blockPos); }
-	{
-		return parent.getBlockEntity(blockPos);
-	}
 	
 	
 	@Override
-	public BlockState getBlockState(BlockPos blockPos)
+	public BlockState getBlockState(BlockPos blockPos) { return this.parent.getBlockState(blockPos); }
-	{
-		return parent.getBlockState(blockPos);
-	}
 	
 	@Override
-	public FluidState getFluidState(BlockPos blockPos)
+	public FluidState getFluidState(BlockPos blockPos) { return this.parent.getFluidState(blockPos); }
-	{
-		return parent.getFluidState(blockPos);
-	}
 	
 	@Override
-	public int getLightEmission(BlockPos blockPos)
+	public int getLightEmission(BlockPos blockPos) { return this.parent.getLightEmission(blockPos); }
-	{
-		return parent.getLightEmission(blockPos);
-	}
 	
+	#if MC_VER < MC_1_21_3
 	@Override
-	public int getMaxLightLevel()
+	public int getMaxLightLevel() { return parent.getMaxLightLevel(); }
-	{
+	#else
-		return parent.getMaxLightLevel();
+	#endif
-	}
 	
 	@Override
 	public Stream<BlockState> getBlockStates(AABB aABB)
-	{
+	{ return this.parent.getBlockStates(aABB); }
-		return parent.getBlockStates(aABB);
-	}
 	
 	@Override
 	public BlockHitResult clip(ClipContext clipContext)
-	{
+	{ return this.parent.clip(clipContext); }
-		return parent.clip(clipContext);
-	}
 	
 	@Override
 	@Nullable
 	public BlockHitResult clipWithInteractionOverride(Vec3 vec3, Vec3 vec32, BlockPos blockPos, VoxelShape voxelShape, BlockState blockState)
-	{
+	{ return this.parent.clipWithInteractionOverride(vec3, vec32, blockPos, voxelShape, blockState); }
-		return parent.clipWithInteractionOverride(vec3, vec32, blockPos, voxelShape, blockState);
-	}
 	
 	@Override
 	public double getBlockFloorHeight(VoxelShape voxelShape, Supplier<VoxelShape> supplier)
-	{
+	{ return this.parent.getBlockFloorHeight(voxelShape, supplier); }
-		return parent.getBlockFloorHeight(voxelShape, supplier);
-	}
 	
 	@Override
-	public double getBlockFloorHeight(BlockPos blockPos)
+	public double getBlockFloorHeight(BlockPos blockPos) { return this.parent.getBlockFloorHeight(blockPos); }
-	{
-		return parent.getBlockFloorHeight(blockPos);
-	}
 	
+	#if MC_VER < MC_1_21_3
 	@Override
-	public int getMaxBuildHeight()
+	public int getMaxBuildHeight() { return this.parent.getMaxBuildHeight(); }
-	{
+	#else
-		return parent.getMaxBuildHeight();
+	@Override
-	}
+	public int getMaxY() { return this.parent.getMaxY(); }
+	#endif
+	
+	
+	
+	//==============//
+	// post MC 1.17 //
+	//==============//
 	
 	#if MC_VER >= MC_1_17_1
 	@Override
 	public <T extends BlockEntity> Optional<T> getBlockEntity(BlockPos blockPos, BlockEntityType<T> blockEntityType)
-	{
+	{ return this.parent.getBlockEntity(blockPos, blockEntityType); }
-		return parent.getBlockEntity(blockPos, blockEntityType);
-	}
 	
 	@Override
 	public BlockHitResult isBlockInLine(ClipBlockStateContext clipBlockStateContext)
-	{
+	{ return this.parent.isBlockInLine(clipBlockStateContext); }
-		return parent.isBlockInLine(clipBlockStateContext);
-	}
 	
 	@Override
-	public int getHeight()
+	public int getHeight() { return this.parent.getHeight(); }
-	{
+	
-		return parent.getHeight();
+	#if MC_VER < MC_1_21_3
-	}
+	@Override
+	public int getMinBuildHeight() { return this.parent.getMinBuildHeight(); }
+	#else
+	@Override
+	public int getMinY() { return this.parent.getMinY(); }
+	#endif
 	
 	@Override
-	public int getMinBuildHeight()
+	public int getSectionsCount() { return this.parent.getSectionsCount(); }
-	{
+	
-		return parent.getMinBuildHeight();
+	#if MC_VER < MC_1_21_3
-	}
+	@Override
+	public int getMinSection() { return this.parent.getMinSection(); }
+	#else
+	@Override
+	public int getMinSectionY() { return BlockAndTintGetter.super.getMinSectionY(); }	
+	#endif
+	
+	#if MC_VER < MC_1_21_3
+	@Override
+	public int getMaxSection() { return this.parent.getMaxSection(); }
+	#else
+	@Override
+	public int getMaxSectionY() { return this.parent.getMaxSectionY(); }
+	#endif
 	
 	@Override
-	public int getSectionsCount()
+	public boolean isOutsideBuildHeight(BlockPos blockPos) { return this.parent.isOutsideBuildHeight(blockPos); }
-	{
-		return parent.getSectionsCount();
-	}
 	
 	@Override
-	public int getMinSection()
+	public boolean isOutsideBuildHeight(int i) { return this.parent.isOutsideBuildHeight(i); }
-	{
-		return parent.getMinSection();
-	}
 	
 	@Override
-	public int getMaxSection()
+	public int getSectionIndex(int i) { return this.parent.getSectionIndex(i); }
-	{
-		return parent.getMaxSection();
-	}
 	
 	@Override
-	public boolean isOutsideBuildHeight(BlockPos blockPos)
+	public int getSectionIndexFromSectionY(int i) { return this.parent.getSectionIndexFromSectionY(i); }
-	{
-		return parent.isOutsideBuildHeight(blockPos);
-	}
 	
 	@Override
-	public boolean isOutsideBuildHeight(int i)
+	public int getSectionYFromSectionIndex(int i) { return this.parent.getSectionYFromSectionIndex(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/distanthorizons/common/wrappers/block/TintGetterOverrideSmooth.java

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by
@@ -19,6 +19,7 @@
 
 package com.seibel.distanthorizons.common.wrappers.block;
 
+import com.seibel.distanthorizons.core.util.LodUtil;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Cursor3D;
 import net.minecraft.core.Direction;
@@ -44,16 +45,28 @@ public class TintGetterOverrideSmooth implements BlockAndTintGetter
 	LevelReader parent;
 	public int smoothingRange;
 	
+	
+	
+	//=============//
+	// constructor //
+	//=============//
+	
 	public TintGetterOverrideSmooth(LevelReader parent, int smoothingRange)
 	{
 		this.parent = parent;
 		this.smoothingRange = smoothingRange;
 	}
 	
+	
+	
+	//=========//
+	// methods //
+	//=========//
+	
 	private Biome _getBiome(BlockPos pos)
 	{
 		#if MC_VER >= MC_1_18_2
-		return parent.getBiome(pos).value();
+		return this.parent.getBiome(pos).value();
 		#else
 		return parent.getBiome(pos);
 		#endif
@@ -113,8 +126,11 @@ public class TintGetterOverrideSmooth implements BlockAndTintGetter
 	@Override
 	public int getLightEmission(BlockPos blockPos) { return this.parent.getLightEmission(blockPos); }
 	
+	#if MC_VER < MC_1_21_3
 	@Override
 	public int getMaxLightLevel() { return this.parent.getMaxLightLevel(); }
+	#else
+	#endif
 	
 	@Override
 	public Stream<BlockState> getBlockStates(AABB aABB) { return this.parent.getBlockStates(aABB); }
@@ -135,8 +151,13 @@ public class TintGetterOverrideSmooth implements BlockAndTintGetter
 	@Override
 	public double getBlockFloorHeight(BlockPos blockPos) { return this.parent.getBlockFloorHeight(blockPos); }
 	
+	#if MC_VER < MC_1_21_3
 	@Override
 	public int getMaxBuildHeight() { return this.parent.getMaxBuildHeight(); }
+	#else
+	@Override
+	public int getMaxY() { return this.parent.getMaxY(); }
+	#endif
 	
 	#if MC_VER >= MC_1_17_1
 	@Override
@@ -148,17 +169,32 @@ public class TintGetterOverrideSmooth implements BlockAndTintGetter
 	@Override
 	public int getHeight() { return this.parent.getHeight(); }
 	
+	#if MC_VER < MC_1_21_3
 	@Override
 	public int getMinBuildHeight() { return this.parent.getMinBuildHeight(); }
+	#else
+	@Override
+	public int getMinY() { return this.parent.getMinY(); }
+	#endif
 	
 	@Override
 	public int getSectionsCount() { return this.parent.getSectionsCount(); }
 	
+	#if MC_VER < MC_1_21_3
 	@Override
 	public int getMinSection() { return this.parent.getMinSection(); }
+	#else
+	@Override
+	public int getMinSectionY() { return BlockAndTintGetter.super.getMinSectionY(); }	
+	#endif
 	
+	#if MC_VER < MC_1_21_3
 	@Override
 	public int getMaxSection() { return this.parent.getMaxSection(); }
+	#else
+	@Override
+	public int getMaxSectionY() { return this.parent.getMaxSectionY(); }
+	#endif
 	
 	@Override
 	public boolean isOutsideBuildHeight(BlockPos blockPos) { return this.parent.isOutsideBuildHeight(blockPos); }

common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintWithoutLevelOverrider.java

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by
@@ -19,19 +19,16 @@
 
 package com.seibel.distanthorizons.common.wrappers.block;
 
-import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.util.ColorUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
 import net.minecraft.world.level.*;
 import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.biome.Biomes;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.lighting.LevelLightEngine;
 import net.minecraft.world.level.material.FluidState;
-import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
@@ -46,46 +43,74 @@ public class TintWithoutLevelOverrider implements BlockAndTintGetter
 	 * but {@link Nullable} is there just in case. 
 	 */
 	@Nullable
-	private final Biome biome;
+	#if MC_VER >= MC_1_18_2
-	
+	public final Holder<Biome> biome;
-	
+	#else
+	public final Biome biome;
+	#endif
 	
+	/**
+	 * Constructs the TintWithoutLevelOverrider, storing the provided Biome Holder for late-binding access.
+	 *
+	 * <p>Previously, this class might have immediately unwrapped the Holder like this:</p>
+	 * <pre>{@code
+	 * // Inside constructor (OLD WAY - PROBLEMATIC):
+	 * Holder<Biome> biomeHolder = getTheHolderFromSomewhere();
+	 * this.biome = biomeHolder.value(); // <-- PROBLEM HERE
+	 * }</pre>
+	 *
+	 * <p>This approach is problematic because the {@link net.minecraft.core.Holder} system,
+	 * particularly {@code Holder.Reference}, is designed for <strong>late binding</strong>. Here's why storing
+	 * the Holder itself is now necessary:</p>
+	 * <ol>
+	 *   <li>A {@code Holder.Reference<Biome>} might be created initially just with a
+	 *       {@link net.minecraft.resources.ResourceKey} (like {@code minecraft:plains}), but its actual
+	 *       {@link net.minecraft.core.Holder#value() value()} (the {@code Biome} object itself) might be {@code null}
+	 *       at construction time.</li>
+	 *   <li>Later, during game loading, registry population, or potentially due to modifications by other mods
+	 *       (e.g., Polytone), the system calls internal binding methods (like {@code bindValue(Biome)})
+	 *       on the {@code Holder} instance. This sets or <strong>updates</strong> the internal reference to the
+	 *       actual {@code Biome} object.</li>
+	 *   <li>Crucially, the binding process might assign a completely <strong>new</strong> {@code Biome} object
+	 *       instance to the {@code Holder} reference, replacing any previous one.</li>
+	 * </ol>
+	 *
+	 * <p>If we unwrapped the {@code Holder} using {@code .value()} within the constructor (the old way),
+	 * our class's internal {@code biome} field would permanently store a reference to whatever {@code Biome}
+	 * object the {@code Holder} pointed to *at that exact moment*. It would have no link back to the
+	 * {@code Holder} and would be unaware if the {@code Holder} was later updated to point to a different
+	 * (or the initially missing) {@code Biome} object. This would lead to using stale or even {@code null} data.</p>
+	 *
+	 * <p>By storing the {@code Holder<Biome>} itself, this class can call {@link net.minecraft.core.Holder#value()}
+	 * whenever the biome information is needed, ensuring it always retrieves the most current {@code Biome}
+	 * instance associated with the holder at that time.</p>
+	 */
 	public TintWithoutLevelOverrider(BiomeWrapper biomeWrapper, IClientLevelWrapper clientLevelWrapper)
 	{
-		// try to get the wrapped biome
+		#if MC_VER >= MC_1_18_2 Holder<Biome> #else Biome #endif biome = biomeWrapper.biome;
-		Biome unwrappedBiome = null;
+		if (biome == null) // We are looking at the empty biome wrapper
-		if (biomeWrapper.biome != null)
 		{
-			unwrappedBiome = unwrap(biomeWrapper.biome);
-		}
-		
-		if(unwrappedBiome == null)
-		{
-			// we are looking at the empty biome wrapper, try using plains as a backup
 			BiomeWrapper plainsBiomeWrapper = ((BiomeWrapper) clientLevelWrapper.getPlainsBiomeWrapper());
 			if (plainsBiomeWrapper != null)
 			{
-				unwrappedBiome = unwrap(plainsBiomeWrapper.biome);
+				biome = plainsBiomeWrapper.biome;
 			}
 		}
 		
-		this.biome = unwrappedBiome;
+		this.biome = biome;
 	}
 	
 	
 	
 	@Override
-	public int getBlockTint(@NotNull BlockPos blockPos, @NotNull ColorResolver colorResolver) 
+	public int getBlockTint(@NotNull BlockPos blockPos, @NotNull ColorResolver colorResolver)
-	{ 
+	{
-		if (this.biome != null)
+		if (this.biome == null)
-		{
-			return colorResolver.getColor(this.biome, blockPos.getX(), blockPos.getZ());
-		}
-		else
 		{
 			// hopefully unneeded debug color
 			return ColorUtil.CYAN;
 		}
+		return colorResolver.getColor(unwrap(biome), blockPos.getX(), blockPos.getZ());
 	}
 	
 	private static Biome unwrap(#if MC_VER >= MC_1_18_2 Holder<Biome> #else Biome #endif biome)
@@ -132,17 +157,27 @@ public class TintWithoutLevelOverrider implements BlockAndTintGetter
 	}
 	
 	
+	
+	//==============//
+	// post MC 1.17 //
+	//==============//
+	
 	#if MC_VER >= MC_1_17_1
+	
 	@Override
 	public int getHeight()
-	{
+	{ throw new UnsupportedOperationException("ERROR: getHeight() called on TintWithoutLevelOverrider. Object is for tinting only."); }
-		throw new UnsupportedOperationException("ERROR: getHeight() called on TintWithoutLevelOverrider. Object is for tinting only.");
+	
-	}
+	#if MC_VER < MC_1_21_3
 	@Override
-	public int getMinBuildHeight()
+	public int getMinBuildHeight() 
-	{
+	{ throw new UnsupportedOperationException("ERROR: getMinBuildHeight() called on TintWithoutLevelOverrider. Object is for tinting only."); }
-		throw new UnsupportedOperationException("ERROR: getMinBuildHeight() called on TintWithoutLevelOverrider. Object is for tinting only.");
+	#else
-	}
+	@Override
+	public int getMinY()
+	{ throw new UnsupportedOperationException("ERROR: getMinY() called on TintWithoutLevelOverrider. Object is for tinting only."); }
+	#endif
+	
 	#endif
 	
 }

common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/TintWithoutLevelSmoothOverrider.java

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by
@@ -39,11 +39,24 @@ public class TintWithoutLevelSmoothOverrider implements BlockAndTintGetter
 	final BiomeWrapper biome;
 	public int smoothingRange;
 	
+	
+	
+	//=============//
+	// constructor //
+	//=============//
+	
 	public TintWithoutLevelSmoothOverrider(BiomeWrapper biome, int smoothingRange)
 	{
 		this.biome = biome;
 		this.smoothingRange = smoothingRange;
 	}
+	
+	
+	
+	//=========//
+	// methods //
+	//=========//
+	
 	@Override
 	public int getBlockTint(BlockPos blockPos, ColorResolver colorResolver)
 	{
@@ -57,7 +70,7 @@ public class TintWithoutLevelSmoothOverrider implements BlockAndTintGetter
 		return biome;
 		#endif
 	}
-//
+
 //    public int calculateBlockTint(BlockPos blockPos, ColorResolver colorResolver)
 //    {
 //        int i = smoothingRange;
@@ -89,44 +102,43 @@ public class TintWithoutLevelSmoothOverrider implements BlockAndTintGetter
 	
 	@Override
 	public float getShade(Direction direction, boolean shade)
-	{
+	{ throw new UnsupportedOperationException("ERROR: getShade() called on TintWithoutLevelSmoothOverrider. Object is for tinting only."); }
-		throw new UnsupportedOperationException("ERROR: getShade() called on TintWithoutLevelOverrider. Object is for tinting only.");
-	}
 	@Override
 	public LevelLightEngine getLightEngine()
-	{
+	{ throw new UnsupportedOperationException("ERROR: getLightEngine() called on TintWithoutLevelSmoothOverrider. Object is for tinting only."); }
-		throw new UnsupportedOperationException("ERROR: getLightEngine() called on TintWithoutLevelOverrider. Object is for tinting only.");
-	}
 	@Nullable
 	@Override
 	public BlockEntity getBlockEntity(BlockPos pos)
-	{
+	{ throw new UnsupportedOperationException("ERROR: getBlockEntity() called on TintWithoutLevelSmoothOverrider. Object is for tinting only."); }
-		throw new UnsupportedOperationException("ERROR: getBlockEntity() called on TintWithoutLevelOverrider. Object is for tinting only.");
-	}
 	
 	@Override
 	public BlockState getBlockState(BlockPos pos)
-	{
+	{ throw new UnsupportedOperationException("ERROR: getBlockState() called on TintWithoutLevelSmoothOverrider. Object is for tinting only."); }
-		throw new UnsupportedOperationException("ERROR: getBlockState() called on TintWithoutLevelOverrider. Object is for tinting only.");
-	}
 	@Override
 	public FluidState getFluidState(BlockPos pos)
-	{
+	{ throw new UnsupportedOperationException("ERROR: getFluidState() called on TintWithoutLevelSmoothOverrider. Object is for tinting only."); }
-		throw new UnsupportedOperationException("ERROR: getFluidState() called on TintWithoutLevelOverrider. Object is for tinting only.");
-	}
 	
 	
+	//==============//
+	// post MC 1.17 //
+	//==============//
+	
 	#if MC_VER >= MC_1_17_1
+	
 	@Override
 	public int getHeight()
-	{
+	{ throw new UnsupportedOperationException("ERROR: getHeight() called on TintWithoutLevelSmoothOverrider. Object is for tinting only."); }
-		throw new UnsupportedOperationException("ERROR: getHeight() called on TintWithoutLevelOverrider. Object is for tinting only.");
+	
-	}
+	#if MC_VER < MC_1_21_3
 	@Override
-	public int getMinBuildHeight()
+	public int getMinBuildHeight() 
-	{
+	{ throw new UnsupportedOperationException("ERROR: getMinBuildHeight() called on TintWithoutLevelSmoothOverrider. Object is for tinting only."); }
-		throw new UnsupportedOperationException("ERROR: getMinBuildHeight() called on TintWithoutLevelOverrider. Object is for tinting only.");
+	#else
-	}
+	@Override
+	public int getMinY()
+	{ throw new UnsupportedOperationException("ERROR: getMinY() called on TintWithoutLevelSmoothOverrider. Object is for tinting only."); }
+	#endif
+	
 	#endif
 	
 }

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

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by
@@ -16,19 +16,16 @@
  *    You should have received a copy of the GNU Lesser General Public License
  *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-
 package com.seibel.distanthorizons.common.wrappers.chunk;
 
 import com.seibel.distanthorizons.common.wrappers.block.BiomeWrapper;
 import com.seibel.distanthorizons.common.wrappers.block.BlockStateWrapper;
 import com.seibel.distanthorizons.common.wrappers.misc.MutableBlockPosWrapper;
-import com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject.DhLitWorldGenRegion;
+import com.seibel.distanthorizons.core.config.Config;
-import com.seibel.distanthorizons.core.api.internal.SharedApi;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.pos.blockPos.DhBlockPos;
 import com.seibel.distanthorizons.core.pos.DhChunkPos;
 import com.seibel.distanthorizons.core.util.LodUtil;
-import com.seibel.distanthorizons.core.world.EWorldEnvironment;
 import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.ChunkLightStorage;
 import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
@@ -36,19 +33,14 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IMutableBlockPosWr
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper;
 
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
-import net.minecraft.client.multiplayer.ClientChunkCache;
-import net.minecraft.client.multiplayer.ClientLevel;
 import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.LevelReader;
-import net.minecraft.world.level.LightLayer;
 import net.minecraft.world.level.chunk.ChunkAccess;
-import net.minecraft.world.level.chunk.LevelChunk;
+import net.minecraft.world.level.chunk.ProtoChunk;
 import net.minecraft.world.level.levelgen.Heightmap;
 
 import org.apache.logging.log4j.Logger;
 
 import java.util.*;
-import java.util.concurrent.ConcurrentLinkedQueue;
 
 #if MC_VER >= MC_1_17_1
 import net.minecraft.core.QuartPos;
@@ -72,8 +64,6 @@ import net.minecraft.world.level.chunk.LevelChunkSection;
 
 #if MC_VER >= MC_1_20_1
 import net.minecraft.world.level.chunk.LevelChunkSection;
-import net.minecraft.world.level.lighting.LevelLightEngine;
-import net.minecraft.core.SectionPos;
 #endif
 
 #if MC_VER <= MC_1_20_4
@@ -94,13 +84,10 @@ public class ChunkWrapper implements IChunkWrapper
 	
 	private final ChunkAccess chunk;
 	private final DhChunkPos chunkPos;
-	private final LevelReader lightSource;
 	private final ILevelWrapper wrappedLevel;
 	
 	private boolean isDhBlockLightCorrect = false;
 	private boolean isDhSkyLightCorrect = false;
-	/** only used when connected to a dedicated server */
-	private boolean isMcClientLightingCorrect = false;
 	
 	private ChunkLightStorage blockLightStorage;
 	private ChunkLightStorage skyLightStorage;
@@ -110,19 +97,36 @@ public class ChunkWrapper implements IChunkWrapper
 	private int minNonEmptyHeight = Integer.MIN_VALUE;
 	private int maxNonEmptyHeight = Integer.MAX_VALUE;
 	
+	/** will be null if we are using MC heightmaps */
+	private final int[][] solidHeightMap;
+	/** will be null if we are using MC heightmaps */
+	private final int[][] lightBlockingHeightMap;
+	
 	
 	
 	//=============//
 	// constructor //
 	//=============//
 	
-	public ChunkWrapper(ChunkAccess chunk, LevelReader lightSource, ILevelWrapper wrappedLevel)
+	public ChunkWrapper(ChunkAccess chunk, ILevelWrapper wrappedLevel)
 	{
 		this.chunk = chunk;
-		this.lightSource = lightSource;
 		this.wrappedLevel = wrappedLevel;
 		this.chunkPos = new DhChunkPos(chunk.getPos().x, chunk.getPos().z);
 		
+		// use DH heightmaps if requested
+		if (Config.Common.LodBuilding.recalculateChunkHeightmaps.get())
+		{
+			this.solidHeightMap = new int[LodUtil.CHUNK_WIDTH][LodUtil.CHUNK_WIDTH];
+			this.lightBlockingHeightMap = new int[LodUtil.CHUNK_WIDTH][LodUtil.CHUNK_WIDTH];
+			
+			this.recalculateDhHeightMapsIfNeeded();
+		}
+		else
+		{
+			this.solidHeightMap = null;
+			this.lightBlockingHeightMap = null;
+		}
 	}
 	
 	
@@ -143,19 +147,29 @@ public class ChunkWrapper implements IChunkWrapper
 	}
 	
 	@Override
-	public int getMinBuildHeight() { return getMinBuildHeight(this.chunk); }
+	public int getInclusiveMinBuildHeight() { return getInclusiveMinBuildHeight(this.chunk); }
-	public static int getMinBuildHeight(ChunkAccess chunk)
+	public static int getInclusiveMinBuildHeight(ChunkAccess chunk)
 	{
 		#if MC_VER < MC_1_17_1
 		return 0;
-		#else
+		#elif MC_VER < MC_1_21_3
 		return chunk.getMinBuildHeight();
+		#else
+		return chunk.getMinY();
 		#endif
 	}
 	
 	@Override
-	public int getMaxBuildHeight() { return getMaxBuildHeight(this.chunk); }
+	public int getExclusiveMaxBuildHeight() { return getExclusiveMaxBuildHeight(this.chunk); }
-	public static int getMaxBuildHeight(ChunkAccess chunk) { return chunk.getMaxBuildHeight(); }
+	public static int getExclusiveMaxBuildHeight(ChunkAccess chunk) 
+	{
+		#if MC_VER < MC_1_21_3
+		return chunk.getMaxBuildHeight();
+		#else
+		// +1 since Minecraft made the max value inclusive
+		return chunk.getMaxY() + 1;
+		#endif
+	}
 	
 	@Override
 	public int getMinNonEmptyHeight()
@@ -167,7 +181,7 @@ public class ChunkWrapper implements IChunkWrapper
 		
 		
 		// default if every section is empty or missing
-		this.minNonEmptyHeight = this.getMinBuildHeight();
+		this.minNonEmptyHeight = this.getInclusiveMinBuildHeight();
 		
 		// determine the lowest empty section (bottom up)
 		LevelChunkSection[] sections = this.chunk.getSections();
@@ -199,7 +213,7 @@ public class ChunkWrapper implements IChunkWrapper
 		
 		
 		// default if every section is empty or missing
-		this.maxNonEmptyHeight = this.getMaxBuildHeight();
+		this.maxNonEmptyHeight = this.getExclusiveMaxBuildHeight();
 		
 		// determine the highest empty section (top down)
 		LevelChunkSection[] sections = this.chunk.getSections();
@@ -232,14 +246,92 @@ public class ChunkWrapper implements IChunkWrapper
 		return section.hasOnlyAir();
 		#endif
 	}
-	private int getChunkSectionMinHeight(int index) { return (index * 16) + this.getMinBuildHeight(); }
+	private int getChunkSectionMinHeight(int index) { return (index * 16) + this.getInclusiveMinBuildHeight(); }
 	
+	/** Will only run if the config says the MC heightmaps shouldn't be trusted. */
+	public void recalculateDhHeightMapsIfNeeded()
+	{
+		// re-calculate the min/max heights for consistency (during world gen these may be wrong)
+		this.minNonEmptyHeight = Integer.MIN_VALUE;
+		this.maxNonEmptyHeight = Integer.MAX_VALUE;
+		
+		
+		// recalculate heightmaps if needed
+		if (this.solidHeightMap != null)
+		{
+			for (int x = 0; x < LodUtil.CHUNK_WIDTH; x++)
+			{
+				for (int z = 0; z < LodUtil.CHUNK_WIDTH; z++)
+				{
+					int minInclusiveBuildHeight = this.getMinNonEmptyHeight();
+					// if no blocks are found the height map will be at the bottom of the world
+					int solidHeight = minInclusiveBuildHeight;
+					int lightBlockingHeight = minInclusiveBuildHeight;
+					
+					
+					int y = this.getMaxNonEmptyHeight(); //this.getExclusiveMaxBuildHeight();
+					IBlockStateWrapper block = this.getBlockState(x, y, z);
+					while (// go down until we reach the minimum build height
+							y > minInclusiveBuildHeight
+							// keep going until we find both height map values
+							&& (solidHeight == minInclusiveBuildHeight || lightBlockingHeight == minInclusiveBuildHeight))
+					{
+						// is this block solid?
+						if (solidHeight == minInclusiveBuildHeight
+							&& block.isSolid())
+						{
+							solidHeight = y;
+						}
+						
+						// is this block light blocking?
+						if (lightBlockingHeight == minInclusiveBuildHeight
+							&& block.getOpacity() != LodUtil.BLOCK_FULLY_TRANSPARENT)
+						{
+							lightBlockingHeight = y;
+						}
+						
+						// get the next block down
+						y--;
+						block = this.getBlockState(x, y, z);
+					}
+					
+					this.solidHeightMap[x][z] = solidHeight;
+					this.lightBlockingHeightMap[x][z] = lightBlockingHeight;
+				}
+			}
+		}
+	}
 	
 	@Override
-	public int getSolidHeightMapValue(int xRel, int zRel) { return this.chunk.getOrCreateHeightmapUnprimed(Heightmap.Types.WORLD_SURFACE).getFirstAvailable(xRel, zRel); }
+	public int getSolidHeightMapValue(int xRel, int zRel) 
+	{ 
+		this.throwIndexOutOfBoundsIfRelativePosOutsideChunkBounds(xRel, zRel);
+		
+		// will be null if we want to use MC heightmaps
+		if (this.solidHeightMap == null)
+		{
+			return this.chunk.getOrCreateHeightmapUnprimed(Heightmap.Types.WORLD_SURFACE).getFirstAvailable(xRel, zRel);	
+		}
+		else
+		{
+			return this.solidHeightMap[xRel][zRel];
+		}
+	}
 	
 	@Override
-	public int getLightBlockingHeightMapValue(int xRel, int zRel) { return this.chunk.getOrCreateHeightmapUnprimed(Heightmap.Types.MOTION_BLOCKING).getFirstAvailable(xRel, zRel); }
+	public int getLightBlockingHeightMapValue(int xRel, int zRel) 
+	{
+		this.throwIndexOutOfBoundsIfRelativePosOutsideChunkBounds(xRel, zRel);
+		
+		if (this.lightBlockingHeightMap == null)
+		{
+			return this.chunk.getOrCreateHeightmapUnprimed(Heightmap.Types.MOTION_BLOCKING).getFirstAvailable(xRel, zRel);
+		}
+		else
+		{
+			return this.lightBlockingHeightMap[xRel][zRel];
+		} 
+	}
 	
 	
 	@Override
@@ -276,6 +368,7 @@ public class ChunkWrapper implements IChunkWrapper
 		blockPos.setY(relY);
 		blockPos.setZ(relZ);
 		
+		// TODO copy into pooled array, this isn't thread safe and can cause MC to throw errors if the chunk is loaded
 		return BlockStateWrapper.fromBlockState(this.chunk.getBlockState(blockPos), this.wrappedLevel);
 	}
 	
@@ -292,6 +385,91 @@ public class ChunkWrapper implements IChunkWrapper
 		return BlockStateWrapper.fromBlockState(this.chunk.getBlockState(pos), this.wrappedLevel, guess);
 	}
 	
+	/**
+	
+	 // Commented out experimental LevelChunkSection cloning logic to fix extremely rare concurrency modification issue
+	 // James has only ever seen a report relating to LevelSection concurrent modification once,
+	 // the issue can cause DH lighting/LOD building to fail due to the chunk being modified on the server.
+	 // James has only heard of this issue once, so it isn't a high priority issue.
+	 // And from James' quick look at a few different MC versions it appears the LevelChunkSection object changes quite drastically between MC versions,
+	 // meaning any cloning logic would have to either be a new wrapper or very MC version dependent, either way a lot of additional work.
+	 // Due to the large time cost and extremely rare nature of the issue, this logic is commented out unless this issue pops up again in the future. 
+	
+	 // instance variable to hold the cloned sections
+	private final LevelChunkSection[] levelChunkSections;
+	
+	 // new constructor logic to clone the sections
+	public constructor(...)
+	{
+		// other constructor logic //
+		
+		LevelChunkSection[] sections = this.chunk.getSections();	 
+		this.levelChunkSections = new LevelChunkSection[sections.length];
+		for (int i = 0; i < sections.length; i++)
+		{
+			LevelChunkSection section = sections[i];
+			if (section != null)
+			{
+	            // TODO implement section cloning for older MC versions, only 1.21.4 MC (and maybe other semi recent versions) have a clean way to handle this
+	            // TODO we probably want a wrapper object instead
+				#if MC_VER < MC_1_21_4
+				this.levelChunkSections[i] = section;
+				#else
+				this.levelChunkSections[i] = section.copy();
+				#endif
+			}
+		}
+	}
+	
+	 // replacement getters
+	@Override
+	public IBlockStateWrapper getBlockState(int relX, int relY, int relZ)
+	{
+		this.throwIndexOutOfBoundsIfRelativePosOutsideChunkBounds(relX, relY, relZ);
+		return this.getBlockStateInternal(relX, relY, relZ, null);
+	}
+	
+	@Override
+	public IBlockStateWrapper getBlockState(int relX, int relY, int relZ, IMutableBlockPosWrapper mcBlockPos, IBlockStateWrapper guess)
+	{
+		this.throwIndexOutOfBoundsIfRelativePosOutsideChunkBounds(relX, relY, relZ);
+		return this.getBlockStateInternal(relX, relY, relZ, guess);
+	}
+	
+	// internal getter logic
+	private IBlockStateWrapper getBlockStateInternal(int relX, int y, int relZ, @Nullable IBlockStateWrapper guess)
+	{
+		try
+		{
+			// attempt to get the section for this position
+			int i = (y - this.getInclusiveMinBuildHeight()) / 16;
+			if (i >= 0 && i < this.levelChunkSections.length)
+			{
+				LevelChunkSection section = this.levelChunkSections[i];
+				if (!section.hasOnlyAir())
+				{
+					if (guess != null)
+					{
+						return BlockStateWrapper.fromBlockState(section.getBlockState(relX & 15, y & 15, relZ & 15), this.wrappedLevel, guess);
+					}
+					else
+					{
+						return BlockStateWrapper.fromBlockState(section.getBlockState(relX & 15, y & 15, relZ & 15), this.wrappedLevel);
+					}
+				}
+			}
+			
+			return BlockStateWrapper.AIR;
+		}
+		catch (Exception e)
+		{
+			return BlockStateWrapper.AIR;
+		}
+	}
+	 */
+	
+	
+	
 	@Override
 	public IMutableBlockPosWrapper getMutableBlockPosWrapper() { return MUTABLE_BLOCK_POS_WRAPPER_REF.get(); }
 	
@@ -300,6 +478,20 @@ public class ChunkWrapper implements IChunkWrapper
 	
 	public ChunkAccess getChunk() { return this.chunk; }
 	
+	public void trySetStatus(ChunkStatus status) { trySetStatus(this.getChunk(), status); }
+	/** does nothing if the chunk object doesn't support setting it's status */
+	public static void trySetStatus(ChunkAccess chunk, ChunkStatus status)
+	{
+		if (chunk instanceof ProtoChunk)
+		{
+			#if MC_VER < MC_1_21_1
+			((ProtoChunk) chunk).setStatus(status);
+			#else
+			((ProtoChunk) chunk).setPersistedStatus(status);
+			#endif
+		}
+	}
+	
 	public ChunkStatus getStatus() { return getStatus(this.getChunk()); }
 	public static ChunkStatus getStatus(ChunkAccess chunk)
 	{
@@ -429,32 +621,6 @@ public class ChunkWrapper implements IChunkWrapper
 	// other methods //
 	//===============//
 	
-	@Override
-	public boolean doNearbyChunksExist()
-	{
-		if (this.lightSource instanceof DhLitWorldGenRegion)
-		{
-			return true;
-		}
-		
-		for (int dx = -1; dx <= 1; dx++)
-		{
-			for (int dz = -1; dz <= 1; dz++)
-			{
-				if (dx == 0 && dz == 0)
-				{
-					continue;
-				}
-				else if (this.lightSource.getChunk(dx + this.chunk.getPos().x, dz + this.chunk.getPos().z, ChunkStatus.BIOMES, false) == null)
-				{
-					return false;
-				}
-			}
-		}
-		
-		return true;
-	}
-	
 	@Override
 	public boolean isStillValid() { return this.wrappedLevel.tryGetChunk(this.chunkPos) == this; }
 	

common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/ClassicConfigGUI.java

@@ -16,7 +16,6 @@ import java.util.regex.Pattern;
 // Logger (for debug stuff)
 
 import com.seibel.distanthorizons.api.enums.config.DisallowSelectingViaConfigGui;
-import com.seibel.distanthorizons.api.enums.config.EDhApiUpdateBranch;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.config.ConfigBase;
 import com.seibel.distanthorizons.core.config.types.*;
@@ -119,14 +118,18 @@ public class ClassicConfigGUI
 	 */
 	private static void textField(AbstractConfigType info, Function<String, Number> func, Pattern pattern, boolean cast)
 	{
-		boolean isNumber = pattern != null;
 		((EntryInfo) info.guiValue).widget = (BiFunction<EditBox, Button, Predicate<String>>) (editBox, button) -> stringValue ->
 		{
+			boolean isNumber = (pattern != null);
+			
 			stringValue = stringValue.trim();
 			if (!(stringValue.isEmpty() || !isNumber || pattern.matcher(stringValue).matches()))
+			{
 				return false;
+			}
 			
-			Number value = 0;
+			
+			Number value = info.typeIsFloatingPointNumber() ? 0.0 : 0; // different default values are needed so implicit casting works correctly (if not done casting from 0 (an int) to a double will cause an exception)
 			((EntryInfo) info.guiValue).error = null;
 			if (isNumber && !stringValue.isEmpty() && !stringValue.equals("-") && !stringValue.equals("."))
 			{
@@ -143,18 +146,22 @@ public class ClassicConfigGUI
 				switch (isValid)
 				{
 					case 0:
-						((EntryInfo) info.guiValue).error = null; break;
+						((EntryInfo) info.guiValue).error = null; 
+						break;
 					case -1:
-						((EntryInfo) info.guiValue).error = new AbstractMap.SimpleEntry<>(editBox, TextOrTranslatable("§cMinimum length is " + ((ConfigEntry) info).getMin())); break;
+						((EntryInfo) info.guiValue).error = new AbstractMap.SimpleEntry<>(editBox, TextOrTranslatable("§cMinimum length is " + ((ConfigEntry) info).getMin())); 
+						break;
 					case 1:
-						((EntryInfo) info.guiValue).error = new AbstractMap.SimpleEntry<>(editBox, TextOrTranslatable("§cMaximum length is " + ((ConfigEntry) info).getMax())); break;
+						((EntryInfo) info.guiValue).error = new AbstractMap.SimpleEntry<>(editBox, TextOrTranslatable("§cMaximum length is " + ((ConfigEntry) info).getMax())); 
+						break;
 					case 2:
-						((EntryInfo) info.guiValue).error = new AbstractMap.SimpleEntry<>(editBox, TextOrTranslatable("§cValue is invalid")); break;
+						((EntryInfo) info.guiValue).error = new AbstractMap.SimpleEntry<>(editBox, TextOrTranslatable("§cValue is invalid")); 
+						break;
 				}
 			}
 			
 			((EntryInfo) info.guiValue).tempValue = stringValue;
-			editBox.setTextColor(((ConfigEntry) info).isValid(value) == 0 ? 0xFFFFFFFF : 0xFFFF7777);
+			editBox.setTextColor(((ConfigEntry) info).isValid(value) == 0 ? 0xFFFFFFFF : 0xFFFF7777); // white and red
 //            button.active = entries.stream().allMatch(e -> e.inLimits);
 			
 			
@@ -310,10 +317,13 @@ public class ClassicConfigGUI
 				}
 				catch (Exception e)
 				{
-					System.out.println("ERROR: Failed to show [" + info.getNameWCategory() + "]");
+					String message = "ERROR: Failed to show [\" + info.getNameWCategory() + \"], error: ["+e.getMessage()+"]";
 					if (info.get() != null)
-						System.out.print(" with the value [" + info.get() + "] with type [" + info.getType() + "]");
+					{
-					e.printStackTrace();
+						message += " with the value [" + info.get() + "] with type [" + info.getType() + "]";
+					}
+					
+					LOGGER.error(message, e);
 				}
 			}
 			
@@ -387,9 +397,9 @@ public class ClassicConfigGUI
 				this.list.addButton(null, null, null, name);
 				return;
 			}
-			if (ConfigLinkedEntry.class.isAssignableFrom(info.getClass()))
+			if (ConfigUiLinkedEntry.class.isAssignableFrom(info.getClass()))
 			{
-				this.addMenuItem(((ConfigLinkedEntry) info).get());
+				this.addMenuItem(((ConfigUiLinkedEntry) info).get());
 				return;
 			}
 			
@@ -438,8 +448,8 @@ public class ClassicConfigGUI
 						}
 						
 						// A quick fix for tooltips on linked entries
-						AbstractConfigType newInfo = ConfigLinkedEntry.class.isAssignableFrom(info.getClass()) ?
+						AbstractConfigType newInfo = ConfigUiLinkedEntry.class.isAssignableFrom(info.getClass()) ?
-								((ConfigLinkedEntry) info).get() :
+								((ConfigUiLinkedEntry) info).get() :
 								info;
 						
 						Component name = Translatable(this.translationPrefix + (info.category.isEmpty() ? "" : info.category + ".") + info.getName());
@@ -472,47 +482,47 @@ public class ClassicConfigGUI
 	
 	
 	
-	private static void initEntry(AbstractConfigType info, String translationPrefix)
+	private static void initEntry(AbstractConfigType configType, String translationPrefix)
 	{
-		info.guiValue = new EntryInfo();
+		configType.guiValue = new EntryInfo();
-		Class<?> fieldClass = info.getType();
+		Class<?> fieldClass = configType.getType();
 		
-		if (ConfigEntry.class.isAssignableFrom(info.getClass()))
+		if (ConfigEntry.class.isAssignableFrom(configType.getClass()))
 		{
 			if (fieldClass == Integer.class)
 			{
 				// For int
-				textField(info, Integer::parseInt, INTEGER_ONLY_REGEX, true);
+				textField(configType, Integer::parseInt, INTEGER_ONLY_REGEX, true);
 			}
 			else if (fieldClass == Double.class)
 			{
 				// For double
-				textField(info, Double::parseDouble, DECIMAL_ONLY_REGEX, false);
+				textField(configType, Double::parseDouble, DECIMAL_ONLY_REGEX, false);
 			}
 			else if (fieldClass == String.class || fieldClass == List.class)
 			{
 				// For string or list
-				textField(info, String::length, null, true);
+				textField(configType, String::length, null, true);
 			}
 			else if (fieldClass == Boolean.class)
 			{
 				// For boolean
 				Function<Object, Component> func = value -> Translatable("distanthorizons.general."+((Boolean) value ? "true" : "false")).withStyle((Boolean) value ? ChatFormatting.GREEN : ChatFormatting.RED);
 				
-				((EntryInfo) info.guiValue).widget = new AbstractMap.SimpleEntry<Button.OnPress, Function<Object, Component>>(button -> {
+				((EntryInfo) configType.guiValue).widget = new AbstractMap.SimpleEntry<Button.OnPress, Function<Object, Component>>(button -> {
-					((ConfigEntry) info).uiSetWithoutSaving(!(Boolean) info.get());
+					((ConfigEntry) configType).uiSetWithoutSaving(!(Boolean) configType.get());
-					button.setMessage(func.apply(info.get()));
+					button.setMessage(func.apply(configType.get()));
 				}, func);
 			}
 			else if (fieldClass.isEnum())
 			{
 				// For enum
-				List<?> values = Arrays.asList(info.getType().getEnumConstants());
+				List<?> values = Arrays.asList(configType.getType().getEnumConstants());
-				Function<Object, Component> func = value -> Translatable(translationPrefix + "enum." + fieldClass.getSimpleName() + "." + info.get().toString());
+				Function<Object, Component> func = value -> Translatable(translationPrefix + "enum." + fieldClass.getSimpleName() + "." + configType.get().toString());
-				((EntryInfo) info.guiValue).widget = new AbstractMap.SimpleEntry<Button.OnPress, Function<Object, Component>>(button -> {
+				((EntryInfo) configType.guiValue).widget = new AbstractMap.SimpleEntry<Button.OnPress, Function<Object, Component>>(button -> {
 					
 					// get the currently selected enum and enum index
-					int startingIndex = values.indexOf(info.get());
+					int startingIndex = values.indexOf(configType.get());
 					Enum<?> enumValue = (Enum<?>) values.get(startingIndex);
 					
 					// search for the next enum that is selectable
@@ -540,12 +550,12 @@ public class ClassicConfigGUI
 					}
 					
 					
-					((ConfigEntry<Enum<?>>) info).uiSetWithoutSaving(enumValue);
+					((ConfigEntry<Enum<?>>) configType).uiSetWithoutSaving(enumValue);
-					button.setMessage(func.apply(info.get()));
+					button.setMessage(func.apply(configType.get()));
 				}, func);
 			}
 		}
-		else if (ConfigCategory.class.isAssignableFrom(info.getClass()))
+		else if (ConfigCategory.class.isAssignableFrom(configType.getClass()))
 		{
 //            if (!info.info.getName().equals(""))
 //                info.name = new TranslatableComponent(info.info.getName());

common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/TexturedButtonWidget.java

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by
@@ -19,31 +19,37 @@
 
 package com.seibel.distanthorizons.common.wrappers.gui;
 
-/**
- * Creates a button with a texture on it (and a background) that works with all mc versions
- * 
- * @author coolGi
- * @version 2023-10-03
- */
-
-
-import com.mojang.blaze3d.systems.RenderSystem;
-import net.minecraft.client.gui.components.AbstractButton;
-import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.components.ImageButton;
 import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 
 #if MC_VER >= MC_1_17_1
-import net.minecraft.client.renderer.GameRenderer;
+import net.minecraft.client.gui.components.Button;
-#endif
-#if MC_VER < MC_1_20_1
-import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.client.Minecraft;
-#else
-import net.minecraft.client.gui.GuiGraphics;
 #endif
 
+#if MC_VER < MC_1_17_1
+import net.minecraft.client.gui.components.ImageButton;
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.Minecraft;
+#elif MC_VER < MC_1_20_1
+import net.minecraft.client.gui.components.ImageButton;
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.blaze3d.systems.RenderSystem;
+import net.minecraft.client.renderer.GameRenderer;
+#elif MC_VER < MC_1_20_2
+import net.minecraft.client.gui.components.ImageButton;
+import net.minecraft.client.gui.GuiGraphics;
+#else
+import net.minecraft.client.gui.GuiGraphics;
+import net.minecraft.client.renderer.RenderType;
+#endif
+
+/**
+ * Creates a button with a texture on it (and a background) that works with all mc versions
+ *
+ * @author coolGi
+ * @version 2023-10-03
+ */
 #if MC_VER < MC_1_20_2
 public class TexturedButtonWidget extends ImageButton
 #else
@@ -57,20 +63,21 @@ public class TexturedButtonWidget extends Button
 	private final int v;
 	private final int hoveredVOffset;
 	
-	private final ResourceLocation texture;
+	private final ResourceLocation textureResourceLocation;
 	
 	private final int textureWidth;
 	private final int textureHeight;
 	#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, Component text) {
+	public TexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, ResourceLocation textureResourceLocation, int textureWidth, int textureHeight, OnPress pressAction, Component text) 
-		this(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, pressAction, text, true);
+	{
+		this(x, y, width, height, u, v, hoveredVOffset, textureResourceLocation, textureWidth, textureHeight, pressAction, text, true);
 	}
-	public TexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, ResourceLocation texture, int textureWidth, int textureHeight, OnPress pressAction, Component text, boolean renderBackground)
+	public TexturedButtonWidget(int x, int y, int width, int height, int u, int v, int hoveredVOffset, ResourceLocation textureResourceLocation, int textureWidth, int textureHeight, OnPress pressAction, Component text, boolean renderBackground)
 	{
 		#if MC_VER < MC_1_20_2
-		super(x, y, width, height, u, v, hoveredVOffset, texture, textureWidth, textureHeight, pressAction, text);
+		super(x, y, width, height, u, v, hoveredVOffset, textureResourceLocation, textureWidth, textureHeight, pressAction, text);
 		#else
 		// We don't pass on the text option as otherwise it will render (we normally pass it for narration)
 		// TODO: Find a fix for it
@@ -80,7 +87,7 @@ public class TexturedButtonWidget extends Button
 		this.v = v;
 		this.hoveredVOffset = hoveredVOffset;
 		
-		this.texture = texture;
+		this.textureResourceLocation = textureResourceLocation;
 		
 		this.textureWidth = textureWidth;
 		this.textureHeight = textureHeight;
@@ -92,7 +99,8 @@ public class TexturedButtonWidget extends Button
 	#if MC_VER < MC_1_20_2
 	#if MC_VER < MC_1_19_4
 	@Override
-	public void renderButton(PoseStack matrices, int mouseX, int mouseY, float delta) {
+	public void renderButton(PoseStack matrices, int mouseX, int mouseY, float delta) 
+	{
 		if (this.renderBackground) // Renders the background of the button
 		{
 			#if MC_VER < MC_1_17_1
@@ -119,6 +127,7 @@ public class TexturedButtonWidget extends Button
 
 		super.renderButton(matrices, mouseX, mouseY, delta);
 	}
+	
 	#else
     #if MC_VER < MC_1_20_1
 	@Override
@@ -154,24 +163,49 @@ public class TexturedButtonWidget extends Button
 		super.renderWidget(matrices, mouseX, mouseY, delta);
 	}
 	#endif
+	
 	#else
 	@Override
 	public void renderWidget(GuiGraphics matrices, int mouseX, int mouseY, float delta)
 	{
 		if (this.renderBackground)
 		{
-			//RenderSystem.enableBlend();
+			#if MC_VER < MC_1_21_3
-			//RenderSystem.enableDepthTest();
 			matrices.blitSprite(SPRITES.get(this.active, this.isHoveredOrFocused()), this.getX(), this.getY(), this.getWidth(), this.getHeight());
+			#else
+			matrices.blitSprite(
+				RenderType::guiTextured,
+				SPRITES.get(this.active, this.isHoveredOrFocused()),
+				this.getX(), this.getY(),
+				this.getWidth(), this.getHeight());
+
+			#endif
 		}
 		
 		
 		// Renders the sprite
 		int i = 0;
-		if (!this.active)           i = 2;
+		if (!this.active)
-		else if (this.isHovered)    i = 1;
+		{
+			i = 2;
+		}
+		else if (this.isHovered)
+		{
+			i = 1;
+		}
 		
-		matrices.blit(this.texture, this.getX(), this.getY(), this.u, this.v + (this.hoveredVOffset * i), this.width, this.height, this.textureWidth, this.textureHeight);
+		#if MC_VER < MC_1_21_3
+		matrices.blit(this.textureResourceLocation, this.getX(), this.getY(), this.u, this.v + (this.hoveredVOffset * i), this.width, this.height, this.textureWidth, this.textureHeight);
+		#else
+		matrices.blit(
+				RenderType::guiTextured,
+				this.textureResourceLocation,
+				this.getX(), this.getY(),
+				this.u, this.v + (this.hoveredVOffset * i),
+				this.width, this.height,
+				this.textureWidth, this.textureHeight);
+
+		#endif
 	}
 	#endif
 }

common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/ChangelogScreen.java

@@ -1,8 +1,8 @@
 package com.seibel.distanthorizons.common.wrappers.gui.updater;
 
-import com.mojang.blaze3d.vertex.PoseStack;
 import com.seibel.distanthorizons.common.wrappers.gui.DhScreen;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.wrapperInterfaces.IVersionConstants;
 import com.seibel.distanthorizons.coreapi.ModInfo;
 import com.seibel.distanthorizons.core.jar.installer.MarkdownFormatter;
@@ -14,6 +14,7 @@ import net.minecraft.client.gui.components.ContainerObjectSelectionList;
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
+import org.apache.logging.log4j.Logger;
 
 #if MC_VER >= MC_1_17_1
 import net.minecraft.client.gui.narration.NarratableEntry;
@@ -21,6 +22,7 @@ import net.minecraft.client.gui.narration.NarratableEntry;
 
 #if MC_VER < MC_1_20_1
 import net.minecraft.client.gui.GuiComponent;
+import com.mojang.blaze3d.vertex.PoseStack;
 #else
 import net.minecraft.client.gui.GuiGraphics;
 #endif
@@ -39,6 +41,9 @@ import java.util.*;
 // TODO: Make this
 public class ChangelogScreen extends DhScreen
 {
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	
+	
 	private Screen parent;
 	private String versionID;
 	private List<String> changelog;
@@ -51,24 +56,32 @@ public class ChangelogScreen extends DhScreen
 		this(parent, null);
 		
 		if (!ModrinthGetter.initted) // Make sure the modrinth stuff is initted
+		{
 			ModrinthGetter.init();
+		}
 		if (!ModrinthGetter.initted) // If its not initted, then this isnt usable
+		{
 			return;
+		}
 		
 		if (!ModrinthGetter.mcVersions.contains(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion()))
+		{
 			return;
+		}
 		
 		String versionID = ModrinthGetter.getLatestIDForVersion(SingletonInjector.INSTANCE.get(IVersionConstants.class).getMinecraftVersion());
 		if (versionID == null)
+		{
 			return;
+		}
 		try
 		{
-			setupChangelog(versionID);
+			this.setupChangelog(versionID);
-			usable = true;
+			this.usable = true;
 		}
 		catch (Exception e)
 		{
-			e.printStackTrace();
+			LOGGER.error("failed to setup changelog, error: ["+e.getMessage()+"].", e);
 		}
 	}
 	
@@ -80,11 +93,13 @@ public class ChangelogScreen extends DhScreen
 		
 		
 		if (versionID == null)
+		{
 			return;
+		}
 		try
 		{
-			setupChangelog(versionID);
+			this.setupChangelog(versionID);
-			usable = true;
+			this.usable = true;
 		}
 		catch (Exception e)
 		{
@@ -129,8 +144,10 @@ public class ChangelogScreen extends DhScreen
 	protected void init()
 	{
 		super.init();
-		if (!usable)
+		if (!this.usable)
+		{
 			return;
+		}
 		
 		
 		this.addBtn( // Close
@@ -141,9 +158,9 @@ public class ChangelogScreen extends DhScreen
 		
 		
 		this.changelogArea = new TextArea(this.minecraft, this.width * 2, this.height, 32, 32, 10);
-		for (int i = 0; i < changelog.size(); i++)
+		for (int i = 0; i < this.changelog.size(); i++)
 		{
-			this.changelogArea.addButton(TextOrLiteral(changelog.get(i)));
+			this.changelogArea.addButton(TextOrLiteral(this.changelog.get(i)));
 //            drawString(matrices, this.font, changelog.get(i), this.width / 2 - 175, this.height / 2 - 100 + i*10, 0xFFFFFF);
 		}
 		
@@ -161,29 +178,41 @@ public class ChangelogScreen extends DhScreen
 		#else
 		this.renderBackground(matrices, mouseX, mouseY, delta); // Render background
 		#endif
-		if (!usable)
+		if (!this.usable)
+		{
 			return;
+		}
+		
+		int maxScroll;
+		#if MC_VER <= MC_1_21_3
+		maxScroll = this.changelogArea.getMaxScroll();
+		#else
+		maxScroll = this.changelogArea.maxScrollAmount();
+		#endif
 		
 		// Set the scroll position to the mouse height relative to the screen
 		// This is a bit of a hack as we cannot scroll on this area
-		double scrollAmount = ((double) mouseY) / ((double) this.height) * 1.1 * this.changelogArea.getMaxScroll();
+		double scrollAmount = ((double) mouseY) / ((double) this.height) * 1.1 * maxScroll;
+		
 	    #if MC_VER == MC_1_16_5 || MC_VER == MC_1_17_1
 		this.changelogArea.setScrollAmount(scrollAmount);
-		#else
+		#elif MC_VER <= MC_1_21_3
 		this.changelogArea.scrollAmount = scrollAmount;
+		#else
+		this.changelogArea.setScrollAmount(scrollAmount);
 		#endif
 		
 		
 		// render order matters, otherwise on 1.20.6+ the blurred background will render on top of the text
 		super.render(matrices, mouseX, mouseY, delta); // Render the buttons
 		this.changelogArea.render(matrices, mouseX, mouseY, delta); // Render the changelog
-		DhDrawCenteredString(matrices, font, title, width / 2, 15, 0xFFFFFF); // Render title
+		this.DhDrawCenteredString(matrices, this.font, this.title, this.width / 2, 15, 0xFFFFFF); // Render title
 	}
 	
 	@Override
 	public void onClose()
 	{
-		Objects.requireNonNull(minecraft).setScreen(this.parent); // Goto the parent screen
+		Objects.requireNonNull(this.minecraft).setScreen(this.parent); // Goto the parent screen
 	}
 	
 	public static class TextArea extends ContainerObjectSelectionList<ButtonEntry>
@@ -198,7 +227,7 @@ public class ChangelogScreen extends DhScreen
 			super(minecraftClient, canvasWidth, canvasHeight - (topMargin + botMargin), topMargin, itemSpacing);
 			#endif
 			this.centerListVertically = false;
-			textRenderer = minecraftClient.font;
+			this.textRenderer = minecraftClient.font;
 		}
 		
 		public void addButton(Component text)
@@ -240,20 +269,20 @@ public class ChangelogScreen extends DhScreen
 		@Override
 		public void render(GuiGraphics matrices, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta)
 		{
-			matrices.drawString(textRenderer, text, 12, y + 5, 0xFFFFFF);
+			matrices.drawString(textRenderer, this.text, 12, y + 5, 0xFFFFFF);
 		}
         #endif
 		
 		@Override
 		public List<? extends GuiEventListener> children()
 		{
-			return children;
+			return this.children;
 		}
 		#if MC_VER >= MC_1_17_1
 		@Override
 		public List<? extends NarratableEntry> narratables()
 		{
-			return children;
+			return this.children;
 		}
 		#endif
 	}

common/src/main/java/com/seibel/distanthorizons/common/wrappers/gui/updater/UpdateModScreen.java

@@ -4,6 +4,7 @@ import com.seibel.distanthorizons.api.enums.config.EDhApiUpdateBranch;
 import com.seibel.distanthorizons.common.wrappers.gui.DhScreen;
 import com.seibel.distanthorizons.common.wrappers.gui.TexturedButtonWidget;
 import com.seibel.distanthorizons.core.jar.ModJarInfo;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.coreapi.ModInfo;
 import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.jar.installer.ModrinthGetter;
@@ -15,6 +16,7 @@ import com.mojang.blaze3d.vertex.PoseStack;
 #endif
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.resources.ResourceLocation;
+import org.apache.logging.log4j.Logger;
 
 import static com.seibel.distanthorizons.common.wrappers.gui.GuiHelper.*;
 
@@ -29,6 +31,9 @@ import java.util.*;
 // and also maybe add this suggestion https://discord.com/channels/881614130614767666/1035863487110467625/1035949054485594192
 public class UpdateModScreen extends DhScreen
 {
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	
+	
 	private Screen parent;
 	private String newVersionID;
 	
@@ -36,7 +41,7 @@ public class UpdateModScreen extends DhScreen
 	private String nextVer;
 	
 	
-	public UpdateModScreen(Screen parent, String newVersionID)
+	public UpdateModScreen(Screen parent, String newVersionID) throws IllegalArgumentException
 	{
 		super(Translatable(ModInfo.ID + ".updater.title"));
 		this.parent = parent;
@@ -54,6 +59,13 @@ public class UpdateModScreen extends DhScreen
 	        this.currentVer = ModJarInfo.Git_Commit.substring(0,7);
 	        this.nextVer = this.newVersionID.substring(0,7);
         }
+		
+		// done to prevent trying to update to "null"
+		// (this can happen if no versions are available to check/download from modrinth/gitlab)
+		if (this.nextVer == null)
+		{
+			throw new IllegalArgumentException("No new version found with the ID ["+newVersionID+"].");
+		}
 	}
 	
 	@Override
@@ -69,9 +81,9 @@ public class UpdateModScreen extends DhScreen
 			// Logo image
 			this.addBtn(new TexturedButtonWidget(
 					// Where the button is on the screen
-					this.width / 2 - 65, this.height / 2 - 110,
+					this.width / 2 - 95, this.height / 2 - 110,
 					// Width and height of the button
-					130, 65,
+					195, 65,
 					// Offset
 					0, 0,
 					// Some textuary stuff
@@ -81,7 +93,7 @@ public class UpdateModScreen extends DhScreen
 					#else
 					ResourceLocation.fromNamespaceAndPath(ModInfo.ID, "logo.png"),
 					#endif
-					130, 65,
+					195, 65,
 					// Create the button and tell it where to go
 					// For now it goes to the client option by default
 					(buttonWidget) -> System.out.println("Nice, you found an easter egg :)"), // TODO: Add a proper easter egg to pressing the logo (maybe with confetti)
@@ -93,7 +105,7 @@ public class UpdateModScreen extends DhScreen
 		}
 		catch (Exception e)
 		{
-			e.printStackTrace();
+			LOGGER.error("Failed to setup update mod screen, error: ["+e.getMessage()+"].", e);
 		}
 		
 		if (!ModInfo.IS_DEV_BUILD)

common/src/main/java/com/seibel/distanthorizons/common/wrappers/level/KeyedClientLevelManager.java

@@ -13,6 +13,9 @@ public class KeyedClientLevelManager implements IKeyedClientLevelManager
 	/** This is set and managed by the ClientApi for servers with support for DH. */
 	@Nullable
 	private IServerKeyedClientLevel serverKeyedLevel = null;
+	/** Allows to keep level manager enabled between loading different keyed levels */
+	private boolean enabled = false;
+	
 	
 	
 	
@@ -37,12 +40,16 @@ public class KeyedClientLevelManager implements IKeyedClientLevelManager
 	{
 		IServerKeyedClientLevel keyedLevel = new ServerKeyedClientLevel((ClientLevel) clientLevel.getWrappedMcObject(), levelKey);
 		this.serverKeyedLevel = keyedLevel;
+		this.enabled = true;
 		return keyedLevel;
 	}
 	
 	@Override
 	public void clearKeyedLevel() { this.serverKeyedLevel = null; }
 	@Override
-	public boolean hasLevelSet() { return this.serverKeyedLevel != null; }
+	public boolean isEnabled() { return this.enabled; }
+	@Override
+	public void disable() { this.enabled = false; }
+	
 	
 }

common/src/main/java/com/seibel/distanthorizons/common/wrappers/level/ServerKeyedClientLevel.java

@@ -2,6 +2,8 @@ package com.seibel.distanthorizons.common.wrappers.level;
 
 import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
 import com.seibel.distanthorizons.core.level.IServerKeyedClientLevel;
+import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
+import com.seibel.distanthorizons.coreapi.util.StringUtil;
 import net.minecraft.client.multiplayer.ClientLevel;
 
 public class ServerKeyedClientLevel extends ClientLevelWrapper implements IServerKeyedClientLevel
@@ -9,16 +11,20 @@ public class ServerKeyedClientLevel extends ClientLevelWrapper implements IServe
 	/** A unique identifier (generally the level's name) for differentiating multiverse levels */
 	private final String serverLevelKey;
 	
+	
+	
 	public ServerKeyedClientLevel(ClientLevel level, String serverLevelKey)
 	{
 		super(level);
 		this.serverLevelKey = serverLevelKey;
 	}
 	
+	
+	
 	@Override
 	public String getServerLevelKey() { return this.serverLevelKey; }
 	
 	@Override
-	public String getDimensionName() { return this.getServerLevelKey(); }
+	public String getDhIdentifier() { return this.getServerLevelKey(); }
-
+	
 }

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

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by
@@ -22,6 +22,7 @@ package com.seibel.distanthorizons.common.wrappers.minecraft;
 import java.io.File;
 import java.lang.invoke.MethodHandles;
 import java.util.ArrayList;
+import java.util.Objects;
 import java.util.UUID;
 
 import com.mojang.blaze3d.platform.NativeImage;
@@ -53,10 +54,16 @@ import net.minecraft.core.Direction;
 import net.minecraft.network.chat.TextComponent;
 #endif
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.util.profiling.ProfilerFiller;
 import net.minecraft.world.level.ChunkPos;
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.Nullable;
 
+#if MC_VER < MC_1_21_3
+#else
+import net.minecraft.util.profiling.Profiler;
+#endif
+
 /**
  * A singleton that wraps the Minecraft object.
  *
@@ -111,7 +118,7 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
 	@Override
 	public float getShade(EDhDirection lodDirection)
 	{
-		EDhApiLodShading lodShading = Config.Client.Advanced.Graphics.AdvancedGraphics.lodShading.get();
+		EDhApiLodShading lodShading = Config.Client.Advanced.Graphics.Quality.lodShading.get();
 		switch (lodShading)
 		{
 			default:
@@ -201,20 +208,35 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
 	@Override
 	public UUID getPlayerUUID() { return this.getPlayer().getUUID(); }
 	
+	@Override
+	public String getUsername() { return MINECRAFT.getUser().getName(); }
+	
 	@Override
 	public DhBlockPos getPlayerBlockPos()
 	{
-		BlockPos playerPos = this.getPlayer().blockPosition();
+		LocalPlayer player = this.getPlayer();
+		if (player == null)
+		{
+			return new DhBlockPos(0, 0, 0);	
+		}
+		
+		BlockPos playerPos = player.blockPosition();
 		return new DhBlockPos(playerPos.getX(), playerPos.getY(), playerPos.getZ());
 	}
 	
 	@Override
 	public DhChunkPos getPlayerChunkPos()
 	{
+		LocalPlayer player = this.getPlayer();
+		if (player == null)
+		{
+			return new DhChunkPos(0, 0);
+		}
+		
         #if MC_VER < MC_1_17_1
-        ChunkPos playerPos = new ChunkPos(this.getPlayer().blockPosition());
+        ChunkPos playerPos = new ChunkPos(player.blockPosition());
         #else
-		ChunkPos playerPos = this.getPlayer().chunkPosition();
+		ChunkPos playerPos = player.chunkPosition();
         #endif
 		return new DhChunkPos(playerPos.x, playerPos.z);
 	}
@@ -239,13 +261,20 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
 	@Override
 	public IProfilerWrapper getProfiler()
 	{
+		ProfilerFiller profiler;
+		#if MC_VER < MC_1_21_3
+		profiler = MINECRAFT.getProfiler();
+		#else
+		profiler = Profiler.get();
+		#endif
+		
 		if (this.profilerWrapper == null)
 		{
-			this.profilerWrapper = new ProfilerWrapper(MINECRAFT.getProfiler());
+			this.profilerWrapper = new ProfilerWrapper(profiler);
 		}
-		else if (MINECRAFT.getProfiler() != this.profilerWrapper.profiler)
+		else if (profiler != this.profilerWrapper.profiler)
 		{
-			this.profilerWrapper.profiler = MINECRAFT.getProfiler();
+			this.profilerWrapper.profiler = profiler;
 		}
 		
 		return this.profilerWrapper;
@@ -276,10 +305,27 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
 		{
 			return;
 		}
+		
         #if MC_VER < MC_1_19_2
 		player.sendMessage(new TextComponent(string), getPlayer().getUUID());
         #else
-		player.sendSystemMessage(net.minecraft.network.chat.Component.translatable(string));
+		player.displayClientMessage(net.minecraft.network.chat.Component.translatable(string), /*isOverlay*/false);
+        #endif
+	}
+	
+	@Override
+	public void sendOverlayMessage(String string)
+	{
+		LocalPlayer player = this.getPlayer();
+		if (player == null)
+		{
+			return;
+		}
+		
+        #if MC_VER < MC_1_19_2
+		player.displayClientMessage(new TextComponent(string), /*isOverlay*/true);
+        #else
+		player.displayClientMessage(net.minecraft.network.chat.Component.translatable(string), /*isOverlay*/true);
         #endif
 	}
 	
@@ -316,6 +362,17 @@ public class MinecraftClientWrapper implements IMinecraftClientWrapper, IMinecra
 	public void executeOnRenderThread(Runnable runnable) { MINECRAFT.execute(runnable); }
 	
 	@Override
-	public boolean isWorldNew() { throw new UnsupportedOperationException("Not Implemented"); }
+	public int getPlayerCount()
+	{
+		// can be null if the server hasn't finished booting up yet
+		if (MINECRAFT.getSingleplayerServer() == null)
+		{
+			return 1;
+		}
+		else
+		{
+			return MINECRAFT.getSingleplayerServer().getPlayerCount();
+		}
+	}
 	
 }

common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftGLWrapper.java

@@ -0,0 +1,252 @@
+/*
+ *    This file is part of the Distant Horizons mod
+ *    licensed under the GNU LGPL 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 Lesser 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 Lesser General Public License for more details.
+ *
+ *    You should have received a copy of the GNU Lesser General Public License
+ *    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.seibel.distanthorizons.common.wrappers.minecraft;
+
+#if MC_VER < MC_1_21_5
+import com.mojang.blaze3d.platform.GlStateManager;
+#elif MC_VER == MC_1_21_5
+import com.mojang.blaze3d.opengl.GlStateManager;
+#endif
+
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftGLWrapper;
+
+import org.apache.logging.log4j.Logger;
+import org.lwjgl.opengl.GL32;
+
+
+/**
+ * <b>Why does DH often call GL methods twice? </b><br> 
+ * Once using the base {@link GL32} function and a second time using
+ * Minecraft's {@link GlStateManager}?<br><br>
+ * 
+ * <b>Answer: </b><br>
+ * Compatibility and robustness<br>
+ * In general all MC rendering should go through MC's {@link GlStateManager},
+ * however that isn't always the case.
+ * So, to prevent issues if a mod (or MC itself) calls a direct GL function
+ * instead of the {@link GlStateManager} wrapper, we need to be sure about what the actual
+ * set value is (whether setting or getting) and that MC knows what DH has done.
+ * This way whether a mod (or MC) is using the {@link GlStateManager} or direct GL calls,
+ * they should always have the correct value for anything DH has modified.
+ * <br><br>
+ * This may slow down some low end GPUs that are driver limited,
+ * however James would rather have slow correct rendering vs fast broken rendering.
+ */
+public class MinecraftGLWrapper implements IMinecraftGLWrapper
+{
+	public static final MinecraftGLWrapper INSTANCE = new MinecraftGLWrapper();
+	
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	
+	
+	
+	/*
+    private static final StencilState STENCIL;
+	 */
+	
+	
+	// scissor //
+	
+	/** @see GL32#GL_SCISSOR_TEST */
+	@Override
+	public void enableScissorTest() 
+	{
+		GL32.glEnable(GL32.GL_SCISSOR_TEST);
+		GlStateManager._enableScissorTest(); 
+	}
+	/** @see GL32#GL_SCISSOR_TEST */
+	@Override
+	public void disableScissorTest() 
+	{ 
+		GL32.glDisable(GL32.GL_SCISSOR_TEST);
+		GlStateManager._disableScissorTest(); 
+	}
+	
+	
+	// stencil //
+//	
+//	/** @see GL32#GL_SCISSOR_TEST */
+//	public void enableScissorTest() { GlStateManager._stencilFunc(); }
+//	/** @see GL32#GL_SCISSOR_TEST */
+//	public void disableScissorTest() { GlStateManager._disableScissorTest(); }
+	
+	
+	// depth //
+	
+	/** @see GL32#GL_DEPTH_TEST */
+	@Override
+	public void enableDepthTest() 
+	{
+		GL32.glEnable(GL32.GL_DEPTH_TEST);
+		GlStateManager._enableDepthTest(); 
+	}
+	/** @see GL32#GL_DEPTH_TEST */
+	@Override
+	public void disableDepthTest() 
+	{
+		GL32.glDisable(GL32.GL_DEPTH_TEST);
+		GlStateManager._disableDepthTest(); 
+	}
+	
+	/** @see GL32#glDepthFunc(int)  */
+	@Override
+	public void glDepthFunc(int func) 
+	{ 
+		GL32.glDepthFunc(func);
+		GlStateManager._depthFunc(func); 
+	}
+	
+	/** @see GL32#glDepthMask(boolean) */
+	@Override
+	public void enableDepthMask() 
+	{
+		GL32.glDepthMask(true);
+		GlStateManager._depthMask(true); 
+	}
+	/** @see GL32#glDepthMask(boolean) */
+	@Override
+	public void disableDepthMask() 
+	{
+		GL32.glDepthMask(false);
+		GlStateManager._depthMask(false); 
+	}
+	
+	
+	// blending //
+	
+	/** @see GL32#GL_BLEND */
+	@Override
+	public void enableBlend() 
+	{
+		GL32.glEnable(GL32.GL_BLEND);
+		GlStateManager._enableBlend();
+	}
+	/** @see GL32#GL_BLEND */
+	@Override
+	public void disableBlend() 
+	{
+		GL32.glDisable(GL32.GL_BLEND);
+		GlStateManager._disableBlend(); 
+	}
+	
+	/** @see GL32#glBlendFunc */
+	@Override
+	public void glBlendFunc(int sfactor, int dfactor) 
+	{
+		GL32.glBlendFunc(sfactor, dfactor);
+		
+		#if MC_VER < MC_1_21_5
+		GlStateManager._blendFunc(sfactor, dfactor);
+		#endif
+	}
+	/** @see GL32#glBlendFuncSeparate */
+	@Override
+	public void glBlendFuncSeparate(int sfactorRGB, int dfactorRGB, int sfactorAlpha, int dfactorAlpha) 
+	{
+		GL32.glBlendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha);
+		GlStateManager._blendFuncSeparate(sfactorRGB, dfactorRGB, sfactorAlpha, dfactorAlpha); 
+	}
+	
+	
+	// frame buffers //
+	
+	/** @see GL32#glBindFramebuffer */
+	@Override
+	public void glBindFramebuffer(int target, int framebuffer) 
+	{
+		GL32.glBindFramebuffer(target, framebuffer);
+		GlStateManager._glBindFramebuffer(target, framebuffer); 
+	}
+	
+	
+	// buffers //
+	
+	/** @see GL32#glGenBuffers() */
+	@Override
+	public int glGenBuffers()
+	{ return GlStateManager._glGenBuffers(); }
+	
+	/** @see GL32#glDeleteBuffers(int)  */
+	@Override
+	public void glDeleteBuffers(int buffer)
+	{
+		GL32.glDeleteBuffers(buffer);
+		
+		// MC's implementation has a bug where it will throw:
+		// GL_INVALID_OPERATION in glBufferData(immutable)
+		// when attempting to delete Storage Buffers
+		// So we need to manually delete the buffers ourselves
+		//GlStateManager._glDeleteBuffers(buffer); 
+	}
+	
+	
+	// culling //
+	
+	/** @see GL32#GL_CULL_FACE */
+	@Override
+	public void enableFaceCulling() 
+	{
+		GL32.glEnable(GL32.GL_CULL_FACE);
+		GlStateManager._enableCull(); 
+	}
+	/** @see GL32#GL_CULL_FACE */
+	@Override
+	public void disableFaceCulling() 
+	{
+		GL32.glDisable(GL32.GL_CULL_FACE);
+		GlStateManager._disableCull(); 
+	}
+	
+	
+	// textures //
+	
+	/** @see GL32#glGenTextures() */
+	@Override
+	public int glGenTextures() { return GlStateManager._genTexture(); }
+	/** @see GL32#glDeleteTextures(int) */
+	@Override
+	public void glDeleteTextures(int texture) { GlStateManager._deleteTexture(texture); }
+	
+	/** @see GL32#glActiveTexture(int) */
+	@Override
+	public void glActiveTexture(int textureId) 
+	{ 
+		GL32.glActiveTexture(textureId);
+		GlStateManager._activeTexture(textureId);
+	}
+	@Override
+	public int getActiveTexture() { return GL32.glGetInteger(GL32.GL_ACTIVE_TEXTURE); }
+	
+	/**
+	 * Always binds to {@link GL32#GL_TEXTURE_2D}
+	 * @see GL32#glBindTexture(int, int)
+	 */
+	@Override
+	public void glBindTexture(int texture) 
+	{
+		GL32.glBindTexture(GL32.GL_TEXTURE_2D, texture);
+		GlStateManager._bindTexture(texture);
+	}
+	
+	
+	
+	
+}

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

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by
@@ -30,6 +30,7 @@ import com.seibel.distanthorizons.common.wrappers.misc.LightMapWrapper;
 import com.seibel.distanthorizons.core.dependencyInjection.ModAccessorInjector;
 
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.util.ColorUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.misc.ILightMapWrapper;
 
 #if MC_VER >= MC_1_17_1
@@ -43,7 +44,6 @@ import org.joml.Vector3f;
 #else
 #endif
 #if MC_VER >= MC_1_20_2
-import net.minecraft.client.renderer.chunk.SectionRenderDispatcher;
 #endif
 
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.AbstractOptifineAccessor;
@@ -69,7 +69,12 @@ import net.minecraft.world.level.material.FogType;
 #endif
 import net.minecraft.world.phys.Vec3;
 import org.apache.logging.log4j.Logger;
+import org.joml.Vector4f;
 
+#if MC_VER >= MC_1_21_5
+import com.mojang.blaze3d.opengl.GlTexture;
+import org.lwjgl.opengl.GL32;
+#endif
 
 /**
  * A singleton that contains everything
@@ -101,8 +106,15 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 	 */
 	public int finalLevelFrameBufferId = -1;
 	
+	public boolean colorTextureCastFailLogged = false;
+	public boolean depthTextureCastFailLogged = false;
 	
 	
+	
+	//=========//
+	// methods //
+	//=========//
+	
 	@Override
 	public Vec3f getLookAtVector()
 	{
@@ -136,16 +148,30 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 		#if MC_VER < MC_1_17_1
 		float[] colorValues = new float[4];
 		GL15.glGetFloatv(GL15.GL_FOG_COLOR, colorValues);
-		#else
+		return new Color(
+				Math.max(0f, Math.min(colorValues[0], 1f)), // r
+				Math.max(0f, Math.min(colorValues[1], 1f)), // g
+				Math.max(0f, Math.min(colorValues[2], 1f)), // b
+				Math.max(0f, Math.min(colorValues[3], 1f))  // a
+		);
+		#elif MC_VER < MC_1_21_3
 		FogRenderer.setupColor(MC.gameRenderer.getMainCamera(), partialTicks, MC.level, 1, MC.gameRenderer.getDarkenWorldAmount(partialTicks));
 		float[] colorValues = RenderSystem.getShaderFogColor();
-		#endif
 		return new Color(
-				Math.max(0f, Math.min(colorValues[0], 1f)),
+				Math.max(0f, Math.min(colorValues[0], 1f)), // r
-				Math.max(0f, Math.min(colorValues[1], 1f)),
+				Math.max(0f, Math.min(colorValues[1], 1f)), // g
-				Math.max(0f, Math.min(colorValues[2], 1f)),
+				Math.max(0f, Math.min(colorValues[2], 1f)), // b
-				Math.max(0f, Math.min(colorValues[3], 1f))
+				Math.max(0f, Math.min(colorValues[3], 1f))  // a
 		);
+		#else
+		Vector4f colorValues = FogRenderer.computeFogColor(MC.gameRenderer.getMainCamera(), partialTicks, MC.level, 1, MC.gameRenderer.getDarkenWorldAmount(partialTicks));
+		return new Color(
+				Math.max(0f, Math.min(colorValues.x, 1f)), // r
+				Math.max(0f, Math.min(colorValues.y, 1f)), // g
+				Math.max(0f, Math.min(colorValues.z, 1f)), // b
+				Math.max(0f, Math.min(colorValues.w, 1f))  // a
+		);
+		#endif
 	}
 	// getSpecialFogColor() is the same as getFogColor()
 	
@@ -157,16 +183,22 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 			float frameTime;
 			#if MC_VER < MC_1_21_1
 			frameTime = MC.getFrameTime();
-			#else
+			#elif MC_VER < MC_1_21_3
 			frameTime = MC.getTimer().getRealtimeDeltaTicks();
+			#else
+			frameTime = MC.deltaTracker.getGameTimeDeltaTicks();
 			#endif
 			
 			#if MC_VER < MC_1_17_1
 			Vec3 colorValues = MC.level.getSkyColor(MC.gameRenderer.getMainCamera().getBlockPosition(), frameTime);
-			#else
-			Vec3 colorValues = MC.level.getSkyColor(MC.gameRenderer.getMainCamera().getPosition(), frameTime);
-			#endif
 			return new Color((float) colorValues.x, (float) colorValues.y, (float) colorValues.z);
+			#elif MC_VER < MC_1_21_3
+			Vec3 colorValues = MC.level.getSkyColor(MC.gameRenderer.getMainCamera().getPosition(), frameTime);
+			return new Color((float) colorValues.x, (float) colorValues.y, (float) colorValues.z);
+			#else
+			int argbColorInt = MC.level.getSkyColor(MC.gameRenderer.getMainCamera().getPosition(), frameTime);;
+			return ColorUtil.toColorObjARGB(argbColorInt); // TODO MC changed color formats
+			#endif
 		}
 		else
 		{
@@ -229,6 +261,26 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 	
 	private RenderTarget getRenderTarget() { return MC.getMainRenderTarget(); }
 	
+	@Override
+	public boolean mcRendersToFrameBuffer()
+	{
+		#if MC_VER < MC_1_21_5
+		return true;
+		#else
+		return false;
+		#endif
+	}
+	
+	@Override
+	public boolean runningLegacyOpenGL()
+	{
+		#if MC_VER <= MC_1_16_5
+		return true;
+		#else
+		return false;
+		#endif
+	}
+	
 	@Override
 	public int getTargetFrameBuffer()
 	{
@@ -238,25 +290,87 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 			return this.finalLevelFrameBufferId;
 		}
 		
+		#if MC_VER < MC_1_21_5
 		return this.getRenderTarget().frameBufferId;
+		#else
+		// MC renders to a texture and then directly to the default FBO now
+		// we need to draw to their texture instead of the FBO
+		return 0; // 0 is the ID for the default frame buffer
+		#endif
 	}
 	
 	@Override
 	public void clearTargetFrameBuffer() { this.finalLevelFrameBufferId = -1; }
 	
 	@Override
-	public int getDepthTextureId() { return this.getRenderTarget().getDepthTextureId(); }
+	public int getDepthTextureId()
+	{
+		#if MC_VER < MC_1_21_5
+		return this.getRenderTarget().getDepthTextureId();
+		#else
+		try
+		{
+			GlTexture glTexture = (GlTexture) this.getRenderTarget().getDepthTexture();
+			if (glTexture == null)
+			{
+				// shouldn't happen, but just in case
+				return 0;
+			}
+			
+			return glTexture.glId();
+		}
+		catch (ClassCastException e)
+		{
+			// only log this error once per session
+			if (!this.depthTextureCastFailLogged)
+			{
+				this.depthTextureCastFailLogged = true;
+				LOGGER.error("Unable to cast render Target depth texture to GlTexture. MC or a rendering mod may have changed the object type.", e);
+			}
+			return 0;
+		}
+		#endif
+	}
+	@Override
+	public int getColorTextureId() 
+	{
+		#if MC_VER < MC_1_21_5
+		return this.getRenderTarget().getColorTextureId();
+		#else
+		try
+		{
+			GlTexture glTexture = (GlTexture) this.getRenderTarget().getColorTexture();
+			if (glTexture == null)
+			{
+				// shouldn't happen, but just in case
+				return 0;
+			}
+			
+			return glTexture.glId();
+		}
+		catch (ClassCastException e)
+		{
+			// only log this error once per session
+			if (!this.colorTextureCastFailLogged)
+			{
+				this.colorTextureCastFailLogged = true;
+				LOGGER.error("Unable to cast render Target color texture to GlTexture. MC or a rendering mod may have changed the object type.", e);
+			}
+			return 0;
+		}
+		#endif
+	}
 	
 	@Override
 	public int getTargetFrameBufferViewportWidth()
 	{
-		return getRenderTarget().viewWidth;
+		return this.getRenderTarget().viewWidth;
 	}
 	
 	@Override
 	public int getTargetFrameBufferViewportHeight()
 	{
-		return getRenderTarget().viewHeight;
+		return this.getRenderTarget().viewHeight;
 	}
 	
 	@Override
@@ -279,6 +393,10 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 		#endif
 	}
 	
+	/** 
+	 * It's better to use {@link MinecraftRenderWrapper#setLightmapId(int, IClientLevelWrapper)} if possible,
+	 * however old MC versions don't support it.
+	 */
 	public void updateLightmap(NativeImage lightPixels, IClientLevelWrapper level)
 	{
 		// Using ClientLevelWrapper as the key would be better, but we don't have a consistent way to create the same
@@ -289,5 +407,15 @@ public class MinecraftRenderWrapper implements IMinecraftRenderWrapper
 		LightMapWrapper wrapper = this.lightmapByDimensionType.computeIfAbsent(dimensionType, (dimType) -> new LightMapWrapper());
 		wrapper.uploadLightmap(lightPixels);
 	}
+	public void setLightmapId(int tetxureId, IClientLevelWrapper level)
+	{
+		// Using ClientLevelWrapper as the key would be better, but we don't have a consistent way to create the same
+		// object for the same MC level and/or the same hash,
+		// so this will have to do for now
+		IDimensionTypeWrapper dimensionType = level.getDimensionType();
+
+		LightMapWrapper wrapper = this.lightmapByDimensionType.computeIfAbsent(dimensionType, (dimType) -> new LightMapWrapper());
+		wrapper.setLightmapId(tetxureId);
+	}
 	
 }

common/src/main/java/com/seibel/distanthorizons/common/wrappers/minecraft/MinecraftServerWrapper.java

@@ -44,7 +44,9 @@ public class MinecraftServerWrapper implements IMinecraftSharedWrapper
 	}
 	
 	@Override
-	public boolean isWorldNew() 
+	public int getPlayerCount()
-	{ return this.dedicatedServer.getWorldData().overworldData().isInitialized(); }
+	{
+		return this.dedicatedServer.getPlayerCount();
+	}
 	
 }

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

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by
@@ -31,31 +31,19 @@ public class ProfilerWrapper implements IProfilerWrapper
 {
 	public ProfilerFiller profiler;
 	
-	public ProfilerWrapper(ProfilerFiller newProfiler)
+	public ProfilerWrapper(ProfilerFiller newProfiler) { this.profiler = newProfiler; }
-	{
-		profiler = newProfiler;
-	}
 	
 	
 	/** starts a new section inside the currently running section */
 	@Override
-	public void push(String newSection)
+	public void push(String newSection) { this.profiler.push(newSection); }
-	{
-		profiler.push(newSection);
-	}
 	
 	/** ends the currently running section and starts a new one */
 	@Override
-	public void popPush(String newSection)
+	public void popPush(String newSection) { this.profiler.popPush(newSection); }
-	{
-		profiler.popPush(newSection);
-	}
 	
 	/** ends the currently running section */
 	@Override
-	public void pop()
+	public void pop() { this.profiler.pop(); }
-	{
-		profiler.pop();
-	}
 	
 }

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

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by
@@ -20,16 +20,24 @@
 package com.seibel.distanthorizons.common.wrappers.misc;
 
 import com.mojang.blaze3d.platform.NativeImage;
+import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
+import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftGLWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.misc.ILightMapWrapper;
+import org.apache.logging.log4j.Logger;
 import org.lwjgl.opengl.GL32;
 
 import java.nio.ByteBuffer;
 
 public class LightMapWrapper implements ILightMapWrapper
 {
+	private static final IMinecraftGLWrapper GLMC = SingletonInjector.INSTANCE.get(IMinecraftGLWrapper.class);
+	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
+	
 	private int textureId = 0;
 	
 	
+	
 	//==============//
 	// constructors //
 	//==============//
@@ -38,41 +46,67 @@ public class LightMapWrapper implements ILightMapWrapper
 	
 	
 	
-	//=========//
+	//==================//
-	// methods //
+	// lightmap syncing //
-	//=========//
+	//==================//
 	
 	public void uploadLightmap(NativeImage image)
 	{
-		int currentBind = GL32.glGetInteger(GL32.GL_TEXTURE_BINDING_2D);
+		#if MC_VER < MC_1_21_5
+		int currentTexture = GLMC.getActiveTexture();
 		if (this.textureId == 0)
 		{
 			this.createLightmap(image);
 		}
 		else
 		{
-			GL32.glBindTexture(GL32.GL_TEXTURE_2D, this.textureId);
+			GLMC.glBindTexture(this.textureId);
 		}
 		image.upload(0, 0, 0, false);
-		GL32.glBindTexture(GL32.GL_TEXTURE_2D, currentBind);
+		
+		// getActiveTexture() may return textures that aren't valid and attempting to bind them will
+		// throw a GL error in MC 1.21.1
+		if (GL32.glIsTexture(currentTexture))
+		{
+			GLMC.glBindTexture(currentTexture);
+		}
+		#else 
+		throw new UnsupportedOperationException("setLightmapId should be used for MC versions after 1.21.5"); // TODO that MC version number is wrong, when did we actually start using setLightmapId()?
+		#endif
 	}
 	private void createLightmap(NativeImage image)
 	{
-		this.textureId = GL32.glGenTextures();
+		#if MC_VER < MC_1_21_5
-		GL32.glBindTexture(GL32.GL_TEXTURE_2D, this.textureId);
+		this.textureId = GLMC.glGenTextures();
+		GLMC.glBindTexture(this.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);
+		#else
+		throw new UnsupportedOperationException("setLightmapId should be used for MC versions after 1.21.5"); // TODO that MC version number is wrong, when did we actually start using setLightmapId()?
+		#endif
 	}
 	
+	public void setLightmapId(int minecraftLightmapTetxureId)
+	{
+		// just use the MC texture ID
+		this.textureId = minecraftLightmapTetxureId;
+	}
+	
+	
+	
+	//==============//
+	// lightmap use //
+	//==============//
 	
 	@Override
 	public void bind()
 	{
-		GL32.glActiveTexture(GL32.GL_TEXTURE0);
+		GLMC.glActiveTexture(GL32.GL_TEXTURE0);
-		GL32.glBindTexture(GL32.GL_TEXTURE_2D, this.textureId);
+		GLMC.glBindTexture(this.textureId);
 	}
 	
 	@Override
-	public void unbind() { GL32.glBindTexture(GL32.GL_TEXTURE_2D, 0); }
+	public void unbind() { GLMC.glBindTexture(0); }
 	
 }
+

common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ClientLevelWrapper.java

@@ -25,13 +25,17 @@ import net.minecraft.server.level.ServerLevel;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ChunkSource;
-import net.minecraft.world.phys.Vec3;
 import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 import java.awt.*;
+import java.io.File;
 import java.io.IOException;
+import java.lang.ref.WeakReference;
+import java.util.Collections;
+import java.util.Map;
+import java.util.WeakHashMap;
 import java.util.concurrent.ConcurrentHashMap;
 
 #if MC_VER <= MC_1_20_4
@@ -40,10 +44,21 @@ import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.status.ChunkStatus;
 #endif
 
+#if MC_VER < MC_1_21_3
+import net.minecraft.world.phys.Vec3;
+#else
+import com.seibel.distanthorizons.core.util.ColorUtil;
+#endif
+
 public class ClientLevelWrapper implements IClientLevelWrapper
 {
 	private static final Logger LOGGER = DhLoggerBuilder.getLogger(ClientLevelWrapper.class.getSimpleName());
-	private static final ConcurrentHashMap<ClientLevel, ClientLevelWrapper> LEVEL_WRAPPER_BY_CLIENT_LEVEL = new ConcurrentHashMap<>(); // TODO can leak
+	/**
+	 * weak references are to prevent rare issues
+	 * where, upon world closure, some levels aren't shutdown/removed properly
+	 * and/or for servers were the level object isn't consistent
+	 */
+	private static final Map<ClientLevel, WeakReference<ClientLevelWrapper>> LEVEL_WRAPPER_REF_BY_CLIENT_LEVEL = Collections.synchronizedMap(new WeakHashMap<>());
 	private static final IKeyedClientLevelManager KEYED_CLIENT_LEVEL_MANAGER = SingletonInjector.INSTANCE.get(IKeyedClientLevelManager.class);
 	
 	private static final Minecraft MINECRAFT = Minecraft.getInstance();
@@ -66,9 +81,9 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 	
 	
 	
-	//===============//
+	//==================//
-	// wrapper logic //
+	// instance methods //
-	//===============//
+	//==================//
 	
 	public static IClientLevelWrapper getWrapper(@NotNull ClientLevel level) { return getWrapper(level, false); }
 	
@@ -90,7 +105,19 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 			}
 		}
 		
-		return LEVEL_WRAPPER_BY_CLIENT_LEVEL.computeIfAbsent(level, ClientLevelWrapper::new);
+		return LEVEL_WRAPPER_REF_BY_CLIENT_LEVEL.compute(level, (newLevel, levelRef) ->
+		{
+			if (levelRef != null)
+			{
+				ClientLevelWrapper oldLevelWrapper = levelRef.get();
+				if (oldLevelWrapper != null)
+				{
+					return levelRef;
+				}
+			}
+			
+			return new WeakReference<>(new ClientLevelWrapper(newLevel));
+		}).get();
 	}
 	
 	@Nullable
@@ -124,6 +151,8 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 		}
 	}
 	
+	
+	
 	//====================//
 	// base level methods //
 	//====================//
@@ -183,11 +212,17 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 	
 	@Override
 	public IDimensionTypeWrapper getDimensionType() { return DimensionTypeWrapper.getDimensionTypeWrapper(this.level.dimensionType()); }
-
+	
 	
 	@Override
 	public String getDimensionName() { return this.level.dimension().location().toString(); }
 	
+	@Override
+	public long getHashedSeed() { return this.level.getBiomeManager().biomeZoomSeed; }
+	
+	@Override
+	public String getDhIdentifier() { return this.getHashedSeedEncoded() + "@" + this.getDimensionName(); }
+	
 	@Override
 	public EDhApiLevelType getLevelType() { return EDhApiLevelType.CLIENT_LEVEL; }
 	
@@ -207,8 +242,10 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 	{
         #if MC_VER < MC_1_17_1
         return 0;
-        #else
+		#elif MC_VER < MC_1_21_3
 		return this.level.getMinBuildHeight();
+        #else
+		return this.level.getMinY();
         #endif
 	}
 	
@@ -226,7 +263,7 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 			return null;
 		}
 		
-		return new ChunkWrapper(chunk, this.level, this);
+		return new ChunkWrapper(chunk, this);
 	}
 	
 	@Override
@@ -238,9 +275,7 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 	
 	@Override
 	public IBlockStateWrapper getBlockState(DhBlockPos pos)
-	{
+	{ return BlockStateWrapper.fromBlockState(this.level.getBlockState(McObjectConverter.Convert(pos)), this); }
-		return BlockStateWrapper.fromBlockState(this.level.getBlockState(McObjectConverter.Convert(pos)), this);
-	}
 	
 	@Override
 	public IBiomeWrapper getBiome(DhBlockPos pos) { return BiomeWrapper.getBiomeWrapper(this.level.getBiome(McObjectConverter.Convert(pos)), this); }
@@ -251,10 +286,22 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 	@Override
 	public void onUnload() 
 	{ 
-		LEVEL_WRAPPER_BY_CLIENT_LEVEL.remove(this.level);
+		LEVEL_WRAPPER_REF_BY_CLIENT_LEVEL.remove(this.level);
 		this.parentDhLevel = null;
 	}
 	
+	@Override
+	public File getDhSaveFolder()
+	{
+		if (this.parentDhLevel == null)
+		{
+			return null;
+		}
+		
+		return this.parentDhLevel.getSaveStructure().getSaveFolder(this);
+	}
+	
+	
 	
 	
 	//===================//
@@ -278,8 +325,13 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 	@Override
 	public Color getCloudColor(float tickDelta)
 	{
+		#if MC_VER < MC_1_21_3
 		Vec3 colorVec3 = this.level.getCloudColor(tickDelta);
 		return new Color((float)colorVec3.x, (float)colorVec3.y, (float)colorVec3.z);
+		#else
+		int argbColor = this.level.getCloudColor(tickDelta);
+		return ColorUtil.toColorObjARGB(argbColor);
+		#endif
 	}
 	
 	
@@ -296,7 +348,7 @@ public class ClientLevelWrapper implements IClientLevelWrapper
 			return "Wrapped{null}";
 		}
 		
-		return "Wrapped{" + this.level.toString() + "@" + this.getDimensionName() + "}";
+		return "Wrapped{" + this.level.toString() + "@" + this.getDhIdentifier() + "}";
 	}
 	
 }

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

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by
@@ -28,72 +28,80 @@ import net.minecraft.world.level.dimension.DimensionType;
 
 /**
  * @author James Seibel
- * @version 2022-9-16
  */
 public class DimensionTypeWrapper implements IDimensionTypeWrapper
 {
-	private static final ConcurrentMap<DimensionType, DimensionTypeWrapper> dimensionTypeWrapperMap = new ConcurrentHashMap<>();
+	private static final ConcurrentMap<String, DimensionTypeWrapper> DIMENSION_WRAPPER_BY_NAME = new ConcurrentHashMap<>();
 	private final DimensionType dimensionType;
 	
-	public DimensionTypeWrapper(DimensionType dimensionType)
+	
-	{
+	
-		this.dimensionType = dimensionType;
+	//=============//
-	}
+	// Constructor //
+	//=============//
+	
+	public DimensionTypeWrapper(DimensionType dimensionType) { this.dimensionType = dimensionType; }
 	
 	public static DimensionTypeWrapper getDimensionTypeWrapper(DimensionType dimensionType)
 	{
-		//first we check if the biome has already been wrapped
+		String dimName = getName(dimensionType);
-		if (dimensionTypeWrapperMap.containsKey(dimensionType) && dimensionTypeWrapperMap.get(dimensionType) != null)
+		
+		// check if the dimension has already been wrapped
+		if (DIMENSION_WRAPPER_BY_NAME.containsKey(dimName) 
+			&& DIMENSION_WRAPPER_BY_NAME.get(dimName) != null)
 		{
-			return dimensionTypeWrapperMap.get(dimensionType);
+			return DIMENSION_WRAPPER_BY_NAME.get(dimName);
 		}
 		
 		
-		//if it hasn't been created yet, we create it and save it in the map
+		// create the missing wrapper
 		DimensionTypeWrapper dimensionTypeWrapper = new DimensionTypeWrapper(dimensionType);
-		dimensionTypeWrapperMap.put(dimensionType, dimensionTypeWrapper);
+		DIMENSION_WRAPPER_BY_NAME.put(dimName, dimensionTypeWrapper);
-		
-		//we return the newly created wrapper
 		return dimensionTypeWrapper;
 	}
 	
-	public static void clearMap()
+	public static void clearMap() { DIMENSION_WRAPPER_BY_NAME.clear(); }
-	{
-		dimensionTypeWrapperMap.clear();
-	}
 	
 	
-	private String getDimensionName()
+	
+	//=================//
+	// wrapper methods //
+	//=================//
+	
+	@Override
+	public String getName() { return getName(this.dimensionType); }
+	public static String getName(DimensionType dimensionType)
 	{
 		#if MC_VER <= MC_1_16_5
 		// effectsLocation() is marked as client only, so using the backing field directly
 		return dimensionType.effectsLocation.getPath();
 		#else
-		return this.dimensionType.effectsLocation().getPath();
+		return dimensionType.effectsLocation().getPath();
 		#endif
 	}
 	
 	@Override
-	public boolean hasCeiling()
+	public boolean hasCeiling() { return this.dimensionType.hasCeiling(); }
-	{
-		return this.dimensionType.hasCeiling();
-	}
 	
 	@Override
-	public boolean hasSkyLight()
+	public boolean hasSkyLight() { return this.dimensionType.hasSkyLight(); }
-	{
-		return this.dimensionType.hasSkyLight();
-	}
 	
 	@Override
-	public Object getWrappedMcObject()
+	public Object getWrappedMcObject() { return this.dimensionType; }
-	{
-		return this.dimensionType;
-	}
 	
 	// there's definitely a better way of doing this, but it should work well enough for now
 	@Override
-	public boolean isTheEnd() { return this.getDimensionName().equalsIgnoreCase("the_end"); }
+	public boolean isTheEnd() { return this.getName().equalsIgnoreCase("the_end"); }
+	
+	@Override
+	public double getCoordinateScale() { return this.dimensionType.coordinateScale(); }
+	
+	
+	
+	
+	//================//
+	// base overrides //
+	//================//
 	
 	@Override
 	public boolean equals(Object obj)
@@ -105,9 +113,10 @@ public class DimensionTypeWrapper implements IDimensionTypeWrapper
 		else
 		{
 			DimensionTypeWrapper other = (DimensionTypeWrapper) obj;
-			return other.getDimensionName().equals(this.getDimensionName());
+			return other.getName().equals(this.getName());
 		}
 	}
 	
 	
+	
 }

common/src/main/java/com/seibel/distanthorizons/common/wrappers/world/ServerLevelWrapper.java

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by
@@ -20,6 +20,10 @@
 package com.seibel.distanthorizons.common.wrappers.world;
 
 import java.io.File;
+import java.lang.ref.WeakReference;
+import java.util.Collections;
+import java.util.Map;
+import java.util.WeakHashMap;
 import java.util.concurrent.ConcurrentHashMap;
 
 import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiLevelType;
@@ -38,6 +42,7 @@ import com.seibel.distanthorizons.core.wrapperInterfaces.world.IBiomeWrapper;
 
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IServerLevelWrapper;
 import net.minecraft.server.level.ServerLevel;
+import net.minecraft.world.level.Level;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ChunkSource;
 
@@ -47,15 +52,21 @@ import net.minecraft.world.level.chunk.ChunkStatus;
 import net.minecraft.world.level.chunk.status.ChunkStatus;
 #endif
 
+#if MC_VER < MC_1_21_3
+#else
+import java.nio.file.Path;
+#endif
+
 import org.apache.logging.log4j.Logger;
 
-/**
- * @version 2022-9-16
- */
 public class ServerLevelWrapper implements IServerLevelWrapper
 {
 	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
-	private static final ConcurrentHashMap<ServerLevel, ServerLevelWrapper> LEVEL_WRAPPER_BY_SERVER_LEVEL = new ConcurrentHashMap<>();
+	/** 
+	 * weak references are to prevent rare issues
+	 * where, upon world closure, some levels aren't shutdown/removed properly
+	 */
+	private static final Map<ServerLevel, WeakReference<ServerLevelWrapper>> LEVEL_WRAPPER_REF_BY_SERVER_LEVEL = Collections.synchronizedMap(new WeakHashMap<>());
 	
 	private final ServerLevel level;
 	@Deprecated // TODO circular references are bad
@@ -67,21 +78,52 @@ public class ServerLevelWrapper implements IServerLevelWrapper
 	// constructors //
 	//==============//
 	
-	public static ServerLevelWrapper getWrapper(ServerLevel level) { return LEVEL_WRAPPER_BY_SERVER_LEVEL.computeIfAbsent(level, ServerLevelWrapper::new); }
+	public static ServerLevelWrapper getWrapper(ServerLevel level) 
-	
-	public ServerLevelWrapper(ServerLevel level)
 	{
-		this.level = level;
+		return LEVEL_WRAPPER_REF_BY_SERVER_LEVEL.compute(level, (newLevel, levelRef) ->
+		{
+			if (levelRef != null)
+			{
+				ServerLevelWrapper oldLevelWrapper = levelRef.get();
+				if (oldLevelWrapper != null)
+				{
+					return levelRef;
+				}
+			}
+			
+			return new WeakReference<>(new ServerLevelWrapper(newLevel));
+		}).get();
 	}
 	
+	public ServerLevelWrapper(ServerLevel level) { this.level = level; }
 	
 	
-	//=========//
+	
-	// methods //
+	//==================//
-	//=========//
+	// instance methods //
+	//==================//
 	
 	@Override
-	public File getSaveFolder() { return this.level.getChunkSource().getDataStorage().dataFolder; }
+	public File getMcSaveFolder() 
+	{ 
+		#if MC_VER < MC_1_21_3
+		return this.level.getChunkSource().getDataStorage().dataFolder;
+		#else
+		return this.level.getChunkSource().getDataStorage().dataFolder.toFile();
+		#endif
+	}
+	
+	@Override
+	public String getWorldFolderName()
+	{
+		// Need specifically overworld since it's the only dimension that is stored in a server root folder
+		
+		#if MC_VER >= MC_1_21_3
+		return this.level.getServer().getLevel(Level.OVERWORLD).getChunkSource().getDataStorage().dataFolder.getParent().getFileName().toString();
+		#else // <= 1.21.3
+		return this.level.getServer().getLevel(Level.OVERWORLD).getChunkSource().getDataStorage().dataFolder.getParentFile().getName();
+		#endif
+	}
 	
 	@Override
 	public DimensionTypeWrapper getDimensionType() { return DimensionTypeWrapper.getDimensionTypeWrapper(this.level.dimensionType()); }
@@ -89,6 +131,12 @@ public class ServerLevelWrapper implements IServerLevelWrapper
 	@Override
 	public String getDimensionName() { return this.level.dimension().location().toString(); }
 	
+	@Override
+	public long getHashedSeed() { return this.level.getBiomeManager().biomeZoomSeed; }
+	
+	@Override
+	public String getDhIdentifier() { return this.getDimensionName(); }
+	
 	@Override
 	public EDhApiLevelType getLevelType() { return EDhApiLevelType.SERVER_LEVEL; }
 	
@@ -108,8 +156,10 @@ public class ServerLevelWrapper implements IServerLevelWrapper
 	{
         #if MC_VER < MC_1_17_1
         return 0;
-        #else
+        #elif MC_VER < MC_1_21_3
 		return this.level.getMinBuildHeight();
+        #else
+		return this.level.getMinY();
         #endif
 	}
 	
@@ -127,7 +177,7 @@ public class ServerLevelWrapper implements IServerLevelWrapper
 			return null;
 		}
 		
-		return new ChunkWrapper(chunk, this.level, this);
+		return new ChunkWrapper(chunk, this);
 	}
 	
 	@Override
@@ -154,7 +204,7 @@ public class ServerLevelWrapper implements IServerLevelWrapper
 	public ServerLevel getWrappedMcObject() { return this.level; }
 	
 	@Override
-	public void onUnload() { LEVEL_WRAPPER_BY_SERVER_LEVEL.remove(this.level); }
+	public void onUnload() { LEVEL_WRAPPER_REF_BY_SERVER_LEVEL.remove(this.level); }
 	
 	
 	@Override
@@ -171,6 +221,18 @@ public class ServerLevelWrapper implements IServerLevelWrapper
 		return this.parentDhLevel.getGenericRenderer();
 	}
 	
+	@Override
+	public File getDhSaveFolder()
+	{
+		if (this.parentDhLevel == null)
+		{
+			return null;
+		}
+		
+		return this.parentDhLevel.getSaveStructure().getSaveFolder(this);
+	}
+	
+	
 	
 	
 	//================//
@@ -178,6 +240,6 @@ public class ServerLevelWrapper implements IServerLevelWrapper
 	//================//
 	
 	@Override
-	public String toString() { return "Wrapped{" + this.level.toString() + "@" + this.getDimensionName() + "}"; }
+	public String toString() { return "Wrapped{" + this.level.toString() + "@" + this.getDhIdentifier() + "}"; }
 	
 }

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

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by
@@ -20,11 +20,10 @@
 package com.seibel.distanthorizons.common.wrappers.worldGeneration;
 
 import java.lang.invoke.MethodHandles;
-import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.*;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
+import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiDistantGeneratorMode;
 import com.seibel.distanthorizons.api.enums.worldGeneration.EDhApiWorldGenerationStep;
 import com.seibel.distanthorizons.core.util.objects.UncheckedInterruptedException;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
@@ -46,6 +45,7 @@ public final class GenerationEvent
 	/** the number of chunks wide this event is */
 	public final int size;
 	public final EDhApiWorldGenerationStep targetGenerationStep;
+	public final EDhApiDistantGeneratorMode generatorMode;
 	public EventTimer timer = null;
 	public long inQueueTime;
 	public long timeoutTime = -1;
@@ -56,12 +56,13 @@ public final class GenerationEvent
 	
 	public GenerationEvent(
 			DhChunkPos minPos, int size, BatchGenerationEnvironment generationGroup,
-			EDhApiWorldGenerationStep targetGenerationStep, Consumer<IChunkWrapper> resultConsumer)
+			EDhApiDistantGeneratorMode generatorMode, EDhApiWorldGenerationStep targetGenerationStep, Consumer<IChunkWrapper> resultConsumer)
 	{
 		this.inQueueTime = System.nanoTime();
 		this.id = generationFutureDebugIDs++;
 		this.minPos = minPos;
 		this.size = size;
+		this.generatorMode = generatorMode;
 		this.targetGenerationStep = targetGenerationStep;
 		this.threadedParam = ThreadedParameters.getOrMake(generationGroup.params);
 		this.resultConsumer = resultConsumer;
@@ -71,17 +72,11 @@ public final class GenerationEvent
 	
 	public static GenerationEvent startEvent(
 			DhChunkPos minPos, int size, BatchGenerationEnvironment genEnvironment,
-			EDhApiWorldGenerationStep target, Consumer<IChunkWrapper> resultConsumer,
+			EDhApiDistantGeneratorMode generatorMode, EDhApiWorldGenerationStep target, Consumer<IChunkWrapper> resultConsumer,
 			ExecutorService worldGeneratorThreadPool)
 	{
-		//if (size % 2 == 0)
+		GenerationEvent generationEvent = new GenerationEvent(minPos, size, genEnvironment, generatorMode, target, resultConsumer);
-		//{
+		generationEvent.future = CompletableFuture.supplyAsync(() ->
-		//	size += 1; // size must be odd for vanilla world gen regions to work
-		//}
-		
-		
-		GenerationEvent generationEvent = new GenerationEvent(minPos, size, genEnvironment, target, resultConsumer);
-		generationEvent.future = CompletableFuture.runAsync(() ->
 		{
 			long runStartTime = System.nanoTime();
 			generationEvent.timeoutTime = runStartTime;
@@ -89,19 +84,75 @@ public final class GenerationEvent
 			generationEvent.timer = new EventTimer("setup");
 			
 			BatchGenerationEnvironment.isDistantGeneratorThread.set(true);
+			
 			try
 			{
-				//LOGGER.info("generating [{}]", event.minPos);
+				genEnvironment.generateLodFromListAsync(generationEvent, (runnable) -> 
-				genEnvironment.generateLodFromList(generationEvent);
+				{
+					worldGeneratorThreadPool.execute(() ->
+					{
+						boolean alreadyMarked = BatchGenerationEnvironment.isCurrentThreadDistantGeneratorThread();
+						if (!alreadyMarked)
+						{
+							BatchGenerationEnvironment.isDistantGeneratorThread.set(true);
+						}
+						
+						try
+						{
+							runnable.run();
+						}
+						catch (Throwable throwable)
+						{
+							handleWorldGenThrowable(generationEvent, throwable);
+						}
+						finally
+						{
+							if (!alreadyMarked)
+							{
+								BatchGenerationEnvironment.isDistantGeneratorThread.set(false);
+							}
+						}
+					});
+				});
+			}
+			catch (Throwable initialThrowable)
+			{
+				handleWorldGenThrowable(generationEvent, initialThrowable);
 			}
-			catch (InterruptedException ignored) { }
 			finally
 			{
 				BatchGenerationEnvironment.isDistantGeneratorThread.remove();
 			}
+			
+			return null;
 		}, worldGeneratorThreadPool);
 		return generationEvent;
 	}
+	/** There's probably a better way to handle this, but it'll work for now */
+	private static void handleWorldGenThrowable(GenerationEvent generationEvent, Throwable initialThrowable)
+	{
+		Throwable throwable = initialThrowable;
+		while (throwable instanceof CompletionException)
+		{
+			throwable = throwable.getCause();
+		}
+		
+		if (throwable instanceof InterruptedException
+			|| throwable instanceof UncheckedInterruptedException
+			|| throwable instanceof RejectedExecutionException)
+		{
+			// these exceptions can be ignored, generally they just mean
+			// the thread is busy so it'll need to try again later.
+			// FIXME this should cause the world gen task to be re-queued so we can try again later
+			//  however, currently it can cause large gaps in the world gen instead.
+			//  These gaps will generate correctly if the level is reloaded and the world gen is re-queued,
+			//  however this is makes it look like the generator isn't working or skipped something.
+		}
+		else
+		{
+			generationEvent.future.completeExceptionally(throwable);
+		}
+	}
 	
 	public boolean isComplete() { return this.future.isDone(); }
 	

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

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by
@@ -50,23 +50,26 @@ import net.minecraft.world.level.storage.WorldData;
 public final class GlobalParameters
 {
 	public final ChunkGenerator generator;
-	#if MC_VER < MC_1_19_2
-	public final StructureManager structures;
-	#else
-	public final StructureTemplateManager structures;
-	public final RandomState randomState;
-	#endif
-	#if MC_VER < MC_1_19_4
-	public final WorldGenSettings worldGenSettings;
-	#else
-	public final WorldOptions worldOptions;
-	#endif
 	public final IDhServerLevel lodLevel;
 	public final ServerLevel level;
 	public final Registry<Biome> biomes;
 	public final RegistryAccess registry;
 	public final long worldSeed;
 	public final DataFixer fixerUpper;
+	
+	#if MC_VER < MC_1_19_2
+	public final StructureManager structures;
+	#else
+	public final StructureTemplateManager structures;
+	public final RandomState randomState;
+	#endif
+	
+	#if MC_VER < MC_1_19_4
+	public final WorldGenSettings worldGenSettings;
+	#else
+	public final WorldOptions worldOptions;
+	#endif
+	
 	#if MC_VER >= MC_1_18_2
 	public final BiomeManager biomeManager;
 	public final ChunkScanAccess chunkScanner; // FIXME: Figure out if this is actually needed
@@ -76,29 +79,34 @@ public final class GlobalParameters
 	{
 		this.lodLevel = lodLevel;
 		
-		level = ((ServerLevelWrapper) lodLevel.getServerLevelWrapper()).getWrappedMcObject();
+		this.level = ((ServerLevelWrapper) lodLevel.getServerLevelWrapper()).getWrappedMcObject();
-		MinecraftServer server = level.getServer();
+		MinecraftServer server = this.level.getServer();
 		WorldData worldData = server.getWorldData();
-		registry = server.registryAccess();
+		this.registry = server.registryAccess();
 
 		#if MC_VER < MC_1_19_4
-		worldGenSettings = worldData.worldGenSettings();
+		this.worldGenSettings = worldData.worldGenSettings();
-		biomes = registry.registryOrThrow(Registry.BIOME_REGISTRY);
+		this.biomes = registry.registryOrThrow(Registry.BIOME_REGISTRY);
-		worldSeed = worldGenSettings.seed();
+		this.worldSeed = worldGenSettings.seed();
+		#elif MC_VER < MC_1_21_3
+		this.worldOptions = worldData.worldGenOptions();
+		this.biomes = registry.registryOrThrow(Registries.BIOME);
+		this.worldSeed = worldOptions.seed();
 		#else
-		worldOptions = worldData.worldGenOptions();
+		this.worldOptions = worldData.worldGenOptions();
-		biomes = registry.registryOrThrow(Registries.BIOME);
+		this.biomes = this.registry.lookupOrThrow(Registries.BIOME);
-		worldSeed = worldOptions.seed();
+		this.worldSeed = this.worldOptions.seed();
 		#endif
+		
 		#if MC_VER >= MC_1_18_2
-		biomeManager = new BiomeManager(level, BiomeManager.obfuscateSeed(worldSeed));
+		this.biomeManager = new BiomeManager(this.level, BiomeManager.obfuscateSeed(this.worldSeed));
-		chunkScanner = level.getChunkSource().chunkScanner();
+		this.chunkScanner = this.level.getChunkSource().chunkScanner();
 		#endif
-		structures = server.getStructureManager();
+		this.structures = server.getStructureManager();
-		generator = level.getChunkSource().getGenerator();
+		this.generator = this.level.getChunkSource().getGenerator();
-		fixerUpper = server.getFixerUpper();
+		this.fixerUpper = server.getFixerUpper();
 		#if MC_VER >= MC_1_19_2
-		randomState = level.getChunkSource().randomState();
+		this.randomState = this.level.getChunkSource().randomState();
 		#endif
 	}
 	

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

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by

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

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by

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

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU GPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU General Public License as published by
@@ -19,7 +19,6 @@
 
 package com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject;
 
-import com.google.common.collect.Maps;
 import com.mojang.serialization.Codec;
 import com.mojang.serialization.Dynamic;
 import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
@@ -27,21 +26,16 @@ import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGeneratio
 
 import com.seibel.distanthorizons.core.logging.ConfigBasedLogger;
 import com.seibel.distanthorizons.core.util.LodUtil;
-import com.seibel.distanthorizons.core.wrapperInterfaces.block.IBlockStateWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.ChunkLightStorage;
-import com.seibel.distanthorizons.core.wrapperInterfaces.chunk.IChunkWrapper;
-import it.unimi.dsi.fastutil.longs.LongOpenHashSet;
-import it.unimi.dsi.fastutil.longs.LongSet;
 
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
 import java.util.Objects;
+import java.util.Optional;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.atomic.AtomicBoolean;
 
 
+import it.unimi.dsi.fastutil.shorts.ShortList;
 import net.minecraft.core.Registry;
-import net.minecraft.core.SectionPos;
 #if MC_VER >= MC_1_19_4
 import net.minecraft.core.registries.BuiltInRegistries;
 import net.minecraft.core.registries.Registries;
@@ -50,7 +44,6 @@ import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.ListTag;
 import net.minecraft.nbt.NbtOps;
 import net.minecraft.nbt.Tag;
-import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.*;
 import net.minecraft.world.level.biome.Biome;
@@ -59,20 +52,22 @@ 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.*;
+
+#if MC_VER < MC_1_21_3
 import net.minecraft.world.level.chunk.storage.ChunkSerializer;
+#else
+#endif
+
 import net.minecraft.world.level.levelgen.Heightmap;
 #if MC_VER >= MC_1_18_2
 import net.minecraft.world.level.levelgen.blending.BlendingData;
 #if MC_VER < MC_1_19_2
 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 MC_VER >= MC_1_18_2
 import net.minecraft.core.Holder;
-import net.minecraft.core.RegistryAccess;
 #if MC_VER < MC_1_19_2
 import net.minecraft.world.level.levelgen.feature.ConfiguredStructureFeature;
 #endif
@@ -91,11 +86,13 @@ import net.minecraft.world.level.chunk.status.ChunkType;
 #endif
 
 import net.minecraft.world.level.material.Fluid;
+import org.jetbrains.annotations.Nullable;
 
 
 public class ChunkLoader
 {
-	private static boolean zeroChunkPosErrorLogged = false;
+	private static final AtomicBoolean ZERO_CHUNK_POS_ERROR_LOGGED_REF = new AtomicBoolean(false);
+	
 	
 	#if MC_VER >= MC_1_19_2
 	private static final Codec<PalettedContainer<BlockState>> BLOCK_STATE_CODEC = PalettedContainer.codecRW(Block.BLOCK_STATE_REGISTRY, BlockState.CODEC, PalettedContainer.Strategy.SECTION_STATES, Blocks.AIR.defaultBlockState());
@@ -111,6 +108,8 @@ public class ChunkLoader
 	
 	private static boolean lightingSectionErrorLogged = false;
 	
+	private static final ConcurrentHashMap<String, Object> LOGGED_ERROR_MESSAGE_MAP = new ConcurrentHashMap<>();
+	
 	
 	
 	//============//
@@ -125,19 +124,16 @@ public class ChunkLoader
 		CompoundTag tagLevel = chunkData;
 		#endif
 		
-		ChunkPos actualPos = new ChunkPos(tagLevel.getInt("xPos"), tagLevel.getInt("zPos"));
+		int chunkX = tagGetInt(tagLevel,"xPos");
+		int chunkZ = tagGetInt(tagLevel, "zPos");
+		ChunkPos actualPos = new ChunkPos(chunkX, chunkZ);
+		
 		if (!Objects.equals(chunkPos, actualPos))
 		{
-			#if MC_VER >= MC_1_18_2
+			if (chunkX == 0 && chunkZ == 0)
-			if (actualPos.equals(ChunkPos.ZERO))
-			#else
-			if (actualPos.equals(ChunkPos.INVALID_CHUNK_POS))
-			#endif
 			{
-				if (!zeroChunkPosErrorLogged)
+				if (!ZERO_CHUNK_POS_ERROR_LOGGED_REF.getAndSet(true))
 				{
-					zeroChunkPosErrorLogged = true;
-					
 					// explicit chunkPos toString is necessary otherwise the JDK 17 compiler breaks
 					LOGGER.warn("Chunk file at ["+chunkPos.toString()+"] doesn't have a chunk pos. \n" +
 						"This might happen if the world was created using an external program. \n" +
@@ -179,14 +175,27 @@ public class ChunkLoader
 		
 		#endif
 		
-		long inhabitedTime = tagLevel.getLong("InhabitedTime");
+		long inhabitedTime = tagGetLong(tagLevel, "InhabitedTime");
 		
 		//================== Read params for making the LevelChunk ==================
-		UpgradeData upgradeData = tagLevel.contains(TAG_UPGRADE_DATA, 10)
-				? new UpgradeData(tagLevel.getCompound(TAG_UPGRADE_DATA)#if MC_VER >= MC_1_17_1 , level #endif )
-				: UpgradeData.EMPTY;
 		
-		boolean isLightOn = tagLevel.getBoolean("isLightOn");
+		UpgradeData upgradeData;
+		#if MC_VER < MC_1_17_1
+		upgradeData = tagLevel.contains(TAG_UPGRADE_DATA, 10)
+				? new UpgradeData(tagGetCompoundTag(tagLevel, TAG_UPGRADE_DATA))
+				: UpgradeData.EMPTY;
+		#elif MC_VER < MC_1_21_5
+		upgradeData = tagLevel.contains(TAG_UPGRADE_DATA, 10)
+				? new UpgradeData(tagGetCompoundTag(tagLevel, TAG_UPGRADE_DATA), level)
+				: UpgradeData.EMPTY;
+		#else
+		upgradeData = tagLevel.contains(TAG_UPGRADE_DATA)
+				? new UpgradeData(tagGetCompoundTag(tagLevel, TAG_UPGRADE_DATA), level)
+				: UpgradeData.EMPTY;
+		#endif
+		
+		
+		boolean isLightOn = tagGetBoolean(tagLevel, "isLightOn");
 		#if MC_VER < MC_1_18_2
 		ChunkBiomeContainer chunkBiomeContainer = new ChunkBiomeContainer(
 				level.getLevel().registryAccess().registryOrThrow(Registry.BIOME_REGISTRY)#if MC_VER >= MC_1_17_1 , level #endif ,
@@ -203,17 +212,21 @@ public class ChunkLoader
 				: new ProtoTickList<Fluid>(fluid -> (fluid == null || fluid == Fluids.EMPTY), chunkPos,
 				tagLevel.getList("LiquidsToBeTicked", 9)#if MC_VER >= MC_1_17_1 , level #endif );
 		#else
-		#if MC_VER < MC_1_19_4
+			#if MC_VER < MC_1_19_4
-		LevelChunkTicks<Block> blockTicks = LevelChunkTicks.load(tagLevel.getList(BLOCK_TICKS_TAG_18, 10),
+				LevelChunkTicks<Block> blockTicks = LevelChunkTicks.load(tagLevel.getList(BLOCK_TICKS_TAG_18, 10),
-				string -> Registry.BLOCK.getOptional(ResourceLocation.tryParse(string)), chunkPos);
+						string -> Registry.BLOCK.getOptional(ResourceLocation.tryParse(string)), chunkPos);
-		LevelChunkTicks<Fluid> fluidTicks = LevelChunkTicks.load(tagLevel.getList(FLUID_TICKS_TAG_18, 10),
+				LevelChunkTicks<Fluid> fluidTicks = LevelChunkTicks.load(tagLevel.getList(FLUID_TICKS_TAG_18, 10),
-				string -> Registry.FLUID.getOptional(ResourceLocation.tryParse(string)), chunkPos);
+						string -> Registry.FLUID.getOptional(ResourceLocation.tryParse(string)), chunkPos);
-		#else
+			#elif MC_VER < MC_1_21_4
-		LevelChunkTicks<Block> blockTicks = LevelChunkTicks.load(tagLevel.getList(BLOCK_TICKS_TAG_18, 10),
+				LevelChunkTicks<Block> blockTicks = LevelChunkTicks.load(tagLevel.getList(BLOCK_TICKS_TAG_18, 10),
-				(string -> BuiltInRegistries.BLOCK.getOptional(ResourceLocation.tryParse(string))), chunkPos);
+						(string -> BuiltInRegistries.BLOCK.getOptional(ResourceLocation.tryParse(string))), chunkPos);
-		LevelChunkTicks<Fluid> fluidTicks = LevelChunkTicks.load(tagLevel.getList(FLUID_TICKS_TAG_18, 10),
+				LevelChunkTicks<Fluid> fluidTicks = LevelChunkTicks.load(tagLevel.getList(FLUID_TICKS_TAG_18, 10),
-				string -> BuiltInRegistries.FLUID.getOptional(ResourceLocation.tryParse(string)), chunkPos);
+						string -> BuiltInRegistries.FLUID.getOptional(ResourceLocation.tryParse(string)), chunkPos);
-		#endif
+			#else
+				// do we need the ticks for what we're doing?
+				LevelChunkTicks<Block> blockTicks = new LevelChunkTicks<>();
+				LevelChunkTicks<Fluid> fluidTicks = new LevelChunkTicks<>();
+			#endif
 		#endif
 		
 		LevelChunkSection[] levelChunkSections = readSections(level, chunkPos, tagLevel);
@@ -223,7 +236,6 @@ public class ChunkLoader
 		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
@@ -238,32 +250,42 @@ public class ChunkLoader
 		#if MC_VER >= MC_1_18_2
 		#if MC_VER < MC_1_19_4
 		Registry<Biome> biomes = level.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY);
-		#else
+		#elif MC_VER < MC_1_21_3
 		Registry<Biome> biomes = level.registryAccess().registryOrThrow(Registries.BIOME);
+		#else
+		Registry<Biome> biomes = level.registryAccess().lookupOrThrow(Registries.BIOME);
 		#endif
 			#if MC_VER < MC_1_18_2
 			Codec<PalettedContainer<Biome>> biomeCodec = PalettedContainer.codec(
 					biomes, biomes.byNameCodec(), PalettedContainer.Strategy.SECTION_BIOMES, biomes.getOrThrow(Biomes.PLAINS));
 			#elif MC_VER < MC_1_19_2
-		Codec<PalettedContainer<Holder<Biome>>> biomeCodec = PalettedContainer.codec(
+			Codec<PalettedContainer<Holder<Biome>>> biomeCodec = PalettedContainer.codec(
+				biomes.asHolderIdMap(), biomes.holderByNameCodec(), PalettedContainer.Strategy.SECTION_BIOMES, biomes.getHolderOrThrow(Biomes.PLAINS));
+			#elif MC_VER < MC_1_21_3
+			Codec<PalettedContainer<Holder<Biome>>> biomeCodec = PalettedContainer.codecRW(
 				biomes.asHolderIdMap(), biomes.holderByNameCodec(), PalettedContainer.Strategy.SECTION_BIOMES, biomes.getHolderOrThrow(Biomes.PLAINS));
 			#else
-		Codec<PalettedContainer<Holder<Biome>>> biomeCodec = PalettedContainer.codecRW(
+			Codec<PalettedContainer<Holder<Biome>>> biomeCodec = PalettedContainer.codecRW(
-				biomes.asHolderIdMap(), biomes.holderByNameCodec(), PalettedContainer.Strategy.SECTION_BIOMES, biomes.getHolderOrThrow(Biomes.PLAINS));
+				biomes.asHolderIdMap(), biomes.holderByNameCodec(), PalettedContainer.Strategy.SECTION_BIOMES, biomes.getOrThrow(Biomes.PLAINS));
 			#endif
 		#endif
+		
 		int sectionYIndex = #if MC_VER < MC_1_17_1 16; #else level.getSectionsCount(); #endif
 		LevelChunkSection[] chunkSections = new LevelChunkSection[sectionYIndex];
 		
-		boolean isLightOn = chunkData.getBoolean("isLightOn");
+		ListTag tagSections = tagGetListTag(chunkData, "Sections", 10);
-		boolean hasSkyLight = level.dimensionType().hasSkyLight();
+		if (tagSections == null || tagSections.isEmpty())
-		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);
+			tagSections = tagGetListTag(chunkData, "sections", 10);
-			int sectionYPos = tagSection.getByte("Y");
+		}
+		
+		
+		if (tagSections != null)
+		{
+			for (int j = 0; j < tagSections.size(); ++j)
+			{
+				CompoundTag tagSection = tagGetCompoundTag(tagSections, j);
+				int sectionYPos = tagGetByte(tagSection, "Y");
 
 			#if MC_VER < MC_1_18_2
 			if (tagSection.contains("Palette", 9) && tagSection.contains("BlockStates", 12))
@@ -277,49 +299,89 @@ public class ChunkLoader
 							= levelChunkSection;
 			}
 			#else
-			int sectionId = level.getSectionIndexFromSectionY(sectionYPos);
+				int sectionId = level.getSectionIndexFromSectionY(sectionYPos);
-			if (sectionId >= 0 && sectionId < chunkSections.length)
+				if (sectionId >= 0 && sectionId < chunkSections.length)
-			{
+				{
-				PalettedContainer<BlockState> blockStateContainer;
+					PalettedContainer<BlockState> blockStateContainer;
 				#if MC_VER < MC_1_18_2
 				PalettedContainer<Biome> biomeContainer;
 				#else
-				PalettedContainer<Holder<Biome>> biomeContainer;
+					PalettedContainer<Holder<Biome>> biomeContainer;
 				#endif
+					
+					boolean containsBlockStates;
+				#if MC_VER < MC_1_21_5
+				containsBlockStates = tagSection.contains("block_states", 10);
+				#else
+					containsBlockStates = tagSection.contains("block_states");
+				#endif
+					
+					if (containsBlockStates)
+					{
+					#if MC_VER < MC_1_20_6 
+					blockStateContainer = BLOCK_STATE_CODEC.parse(NbtOps.INSTANCE, tagGetCompoundTag(tagSection, "block_states"))
+						.promotePartial(string -> logBlockDeserializationWarning(chunkPos, sectionYPos, string))
+						.getOrThrow(false, (message) -> logParsingWarningOnce(message));
+					#else
+						blockStateContainer = BLOCK_STATE_CODEC.parse(NbtOps.INSTANCE, tagGetCompoundTag(tagSection, "block_states"))
+								.promotePartial(string -> logBlockDeserializationWarning(chunkPos, sectionYPos, string))
+								.getOrThrow((message) -> logErrorAndReturnException(message));
+					#endif
+					}
+					else
+					{
+						blockStateContainer = new PalettedContainer<BlockState>(Block.BLOCK_STATE_REGISTRY, Blocks.AIR.defaultBlockState(), PalettedContainer.Strategy.SECTION_STATES);
+					}
+				
 				
-				blockStateContainer = tagSection.contains("block_states", 10)
-						? BLOCK_STATE_CODEC.parse(NbtOps.INSTANCE, tagSection.getCompound("block_states")).promotePartial(string -> logBlockDeserializationWarning(chunkPos, sectionYPos, string))
-						#if MC_VER < MC_1_20_6 
-						.getOrThrow(false, LOGGER::error)
-						#else
-						.getOrThrow((message) -> (RuntimeException) LOGGER.errorAndThrow(message, null)) 
-						#endif
-						: new PalettedContainer<BlockState>(Block.BLOCK_STATE_REGISTRY, Blocks.AIR.defaultBlockState(), PalettedContainer.Strategy.SECTION_STATES);
-
 				#if MC_VER < 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)
+						? biomeCodec.parse(NbtOps.INSTANCE, tagSection.getCompound("biomes")).promotePartial(string -> logErrors(chunkPos, sectionYPos, string)).getOrThrow(false, (message) -> logWarningOnce(message))
 						: new PalettedContainer<Biome>(biomes, biomes.getOrThrow(Biomes.PLAINS), PalettedContainer.Strategy.SECTION_BIOMES);
 				#else
+					
+					
+					boolean containsBiomes;
+				#if MC_VER < MC_1_21_5
+				containsBiomes = tagSection.contains("biomes", 10);
+				#else
+					containsBiomes = tagSection.contains("biomes");
+				#endif
+					
+					if (containsBiomes)
+					{
+					#if MC_VER < MC_1_20_6 
+					biomeContainer = biomeCodec.parse(NbtOps.INSTANCE, tagGetCompoundTag(tagSection, "biomes"))
+						.promotePartial(string -> logBiomeDeserializationWarning(chunkPos, sectionYIndex, (String) string))
+						.getOrThrow(false, (message) -> logParsingWarningOnce(message));
+					#else
+						biomeContainer = biomeCodec.parse(NbtOps.INSTANCE, tagGetCompoundTag(tagSection, "biomes"))
+								.promotePartial(string -> logBiomeDeserializationWarning(chunkPos, sectionYIndex, (String) string))
+								.getOrThrow((message) -> logErrorAndReturnException(message));
+					#endif
+					}
+					else
+					{
+						biomeContainer = new PalettedContainer<Holder<Biome>>(biomes.asHolderIdMap(), 
+							#if MC_VER < MC_1_21_3
+							biomes.getHolderOrThrow(Biomes.PLAINS), 
+							#else
+								biomes.getOrThrow(Biomes.PLAINS),
+							#endif
+								PalettedContainer.Strategy.SECTION_BIOMES);
+					}
 				
-				biomeContainer = tagSection.contains("biomes", 10)
-						? biomeCodec.parse(NbtOps.INSTANCE, tagSection.getCompound("biomes")).promotePartial(string -> logBiomeDeserializationWarning(chunkPos, sectionYIndex, (String) string))
-						#if MC_VER < MC_1_20_6 
-						.getOrThrow(false, LOGGER::error)
-						#else
-						.getOrThrow((message) -> (RuntimeException) LOGGER.errorAndThrow(message, null))
-						#endif
-						: new PalettedContainer<Holder<Biome>>(biomes.asHolderIdMap(), biomes.getHolderOrThrow(Biomes.PLAINS), PalettedContainer.Strategy.SECTION_BIOMES);
 				#endif
 				
 				#if MC_VER < MC_1_20_1
 				chunkSections[sectionId] = new LevelChunkSection(sectionYPos, blockStateContainer, biomeContainer);
 				#else
-				chunkSections[sectionId] = new LevelChunkSection(blockStateContainer, biomeContainer);
+					chunkSections[sectionId] = new LevelChunkSection(blockStateContainer, biomeContainer);
 				#endif
-			}
+				}
 			#endif
-			
+				
+			}	
 		}
 		return chunkSections;
 	}
@@ -329,36 +391,55 @@ public class ChunkLoader
 		#else ChunkType #endif 
 	readChunkType(CompoundTag tagLevel)
 	{
-		ChunkStatus chunkStatus = ChunkStatus.byName(tagLevel.getString("Status"));
+		ChunkStatus chunkStatus = ChunkStatus.byName(tagGetString(tagLevel,"Status"));
 		if (chunkStatus != null)
 		{
 			return chunkStatus.getChunkType();
 		}
 		
-		return 
+		#if MC_VER <= MC_1_20_4
-				#if MC_VER <= MC_1_20_4 ChunkStatus.ChunkType.PROTOCHUNK;
+		return ChunkStatus.ChunkType.PROTOCHUNK;
-				#else ChunkType.PROTOCHUNK; #endif
+		#else
+		return ChunkType.PROTOCHUNK;
+		#endif
 	}
 	private static void readHeightmaps(LevelChunk chunk, CompoundTag chunkData)
 	{
-		CompoundTag tagHeightmaps = chunkData.getCompound("Heightmaps");
+		CompoundTag tagHeightmaps = tagGetCompoundTag(chunkData, "Heightmaps");
 		for (Heightmap.Types type : ChunkStatus.FULL.heightmapsAfter())
 		{
 			String heightmap = type.getSerializationKey();
+			#if MC_VER < MC_1_21_5
 			if (tagHeightmaps.contains(heightmap, 12))
+			{
 				chunk.setHeightmap(type, tagHeightmaps.getLongArray(heightmap));
+			}
+			#else
+			if (tagHeightmaps.contains(heightmap))
+			{
+				Optional<long[]> optionalHeightmap = tagHeightmaps.getLongArray(heightmap);
+				if (optionalHeightmap.isPresent())
+				{
+					chunk.setHeightmap(type, optionalHeightmap.get());
+				}
+			}
+			#endif
 		}
 		Heightmap.primeHeightmaps(chunk, ChunkStatus.FULL.heightmapsAfter());
 	}
 	private static void readPostPocessings(LevelChunk chunk, CompoundTag chunkData)
 	{
-		ListTag tagPostProcessings = chunkData.getList("PostProcessing", 9);
+		ListTag tagPostProcessings = tagGetListTag(chunkData,"PostProcessing", 9);
-		for (int n = 0; n < tagPostProcessings.size(); ++n)
+		for (int i = 0; i < tagPostProcessings.size(); ++i)
 		{
-			ListTag listTag3 = tagPostProcessings.getList(n);
+			ListTag listTag3 = tagGetListTag(tagPostProcessings, i);
-			for (int o = 0; o < listTag3.size(); ++o)
+			for (int j = 0; j < listTag3.size(); ++j)
 			{
-				chunk.addPackedPostProcess(listTag3.getShort(o), n);
+				#if MC_VER < MC_1_21_3
+				chunk.addPackedPostProcess(listTag3.getShort(j), i);
+				#else
+				chunk.addPackedPostProcess(ShortList.of(tagGetShort(listTag3, j)), i);
+				#endif
 			}
 		}
 	}
@@ -366,11 +447,38 @@ public class ChunkLoader
 	private static BlendingData readBlendingData(CompoundTag chunkData)
 	{
 		BlendingData blendingData = null;
-		if (chunkData.contains("blending_data", 10))
+		
+		
+		boolean containsBlendingData;
+		#if MC_VER < MC_1_21_5
+		containsBlendingData = chunkData.contains("blending_data", 10);
+		#else
+		containsBlendingData = chunkData.contains("blending_data");
+		#endif
+		
+		if (containsBlendingData)
 		{
 			@SuppressWarnings({"unchecked", "rawtypes"})
 			Dynamic<CompoundTag> blendingDataTag = new Dynamic(NbtOps.INSTANCE, chunkData.getCompound("blending_data"));
-			blendingData = BlendingData.CODEC.parse(blendingDataTag).resultOrPartial(LOGGER::error).orElse(null);
+			
+			try
+			{
+				#if MC_VER < MC_1_21_3
+				blendingData = BlendingData.CODEC.parse(blendingDataTag).resultOrPartial((message) -> logParsingWarningOnce(message)).orElse(null);
+				#else
+				blendingData = BlendingData.unpack(BlendingData.Packed.CODEC.parse(blendingDataTag).resultOrPartial((message) -> logParsingWarningOnce(message)).orElse(null));
+				#endif
+			}
+			catch (Exception e)
+			{
+				String message = e.getMessage();
+				if (message == null || message.trim().isEmpty())
+				{
+					message = "Failed to parse blending data";
+				}
+				
+				logParsingWarningOnce(message, e);
+			}
 		}
 		return blendingData;
 	}
@@ -392,7 +500,7 @@ public class ChunkLoader
 		return null;
 		#else
 		
-		CombinedChunkLightStorage combinedStorage = new CombinedChunkLightStorage(ChunkWrapper.getMinBuildHeight(chunk), ChunkWrapper.getMaxBuildHeight(chunk));
+		CombinedChunkLightStorage combinedStorage = new CombinedChunkLightStorage(ChunkWrapper.getInclusiveMinBuildHeight(chunk), ChunkWrapper.getExclusiveMaxBuildHeight(chunk));
 		ChunkLightStorage blockLightStorage = combinedStorage.blockLightStorage;
 		ChunkLightStorage skyLightStorage = combinedStorage.skyLightStorage;
 		
@@ -447,33 +555,37 @@ public class ChunkLoader
 			
 			
 			// if null all lights = 0
-			byte[] blockLightNibbleArray = chunkSectionCompoundTag.getByteArray("BlockLight");
+			byte[] blockLightNibbleArray = tagGetByteArray(chunkSectionCompoundTag, "BlockLight");
-			byte[] skyLightNibbleArray = chunkSectionCompoundTag.getByteArray("SkyLight");
+			byte[] skyLightNibbleArray = tagGetByteArray(chunkSectionCompoundTag, "SkyLight");
 			
-			// if any sky light was found then all lights above will be max brightness
+			if (blockLightNibbleArray != null 
-			if (skyLightNibbleArray.length != 0)
+				&& skyLightNibbleArray != null)
 			{
-				foundSkyLight = true;
+				// if any sky light was found then all lights above will be max brightness
-			}
+				if (skyLightNibbleArray.length != 0)
-			
-			for (int relX = 0; relX < LodUtil.CHUNK_WIDTH; relX++)
-			{
-				for (int relZ = 0; relZ < LodUtil.CHUNK_WIDTH; relZ++)
 				{
-					// chunk sections are also 16 blocks tall
+					foundSkyLight = true;
-					for (int relY = 0; relY < LodUtil.CHUNK_WIDTH; relY++)
+				}
+				
+				for (int relX = 0; relX < LodUtil.CHUNK_WIDTH; relX++)
+				{
+					for (int relZ = 0; relZ < LodUtil.CHUNK_WIDTH; relZ++)
 					{
-						int blockPosIndex = relY*16*16 + relZ*16 + relX;
+						// chunk sections are also 16 blocks tall
-						byte blockLight = (blockLightNibbleArray.length == 0) ? 0 : getNibbleAtIndex(blockLightNibbleArray, blockPosIndex);
+						for (int relY = 0; relY < LodUtil.CHUNK_WIDTH; relY++)
-						byte skyLight = (skyLightNibbleArray.length == 0) ? 0 : getNibbleAtIndex(skyLightNibbleArray, blockPosIndex);
-						if (skyLightNibbleArray.length == 0 && foundSkyLight)
 						{
-							skyLight = LodUtil.MAX_MC_LIGHT;
+							int blockPosIndex = relY*16*16 + relZ*16 + relX;
+							byte blockLight = (blockLightNibbleArray.length == 0) ? 0 : getNibbleAtIndex(blockLightNibbleArray, blockPosIndex);
+							byte skyLight = (skyLightNibbleArray.length == 0) ? 0 : getNibbleAtIndex(skyLightNibbleArray, blockPosIndex);
+							if (skyLightNibbleArray.length == 0 && foundSkyLight)
+							{
+								skyLight = LodUtil.MAX_MC_LIGHT;
+							}
+							
+							int y = relY + (sectionIndex * LodUtil.CHUNK_WIDTH) + ChunkWrapper.getInclusiveMinBuildHeight(chunk);
+							blockLightStorage.set(relX, y, relZ, blockLight);
+							skyLightStorage.set(relX, y, relZ, skyLight);
 						}
-						
-						int y = relY + (sectionIndex * LodUtil.CHUNK_WIDTH) + ChunkWrapper.getMinBuildHeight(chunk);
-						blockLightStorage.set(relX, y, relZ, blockLight);
-						skyLightStorage.set(relX, y, relZ, skyLight);
 					}
 				}
 			}
@@ -495,13 +607,192 @@ public class ChunkLoader
 		}
 	}
 	
+	
+	
+	//=========//
+	// logging //
+	//=========//
+	
 	private static void logBlockDeserializationWarning(ChunkPos chunkPos, int sectionYIndex, String message)
 	{
-		LOGGER.warn("Unable to deserialize blocks for chunk section [" + chunkPos.x + ", " + sectionYIndex + ", " + chunkPos.z + "], error: ["+message+"]. This can probably be ignored, although if your world looks wrong, optimizing it via the single player menu then deleting your DH database(s) should fix the problem.");
+		LOGGED_ERROR_MESSAGE_MAP.computeIfAbsent(message, (newMessage) ->
+		{
+			LOGGER.warn("Unable to deserialize blocks for chunk section [" + chunkPos.x + ", " + sectionYIndex + ", " + chunkPos.z + "], error: ["+newMessage+"]. " +
+					"This can probably be ignored, although if your world looks wrong, optimizing it via the single player menu then deleting your DH database(s) should fix the problem.");
+			
+			return newMessage;
+		});
 	}
 	private static void logBiomeDeserializationWarning(ChunkPos chunkPos, int sectionYIndex, String message)
 	{
-		LOGGER.warn("Unable to deserialize biomes for chunk section [" + chunkPos.x + ", " + sectionYIndex + ", " + chunkPos.z + "], error: ["+message+"]. This can probably be ignored, although if your world looks wrong, optimizing it via the single player menu then deleting your DH database(s) should fix the problem.");
+		LOGGED_ERROR_MESSAGE_MAP.computeIfAbsent(message, (newMessage) -> 
+		{
+			LOGGER.warn("Unable to deserialize biomes for chunk section [" + chunkPos.x + ", " + sectionYIndex + ", " + chunkPos.z + "], error: ["+newMessage+"]. " +
+					"This can probably be ignored, although if your world looks wrong, optimizing it via the single player menu then deleting your DH database(s) should fix the problem.");
+			
+			return newMessage;
+		});
+	}
+	
+	private static void logParsingWarningOnce(String message) { logParsingWarningOnce(message, null); }
+	private static void logParsingWarningOnce(String message, Exception e)
+	{
+		if (message == null)
+		{
+			return;
+		}
+		
+		LOGGED_ERROR_MESSAGE_MAP.computeIfAbsent(message, (newMessage) ->
+		{
+			LOGGER.warn("Parsing error: ["+newMessage+"]. " +
+					"This can probably be ignored, although if your world looks wrong, optimizing it via the single player menu then deleting your DH database(s) should fix the problem.",
+					e);
+			
+			return newMessage;
+		});
+	}
+	
+	private static RuntimeException logErrorAndReturnException(String message)
+	{
+		LOGGED_ERROR_MESSAGE_MAP.computeIfAbsent(message, (newMessage) ->
+		{
+			LOGGER.warn("Parsing error: ["+newMessage+"]. " +
+					"This can probably be ignored, although if your world looks wrong, optimizing it via the single player menu then deleting your DH database(s) should fix the problem.");
+			
+			return newMessage;
+		});
+		
+		// Currently we want to ignore these errors, if returning null is a problem, we can change this later
+		return null; //new RuntimeException(message);
+	}
+	
+	
+	
+	//====================//
+	// tag helper methods //
+	//====================//
+	
+	// TODO move into separate file (this file is getting long)
+	// these tag helpers are to simplify tag accessing between MC versions
+	
+	/** defaults to "false" if the tag isn't present */
+	private static boolean tagGetBoolean(CompoundTag tag, String key)
+	{
+		#if MC_VER < MC_1_21_5
+		return tag.getBoolean(key);
+		#else
+		return tag.getBoolean(key).orElse(false);
+		#endif
+	}
+	
+	/** defaults to "0" if the tag isn't present */
+	private static byte tagGetByte(CompoundTag tag, String key)
+	{
+		#if MC_VER < MC_1_21_5
+		return tag.getByte(key);
+		#else
+		return tag.getByte(key).orElse((byte)0);
+		#endif
+	}
+	
+	/** defaults to "0" if the tag isn't present */
+	private static short tagGetShort(ListTag tag, int index)
+	{
+		#if MC_VER < MC_1_21_5
+		return tag.getShort(index);
+		#else
+		return tag.getShort(index).orElse((short)0);
+		#endif
+	}
+	
+	/** defaults to "0" if the tag isn't present */
+	private static int tagGetInt(CompoundTag tag, String key)
+	{
+		#if MC_VER < MC_1_21_5
+		return tag.getInt(key);
+		#else
+		return tag.getInt(key).orElse(0);
+		#endif
+	}
+	
+	/** defaults to "0" if the tag isn't present */
+	private static long tagGetLong(CompoundTag tag, String key)
+	{
+		#if MC_VER < MC_1_21_5
+		return tag.getInt(key);
+		#else
+		return tag.getLong(key).orElse(0L);
+		#endif
+	}
+	
+	
+	
+	/** defaults to null if the tag isn't present */
+	private static String tagGetString(CompoundTag tag, String key)
+	{
+		#if MC_VER < MC_1_21_5
+		return tag.getString(key);
+		#else
+		return tag.getString(key).orElse(null);
+		#endif
+	}
+	
+	/** defaults to null if the tag isn't present */
+	private static byte[] tagGetByteArray(CompoundTag tag, String key)
+	{
+		#if MC_VER < MC_1_21_5
+		return tag.getByteArray(key);
+		#else
+		return tag.getByteArray(key).orElse(null);
+		#endif
+	}
+	
+	
+	
+	/** defaults to null if the tag isn't present */
+	@Nullable
+	private static CompoundTag tagGetCompoundTag(CompoundTag tag, String key)
+	{
+		#if MC_VER < MC_1_21_5
+		return tag.getCompound(key);
+		#else
+		return tag.getCompound(key).orElse(null);
+		#endif
+	}
+	/** defaults to null if the tag isn't present */
+	@Nullable
+	private static CompoundTag tagGetCompoundTag(ListTag tag, int index)
+	{
+		#if MC_VER < MC_1_21_5
+		return tag.getCompound(index);
+		#else
+		return tag.getCompound(index).orElse(null);
+		#endif
+	}
+	
+	/** 
+	 * defaults to null if the tag isn't present
+	 * @param elementType unused after MC 1.21.5
+	 */
+	@Nullable
+	private static ListTag tagGetListTag(CompoundTag tag, String key, int elementType)
+	{
+		#if MC_VER < MC_1_21_5
+		return tag.getList(key, elementType);
+		#else
+		return tag.getList(key).orElse(null);
+		#endif
+	}
+	
+	/** defaults to null if the tag isn't present */
+	@Nullable
+	private static ListTag tagGetListTag(ListTag tag, int index)
+	{
+		#if MC_VER < MC_1_21_5
+		return tag.getList(index);
+		#else
+		return tag.getList(index).orElse(null);
+		#endif
 	}
 	
 	

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/DhGenerationChunkHolder.java

@@ -5,19 +5,24 @@ package com.seibel.distanthorizons.common.wrappers.worldGeneration.mimicObject;
 import net.minecraft.server.level.GenerationChunkHolder;
 import net.minecraft.world.level.ChunkPos;
 
+import java.util.concurrent.CompletableFuture;
+
 public class DhGenerationChunkHolder extends GenerationChunkHolder
 {
 	
-	public DhGenerationChunkHolder(ChunkPos pos)
+	public DhGenerationChunkHolder(ChunkPos pos) { super(pos); }
-	{
-		super(pos);
-	}
 	
 	@Override 
 	public int getTicketLevel() { return 0; }
 	@Override 
 	public int getQueueLevel() { return 0; }
 	
+	#if MC_VER < MC_1_21_3
+	#else
+	@Override
+	protected void addSaveDependency(CompletableFuture<?> completableFuture) { }
+	#endif
+	
 }
 
 #endif

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/DhLitWorldGenRegion.java

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by
@@ -68,6 +68,13 @@ import com.google.common.collect.ImmutableList;
 import net.minecraft.server.level.GenerationChunkHolder;
 #endif
 
+#if MC_VER >= MC_1_18_2
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.world.ticks.BlackholeTickAccess;
+import net.minecraft.world.ticks.LevelTickAccess;
+#endif
+
 
 public class DhLitWorldGenRegion extends WorldGenRegion
 {
@@ -76,8 +83,9 @@ public class DhLitWorldGenRegion extends WorldGenRegion
 	private static ChunkStatus debugTriggeredForStatus = null;
 	
 	
+	public final ServerLevel serverLevel;
 	public final DummyLightEngine lightEngine;
-	public final BatchGenerationEnvironment.IEmptyChunkGeneratorFunc generator;
+	public final BatchGenerationEnvironment.IEmptyChunkRetrievalFunc generator;
 	public final int writeRadius;
 	public final int size;
 	
@@ -122,7 +130,7 @@ public class DhLitWorldGenRegion extends WorldGenRegion
 			ChunkAccess centerChunk,
 			ServerLevel serverLevel, DummyLightEngine lightEngine,
 			List<ChunkAccess> chunkList, ChunkStatus chunkStatus, int writeRadius,
-			BatchGenerationEnvironment.IEmptyChunkGeneratorFunc generator)
+			BatchGenerationEnvironment.IEmptyChunkRetrievalFunc generator)
 	{
 		#if MC_VER == MC_1_16_5
 		super(serverLevel, chunkList);
@@ -139,9 +147,10 @@ public class DhLitWorldGenRegion extends WorldGenRegion
 						new ChunkDependencies(ImmutableList.copyOf(ChunkStatus.getStatusList()).reverse()),
 						writeRadius, (WorldGenContext var1, ChunkStep var2, StaticCache2D<GenerationChunkHolder> var3, ChunkAccess var4) -> null),
 				centerChunk);
-		
 		#endif
+		
 		this.firstPos = chunkList.get(0).getPos();
+		this.serverLevel = serverLevel;
 		this.generator = generator;
 		this.lightEngine = lightEngine;
 		this.writeRadius = writeRadius;
@@ -170,7 +179,18 @@ public class DhLitWorldGenRegion extends WorldGenRegion
 		if (center.isUpgrading())
 		{
 			LevelHeightAccessor levelHeightAccessor = center.getHeightAccessorForGeneration();
-			if (blockPos.getY() < levelHeightAccessor.getMinBuildHeight() || blockPos.getY() >= levelHeightAccessor.getMaxBuildHeight())
+			
+			int minY;
+			int maxY;
+			#if MC_VER < MC_1_21_3
+			minY = levelHeightAccessor.getMinBuildHeight();
+			maxY = levelHeightAccessor.getMaxBuildHeight();
+			#else
+			minY = levelHeightAccessor.getMinY();
+			maxY = levelHeightAccessor.getMaxY();
+			#endif
+			
+			if (blockPos.getY() < minY || blockPos.getY() >= maxY)
 			{
 				return false;
 			}
@@ -180,6 +200,22 @@ public class DhLitWorldGenRegion extends WorldGenRegion
 	}
 	#endif
 	
+	#if MC_VER >= MC_1_18_2
+	@Override
+	@NotNull
+	public LevelTickAccess<Block> getBlockTicks()
+	{
+		// DH world gen doesn't need ticking, so return the BlackholeTickAccess list (which causes all ticks to be ignored).
+		// If this isn't done the server may attempt to tick chunks outside the vanilla render distance,
+		// which can throw warnings or cause other issues
+		return BlackholeTickAccess.emptyLevelList();
+	}
+	
+	@Override
+	@NotNull
+	public LevelTickAccess<Fluid> getFluidTicks() { return BlackholeTickAccess.emptyLevelList(); }
+	#endif
+	
 	// TODO Check this
 //	@Override
 //	public List<? extends StructureStart<?>> startsForFeature(SectionPos sectionPos,
@@ -193,8 +229,16 @@ public class DhLitWorldGenRegion extends WorldGenRegion
 	{
 		ChunkAccess chunkAccess = this.getChunk(blockPos);
 		if (chunkAccess instanceof LevelChunk)
+		{
 			return true;
-		chunkAccess.setBlockState(blockPos, blockState, false);
+		}
+		
+		#if MC_VER < MC_1_21_5
+		chunkAccess.setBlockState(blockPos, blockState, /*isBlockMoving*/false);
+		#else
+		chunkAccess.setBlockState(blockPos, blockState, /*flags*/0);
+		#endif
+		
 		// This is for post ticking for water on gen and stuff like that. Not enabled
 		// for now.
 		// if (blockState.hasPostProcess(this, blockPos))
@@ -339,7 +383,7 @@ public class DhLitWorldGenRegion extends WorldGenRegion
 			if (chunk == null)
 			{
 				// chunk isn't in memory, generate a new one
-				chunk = this.generator.generate(chunkX, chunkZ);
+				chunk = this.generator.getChunk(chunkX, chunkZ);
 				if (chunk == null)
 				{
 					throw new NullPointerException("The provided generator should not return null!");
@@ -390,14 +434,10 @@ public class DhLitWorldGenRegion extends WorldGenRegion
 	/** Overriding allows us to use our own lighting engine */
 	@Override
 	public boolean canSeeSky(@NotNull BlockPos blockPos)
-	{
+	{ return (this.getBrightness(LightLayer.SKY, blockPos) >= LodUtil.MAX_MC_LIGHT); }
-		return (this.getBrightness(LightLayer.SKY, blockPos) >= this.getMaxLightLevel());
-	}
 	
 	public int getBlockTint(@NotNull BlockPos blockPos, @NotNull ColorResolver colorResolver)
-	{
+	{ return this.calculateBlockTint(blockPos, colorResolver); }
-		return this.calculateBlockTint(blockPos, colorResolver);
-	}
 	
 	private Biome _getBiome(BlockPos pos)
 	{

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/DummyLightEngine.java

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by

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

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by

common/src/main/java/com/seibel/distanthorizons/common/wrappers/worldGeneration/mimicObject/RegionFileStorageExternalCache.java

@@ -22,11 +22,11 @@ import net.minecraft.world.level.chunk.storage.RegionStorageInfo;
 #endif
 
 /** 
- * @deprecated should be replaced with net.minecraft.world.level.chunk.storage.IOWorker to
+ * Shouldn't be used when the C2ME mod is present,
- *              prevent potential file corruption and issues with the C2ME mod.
+ * otherwise there may be potential file corruption.
- *              Generally this would be done via (MC ServerLevel) level.getChunkSource().chunkMap.worker#loadAsync()
+ * When C2ME is present use (via MC ServerLevel) level.getChunkSource().chunkMap.worker#loadAsync()
+ * instead.
  */
-@Deprecated
 public class RegionFileStorageExternalCache implements AutoCloseable
 {
 	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
@@ -46,22 +46,11 @@ public class RegionFileStorageExternalCache implements AutoCloseable
 	
 	
 	
-	static class RegionFileCache
-	{
-		public final long pos;
-		public final RegionFile file;
-		
-		public RegionFileCache(long pos, RegionFile file)
-		{
-			this.pos = pos;
-			this.file = file;
-		}
-		
-	}
 	
 	
+	private final ConcurrentLinkedQueue<RegionFileCache> regionFileCache = new ConcurrentLinkedQueue<>();
+	
 	
-	public ConcurrentLinkedQueue<RegionFileCache> regionFileCache = new ConcurrentLinkedQueue<>();
 	
 	public RegionFileStorageExternalCache(RegionFileStorage storage) { this.storage = storage; }
 	
@@ -150,7 +139,7 @@ public class RegionFileStorageExternalCache implements AutoCloseable
 		
 		if (retryCount >= maxRetryCount)
 		{
-			BatchGenerationEnvironment.LOAD_LOGGER.warn("Concurrency issue detected when getting region file for chunk at " + pos + ".");
+			BatchGenerationEnvironment.LOAD_LOGGER.warn("Concurrency issue detected when getting region file for chunk at [" + pos + "].");
 		}
 		
 		
@@ -237,4 +226,22 @@ public class RegionFileStorageExternalCache implements AutoCloseable
 	}
 	
 	
+	
+	//================//
+	// helper classes //
+	//================//
+	
+	private static class RegionFileCache
+	{
+		public final long pos;
+		public final RegionFile file;
+		
+		public RegionFileCache(long pos, RegionFile file)
+		{
+			this.pos = pos;
+			this.file = file;
+		}
+		
+	}
+	
 }

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

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by

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

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by
@@ -68,33 +68,50 @@ public final class StepBiomes
 			}
 			else if (chunk instanceof ProtoChunk)
 			{
-				#if MC_VER < MC_1_21_1
+				chunkWrapper.trySetStatus(STATUS);
-				((ProtoChunk) chunk).setStatus(STATUS);
-				#else
-				((ProtoChunk) chunk).setPersistedStatus(STATUS);
-				#endif
-				
 				chunksToDo.add(chunk);
 			}
 		}
 		
 		for (ChunkAccess chunk : chunksToDo)
 		{
-			// System.out.println("StepBiomes: "+chunk.getPos());
 			#if MC_VER < MC_1_18_2
 			this.environment.params.generator.createBiomes(this.environment.params.biomes, chunk);
 			#elif MC_VER < MC_1_19_2
-			chunk = this.environment.joinSync(this.environment.params.generator.createBiomes(this.environment.params.biomes, Runnable::run, Blender.of(worldGenRegion),
+			chunk = this.environment.confirmFutureWasRunSynchronously(
-					tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk));
+						this.environment.params.generator.createBiomes(
+							this.environment.params.biomes, 
+							Runnable::run, 
+							Blender.of(worldGenRegion),
+							tParams.structFeat.forWorldGenRegion(worldGenRegion), 
+							chunk)
+					);
 			#elif MC_VER < MC_1_19_4
-			chunk = this.environment.joinSync(this.environment.params.generator.createBiomes(this.environment.params.biomes, Runnable::run, this.environment.params.randomState, Blender.of(worldGenRegion),
+			chunk = this.environment.confirmFutureWasRunSynchronously(
-					tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk));
+						this.environment.params.generator.createBiomes(
+							this.environment.params.biomes, 
+							Runnable::run, 
+							this.environment.params.randomState, Blender.of(worldGenRegion),
+							tParams.structFeat.forWorldGenRegion(worldGenRegion), 
+							chunk)
+					);
 			#elif MC_VER < MC_1_21_1
-			chunk = this.environment.joinSync(this.environment.params.generator.createBiomes(Runnable::run, this.environment.params.randomState, Blender.of(worldGenRegion),
+			chunk = this.environment.confirmFutureWasRunSynchronously(
-					tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk));
+						this.environment.params.generator.createBiomes(
+							Runnable::run, 
+							this.environment.params.randomState, 
+							Blender.of(worldGenRegion),
+							tParams.structFeat.forWorldGenRegion(worldGenRegion), 
+							chunk)
+					);
 			#else
-			chunk = this.environment.joinSync(this.environment.params.generator.createBiomes(this.environment.params.randomState, Blender.of(worldGenRegion),
+			chunk = this.environment.confirmFutureWasRunSynchronously(
-					tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk));
+						this.environment.params.generator.createBiomes(
+							this.environment.params.randomState, 
+							Blender.of(worldGenRegion),
+							tParams.structFeat.forWorldGenRegion(worldGenRegion), 
+							chunk)
+					);
 			#endif
 		}
 	}

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

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by
@@ -66,11 +66,7 @@ public final class StepFeatures
 			}
 			else if (chunk instanceof ProtoChunk)
 			{
-				#if MC_VER < MC_1_21_1
+				chunkWrapper.trySetStatus(STATUS);
-				((ProtoChunk) chunk).setStatus(STATUS);
-				#else
-				((ProtoChunk) chunk).setPersistedStatus(STATUS);
-				#endif
 			}
 			
 			
@@ -91,7 +87,6 @@ public final class StepFeatures
 				#endif
 				
 				Heightmap.primeHeightmaps(chunk, STATUS.heightmapsAfter());
-				BatchGenerationEnvironment.clearDistantGenerationMixinData();
 			}
 			catch (Exception e)
 			{

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

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by
@@ -67,32 +67,42 @@ public final class StepNoise
 			{
 				continue;
 			}
-			
+			chunkWrapper.trySetStatus(STATUS);
-			#if MC_VER < MC_1_21_1
-			((ProtoChunk) chunk).setStatus(STATUS);
-			#else
-			((ProtoChunk) chunk).setPersistedStatus(STATUS);
-			#endif
 			chunksToDo.add(chunk);
 		}
 		
 		for (ChunkAccess chunk : chunksToDo)
 		{
-			// System.out.println("StepNoise: "+chunk.getPos());
 			#if MC_VER < MC_1_17_1
 			this.environment.params.generator.fillFromNoise(worldGenRegion, tParams.structFeat, chunk);
 			#elif MC_VER < MC_1_18_2
-			chunk = this.environment.joinSync(this.environment.params.generator.fillFromNoise(Runnable::run,
+			chunk = this.environment.confirmFutureWasRunSynchronously(
-					tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk));
+						this.environment.params.generator.fillFromNoise(
+							Runnable::run,
+							tParams.structFeat.forWorldGenRegion(worldGenRegion), 
+							chunk));
 			#elif MC_VER < MC_1_19_2
-			chunk = this.environment.joinSync(this.environment.params.generator.fillFromNoise(Runnable::run, Blender.of(worldGenRegion),
+			chunk = this.environment.confirmFutureWasRunSynchronously(
-					tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk));
+						this.environment.params.generator.fillFromNoise(
+							Runnable::run, 
+							Blender.of(worldGenRegion),
+							tParams.structFeat.forWorldGenRegion(worldGenRegion), 
+							chunk));
 			#elif MC_VER < MC_1_21_1
-			chunk = this.environment.joinSync(this.environment.params.generator.fillFromNoise(Runnable::run, Blender.of(worldGenRegion), this.environment.params.randomState,
+			chunk = this.environment.confirmFutureWasRunSynchronously(
-					tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk));
+						this.environment.params.generator.fillFromNoise(
+							Runnable::run, 
+							Blender.of(worldGenRegion), 
+							this.environment.params.randomState,
+							tParams.structFeat.forWorldGenRegion(worldGenRegion), 
+							chunk));
 			#else
-			chunk = this.environment.joinSync(this.environment.params.generator.fillFromNoise(Blender.of(worldGenRegion), this.environment.params.randomState,
+			chunk = this.environment.confirmFutureWasRunSynchronously(
-					tParams.structFeat.forWorldGenRegion(worldGenRegion), chunk));
+						this.environment.params.generator.fillFromNoise(
+							Blender.of(worldGenRegion), 
+							this.environment.params.randomState,
+							tParams.structFeat.forWorldGenRegion(worldGenRegion), 
+							chunk));
 			#endif
 			UncheckedInterruptedException.throwIfInterrupted();
 		}

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

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by
@@ -66,12 +66,7 @@ public final class StepStructureReference
 			}
 			else if (chunk instanceof ProtoChunk)
 			{
-				#if MC_VER < MC_1_21_1
+				chunkWrapper.trySetStatus(STATUS);
-				((ProtoChunk) chunk).setStatus(STATUS);
-				#else
-				((ProtoChunk) chunk).setPersistedStatus(STATUS);
-				#endif
-				chunksToDo.add(chunk);
 			}
 		}
 		

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

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by
@@ -28,7 +28,9 @@ import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGeneratio
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.ThreadedParameters;
 
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.level.WorldGenRegion;
+import net.minecraft.world.level.Level;
 import net.minecraft.world.level.chunk.ChunkAccess;
 import net.minecraft.world.level.chunk.ProtoChunk;
 import org.apache.logging.log4j.Logger;
@@ -83,12 +85,7 @@ public final class StepStructureStart
 			}
 			else if (chunk instanceof ProtoChunk)
 			{
-				#if MC_VER < MC_1_21_1
+				chunkWrapper.trySetStatus(STATUS);
-				((ProtoChunk) chunk).setStatus(STATUS);
-				#else
-				((ProtoChunk) chunk).setPersistedStatus(STATUS);
-				#endif
-				chunksToDo.add(chunk);
 			}
 		}
 		
@@ -96,7 +93,8 @@ public final class StepStructureStart
 		if (this.environment.params.worldGenSettings.generateFeatures())
 		{
 		#elif MC_VER < MC_1_19_4
-		if (this.environment.params.worldGenSettings.generateStructures()) {
+		if (this.environment.params.worldGenSettings.generateStructures()) 
+		{
 		#else
 		if (this.environment.params.worldOptions.generateStructures())
 		{
@@ -114,15 +112,20 @@ public final class StepStructureStart
 				STRUCTURE_PLACEMENT_LOCK.lock();
 				
 				#if MC_VER < MC_1_19_2
-				environment.params.generator.createStructures(environment.params.registry, tParams.structFeat, chunk, environment.params.structures,
+				this.environment.params.generator.createStructures(this.environment.params.registry, tParams.structFeat, chunk, this.environment.params.structures,
-						environment.params.worldSeed);
+						this.environment.params.worldSeed);
 				#elif MC_VER < MC_1_19_4
-				environment.params.generator.createStructures(environment.params.registry, environment.params.randomState, tParams.structFeat, chunk, environment.params.structures,
+				this.environment.params.generator.createStructures(this.environment.params.registry, this.environment.params.randomState, tParams.structFeat, chunk, this.environment.params.structures,
-						environment.params.worldSeed);
+						this.environment.params.worldSeed);
+				#elif MC_VER <= MC_1_21_3
+				this.environment.params.generator.createStructures(this.environment.params.registry,
+						this.environment.params.level.getChunkSource().getGeneratorState(),
+						tParams.structFeat, chunk, this.environment.params.structures);
 				#else
-				environment.params.generator.createStructures(environment.params.registry,
+				this.environment.params.generator.createStructures(this.environment.params.registry,
-						environment.params.level.getChunkSource().getGeneratorState(),
+						this.environment.params.level.getChunkSource().getGeneratorState(),
-						tParams.structFeat, chunk, environment.params.structures);
+						tParams.structFeat, chunk, this.environment.params.structures, 
+						this.environment.params.level.dimension());
 				#endif
 				
 				#if MC_VER >= MC_1_18_2

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

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by
@@ -65,12 +65,7 @@ public final class StepSurface
 			}
 			else if (chunk instanceof ProtoChunk)
 			{
-				#if MC_VER < MC_1_21_1
+				chunkWrapper.trySetStatus(STATUS);
-				((ProtoChunk) chunk).setStatus(STATUS);
-				#else
-				((ProtoChunk) chunk).setPersistedStatus(STATUS);
-				#endif
-				
 				chunksToDo.add(chunk);
 			}
 		}

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

@@ -2,6 +2,8 @@ accessWidener v1 named
 
 # used when determining where to save files to
 accessible field net/minecraft/world/level/storage/DimensionDataStorage dataFolder Ljava/io/File;
+# used to help determine what folder a clientLevel is
+accessible field net/minecraft/world/level/biome/BiomeManager biomeZoomSeed J
 
 # used when rendering
 accessible field com/mojang/blaze3d/vertex/VertexBuffer vertexCount I
@@ -31,6 +33,9 @@ accessible field net/minecraft/world/level/biome/Biome biomeCategory Lnet/minecr
 #accessible field net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator settings Lnet/minecraft/core/Holder;
 #accessible method net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator doCreateBiomes (Lnet/minecraft/core/Registry;Lnet/minecraft/world/level/levelgen/blending/Blender;Lnet/minecraft/world/level/StructureFeatureManager;Lnet/minecraft/world/level/chunk/ChunkAccess;)V
 accessible method net/minecraft/world/level/lighting/LayerLightEngine queueSectionData (JLnet/minecraft/world/level/chunk/DataLayer;Z)V
+accessible field net/minecraft/server/level/ServerChunkCache distanceManager Lnet/minecraft/server/level/DistanceManager;
+accessible method net/minecraft/server/level/ChunkMap getUpdatingChunkIfPresent (J)Lnet/minecraft/server/level/ChunkHolder;
+accessible method net/minecraft/server/level/ChunkMap tick (Ljava/util/function/BooleanSupplier;)V
 
 # lod generation from save file
 accessible field net/minecraft/server/level/ChunkMap mainThreadExecutor Lnet/minecraft/util/thread/BlockableEventLoop;

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

@@ -1,8 +1,9 @@
 accessWidener v1 named
 
-
 # used when determining where to save files to
 accessible field net/minecraft/world/level/storage/DimensionDataStorage dataFolder Ljava/io/File;
+# used to help determine what folder a clientLevel is
+accessible field net/minecraft/world/level/biome/BiomeManager biomeZoomSeed J
 
 # used when rendering
 accessible field com/mojang/blaze3d/vertex/VertexBuffer indexCount I
@@ -31,6 +32,11 @@ accessible field net/minecraft/world/level/biome/Biome biomeCategory Lnet/minecr
 # accessible field net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator settings Lnet/minecraft/core/Holder;
 #accessible method net/minecraft/world/level/levelgen/NoiseBasedChunkGenerator doCreateBiomes (Lnet/minecraft/core/Registry;Lnet/minecraft/world/level/levelgen/blending/Blender;Lnet/minecraft/world/level/StructureFeatureManager;Lnet/minecraft/world/level/chunk/ChunkAccess;)V
 accessible method net/minecraft/world/level/lighting/LayerLightEngine queueSectionData (JLnet/minecraft/world/level/chunk/DataLayer;Z)V
+accessible field net/minecraft/server/level/ServerChunkCache distanceManager Lnet/minecraft/server/level/DistanceManager;
+accessible method net/minecraft/server/level/ChunkMap getUpdatingChunkIfPresent (J)Lnet/minecraft/server/level/ChunkHolder;
+accessible method net/minecraft/server/level/ChunkMap tick (Ljava/util/function/BooleanSupplier;)V
+accessible field net/minecraft/server/level/ServerLevel entityManager Lnet/minecraft/world/level/entity/PersistentEntitySectionManager;
+accessible field net/minecraft/server/level/ChunkMap mainThreadExecutor Lnet/minecraft/util/thread/BlockableEventLoop;
 
 # lod generation from save file
 accessible field net/minecraft/server/level/ChunkMap mainThreadExecutor Lnet/minecraft/util/thread/BlockableEventLoop;

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

@@ -2,6 +2,8 @@ accessWidener v1 named
 
 # used when determining where to save files to
 accessible field net/minecraft/world/level/storage/DimensionDataStorage dataFolder Ljava/io/File;
+# used to help determine what folder a clientLevel is
+accessible field net/minecraft/world/level/biome/BiomeManager biomeZoomSeed J
 
 # used when rendering
 accessible method net/minecraft/client/renderer/GameRenderer getFov (Lnet/minecraft/client/Camera;FZ)D
@@ -15,6 +17,11 @@ accessible field net/minecraft/client/renderer/LevelRenderer$RenderChunkInfo chu
 # world generation
 accessible method net/minecraft/world/level/lighting/LayerLightEngine queueSectionData (JLnet/minecraft/world/level/chunk/DataLayer;Z)V
 accessible field net/minecraft/world/level/chunk/LevelChunk loaded Z
+accessible field net/minecraft/server/level/ServerChunkCache distanceManager Lnet/minecraft/server/level/DistanceManager;
+accessible method net/minecraft/server/level/ChunkMap getUpdatingChunkIfPresent (J)Lnet/minecraft/server/level/ChunkHolder;
+accessible method net/minecraft/server/level/ChunkMap tick (Ljava/util/function/BooleanSupplier;)V
+accessible field net/minecraft/server/level/ServerLevel entityManager Lnet/minecraft/world/level/entity/PersistentEntitySectionManager;
+accessible field net/minecraft/server/level/ChunkMap mainThreadExecutor Lnet/minecraft/util/thread/BlockableEventLoop;
 
 # lod generation from save file
 accessible field net/minecraft/world/level/chunk/storage/ChunkStorage worker Lnet/minecraft/world/level/chunk/storage/IOWorker;

common/src/main/resources/1_19_2.distanthorizons.accesswidener

@@ -2,6 +2,8 @@ accessWidener v1 named
 
 # used when determining where to save files to
 accessible field net/minecraft/world/level/storage/DimensionDataStorage dataFolder Ljava/io/File;
+# used to help determine what folder a clientLevel is
+accessible field net/minecraft/world/level/biome/BiomeManager biomeZoomSeed J
 
 # used when rendering
 accessible method net/minecraft/client/renderer/GameRenderer getFov (Lnet/minecraft/client/Camera;FZ)D
@@ -15,6 +17,11 @@ accessible field net/minecraft/client/renderer/LevelRenderer$RenderChunkInfo chu
 # world generation
 accessible method net/minecraft/world/level/lighting/LayerLightEngine queueSectionData (JLnet/minecraft/world/level/chunk/DataLayer;Z)V
 accessible field net/minecraft/world/level/chunk/LevelChunk loaded Z
+accessible field net/minecraft/server/level/ServerChunkCache distanceManager Lnet/minecraft/server/level/DistanceManager;
+accessible method net/minecraft/server/level/ChunkMap getUpdatingChunkIfPresent (J)Lnet/minecraft/server/level/ChunkHolder;
+accessible method net/minecraft/server/level/ChunkMap tick (Ljava/util/function/BooleanSupplier;)V
+accessible field net/minecraft/server/level/ServerLevel entityManager Lnet/minecraft/world/level/entity/PersistentEntitySectionManager;
+accessible field net/minecraft/server/level/ChunkMap mainThreadExecutor Lnet/minecraft/util/thread/BlockableEventLoop;
 
 # lod generation from save file
 accessible field net/minecraft/world/level/chunk/storage/ChunkStorage worker Lnet/minecraft/world/level/chunk/storage/IOWorker;

common/src/main/resources/1_19_4.distanthorizons.accesswidener

@@ -2,6 +2,8 @@ accessWidener v1 named
 
 # used when determining where to save files to
 accessible field net/minecraft/world/level/storage/DimensionDataStorage dataFolder Ljava/io/File;
+# used to help determine what folder a clientLevel is
+accessible field net/minecraft/world/level/biome/BiomeManager biomeZoomSeed J
 
 # used when rendering
 accessible method net/minecraft/client/renderer/GameRenderer getFov (Lnet/minecraft/client/Camera;FZ)D
@@ -15,6 +17,11 @@ accessible field net/minecraft/client/renderer/LevelRenderer$RenderChunkInfo chu
 # world generation
 accessible method net/minecraft/world/level/lighting/LayerLightEngine queueSectionData (JLnet/minecraft/world/level/chunk/DataLayer;Z)V
 accessible field net/minecraft/world/level/chunk/LevelChunk loaded Z
+accessible field net/minecraft/server/level/ServerChunkCache distanceManager Lnet/minecraft/server/level/DistanceManager;
+accessible method net/minecraft/server/level/ChunkMap getUpdatingChunkIfPresent (J)Lnet/minecraft/server/level/ChunkHolder;
+accessible method net/minecraft/server/level/ChunkMap tick (Ljava/util/function/BooleanSupplier;)V
+accessible field net/minecraft/server/level/ServerLevel entityManager Lnet/minecraft/world/level/entity/PersistentEntitySectionManager;
+accessible field net/minecraft/server/level/ChunkMap mainThreadExecutor Lnet/minecraft/util/thread/BlockableEventLoop;
 
 # lod generation from save file
 accessible field net/minecraft/world/level/chunk/storage/ChunkStorage worker Lnet/minecraft/world/level/chunk/storage/IOWorker;

common/src/main/resources/1_20.distanthorizons.accesswidener

@@ -2,6 +2,8 @@ accessWidener v1 named
 
 # used when determining where to save files to
 accessible field net/minecraft/world/level/storage/DimensionDataStorage dataFolder Ljava/io/File;
+# used to help determine what folder a clientLevel iss
+accessible field net/minecraft/world/level/biome/BiomeManager biomeZoomSeed J
 
 # used when rendering
 accessible method net/minecraft/client/renderer/GameRenderer getFov (Lnet/minecraft/client/Camera;FZ)D
@@ -17,6 +19,11 @@ accessible field net/minecraft/client/renderer/LevelRenderer$RenderChunkInfo chu
 accessible field net/minecraft/world/level/chunk/LevelChunk loaded Z
 accessible field net/minecraft/world/level/lighting/LightEngine storage Lnet/minecraft/world/level/lighting/LayerLightSectionStorage;
 accessible method net/minecraft/world/level/lighting/LayerLightSectionStorage lightOnInSection (J)Z
+accessible field net/minecraft/server/level/ServerChunkCache distanceManager Lnet/minecraft/server/level/DistanceManager;
+accessible method net/minecraft/server/level/ChunkMap getUpdatingChunkIfPresent (J)Lnet/minecraft/server/level/ChunkHolder;
+accessible method net/minecraft/server/level/ChunkMap tick (Ljava/util/function/BooleanSupplier;)V
+accessible field net/minecraft/server/level/ServerLevel entityManager Lnet/minecraft/world/level/entity/PersistentEntitySectionManager;
+accessible field net/minecraft/server/level/ChunkMap mainThreadExecutor Lnet/minecraft/util/thread/BlockableEventLoop;
 
 # lod generation from save file
 accessible field net/minecraft/world/level/chunk/storage/ChunkStorage worker Lnet/minecraft/world/level/chunk/storage/IOWorker;

common/src/main/resources/1_20_2.distanthorizons.accesswidener

@@ -2,6 +2,8 @@ accessWidener v1 named
 
 # used when determining where to save files to
 accessible field net/minecraft/world/level/storage/DimensionDataStorage dataFolder Ljava/io/File;
+# used to help determine what folder a clientLevel is
+accessible field net/minecraft/world/level/biome/BiomeManager biomeZoomSeed J
 
 # used when rendering
 accessible method net/minecraft/client/renderer/GameRenderer getFov (Lnet/minecraft/client/Camera;FZ)D
@@ -16,6 +18,11 @@ accessible field net/minecraft/client/renderer/LevelRenderer visibleSections Lit
 accessible field net/minecraft/world/level/chunk/LevelChunk loaded Z
 accessible field net/minecraft/world/level/lighting/LightEngine storage Lnet/minecraft/world/level/lighting/LayerLightSectionStorage;
 accessible method net/minecraft/world/level/lighting/LayerLightSectionStorage lightOnInSection (J)Z
+accessible field net/minecraft/server/level/ServerChunkCache distanceManager Lnet/minecraft/server/level/DistanceManager;
+accessible method net/minecraft/server/level/ChunkMap getUpdatingChunkIfPresent (J)Lnet/minecraft/server/level/ChunkHolder;
+accessible method net/minecraft/server/level/ChunkMap tick (Ljava/util/function/BooleanSupplier;)V
+accessible field net/minecraft/server/level/ServerLevel entityManager Lnet/minecraft/world/level/entity/PersistentEntitySectionManager;
+accessible field net/minecraft/server/level/ChunkMap mainThreadExecutor Lnet/minecraft/util/thread/BlockableEventLoop;
 
 # lod generation from save file
 accessible field net/minecraft/world/level/chunk/storage/ChunkStorage worker Lnet/minecraft/world/level/chunk/storage/IOWorker;

common/src/main/resources/1_20_6.distanthorizons.accesswidener

@@ -2,6 +2,8 @@ accessWidener v1 named
 
 # used when determining where to save files to
 accessible field net/minecraft/world/level/storage/DimensionDataStorage dataFolder Ljava/io/File;
+# used to help determine what folder a clientLevel is
+accessible field net/minecraft/world/level/biome/BiomeManager biomeZoomSeed J
 
 # used when rendering
 accessible method net/minecraft/client/renderer/GameRenderer getFov (Lnet/minecraft/client/Camera;FZ)D
@@ -16,6 +18,11 @@ accessible field net/minecraft/client/renderer/LevelRenderer visibleSections Lit
 accessible field net/minecraft/world/level/chunk/LevelChunk loaded Z
 accessible field net/minecraft/world/level/lighting/LightEngine storage Lnet/minecraft/world/level/lighting/LayerLightSectionStorage;
 accessible method net/minecraft/world/level/lighting/LayerLightSectionStorage lightOnInSection (J)Z
+accessible field net/minecraft/server/level/ServerChunkCache distanceManager Lnet/minecraft/server/level/DistanceManager;
+accessible method net/minecraft/server/level/ChunkMap getUpdatingChunkIfPresent (J)Lnet/minecraft/server/level/ChunkHolder;
+accessible method net/minecraft/server/level/ChunkMap tick (Ljava/util/function/BooleanSupplier;)V
+accessible field net/minecraft/server/level/ServerLevel entityManager Lnet/minecraft/world/level/entity/PersistentEntitySectionManager;
+accessible field net/minecraft/server/level/ChunkMap mainThreadExecutor Lnet/minecraft/util/thread/BlockableEventLoop;
 
 # lod generation from save file
 accessible field net/minecraft/world/level/chunk/storage/ChunkStorage worker Lnet/minecraft/world/level/chunk/storage/IOWorker;

common/src/main/resources/1_21_3.distanthorizons.accesswidener

@@ -0,0 +1,53 @@
+accessWidener v1 named
+
+# used when determining where to save files to
+accessible field net/minecraft/world/level/storage/DimensionDataStorage dataFolder Ljava/nio/file/Path;
+# used to help determine what folder a clientLevel is
+accessible field net/minecraft/world/level/biome/BiomeManager biomeZoomSeed J
+
+# used when rendering
+accessible method net/minecraft/client/renderer/GameRenderer getFov (Lnet/minecraft/client/Camera;FZ)F
+accessible field net/minecraft/client/Minecraft deltaTracker Lnet/minecraft/client/DeltaTracker$Timer;
+
+
+# used for grabbing vanilla rendered chunks
+accessible field net/minecraft/client/renderer/LevelRenderer visibleSections Lit/unimi/dsi/fastutil/objects/ObjectArrayList;
+
+# world generation
+# accessible method net/minecraft/world/level/lighting/LayerLightEngine queueSectionData (JLnet/minecraft/world/level/chunk/DataLayer;Z)V
+accessible field net/minecraft/world/level/chunk/LevelChunk loaded Z
+accessible field net/minecraft/world/level/lighting/LightEngine storage Lnet/minecraft/world/level/lighting/LayerLightSectionStorage;
+accessible method net/minecraft/world/level/lighting/LayerLightSectionStorage lightOnInSection (J)Z
+accessible field net/minecraft/server/level/ServerChunkCache distanceManager Lnet/minecraft/server/level/DistanceManager;
+accessible method net/minecraft/server/level/ChunkMap getUpdatingChunkIfPresent (J)Lnet/minecraft/server/level/ChunkHolder;
+accessible method net/minecraft/server/level/ChunkMap tick (Ljava/util/function/BooleanSupplier;)V
+accessible field net/minecraft/server/level/ServerLevel entityManager Lnet/minecraft/world/level/entity/PersistentEntitySectionManager;
+accessible field net/minecraft/server/level/ChunkMap mainThreadExecutor Lnet/minecraft/util/thread/BlockableEventLoop;
+
+# lod generation from save file
+accessible field net/minecraft/world/level/chunk/storage/ChunkStorage worker Lnet/minecraft/world/level/chunk/storage/IOWorker;
+accessible field net/minecraft/world/level/chunk/storage/IOWorker storage Lnet/minecraft/world/level/chunk/storage/RegionFileStorage;
+accessible field net/minecraft/world/level/chunk/storage/RegionFileStorage regionCache Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap;
+accessible field net/minecraft/world/level/chunk/storage/RegionFileStorage folder Ljava/nio/file/Path;
+
+# grabbing textures
+accessible class net/minecraft/client/renderer/texture/SpriteContents$AnimatedTexture
+accessible method net/minecraft/client/renderer/texture/SpriteContents$AnimatedTexture getFrameX (I)I
+accessible method net/minecraft/client/renderer/texture/SpriteContents$AnimatedTexture getFrameY (I)I
+accessible field net/minecraft/client/renderer/texture/SpriteContents animatedTexture Lnet/minecraft/client/renderer/texture/SpriteContents$AnimatedTexture;
+accessible field net/minecraft/client/renderer/texture/SpriteContents originalImage Lcom/mojang/blaze3d/platform/NativeImage;
+
+# UI stuff
+accessible field net/minecraft/client/gui/components/AbstractButton SPRITES Lnet/minecraft/client/gui/components/WidgetSprites;
+# Handles inserting the config button
+accessible field net/minecraft/client/gui/layouts/HeaderAndFooterLayout headerFrame Lnet/minecraft/client/gui/layouts/FrameLayout;
+accessible field net/minecraft/client/gui/layouts/FrameLayout children Ljava/util/List;
+accessible class net/minecraft/client/gui/layouts/FrameLayout$ChildContainer
+accessible field net/minecraft/client/gui/layouts/LinearLayout wrapped Lnet/minecraft/client/gui/layouts/GridLayout;
+
+# hacky stuff
+accessible field net/minecraft/util/ThreadingDetector lock Ljava/util/concurrent/Semaphore;
+mutable field net/minecraft/util/ThreadingDetector lock Ljava/util/concurrent/Semaphore;
+accessible field net/minecraft/client/gui/components/AbstractSelectionList scrollAmount D # Hack to bypass vanilla's setScrollAmount's clamp
+
+

common/src/main/resources/1_21_4.distanthorizons.accesswidener

@@ -0,0 +1,52 @@
+accessWidener v1 named
+
+# used when determining where to save files to
+accessible field net/minecraft/world/level/storage/DimensionDataStorage dataFolder Ljava/nio/file/Path;
+# used to help determine what folder a clientLevel is
+accessible field net/minecraft/world/level/biome/BiomeManager biomeZoomSeed J
+
+# used when rendering
+accessible method net/minecraft/client/renderer/GameRenderer getFov (Lnet/minecraft/client/Camera;FZ)F
+accessible field net/minecraft/client/Minecraft deltaTracker Lnet/minecraft/client/DeltaTracker$Timer;
+
+
+# used for grabbing vanilla rendered chunks
+accessible field net/minecraft/client/renderer/LevelRenderer visibleSections Lit/unimi/dsi/fastutil/objects/ObjectArrayList;
+
+# world generation
+# accessible method net/minecraft/world/level/lighting/LayerLightEngine queueSectionData (JLnet/minecraft/world/level/chunk/DataLayer;Z)V
+accessible field net/minecraft/world/level/chunk/LevelChunk loaded Z
+accessible field net/minecraft/world/level/lighting/LightEngine storage Lnet/minecraft/world/level/lighting/LayerLightSectionStorage;
+accessible method net/minecraft/world/level/lighting/LayerLightSectionStorage lightOnInSection (J)Z
+accessible field net/minecraft/server/level/ServerChunkCache distanceManager Lnet/minecraft/server/level/DistanceManager;
+accessible method net/minecraft/server/level/ChunkMap getUpdatingChunkIfPresent (J)Lnet/minecraft/server/level/ChunkHolder;
+accessible method net/minecraft/server/level/ChunkMap tick (Ljava/util/function/BooleanSupplier;)V
+accessible field net/minecraft/server/level/ServerLevel entityManager Lnet/minecraft/world/level/entity/PersistentEntitySectionManager;
+accessible field net/minecraft/server/level/ChunkMap mainThreadExecutor Lnet/minecraft/util/thread/BlockableEventLoop;
+
+# lod generation from save file
+accessible field net/minecraft/world/level/chunk/storage/ChunkStorage worker Lnet/minecraft/world/level/chunk/storage/IOWorker;
+accessible field net/minecraft/world/level/chunk/storage/IOWorker storage Lnet/minecraft/world/level/chunk/storage/RegionFileStorage;
+accessible field net/minecraft/world/level/chunk/storage/RegionFileStorage regionCache Lit/unimi/dsi/fastutil/longs/Long2ObjectLinkedOpenHashMap;
+accessible field net/minecraft/world/level/chunk/storage/RegionFileStorage folder Ljava/nio/file/Path;
+
+# grabbing textures
+accessible class net/minecraft/client/renderer/texture/SpriteContents$AnimatedTexture
+accessible method net/minecraft/client/renderer/texture/SpriteContents$AnimatedTexture getFrameX (I)I
+accessible method net/minecraft/client/renderer/texture/SpriteContents$AnimatedTexture getFrameY (I)I
+accessible field net/minecraft/client/renderer/texture/SpriteContents animatedTexture Lnet/minecraft/client/renderer/texture/SpriteContents$AnimatedTexture;
+accessible field net/minecraft/client/renderer/texture/SpriteContents originalImage Lcom/mojang/blaze3d/platform/NativeImage;
+
+# UI stuff
+accessible field net/minecraft/client/gui/components/AbstractButton SPRITES Lnet/minecraft/client/gui/components/WidgetSprites;
+# Handles inserting the config button
+accessible field net/minecraft/client/gui/layouts/HeaderAndFooterLayout headerFrame Lnet/minecraft/client/gui/layouts/FrameLayout;
+accessible field net/minecraft/client/gui/layouts/FrameLayout children Ljava/util/List;
+accessible class net/minecraft/client/gui/layouts/FrameLayout$ChildContainer
+accessible field net/minecraft/client/gui/layouts/LinearLayout wrapped Lnet/minecraft/client/gui/layouts/GridLayout;
+
+# hacky stuff
+accessible field net/minecraft/util/ThreadingDetector lock Ljava/util/concurrent/Semaphore;
+mutable field net/minecraft/util/ThreadingDetector lock Ljava/util/concurrent/Semaphore;
+
+

fabric/build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id "fabric-loom" version "1.6-SNAPSHOT"
+    id "fabric-loom" version "1.10-SNAPSHOT"
 }
 
 loom {
@@ -12,7 +12,15 @@ loom {
             setConfigName("Fabric Client")
             ideConfigGenerated(true) // When true a run configuration file will be generated for IDE's. By default only set to true for the root project.
             runDir("../run/client")
-            vmArgs("-Dio.netty.leakDetection.level=advanced") // https://netty.io/wiki/reference-counted-objects.html#leak-detection-levels
+            vmArgs(
+                    // https://github.com/FabricMC/fabric-loom/issues/915#issuecomment-1609154390
+                    "-Dminecraft.api.auth.host=https://nope.invalid",
+                    "-Dminecraft.api.account.host=https://nope.invalid",
+                    "-Dminecraft.api.session.host=https://nope.invalid",
+                    "-Dminecraft.api.services.host=https://nope.invalid",
+                    // https://netty.io/wiki/reference-counted-objects.html#leak-detection-levels
+                    "-Dio.netty.leakDetection.level=advanced"
+            )
             programArgs("--username", "Dev")
         }
         server {

fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricClientProxy.java

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by
@@ -33,6 +33,7 @@ import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
 import com.seibel.distanthorizons.core.util.threading.ThreadPoolUtil;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftClientWrapper;
+import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IPluginPacketSender;
 import com.seibel.distanthorizons.core.wrapperInterfaces.modAccessor.ISodiumAccessor;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import com.seibel.distanthorizons.core.util.math.Mat4f;
@@ -59,6 +60,7 @@ import com.seibel.distanthorizons.core.network.messages.AbstractNetworkMessage;
 import java.nio.FloatBuffer;
 #endif
 import java.util.HashSet;
+import java.util.concurrent.AbstractExecutorService;
 import java.util.concurrent.ThreadPoolExecutor;
 
 import net.minecraft.client.multiplayer.ClientLevel;
@@ -81,6 +83,7 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 {
 	private final ClientApi clientApi = ClientApi.INSTANCE;
 	private static final IMinecraftClientWrapper MC = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
+	private static final AbstractPluginPacketSender PACKET_SENDER = (AbstractPluginPacketSender) SingletonInjector.INSTANCE.get(IPluginPacketSender.class);
 	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
 	// TODO we shouldn't be filtering keys on the Forge/Fabric side, only in ClientApi
@@ -126,7 +129,7 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 			if (MC.clientConnectedToDedicatedServer())
 			{
 				IClientLevelWrapper wrappedLevel = ClientLevelWrapper.getWrapper(level);
-				SharedApi.INSTANCE.chunkLoadEvent(new ChunkWrapper(chunk, level, wrappedLevel), wrappedLevel);
+				SharedApi.INSTANCE.chunkLoadEvent(new ChunkWrapper(chunk, wrappedLevel), wrappedLevel);
 			}
 		});
 		
@@ -142,7 +145,7 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 					// executor to prevent locking up the render/event thread
 					// if the getChunk() takes longer than expected 
 					// (which can be caused by certain mods) 
-					ThreadPoolExecutor executor = ThreadPoolUtil.getFileHandlerExecutor();
+					AbstractExecutorService executor = ThreadPoolUtil.getFileHandlerExecutor();
 					if (executor != null)
 					{
 						executor.execute(() ->
@@ -154,7 +157,7 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 								
 								IClientLevelWrapper wrappedLevel = ClientLevelWrapper.getWrapper((ClientLevel) level);
 								SharedApi.INSTANCE.chunkBlockChangedEvent(
-										new ChunkWrapper(chunk, level, wrappedLevel),
+										new ChunkWrapper(chunk, wrappedLevel),
 										wrappedLevel
 								);
 							}
@@ -182,7 +185,7 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 						// executor to prevent locking up the render/event thread
 						// if the getChunk() takes longer than expected 
 						// (which can be caused by certain mods) 
-						ThreadPoolExecutor executor = ThreadPoolUtil.getFileHandlerExecutor();
+						AbstractExecutorService executor = ThreadPoolUtil.getFileHandlerExecutor();
 						if (executor != null)
 						{
 							executor.execute(() ->
@@ -194,7 +197,7 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 									
 									IClientLevelWrapper wrappedLevel = ClientLevelWrapper.getWrapper((ClientLevel) level);
 									SharedApi.INSTANCE.chunkBlockChangedEvent(
-											new ChunkWrapper(chunk, level, wrappedLevel),
+											new ChunkWrapper(chunk, wrappedLevel),
 											wrappedLevel
 									);
 								}
@@ -236,6 +239,56 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 					);
 		});
 		
+		
+		// TODO add to forge and neo
+		WorldRenderEvents.AFTER_ENTITIES.register((renderContext) ->
+		{
+			Mat4f projectionMatrix = McObjectConverter.Convert(renderContext.projectionMatrix());
+			
+			Mat4f modelViewMatrix;
+			#if MC_VER < MC_1_20_6
+			modelViewMatrix = McObjectConverter.Convert(renderContext.matrixStack().last().pose());
+			#else
+			modelViewMatrix = McObjectConverter.Convert(renderContext.positionMatrix());
+			#endif
+			
+			this.clientApi.renderFadeOpaque(
+					modelViewMatrix,
+					projectionMatrix,
+					#if MC_VER < MC_1_21_1
+					renderContext.tickDelta(),
+					#else
+					renderContext.tickCounter().getGameTimeDeltaTicks(),
+					#endif
+					ClientLevelWrapper.getWrapper(renderContext.world())
+			);
+		});
+		
+		// TODO add to forge and neo
+		WorldRenderEvents.AFTER_TRANSLUCENT.register((renderContext) ->
+		{
+			Mat4f projectionMatrix = McObjectConverter.Convert(renderContext.projectionMatrix());
+			
+			Mat4f modelViewMatrix;
+			#if MC_VER < MC_1_20_6
+			modelViewMatrix = McObjectConverter.Convert(renderContext.matrixStack().last().pose());
+			#else
+			modelViewMatrix = McObjectConverter.Convert(renderContext.positionMatrix());
+			#endif
+			
+			this.clientApi.renderFade(
+					modelViewMatrix,
+					projectionMatrix,
+					#if MC_VER < MC_1_21_1
+					renderContext.tickDelta(),
+					#else
+					renderContext.tickCounter().getGameTimeDeltaTicks(),
+					#endif
+					ClientLevelWrapper.getWrapper(renderContext.world())
+			);
+		});
+		
+		
 		// Debug keyboard event
 		// FIXME: Use better hooks so it doesn't trigger key press events in text boxes
 		ClientTickEvents.END_CLIENT_TICK.register(client -> 
@@ -253,7 +306,6 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 		//==================//
 		
 		#if MC_VER >= MC_1_20_6
-		PayloadTypeRegistry.playC2S().register(CommonPacketPayload.TYPE, new CommonPacketPayload.Codec());
 		PayloadTypeRegistry.playS2C().register(CommonPacketPayload.TYPE, new CommonPacketPayload.Codec());
 		ClientPlayNetworking.registerGlobalReceiver(CommonPacketPayload.TYPE, (payload, context) ->
 		{
@@ -266,9 +318,7 @@ public class FabricClientProxy implements AbstractModInitializer.IEventProxy
 		#else
 		ClientPlayNetworking.registerGlobalReceiver(AbstractPluginPacketSender.WRAPPER_PACKET_RESOURCE, (client, handler, buffer, packetSender) ->
 		{
-			// Forge packet ID
+			AbstractNetworkMessage message = PACKET_SENDER.decodeMessage(buffer);
-			buffer.readByte();
-			AbstractNetworkMessage message = AbstractPluginPacketSender.decodeMessage(buffer);
 			if (message != null)
 			{
 				ClientApi.INSTANCE.pluginMessageReceived(message);

fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricMain.java

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by
@@ -40,6 +40,7 @@ import net.minecraft.commands.CommandSourceStack;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.server.MinecraftServer;
 import org.apache.logging.log4j.Logger;
+import org.lwjgl.util.tinyfd.TinyFileDialogs;
 
 #if MC_VER >= MC_1_19_2
 import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
@@ -89,16 +90,13 @@ public class FabricMain extends AbstractModInitializer implements ClientModIniti
 		{
 			ModAccessorInjector.INSTANCE.bind(ISodiumAccessor.class, new SodiumAccessor());
 			
-			// If sodium is installed Indium is also necessary in order to use the Fabric rendering API
+			// If sodium is installed Indium is also necessary for versions 0.5 and less in order to use the Fabric rendering API
-			if (!modChecker.isModLoaded("indium"))
+			if (!modChecker.isModLoaded("indium") && SodiumAccessor.isSodiumV5OrLess)
 			{
 				String indiumMissingMessage = ModInfo.READABLE_NAME + " needs Indium to work with Sodium.\nPlease download Indium from https://modrinth.com/mod/indium";
 				LOGGER.fatal(indiumMissingMessage);
 				
-				if (!GraphicsEnvironment.isHeadless())
+				TinyFileDialogs.tinyfd_messageBox(ModInfo.READABLE_NAME, indiumMissingMessage, "ok", "error", false);
-				{
-					JOptionPane.showMessageDialog(null, indiumMissingMessage, ModInfo.READABLE_NAME, JOptionPane.INFORMATION_MESSAGE);
-				}
 				
 				IMinecraftClientWrapper mc = SingletonInjector.INSTANCE.get(IMinecraftClientWrapper.class);
 				String errorMessage = "loading Distant Horizons. Distant Horizons requires Indium in order to run with Sodium.";
@@ -142,7 +140,7 @@ public class FabricMain extends AbstractModInitializer implements ClientModIniti
 	{
 		SingletonInjector.INSTANCE.runDelayedSetup();
 		
-		if (Config.Client.Advanced.Graphics.Fog.disableVanillaFog.get() && SingletonInjector.INSTANCE.get(IModChecker.class).isModLoaded("bclib"))
+		if (!Config.Client.Advanced.Graphics.Fog.enableVanillaFog.get() && SingletonInjector.INSTANCE.get(IModChecker.class).isModLoaded("bclib"))
 		{
 			ModAccessorInjector.INSTANCE.get(IBCLibAccessor.class).setRenderCustomFog(false); // Remove BCLib's fog
 		}

fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricPluginPacketSender.java

@@ -22,9 +22,7 @@ public class FabricPluginPacketSender extends AbstractPluginPacketSender
 		ClientPlayNetworking.send(new CommonPacketPayload(message));
 		#else // < 1.20.6
 		FriendlyByteBuf buffer = PacketByteBufs.create();
-		// Forge packet ID
+		this.encodeMessage(buffer, message);
-		buffer.writeByte(0);
-		AbstractPluginPacketSender.encodeMessage(buffer, message);
 		ClientPlayNetworking.send(WRAPPER_PACKET_RESOURCE, buffer);
 		#endif
 	}
@@ -36,9 +34,7 @@ public class FabricPluginPacketSender extends AbstractPluginPacketSender
 		ServerPlayNetworking.send(serverPlayer, new CommonPacketPayload(message));
 		#else // < 1.20.6
 		FriendlyByteBuf buffer = PacketByteBufs.create();
-		// Forge packet ID
+		this.encodeMessage(buffer, message);
-		buffer.writeByte(0);
-		AbstractPluginPacketSender.encodeMessage(buffer, message);
 		ServerPlayNetworking.send(serverPlayer, WRAPPER_PACKET_RESOURCE, buffer);
 		#endif
 	}

fabric/src/main/java/com/seibel/distanthorizons/fabric/FabricServerProxy.java

@@ -9,7 +9,10 @@ import com.seibel.distanthorizons.common.wrappers.world.ClientLevelWrapper;
 import com.seibel.distanthorizons.common.wrappers.world.ServerLevelWrapper;
 import com.seibel.distanthorizons.common.wrappers.worldGeneration.BatchGenerationEnvironment;
 import com.seibel.distanthorizons.core.api.internal.ServerApi;
+import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
+import com.seibel.distanthorizons.common.AbstractPluginPacketSender;
 import com.seibel.distanthorizons.core.logging.DhLoggerBuilder;
+import com.seibel.distanthorizons.core.wrapperInterfaces.misc.IPluginPacketSender;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.IClientLevelWrapper;
 import com.seibel.distanthorizons.core.wrapperInterfaces.world.ILevelWrapper;
 import com.seibel.distanthorizons.fabric.testing.TestWorldGenBindingEvent;
@@ -32,7 +35,6 @@ import com.seibel.distanthorizons.common.CommonPacketPayload;
 import net.fabricmc.fabric.api.networking.v1.PayloadTypeRegistry;
 #else
 import com.seibel.distanthorizons.core.network.messages.AbstractNetworkMessage;
-import com.seibel.distanthorizons.common.AbstractPluginPacketSender;
 #endif
 
 import java.util.function.Supplier;
@@ -48,10 +50,11 @@ import java.util.function.Supplier;
 public class FabricServerProxy implements AbstractModInitializer.IEventProxy
 {
 	private static final ServerApi SERVER_API = ServerApi.INSTANCE;
+	@SuppressWarnings("unused")
+	private static final AbstractPluginPacketSender PACKET_SENDER = (AbstractPluginPacketSender) SingletonInjector.INSTANCE.get(IPluginPacketSender.class);
 	private static final Logger LOGGER = DhLoggerBuilder.getLogger();
 	
 	private final boolean isDedicatedServer;
-	public static Supplier<Boolean> isGenerationThreadChecker = null;
 	
 	
 	
@@ -87,7 +90,6 @@ public class FabricServerProxy implements AbstractModInitializer.IEventProxy
 	public void registerEvents()
 	{
 		LOGGER.info("Registering Fabric Server Events");
-		isGenerationThreadChecker = BatchGenerationEnvironment::isCurrentThreadDistantGeneratorThread;
 		
 		/* Register the mod needed event callbacks */
 		
@@ -144,7 +146,7 @@ public class FabricServerProxy implements AbstractModInitializer.IEventProxy
 			if (this.isValidTime())
 			{
 				ServerApi.INSTANCE.serverChunkLoadEvent(
-						new ChunkWrapper(chunk, chunk.getLevel(), level),
+						new ChunkWrapper(chunk, level),
 						level);
 			}
 		});
@@ -176,32 +178,31 @@ public class FabricServerProxy implements AbstractModInitializer.IEventProxy
 			}
 		});
 		
+		#if MC_VER >= MC_1_20_6
+		PayloadTypeRegistry.playC2S().register(CommonPacketPayload.TYPE, new CommonPacketPayload.Codec());
 		if (this.isDedicatedServer)
 		{
-			#if MC_VER >= MC_1_20_6
-			PayloadTypeRegistry.playC2S().register(CommonPacketPayload.TYPE, new CommonPacketPayload.Codec());
 			PayloadTypeRegistry.playS2C().register(CommonPacketPayload.TYPE, new CommonPacketPayload.Codec());
-			ServerPlayNetworking.registerGlobalReceiver(CommonPacketPayload.TYPE, (payload, context) ->
-			{
-				if (payload.message() == null)
-				{
-					return;
-				}
-				ServerApi.INSTANCE.pluginMessageReceived(ServerPlayerWrapper.getWrapper(context.player()), payload.message());
-			});
-			#else
-			ServerPlayNetworking.registerGlobalReceiver(AbstractPluginPacketSender.WRAPPER_PACKET_RESOURCE, (server, serverPlayer, handler, buffer, packetSender) ->
-			{
-				// Forge packet ID
-				buffer.readByte();
-				AbstractNetworkMessage message = AbstractPluginPacketSender.decodeMessage(buffer);
-				if (message != null)
-				{
-					ServerApi.INSTANCE.pluginMessageReceived(ServerPlayerWrapper.getWrapper(serverPlayer), message);
-				}
-			});
-			#endif
 		}
+		
+		ServerPlayNetworking.registerGlobalReceiver(CommonPacketPayload.TYPE, (payload, context) ->
+		{
+			if (payload.message() == null)
+			{
+				return;
+			}
+			ServerApi.INSTANCE.pluginMessageReceived(ServerPlayerWrapper.getWrapper(context.player()), payload.message());
+		});
+		#else
+		ServerPlayNetworking.registerGlobalReceiver(AbstractPluginPacketSender.WRAPPER_PACKET_RESOURCE, (server, serverPlayer, handler, buffer, packetSender) ->
+		{
+			AbstractNetworkMessage message = PACKET_SENDER.decodeMessage(buffer);
+			if (message != null)
+			{
+				ServerApi.INSTANCE.pluginMessageReceived(ServerPlayerWrapper.getWrapper(serverPlayer), message);
+			}
+		});
+		#endif
 	}
 	
 }

fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinClientLevel.java

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by
@@ -41,15 +41,6 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 @Mixin(ClientLevel.class)
 public class MixinClientLevel
 {
-//    //Moved to MixinClientPacketListener
-//    @Inject(method = "<init>", at = @At("TAIL"))
-//    private void loadWorldEvent(ClientPacketListener clientPacketListener, ClientLevel.ClientLevelData clientLevelData, ResourceKey resourceKey,
-//            #if MC_VER >= MC_1_18_2 Holder holder, #else DimensionType dimensionType, #endif int i,
-//            #if MC_VER >= MC_1_18_2 int j, #endif Supplier supplier, LevelRenderer levelRenderer, boolean bl, long l, CallbackInfo ci)
-//	{
-//        ClientApi.INSTANCE.clientLevelLoadEvent(WorldWrapper.getWorldWrapper((ClientLevel)(Object)this));
-//    }
-	
 	// Moved to overriding the enableChunkLight(...) method over at ClientPacketListener for 1.20+
 	#if MC_VER >= MC_1_18_2 && MC_VER < MC_1_20_1 // Only the setLightReady is only available after 1.18. This ensures the light data is ready.
 	@Inject(method = "setLightReady", at = @At("HEAD"))
@@ -60,7 +51,9 @@ public class MixinClientLevel
 		
 		if (chunk != null && !chunk.isClientLightReady())
 		{
-			SharedApi.INSTANCE.chunkLoadEvent(new ChunkWrapper(chunk, clientLevel, ClientLevelWrapper.getWrapper(clientLevel)), ClientLevelWrapper.getWrapper(clientLevel));
+			SharedApi.INSTANCE.chunkLoadEvent(
+					new ChunkWrapper(chunk, ClientLevelWrapper.getWrapper(clientLevel)), 
+					ClientLevelWrapper.getWrapper(clientLevel));
 		}
 	}
 	#endif

fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinClientPacketListener.java

@@ -21,8 +21,15 @@ import com.seibel.distanthorizons.common.wrappers.chunk.ChunkWrapper;
 @Mixin(ClientPacketListener.class)
 public class MixinClientPacketListener
 {
+	@Shadow
+	private ClientLevel level;
+	
 	@Inject(method = "handleLogin", at = @At("RETURN"))
-	void onHandleLoginEnd(CallbackInfo ci) { ClientApi.INSTANCE.onClientOnlyConnected(); }
+	void onHandleLoginEnd(CallbackInfo ci) 
+	{ 
+		ClientApi.INSTANCE.onClientOnlyConnected(); 
+		ClientApi.INSTANCE.clientLevelLoadEvent(ClientLevelWrapper.getWrapper(this.level, true));
+	}
 	
 	#if MC_VER < MC_1_19_4
 	@Inject(method = "cleanup", at = @At("HEAD"))
@@ -39,7 +46,7 @@ public class MixinClientPacketListener
 	void onEnableChunkLight(LevelChunk chunk, int x, int z, CallbackInfo ci)
 	{
 		IClientLevelWrapper clientLevel = ClientLevelWrapper.getWrapper((ClientLevel) chunk.getLevel());
-		SharedApi.INSTANCE.chunkLoadEvent(new ChunkWrapper(chunk, chunk.getLevel(), clientLevel), clientLevel);
+		SharedApi.INSTANCE.chunkLoadEvent(new ChunkWrapper(chunk, clientLevel), clientLevel);
 	}
 
 	#endif

fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinFogRenderer.java

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by
@@ -23,6 +23,7 @@ import com.seibel.distanthorizons.core.config.Config;
 import com.seibel.distanthorizons.core.dependencyInjection.SingletonInjector;
 import com.seibel.distanthorizons.core.wrapperInterfaces.minecraft.IMinecraftRenderWrapper;
 import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Unique;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
@@ -35,28 +36,64 @@ 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 MC_VER < MC_1_17_1
 import net.minecraft.world.level.material.FluidState;
+#elif MC_VER < MC_1_21_3
+import net.minecraft.world.level.material.FogType;
 #else
 import net.minecraft.world.level.material.FogType;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+import com.mojang.blaze3d.shaders.FogShape;
+import net.minecraft.client.renderer.FogParameters;
+import org.joml.Vector4f;
 #endif
 
 @Mixin(FogRenderer.class)
 public class MixinFogRenderer
 {
-	
 	// Using this instead of Float.MAX_VALUE because Sodium don't like it.
+	@Unique
 	private static final float A_REALLY_REALLY_BIG_VALUE = 420694206942069.F;
+	@Unique
 	private static final float A_EVEN_LARGER_VALUE = 42069420694206942069.F;
 	
-	@Inject(at = @At("RETURN"), method = "setupFog")
+	
+	
 	#if MC_VER < MC_1_19_2
+	@Inject(at = @At("RETURN"), method = "setupFog")
 	private static void disableSetupFog(Camera camera, FogMode fogMode, float f, boolean bl, CallbackInfo callback)
-	{
+	#elif MC_VER < MC_1_21_3
-	#else
+	@Inject(at = @At("RETURN"), method = "setupFog")
 	private static void disableSetupFog(Camera camera, FogMode fogMode, float f, boolean bl, float g, CallbackInfo callback)
-	{
+	#else
+	@Inject(at = @At("RETURN"), method = "setupFog", cancellable = true)
+	private static void disableSetupFog(Camera camera, FogMode fogMode, Vector4f vector4f, float f, boolean bl, float g, CallbackInfoReturnable<FogParameters> callback)
 	#endif
+	{
+		boolean cameraNotInFluid = cameraNotInFluid(camera);
+		
+		Entity entity = camera.getEntity();
+		boolean isSpecialFog = (entity instanceof LivingEntity) && ((LivingEntity) entity).hasEffect(MobEffects.BLINDNESS);
+		if (!isSpecialFog && cameraNotInFluid && fogMode == FogMode.FOG_TERRAIN
+				&& !SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class).isFogStateSpecial()
+				&& !Config.Client.Advanced.Graphics.Fog.enableVanillaFog.get())
+		{
+			#if MC_VER < MC_1_17_1
+			RenderSystem.fogStart(A_REALLY_REALLY_BIG_VALUE);
+			RenderSystem.fogEnd(A_EVEN_LARGER_VALUE);
+			#elif MC_VER < MC_1_21_3
+			RenderSystem.setShaderFogStart(A_REALLY_REALLY_BIG_VALUE);
+			RenderSystem.setShaderFogEnd(A_EVEN_LARGER_VALUE);
+			#else
+			callback.setReturnValue(FogParameters.NO_FOG);
+			#endif
+		}
+	}
+	
+	@Unique
+	private static boolean cameraNotInFluid(Camera camera)
+	{
 		#if MC_VER < MC_1_17_1
 		FluidState fluidState = camera.getFluidInCamera();
 		boolean cameraNotInFluid = fluidState.isEmpty();
@@ -65,20 +102,7 @@ public class MixinFogRenderer
 		boolean cameraNotInFluid = fogTypes == FogType.NONE;
 		#endif
 		
-		Entity entity = camera.getEntity();
+		return cameraNotInFluid;
-		boolean isSpecialFog = (entity instanceof LivingEntity) && ((LivingEntity) entity).hasEffect(MobEffects.BLINDNESS);
-		if (!isSpecialFog && cameraNotInFluid && fogMode == FogMode.FOG_TERRAIN
-				&& !SingletonInjector.INSTANCE.get(IMinecraftRenderWrapper.class).isFogStateSpecial()
-				&& Config.Client.Advanced.Graphics.Fog.disableVanillaFog.get())
-		{
-			#if MC_VER < 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/distanthorizons/fabric/mixins/client/MixinGameRenderer.java

@@ -1,58 +0,0 @@
-package com.seibel.distanthorizons.fabric.mixins.client;
-
-import com.seibel.distanthorizons.common.wrappers.DependencySetupDoneCheck;
-import com.seibel.distanthorizons.core.api.internal.ClientApi;
-import net.minecraft.client.renderer.GameRenderer;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
-import org.spongepowered.asm.mixin.Mixin;
-import org.spongepowered.asm.mixin.injection.At;
-import org.spongepowered.asm.mixin.injection.Inject;
-import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-
-@Mixin(GameRenderer.class)
-public class MixinGameRenderer
-{
-	private static final Logger LOGGER = LogManager.getLogger(MixinGameRenderer.class.getSimpleName());
-	
-	
-	#if MC_VER >= MC_1_17_1
-	// FIXME: This I think will dup multiple renderStartupEvent calls...
-	@Inject(method = {"reloadShaders", "preloadUiShader"}, at = @At("TAIL"))
-	public void onStartupShaders(CallbackInfo ci)
-	{
-		LOGGER.info("Starting up renderer (fabric)");
-		if (!DependencySetupDoneCheck.isDone)
-		{
-			LOGGER.warn("Dependency setup is not done yet, skipping renderer this startup event!");
-			return;
-		}
-		ClientApi.INSTANCE.rendererStartupEvent();
-	}
-	
-	@Inject(method = "shutdownShaders", at = @At("HEAD"))
-	public void onShutdownShaders(CallbackInfo ci)
-	{
-		LOGGER.info("Shutting down renderer (fabric)");
-		if (!DependencySetupDoneCheck.isDone)
-		{
-			LOGGER.warn("Dependency setup is not done yet, skipping renderer this shutdown event!");
-			return;
-		}
-		ClientApi.INSTANCE.rendererShutdownEvent();
-	}
-    #else
-    // FIXME: on 1.16 we dont have stuff for reloading/shutting down shaders
-	
-	// FIXME: This I think will dup multiple renderStartupEvent calls...
-	@Inject(method = {"loadEffect"}, at = @At("TAIL"))
-	public void onStartupShaders(CallbackInfo ci) {
-		ClientApi.INSTANCE.rendererStartupEvent();
-	}
-	
-	@Inject(method = "shutdownEffect", at = @At("HEAD"))
-	public void onShutdownShaders(CallbackInfo ci) {
-		ClientApi.INSTANCE.rendererShutdownEvent();
-	}
-    #endif
-}

fabric/src/main/java/com/seibel/distanthorizons/fabric/mixins/client/MixinLevelRenderer.java

@@ -2,7 +2,7 @@
  *    This file is part of the Distant Horizons mod
  *    licensed under the GNU LGPL v3 License.
  *
- *    Copyright (C) 2020-2023 James Seibel
+ *    Copyright (C) 2020 James Seibel
  *
  *    This program is free software: you can redistribute it and/or modify
  *    it under the terms of the GNU Lesser General Public License as published by
@@ -111,16 +111,22 @@ public class MixinLevelRenderer
 	    mcProjectionMatrix.setIdentity();
 		#endif
 	    
+		// TODO move this into a common place
+		float frameTime;
+		#if MC_VER < MC_1_21_1
+		frameTime = Minecraft.getInstance().getFrameTime();
+		#elif MC_VER < MC_1_21_3
+		frameTime = Minecraft.getInstance().getTimer().getRealtimeDeltaTicks();
+		#else
+		frameTime = Minecraft.getInstance().deltaTracker.getRealtimeDeltaTicks();
+		#endif
+	    
 	    if (renderType.equals(RenderType.translucent())) 
 		{
 		    ClientApi.INSTANCE.renderDeferredLods(ClientLevelWrapper.getWrapper(this.level),
 				    mcModelViewMatrix,
 				    mcProjectionMatrix,
-					#if MC_VER < MC_1_21_1
+				    frameTime
-					Minecraft.getInstance().getFrameTime()
-					#else
-				    Minecraft.getInstance().getTimer().getRealtimeDeltaTicks()
-					#endif
 				    );
 	    }